diff --git a/.mvn/.gitkeep b/.mvn/.gitkeep new file mode 100644 index 00000000000..e69de29bb2d diff --git a/examples/storm-hdfs-examples/pom.xml b/examples/storm-hdfs-examples/pom.xml index 5db8b16fa7c..ab77d4f037b 100644 --- a/examples/storm-hdfs-examples/pom.xml +++ b/examples/storm-hdfs-examples/pom.xml @@ -93,6 +93,11 @@ + + org.codehaus.gmavenplus + gmavenplus-plugin + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/bolt/HdfsFileTopology.java b/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/bolt/HdfsFileTopology.java index 01a446c9353..18321a34d6e 100644 --- a/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/bolt/HdfsFileTopology.java +++ b/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/bolt/HdfsFileTopology.java @@ -180,7 +180,7 @@ public void execute(Tuple tuple) { @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { - // this bolt does not emit anything + // this bolt does not emit anything } @Override diff --git a/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/bolt/SequenceFileTopology.java b/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/bolt/SequenceFileTopology.java index 90e0aea0d42..9b32e0cd0b4 100644 --- a/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/bolt/SequenceFileTopology.java +++ b/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/bolt/SequenceFileTopology.java @@ -25,8 +25,8 @@ import org.apache.storm.hdfs.bolt.format.DefaultSequenceFormat; import org.apache.storm.hdfs.bolt.format.FileNameFormat; import org.apache.storm.hdfs.bolt.rotation.FileRotationPolicy; -import org.apache.storm.hdfs.bolt.rotation.FileSizeRotationPolicy; import org.apache.storm.hdfs.bolt.rotation.FileSizeRotationPolicy.Units; +import org.apache.storm.hdfs.bolt.rotation.FileSizeRotationPolicy; import org.apache.storm.hdfs.bolt.sync.CountSyncPolicy; import org.apache.storm.hdfs.bolt.sync.SyncPolicy; import org.apache.storm.hdfs.common.rotation.MoveFileAction; @@ -189,7 +189,7 @@ public void execute(Tuple tuple) { @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { - // this bolt does not emit anything + // this bolt does not emit anything } @Override diff --git a/examples/storm-jdbc-examples/pom.xml b/examples/storm-jdbc-examples/pom.xml index 420744a675f..0d047a76763 100644 --- a/examples/storm-jdbc-examples/pom.xml +++ b/examples/storm-jdbc-examples/pom.xml @@ -85,6 +85,11 @@ + + org.codehaus.gmavenplus + gmavenplus-plugin + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/examples/storm-jdbc-examples/src/main/java/org/apache/storm/jdbc/spout/UserSpout.java b/examples/storm-jdbc-examples/src/main/java/org/apache/storm/jdbc/spout/UserSpout.java index 6854722191d..a4921afe35a 100644 --- a/examples/storm-jdbc-examples/src/main/java/org/apache/storm/jdbc/spout/UserSpout.java +++ b/examples/storm-jdbc-examples/src/main/java/org/apache/storm/jdbc/spout/UserSpout.java @@ -19,11 +19,9 @@ package org.apache.storm.jdbc.spout; import com.google.common.collect.Lists; - import java.util.List; import java.util.Map; import java.util.Random; - import org.apache.storm.spout.SpoutOutputCollector; import org.apache.storm.task.TopologyContext; import org.apache.storm.topology.IRichSpout; diff --git a/examples/storm-jdbc-examples/src/main/java/org/apache/storm/jdbc/topology/AbstractUserTopology.java b/examples/storm-jdbc-examples/src/main/java/org/apache/storm/jdbc/topology/AbstractUserTopology.java index aa7f68609a2..761dafe9e24 100644 --- a/examples/storm-jdbc-examples/src/main/java/org/apache/storm/jdbc/topology/AbstractUserTopology.java +++ b/examples/storm-jdbc-examples/src/main/java/org/apache/storm/jdbc/topology/AbstractUserTopology.java @@ -20,11 +20,9 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import java.sql.Types; import java.util.List; import java.util.Map; - import org.apache.storm.Config; import org.apache.storm.StormSubmitter; import org.apache.storm.generated.StormTopology; diff --git a/examples/storm-jdbc-examples/src/main/java/org/apache/storm/jdbc/topology/UserPersistenceTopology.java b/examples/storm-jdbc-examples/src/main/java/org/apache/storm/jdbc/topology/UserPersistenceTopology.java index 7d4129341f6..495d0995bfc 100644 --- a/examples/storm-jdbc-examples/src/main/java/org/apache/storm/jdbc/topology/UserPersistenceTopology.java +++ b/examples/storm-jdbc-examples/src/main/java/org/apache/storm/jdbc/topology/UserPersistenceTopology.java @@ -19,10 +19,8 @@ package org.apache.storm.jdbc.topology; import com.google.common.collect.Lists; - import java.sql.Types; import java.util.List; - import org.apache.storm.generated.StormTopology; import org.apache.storm.jdbc.bolt.JdbcInsertBolt; import org.apache.storm.jdbc.bolt.JdbcLookupBolt; diff --git a/examples/storm-jdbc-examples/src/main/java/org/apache/storm/jdbc/topology/UserPersistenceTridentTopology.java b/examples/storm-jdbc-examples/src/main/java/org/apache/storm/jdbc/topology/UserPersistenceTridentTopology.java index 1c38c351efd..1721ac1f2fc 100644 --- a/examples/storm-jdbc-examples/src/main/java/org/apache/storm/jdbc/topology/UserPersistenceTridentTopology.java +++ b/examples/storm-jdbc-examples/src/main/java/org/apache/storm/jdbc/topology/UserPersistenceTridentTopology.java @@ -19,9 +19,7 @@ package org.apache.storm.jdbc.topology; import com.google.common.collect.Lists; - import java.sql.Types; - import org.apache.storm.generated.StormTopology; import org.apache.storm.jdbc.common.Column; import org.apache.storm.jdbc.mapper.SimpleJdbcLookupMapper; diff --git a/examples/storm-jms-examples/pom.xml b/examples/storm-jms-examples/pom.xml index ed4172d021c..aca17b73168 100644 --- a/examples/storm-jms-examples/pom.xml +++ b/examples/storm-jms-examples/pom.xml @@ -105,6 +105,11 @@ + + org.codehaus.gmavenplus + gmavenplus-plugin + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/examples/storm-kafka-client-examples/pom.xml b/examples/storm-kafka-client-examples/pom.xml index b9eed85d8a2..7c6666bd99a 100644 --- a/examples/storm-kafka-client-examples/pom.xml +++ b/examples/storm-kafka-client-examples/pom.xml @@ -103,6 +103,11 @@ + + org.codehaus.gmavenplus + gmavenplus-plugin + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/examples/storm-loadgen/pom.xml b/examples/storm-loadgen/pom.xml index 4fab7113e7c..c9ef65ae9b3 100644 --- a/examples/storm-loadgen/pom.xml +++ b/examples/storm-loadgen/pom.xml @@ -122,6 +122,11 @@ + + org.codehaus.gmavenplus + gmavenplus-plugin + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/ExecAndProcessLatencyEngine.java b/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/ExecAndProcessLatencyEngine.java index c2dd81f71a4..1e5698ce0bb 100644 --- a/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/ExecAndProcessLatencyEngine.java +++ b/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/ExecAndProcessLatencyEngine.java @@ -67,7 +67,7 @@ public void sleepNano(long start, long sleepAmount) { long diff = newEnd - start; //There are some different levels of accuracy here, and we want to deal with all of them if (diff <= 1_000) { - //We are done, nothing that short is going to work here + //We are done, nothing that short is going to work here } else if (diff < NANO_IN_MS) { //Busy wait... long sum = 0; diff --git a/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/InputStream.java b/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/InputStream.java index 19802d9e0fa..974710c15f3 100644 --- a/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/InputStream.java +++ b/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/InputStream.java @@ -184,7 +184,7 @@ public Builder withGroupingType(Grouping grouping) { } catch (Exception e) { //ignored } - //Fall through if not supported + //Fall through if not supported default: LOG.warn("{} is not supported for replay of a topology. Using SHUFFLE", thriftType); break; diff --git a/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/LoadMetricsServer.java b/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/LoadMetricsServer.java index f02c407093a..9af989a7bb4 100644 --- a/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/LoadMetricsServer.java +++ b/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/LoadMetricsServer.java @@ -319,7 +319,7 @@ private static class NoCloseOutputStream extends FilterOutputStream { @Override public void close() { - //NOOP on purpose + //NOOP on purpose } } @@ -363,7 +363,7 @@ abstract static class FileReporter implements MetricResultsReporter { @Override public void start() { - //NOOP + //NOOP } @Override diff --git a/examples/storm-loadgen/src/test/java/org/apache/storm/loadgen/LoadCompConfTest.java b/examples/storm-loadgen/src/test/java/org/apache/storm/loadgen/LoadCompConfTest.java index ed10692cdc4..b2c3276a600 100644 --- a/examples/storm-loadgen/src/test/java/org/apache/storm/loadgen/LoadCompConfTest.java +++ b/examples/storm-loadgen/src/test/java/org/apache/storm/loadgen/LoadCompConfTest.java @@ -18,10 +18,10 @@ package org.apache.storm.loadgen; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; + public class LoadCompConfTest { @Test public void scaleParallel() { @@ -54,4 +54,4 @@ public void scaleThroughput() { //But throughput is the same assertEquals(1000.0, scaled.getAllEmittedAggregate(), 0.001); } -} \ No newline at end of file +} diff --git a/examples/storm-loadgen/src/test/java/org/apache/storm/loadgen/LoadMetricsServerTest.java b/examples/storm-loadgen/src/test/java/org/apache/storm/loadgen/LoadMetricsServerTest.java index 7f549be1c0c..b4cd472a1ed 100644 --- a/examples/storm-loadgen/src/test/java/org/apache/storm/loadgen/LoadMetricsServerTest.java +++ b/examples/storm-loadgen/src/test/java/org/apache/storm/loadgen/LoadMetricsServerTest.java @@ -18,12 +18,12 @@ package org.apache.storm.loadgen; +import static org.apache.storm.loadgen.LoadMetricsServer.convert; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.apache.storm.loadgen.LoadMetricsServer.convert; - public class LoadMetricsServerTest { @Test public void convertTest() { @@ -34,4 +34,4 @@ public void convertTest() { } } } -} \ No newline at end of file +} diff --git a/examples/storm-loadgen/src/test/java/org/apache/storm/loadgen/NormalDistStatsTest.java b/examples/storm-loadgen/src/test/java/org/apache/storm/loadgen/NormalDistStatsTest.java index 3512bbae13d..91e380b16c8 100644 --- a/examples/storm-loadgen/src/test/java/org/apache/storm/loadgen/NormalDistStatsTest.java +++ b/examples/storm-loadgen/src/test/java/org/apache/storm/loadgen/NormalDistStatsTest.java @@ -18,10 +18,10 @@ package org.apache.storm.loadgen; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; + public class NormalDistStatsTest { public static void assertNDSEquals(NormalDistStats a, NormalDistStats b) { assertEquals(a.mean, b.mean, 0.0001, "mean"); @@ -40,4 +40,4 @@ public void scaleBy() { assertNDSEquals(expectedHalf, orig.scaleBy(0.5)); } -} \ No newline at end of file +} diff --git a/examples/storm-loadgen/src/test/java/org/apache/storm/loadgen/OutputStreamTest.java b/examples/storm-loadgen/src/test/java/org/apache/storm/loadgen/OutputStreamTest.java index 3980e2a7ab6..8ffc70f20a7 100644 --- a/examples/storm-loadgen/src/test/java/org/apache/storm/loadgen/OutputStreamTest.java +++ b/examples/storm-loadgen/src/test/java/org/apache/storm/loadgen/OutputStreamTest.java @@ -18,10 +18,10 @@ package org.apache.storm.loadgen; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; + public class OutputStreamTest { @Test public void scaleThroughput() { @@ -34,4 +34,4 @@ public void scaleThroughput() { assertEquals(scaled.rate.min, 199.0, 0.0001); assertEquals(scaled.rate.max, 201.0, 0.0001); } -} \ No newline at end of file +} diff --git a/examples/storm-perf/pom.xml b/examples/storm-perf/pom.xml index c0735359f30..e6df84631ef 100644 --- a/examples/storm-perf/pom.xml +++ b/examples/storm-perf/pom.xml @@ -86,6 +86,11 @@ ${storm.topology} + + org.codehaus.gmavenplus + gmavenplus-plugin + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/JitterAwareGroupingTopology.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/JitterAwareGroupingTopology.java index 7bc53476f3c..67403be5a8a 100644 --- a/examples/storm-perf/src/main/java/org/apache/storm/perf/JitterAwareGroupingTopology.java +++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/JitterAwareGroupingTopology.java @@ -343,7 +343,7 @@ public void execute(Tuple tuple) { @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { - // terminal — no output + // terminal — no output } } } diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/KafkaClientSpoutNullBoltTopo.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/KafkaClientSpoutNullBoltTopo.java index 4ac1ed8e86e..ac3bd0d3674 100644 --- a/examples/storm-perf/src/main/java/org/apache/storm/perf/KafkaClientSpoutNullBoltTopo.java +++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/KafkaClientSpoutNullBoltTopo.java @@ -22,8 +22,8 @@ import org.apache.storm.generated.StormTopology; import org.apache.storm.kafka.spout.FirstPollOffsetStrategy; import org.apache.storm.kafka.spout.KafkaSpout; -import org.apache.storm.kafka.spout.KafkaSpoutConfig; import org.apache.storm.kafka.spout.KafkaSpoutConfig.ProcessingGuarantee; +import org.apache.storm.kafka.spout.KafkaSpoutConfig; import org.apache.storm.perf.bolt.DevNullBolt; import org.apache.storm.perf.utils.Helper; import org.apache.storm.topology.TopologyBuilder; diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/AckingProducer.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/AckingProducer.java index 0214515d4c2..f7e70001f01 100644 --- a/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/AckingProducer.java +++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/AckingProducer.java @@ -51,12 +51,12 @@ public void run() { private class Handler implements JCQueue.Consumer { @Override public void accept(Object event) { - // no-op + // no-op } @Override public void flush() { - // no-op + // no-op } } } diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/Consumer.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/Consumer.java index eadb51d8b5e..2cf0ac0eb29 100644 --- a/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/Consumer.java +++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/Consumer.java @@ -57,7 +57,7 @@ public void accept(Object event) { @Override public void flush() { - // no-op + // no-op } } } diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/Forwarder.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/Forwarder.java index a5781d08554..eb184bf4a9d 100644 --- a/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/Forwarder.java +++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/Forwarder.java @@ -64,7 +64,7 @@ public void accept(Object event) { @Override public void flush() { - // no-op + // no-op } } } diff --git a/examples/storm-redis-examples/pom.xml b/examples/storm-redis-examples/pom.xml index f8963e6ab3c..38cd7b0565b 100644 --- a/examples/storm-redis-examples/pom.xml +++ b/examples/storm-redis-examples/pom.xml @@ -89,6 +89,11 @@ + + org.codehaus.gmavenplus + gmavenplus-plugin + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/tools/Base64ToBinaryStateMigrationUtil.java b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/tools/Base64ToBinaryStateMigrationUtil.java index 9d0d4c113d4..60a3c72e62c 100644 --- a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/tools/Base64ToBinaryStateMigrationUtil.java +++ b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/tools/Base64ToBinaryStateMigrationUtil.java @@ -21,7 +21,6 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; - import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; import org.apache.commons.cli.DefaultParser; diff --git a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/LookupWordCount.java b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/LookupWordCount.java index 243f1bffc46..e7e12368b5b 100644 --- a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/LookupWordCount.java +++ b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/LookupWordCount.java @@ -19,11 +19,9 @@ package org.apache.storm.redis.topology; import com.google.common.collect.Lists; - import java.util.List; import java.util.Map; import java.util.Random; - import org.apache.storm.Config; import org.apache.storm.StormSubmitter; import org.apache.storm.redis.bolt.RedisLookupBolt; @@ -39,7 +37,6 @@ import org.apache.storm.tuple.ITuple; import org.apache.storm.tuple.Tuple; import org.apache.storm.tuple.Values; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WhitelistWordCount.java b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WhitelistWordCount.java index 5b47f0cd51e..5f103bb3730 100644 --- a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WhitelistWordCount.java +++ b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WhitelistWordCount.java @@ -20,7 +20,6 @@ import java.util.Map; import java.util.Random; - import org.apache.storm.Config; import org.apache.storm.StormSubmitter; import org.apache.storm.redis.bolt.RedisFilterBolt; diff --git a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WordCounter.java b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WordCounter.java index a0b9714c804..b9c0c9117b0 100644 --- a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WordCounter.java +++ b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WordCounter.java @@ -19,9 +19,7 @@ package org.apache.storm.redis.topology; import com.google.common.collect.Maps; - import java.util.Map; - import org.apache.storm.task.TopologyContext; import org.apache.storm.topology.BasicOutputCollector; import org.apache.storm.topology.IBasicBolt; diff --git a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WordSpout.java b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WordSpout.java index ff3ec39101b..efb3c9f250d 100644 --- a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WordSpout.java +++ b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WordSpout.java @@ -21,7 +21,6 @@ import java.util.Map; import java.util.Random; import java.util.UUID; - import org.apache.storm.spout.SpoutOutputCollector; import org.apache.storm.task.TopologyContext; import org.apache.storm.topology.IRichSpout; diff --git a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/trident/PrintFunction.java b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/trident/PrintFunction.java index f32cfe8e037..6f0f389fdbb 100644 --- a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/trident/PrintFunction.java +++ b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/trident/PrintFunction.java @@ -19,11 +19,9 @@ package org.apache.storm.redis.trident; import java.util.Random; - import org.apache.storm.trident.operation.BaseFunction; import org.apache.storm.trident.operation.TridentCollector; import org.apache.storm.trident.tuple.TridentTuple; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/trident/WordCountLookupMapper.java b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/trident/WordCountLookupMapper.java index 04874d5f13c..8ac4c0d8811 100644 --- a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/trident/WordCountLookupMapper.java +++ b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/trident/WordCountLookupMapper.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; - import org.apache.storm.redis.common.mapper.RedisDataTypeDescription; import org.apache.storm.redis.common.mapper.RedisLookupMapper; import org.apache.storm.topology.OutputFieldsDeclarer; diff --git a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/trident/WordCountTridentRedisCluster.java b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/trident/WordCountTridentRedisCluster.java index 7ced2afdadf..23338374faa 100644 --- a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/trident/WordCountTridentRedisCluster.java +++ b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/trident/WordCountTridentRedisCluster.java @@ -21,7 +21,6 @@ import java.net.InetSocketAddress; import java.util.HashSet; import java.util.Set; - import org.apache.storm.Config; import org.apache.storm.StormSubmitter; import org.apache.storm.generated.StormTopology; diff --git a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/trident/WordCountTridentRedisClusterMap.java b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/trident/WordCountTridentRedisClusterMap.java index b1425c9bf34..9fec8f7b508 100644 --- a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/trident/WordCountTridentRedisClusterMap.java +++ b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/trident/WordCountTridentRedisClusterMap.java @@ -21,7 +21,6 @@ import java.net.InetSocketAddress; import java.util.HashSet; import java.util.Set; - import org.apache.storm.Config; import org.apache.storm.StormSubmitter; import org.apache.storm.generated.StormTopology; diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml index 0da74cb73de..d84bfcf572a 100644 --- a/examples/storm-starter/pom.xml +++ b/examples/storm-starter/pom.xml @@ -174,6 +174,11 @@ none + + org.codehaus.gmavenplus + gmavenplus-plugin + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/FastWordCountTopology.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/FastWordCountTopology.java index e5da703380b..61a33b1e5fa 100644 --- a/examples/storm-starter/src/jvm/org/apache/storm/starter/FastWordCountTopology.java +++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/FastWordCountTopology.java @@ -140,7 +140,7 @@ public void nextTuple() { @Override public void ack(Object id) { - //Ignored + //Ignored } @Override diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/InOrderDeliveryTest.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/InOrderDeliveryTest.java index 4820aef2026..cfe63a3120b 100644 --- a/examples/storm-starter/src/jvm/org/apache/storm/starter/InOrderDeliveryTest.java +++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/InOrderDeliveryTest.java @@ -128,12 +128,12 @@ public void nextTuple() { @Override public void ack(Object id) { - //Ignored + //Ignored } @Override public void fail(Object id) { - //Ignored + //Ignored } @Override @@ -163,7 +163,7 @@ public void execute(Tuple tuple, BasicOutputCollector collector) { @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { - //Empty + //Empty } } } diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/ResourceAwareExampleTopology.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/ResourceAwareExampleTopology.java index 20f951e7602..185a81933ba 100644 --- a/examples/storm-starter/src/jvm/org/apache/storm/starter/ResourceAwareExampleTopology.java +++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/ResourceAwareExampleTopology.java @@ -13,8 +13,8 @@ package org.apache.storm.starter; import java.util.Iterator; -import java.util.Map; import java.util.Map.Entry; +import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.apache.storm.Config; import org.apache.storm.StormSubmitter; diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/SlidingTupleTsTopology.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/SlidingTupleTsTopology.java index d179899d69b..9a031b0f8fd 100644 --- a/examples/storm-starter/src/jvm/org/apache/storm/starter/SlidingTupleTsTopology.java +++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/SlidingTupleTsTopology.java @@ -19,8 +19,8 @@ import org.apache.storm.starter.bolt.SlidingWindowSumBolt; import org.apache.storm.starter.spout.RandomIntegerSpout; import org.apache.storm.topology.TopologyBuilder; -import org.apache.storm.topology.base.BaseWindowedBolt; import org.apache.storm.topology.base.BaseWindowedBolt.Duration; +import org.apache.storm.topology.base.BaseWindowedBolt; /** * Windowing based on tuple timestamp (e.g. the time when tuple is generated diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/SlidingWindowTopology.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/SlidingWindowTopology.java index fda309df70f..d7d8b8de154 100644 --- a/examples/storm-starter/src/jvm/org/apache/storm/starter/SlidingWindowTopology.java +++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/SlidingWindowTopology.java @@ -23,8 +23,8 @@ import org.apache.storm.task.TopologyContext; import org.apache.storm.topology.OutputFieldsDeclarer; import org.apache.storm.topology.TopologyBuilder; -import org.apache.storm.topology.base.BaseWindowedBolt; import org.apache.storm.topology.base.BaseWindowedBolt.Count; +import org.apache.storm.topology.base.BaseWindowedBolt; import org.apache.storm.tuple.Fields; import org.apache.storm.tuple.Tuple; import org.apache.storm.tuple.Values; diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/bolt/RollingCountBolt.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/bolt/RollingCountBolt.java index 0e5cef57d9f..de03c55c820 100644 --- a/examples/storm-starter/src/jvm/org/apache/storm/starter/bolt/RollingCountBolt.java +++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/bolt/RollingCountBolt.java @@ -13,8 +13,8 @@ package org.apache.storm.starter.bolt; import java.util.HashMap; -import java.util.Map; import java.util.Map.Entry; +import java.util.Map; import org.apache.log4j.Logger; import org.apache.storm.Config; import org.apache.storm.starter.tools.NthLastModifiedTimeTracker; diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/tools/NthLastModifiedTimeTracker.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/tools/NthLastModifiedTimeTracker.java index 67260a3b580..7eb6e931d77 100644 --- a/examples/storm-starter/src/jvm/org/apache/storm/starter/tools/NthLastModifiedTimeTracker.java +++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/tools/NthLastModifiedTimeTracker.java @@ -13,7 +13,6 @@ package org.apache.storm.starter.tools; import java.util.concurrent.ArrayBlockingQueue; - import org.apache.storm.utils.Time; /** diff --git a/examples/storm-starter/test/jvm/org/apache/storm/starter/bolt/IntermediateRankingsBoltTest.java b/examples/storm-starter/test/jvm/org/apache/storm/starter/bolt/IntermediateRankingsBoltTest.java index 18834d3095c..022ebd1d30e 100644 --- a/examples/storm-starter/test/jvm/org/apache/storm/starter/bolt/IntermediateRankingsBoltTest.java +++ b/examples/storm-starter/test/jvm/org/apache/storm/starter/bolt/IntermediateRankingsBoltTest.java @@ -12,6 +12,14 @@ package org.apache.storm.starter.bolt; +import static org.fest.assertions.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoInteractions; +import static org.mockito.Mockito.when; + import com.google.common.collect.Lists; import java.util.Map; import org.apache.storm.Config; @@ -24,14 +32,6 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import static org.fest.assertions.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoInteractions; -import static org.mockito.Mockito.when; - public class IntermediateRankingsBoltTest { private static final String ANY_NON_SYSTEM_COMPONENT_ID = "irrelevant_component_id"; diff --git a/examples/storm-starter/test/jvm/org/apache/storm/starter/bolt/RollingCountBoltTest.java b/examples/storm-starter/test/jvm/org/apache/storm/starter/bolt/RollingCountBoltTest.java index 56d65606520..623d807ed15 100644 --- a/examples/storm-starter/test/jvm/org/apache/storm/starter/bolt/RollingCountBoltTest.java +++ b/examples/storm-starter/test/jvm/org/apache/storm/starter/bolt/RollingCountBoltTest.java @@ -12,6 +12,14 @@ package org.apache.storm.starter.bolt; +import static org.fest.assertions.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoInteractions; +import static org.mockito.Mockito.when; + import java.util.Map; import org.apache.storm.Config; import org.apache.storm.task.OutputCollector; @@ -23,14 +31,6 @@ import org.apache.storm.utils.MockTupleHelpers; import org.testng.annotations.Test; -import static org.fest.assertions.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoInteractions; -import static org.mockito.Mockito.when; - public class RollingCountBoltTest { private static final String ANY_NON_SYSTEM_COMPONENT_ID = "irrelevant_component_id"; diff --git a/examples/storm-starter/test/jvm/org/apache/storm/starter/bolt/TotalRankingsBoltTest.java b/examples/storm-starter/test/jvm/org/apache/storm/starter/bolt/TotalRankingsBoltTest.java index d74e41e5a19..cc7405504b9 100644 --- a/examples/storm-starter/test/jvm/org/apache/storm/starter/bolt/TotalRankingsBoltTest.java +++ b/examples/storm-starter/test/jvm/org/apache/storm/starter/bolt/TotalRankingsBoltTest.java @@ -12,6 +12,14 @@ package org.apache.storm.starter.bolt; +import static org.fest.assertions.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoInteractions; +import static org.mockito.Mockito.when; + import java.util.Map; import org.apache.storm.Config; import org.apache.storm.starter.tools.Rankings; @@ -24,14 +32,6 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import static org.fest.assertions.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoInteractions; -import static org.mockito.Mockito.when; - public class TotalRankingsBoltTest { private static final String ANY_NON_SYSTEM_COMPONENT_ID = "irrelevant_component_id"; diff --git a/examples/storm-starter/test/jvm/org/apache/storm/starter/tools/NthLastModifiedTimeTrackerTest.java b/examples/storm-starter/test/jvm/org/apache/storm/starter/tools/NthLastModifiedTimeTrackerTest.java index f4393ed41b4..71d3d71d93d 100644 --- a/examples/storm-starter/test/jvm/org/apache/storm/starter/tools/NthLastModifiedTimeTrackerTest.java +++ b/examples/storm-starter/test/jvm/org/apache/storm/starter/tools/NthLastModifiedTimeTrackerTest.java @@ -12,13 +12,13 @@ package org.apache.storm.starter.tools; -import org.apache.storm.utils.Time; +import static org.fest.assertions.api.Assertions.assertThat; + import org.apache.storm.utils.Time.SimulatedTime; +import org.apache.storm.utils.Time; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import static org.fest.assertions.api.Assertions.assertThat; - public class NthLastModifiedTimeTrackerTest { private static final int ANY_NUM_TIMES_TO_TRACK = 3; diff --git a/examples/storm-starter/test/jvm/org/apache/storm/starter/tools/RankableObjectWithFieldsTest.java b/examples/storm-starter/test/jvm/org/apache/storm/starter/tools/RankableObjectWithFieldsTest.java index cf275d26d72..7dfcdb45bfa 100644 --- a/examples/storm-starter/test/jvm/org/apache/storm/starter/tools/RankableObjectWithFieldsTest.java +++ b/examples/storm-starter/test/jvm/org/apache/storm/starter/tools/RankableObjectWithFieldsTest.java @@ -12,6 +12,12 @@ package org.apache.storm.starter.tools; +import static org.fest.assertions.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; + import com.google.common.collect.Lists; import java.util.ArrayList; import java.util.List; @@ -19,12 +25,6 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import static org.fest.assertions.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertTrue; - public class RankableObjectWithFieldsTest { private static final Object ANY_OBJECT = new Object(); diff --git a/examples/storm-starter/test/jvm/org/apache/storm/starter/tools/RankingsTest.java b/examples/storm-starter/test/jvm/org/apache/storm/starter/tools/RankingsTest.java index 206d45c77d4..47c54e8e72f 100644 --- a/examples/storm-starter/test/jvm/org/apache/storm/starter/tools/RankingsTest.java +++ b/examples/storm-starter/test/jvm/org/apache/storm/starter/tools/RankingsTest.java @@ -12,6 +12,8 @@ package org.apache.storm.starter.tools; +import static org.fest.assertions.api.Assertions.assertThat; + import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; @@ -20,8 +22,6 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import static org.fest.assertions.api.Assertions.assertThat; - public class RankingsTest { private static final int ANY_TOPN = 42; diff --git a/examples/storm-starter/test/jvm/org/apache/storm/starter/tools/SlidingWindowCounterTest.java b/examples/storm-starter/test/jvm/org/apache/storm/starter/tools/SlidingWindowCounterTest.java index 3bdb4ff25e6..24186ca49e1 100644 --- a/examples/storm-starter/test/jvm/org/apache/storm/starter/tools/SlidingWindowCounterTest.java +++ b/examples/storm-starter/test/jvm/org/apache/storm/starter/tools/SlidingWindowCounterTest.java @@ -12,12 +12,12 @@ package org.apache.storm.starter.tools; +import static org.fest.assertions.api.Assertions.assertThat; + import java.util.Map; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import static org.fest.assertions.api.Assertions.assertThat; - public class SlidingWindowCounterTest { private static final int ANY_WINDOW_LENGTH_IN_SLOTS = 2; diff --git a/examples/storm-starter/test/jvm/org/apache/storm/starter/tools/SlotBasedCounterTest.java b/examples/storm-starter/test/jvm/org/apache/storm/starter/tools/SlotBasedCounterTest.java index df2ab21d65c..dc297dfa4c4 100644 --- a/examples/storm-starter/test/jvm/org/apache/storm/starter/tools/SlotBasedCounterTest.java +++ b/examples/storm-starter/test/jvm/org/apache/storm/starter/tools/SlotBasedCounterTest.java @@ -12,12 +12,12 @@ package org.apache.storm.starter.tools; +import static org.fest.assertions.api.Assertions.assertThat; + import java.util.Map; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import static org.fest.assertions.api.Assertions.assertThat; - public class SlotBasedCounterTest { private static final int ANY_NUM_SLOTS = 1; diff --git a/external/storm-autocreds/pom.xml b/external/storm-autocreds/pom.xml index 0e922ba1b26..b717ec0af53 100644 --- a/external/storm-autocreds/pom.xml +++ b/external/storm-autocreds/pom.xml @@ -112,6 +112,11 @@ + + org.codehaus.gmavenplus + gmavenplus-plugin + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopAutoCreds.java b/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopAutoCreds.java index 80aef42dfed..60bfff03a4c 100644 --- a/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopAutoCreds.java +++ b/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopAutoCreds.java @@ -26,7 +26,6 @@ import java.util.Set; import javax.security.auth.Subject; import javax.xml.bind.DatatypeConverter; - import org.apache.commons.math3.util.Pair; import org.apache.hadoop.security.Credentials; import org.apache.hadoop.security.UserGroupInformation; @@ -147,4 +146,4 @@ private void loadConfigKeys(Map conf) { } } -} \ No newline at end of file +} diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopNimbusPluginAutoCreds.java b/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopNimbusPluginAutoCreds.java index ad3bd17886f..715d4efef9b 100644 --- a/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopNimbusPluginAutoCreds.java +++ b/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopNimbusPluginAutoCreds.java @@ -25,7 +25,6 @@ import java.util.Map; import java.util.Set; import javax.xml.bind.DatatypeConverter; - import org.apache.commons.math3.util.Pair; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/common/HadoopCredentialUtil.java b/external/storm-autocreds/src/main/java/org/apache/storm/common/HadoopCredentialUtil.java index 8e7c64bc2f1..37327953c72 100644 --- a/external/storm-autocreds/src/main/java/org/apache/storm/common/HadoopCredentialUtil.java +++ b/external/storm-autocreds/src/main/java/org/apache/storm/common/HadoopCredentialUtil.java @@ -25,7 +25,6 @@ import java.util.Map; import java.util.Set; import javax.xml.bind.DatatypeConverter; - import org.apache.commons.math3.util.Pair; import org.apache.hadoop.security.Credentials; import org.slf4j.Logger; diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBase.java b/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBase.java index 549f2d94f5f..9de799f7b4d 100644 --- a/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBase.java +++ b/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBase.java @@ -21,7 +21,6 @@ import static org.apache.storm.hbase.security.HBaseSecurityUtil.HBASE_CREDENTIALS; import java.util.Map; - import org.apache.storm.common.AbstractHadoopAutoCreds; /** diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBaseCommand.java b/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBaseCommand.java index 518f2130b03..e3e49b9a375 100644 --- a/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBaseCommand.java +++ b/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBaseCommand.java @@ -24,7 +24,6 @@ import java.util.HashMap; import java.util.Map; import javax.security.auth.Subject; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBaseNimbus.java b/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBaseNimbus.java index 84ce57e0844..beec2ffb2f3 100644 --- a/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBaseNimbus.java +++ b/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBaseNimbus.java @@ -26,7 +26,6 @@ import java.io.ObjectOutputStream; import java.net.InetAddress; import java.util.Map; - import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.client.Connection; @@ -51,7 +50,7 @@ public class AutoHBaseNimbus extends AbstractHadoopNimbusPluginAutoCreds { @Override public void doPrepare(Map conf) { - // we don't allow any cluster wide configuration + // we don't allow any cluster wide configuration } @Override @@ -61,7 +60,7 @@ protected String getConfigKeyString() { @Override public void shutdown() { - //no op. + //no op. } @Override diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/HBaseSecurityUtil.java b/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/HBaseSecurityUtil.java index 1d8e5b865a8..6d444d78ea6 100644 --- a/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/HBaseSecurityUtil.java +++ b/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/HBaseSecurityUtil.java @@ -24,7 +24,6 @@ import java.net.InetAddress; import java.util.List; import java.util.Map; - import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.security.UserProvider; import org.apache.hadoop.security.UserGroupInformation; diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/AutoHDFS.java b/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/AutoHDFS.java index a5d1a03a335..305a0e1b8f3 100644 --- a/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/AutoHDFS.java +++ b/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/AutoHDFS.java @@ -21,7 +21,6 @@ import static org.apache.storm.hdfs.security.HdfsSecurityUtil.HDFS_CREDENTIALS; import java.util.Map; - import org.apache.storm.common.AbstractHadoopAutoCreds; /** diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/AutoHDFSCommand.java b/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/AutoHDFSCommand.java index b8e4396a930..95a3896c9b9 100644 --- a/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/AutoHDFSCommand.java +++ b/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/AutoHDFSCommand.java @@ -24,7 +24,6 @@ import java.util.HashMap; import java.util.Map; import javax.security.auth.Subject; - import org.apache.storm.Config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/AutoHDFSNimbus.java b/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/AutoHDFSNimbus.java index 200ae4747d8..7813f051a40 100644 --- a/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/AutoHDFSNimbus.java +++ b/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/AutoHDFSNimbus.java @@ -31,7 +31,6 @@ import java.util.Collection; import java.util.List; import java.util.Map; - import org.apache.commons.math3.util.Pair; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; @@ -71,7 +70,7 @@ protected String getConfigKeyString() { @Override public void shutdown() { - //no op. + //no op. } @Override diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/HdfsSecurityUtil.java b/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/HdfsSecurityUtil.java index 0f8ef9b4ef5..71f9e1eb989 100644 --- a/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/HdfsSecurityUtil.java +++ b/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/HdfsSecurityUtil.java @@ -24,13 +24,10 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; - import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.security.SecurityUtil; import org.apache.hadoop.security.UserGroupInformation; - import org.apache.storm.security.auth.kerberos.AutoTGT; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -73,4 +70,4 @@ public static void login(Map conf, Configuration hdfsConfig) thr } } } -} \ No newline at end of file +} diff --git a/external/storm-blobstore-migration/pom.xml b/external/storm-blobstore-migration/pom.xml index d92270b6c58..a020b699130 100644 --- a/external/storm-blobstore-migration/pom.xml +++ b/external/storm-blobstore-migration/pom.xml @@ -146,6 +146,11 @@ limitations under the License. + + org.codehaus.gmavenplus + gmavenplus-plugin + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/ListHDFS.java b/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/ListHDFS.java index cfa71312c24..98739cc2ec0 100644 --- a/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/ListHDFS.java +++ b/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/ListHDFS.java @@ -19,9 +19,7 @@ package org.apache.storm.blobstore; import java.util.Map; - import javax.security.auth.Subject; - import org.apache.storm.Config; import org.apache.storm.blobstore.ClientBlobStore; import org.apache.storm.hdfs.blobstore.HdfsBlobStore; diff --git a/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/ListLocalFs.java b/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/ListLocalFs.java index aefddb8869b..aec0afe9dc6 100644 --- a/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/ListLocalFs.java +++ b/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/ListLocalFs.java @@ -19,9 +19,7 @@ package org.apache.storm.blobstore; import java.util.Map; - import javax.security.auth.Subject; - import org.apache.storm.Config; import org.apache.storm.blobstore.LocalFsBlobStore; import org.apache.storm.nimbus.NimbusInfo; diff --git a/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/MigrateBlobs.java b/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/MigrateBlobs.java index e7a3581637d..0682b123a83 100644 --- a/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/MigrateBlobs.java +++ b/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/MigrateBlobs.java @@ -21,10 +21,8 @@ import java.io.IOException; import java.io.InputStream; import java.util.Map; - import javax.security.auth.Subject; import javax.security.auth.login.LoginContext; - import org.apache.storm.Config; import org.apache.storm.blobstore.BlobStore; import org.apache.storm.blobstore.LocalFsBlobStore; diff --git a/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/MigratorMain.java b/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/MigratorMain.java index 03d163aad27..08d29688680 100644 --- a/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/MigratorMain.java +++ b/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/MigratorMain.java @@ -19,7 +19,6 @@ package org.apache.storm.blobstore; import java.util.Arrays; - import javax.security.auth.Subject; public class MigratorMain { diff --git a/external/storm-hdfs-blobstore/pom.xml b/external/storm-hdfs-blobstore/pom.xml index bfd31f56c58..a11b155439f 100644 --- a/external/storm-hdfs-blobstore/pom.xml +++ b/external/storm-hdfs-blobstore/pom.xml @@ -153,6 +153,11 @@ + + org.codehaus.gmavenplus + gmavenplus-plugin + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/external/storm-hdfs-blobstore/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStore.java b/external/storm-hdfs-blobstore/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStore.java index 7d957186a21..471527c85be 100644 --- a/external/storm-hdfs-blobstore/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStore.java +++ b/external/storm-hdfs-blobstore/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStore.java @@ -245,7 +245,7 @@ public ReadableBlobMeta getBlobMeta(String key, Subject who) */ @Override public void setLeaderElector(ILeaderElector leaderElector) { - // NO-OP + // NO-OP } @Override @@ -324,7 +324,7 @@ public Iterator listKeys() { @Override public void shutdown() { - //Empty + //Empty } @Override diff --git a/external/storm-hdfs-blobstore/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStoreFile.java b/external/storm-hdfs-blobstore/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStoreFile.java index f124cdfd0fe..25d75728501 100644 --- a/external/storm-hdfs-blobstore/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStoreFile.java +++ b/external/storm-hdfs-blobstore/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStoreFile.java @@ -22,7 +22,6 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.regex.Matcher; - import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileContext; import org.apache.hadoop.fs.FileSystem; diff --git a/external/storm-hdfs-blobstore/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStoreImpl.java b/external/storm-hdfs-blobstore/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStoreImpl.java index 455cdd78569..dcf0a356061 100644 --- a/external/storm-hdfs-blobstore/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStoreImpl.java +++ b/external/storm-hdfs-blobstore/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStoreImpl.java @@ -29,7 +29,6 @@ import java.util.NoSuchElementException; import java.util.Timer; import java.util.TimerTask; - import org.apache.commons.io.IOUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; diff --git a/external/storm-hdfs-blobstore/src/main/java/org/apache/storm/hdfs/blobstore/HdfsClientBlobStore.java b/external/storm-hdfs-blobstore/src/main/java/org/apache/storm/hdfs/blobstore/HdfsClientBlobStore.java index fbdc1866100..4fa35bb9680 100644 --- a/external/storm-hdfs-blobstore/src/main/java/org/apache/storm/hdfs/blobstore/HdfsClientBlobStore.java +++ b/external/storm-hdfs-blobstore/src/main/java/org/apache/storm/hdfs/blobstore/HdfsClientBlobStore.java @@ -21,7 +21,6 @@ import java.io.IOException; import java.util.Iterator; import java.util.Map; - import org.apache.storm.blobstore.AtomicOutputStream; import org.apache.storm.blobstore.ClientBlobStore; import org.apache.storm.blobstore.InputStreamWithMeta; @@ -119,7 +118,7 @@ public boolean setClient(Map conf, NimbusClient client) { @Override public void createStateInZookeeper(String key) { - // Do nothing + // Do nothing } @Override diff --git a/external/storm-hdfs-blobstore/src/test/java/org/apache/storm/hdfs/blobstore/BlobStoreTest.java b/external/storm-hdfs-blobstore/src/test/java/org/apache/storm/hdfs/blobstore/BlobStoreTest.java index 206e6518a0c..72b4deefd43 100644 --- a/external/storm-hdfs-blobstore/src/test/java/org/apache/storm/hdfs/blobstore/BlobStoreTest.java +++ b/external/storm-hdfs-blobstore/src/test/java/org/apache/storm/hdfs/blobstore/BlobStoreTest.java @@ -18,7 +18,18 @@ */ package org.apache.storm.hdfs.blobstore; -import org.apache.storm.hdfs.testing.MiniDFSClusterExtension; +import static org.junit.jupiter.api.Assertions.*; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import javax.security.auth.Subject; import org.apache.storm.Config; import org.apache.storm.blobstore.AtomicOutputStream; import org.apache.storm.blobstore.BlobStore; @@ -28,25 +39,10 @@ import org.apache.storm.generated.AuthorizationException; import org.apache.storm.generated.KeyNotFoundException; import org.apache.storm.generated.SettableBlobMeta; +import org.apache.storm.hdfs.testing.MiniDFSClusterExtension; import org.apache.storm.security.auth.FixedGroupsMapping; import org.apache.storm.security.auth.NimbusPrincipal; import org.apache.storm.security.auth.SingleUserPrincipal; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.security.auth.Subject; -import java.io.IOException; -import java.io.InputStream; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import static org.junit.jupiter.api.Assertions.*; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -54,6 +50,8 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; import org.junit.jupiter.params.provider.ValueSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class BlobStoreTest { diff --git a/external/storm-hdfs-blobstore/src/test/java/org/apache/storm/hdfs/blobstore/HdfsBlobStoreImplTest.java b/external/storm-hdfs-blobstore/src/test/java/org/apache/storm/hdfs/blobstore/HdfsBlobStoreImplTest.java index f596e4591df..2f9ae18049a 100644 --- a/external/storm-hdfs-blobstore/src/test/java/org/apache/storm/hdfs/blobstore/HdfsBlobStoreImplTest.java +++ b/external/storm-hdfs-blobstore/src/test/java/org/apache/storm/hdfs/blobstore/HdfsBlobStoreImplTest.java @@ -18,6 +18,17 @@ */ package org.apache.storm.hdfs.blobstore; +import static org.junit.jupiter.api.Assertions.*; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import org.apache.commons.io.IOUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; @@ -30,18 +41,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import static org.junit.jupiter.api.Assertions.*; - public class HdfsBlobStoreImplTest { @RegisterExtension diff --git a/external/storm-hdfs-blobstore/src/test/java/org/apache/storm/hdfs/testing/MiniDFSClusterExtension.java b/external/storm-hdfs-blobstore/src/test/java/org/apache/storm/hdfs/testing/MiniDFSClusterExtension.java index 8bf6b0b3c5b..7e02eb761ed 100644 --- a/external/storm-hdfs-blobstore/src/test/java/org/apache/storm/hdfs/testing/MiniDFSClusterExtension.java +++ b/external/storm-hdfs-blobstore/src/test/java/org/apache/storm/hdfs/testing/MiniDFSClusterExtension.java @@ -17,19 +17,18 @@ */ package org.apache.storm.hdfs.testing; +import static org.apache.hadoop.test.GenericTestUtils.DEFAULT_TEST_DATA_DIR; +import static org.apache.hadoop.test.GenericTestUtils.SYSPROP_TEST_DATA_DIR; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.File; +import java.util.function.Supplier; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hdfs.MiniDFSCluster; import org.junit.jupiter.api.extension.AfterEachCallback; import org.junit.jupiter.api.extension.BeforeEachCallback; import org.junit.jupiter.api.extension.ExtensionContext; -import java.io.File; -import java.util.function.Supplier; - -import static org.apache.hadoop.test.GenericTestUtils.DEFAULT_TEST_DATA_DIR; -import static org.apache.hadoop.test.GenericTestUtils.SYSPROP_TEST_DATA_DIR; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class MiniDFSClusterExtension implements BeforeEachCallback, AfterEachCallback { private static final String TEST_BUILD_DATA = "test.build.data"; diff --git a/external/storm-hdfs-blobstore/src/test/java/org/apache/storm/hdfs/testing/MiniDFSClusterExtensionClassLevel.java b/external/storm-hdfs-blobstore/src/test/java/org/apache/storm/hdfs/testing/MiniDFSClusterExtensionClassLevel.java index 1fd13d930ce..6795c56214e 100644 --- a/external/storm-hdfs-blobstore/src/test/java/org/apache/storm/hdfs/testing/MiniDFSClusterExtensionClassLevel.java +++ b/external/storm-hdfs-blobstore/src/test/java/org/apache/storm/hdfs/testing/MiniDFSClusterExtensionClassLevel.java @@ -17,17 +17,16 @@ */ package org.apache.storm.hdfs.testing; +import static org.apache.storm.hdfs.testing.MiniDFSClusterExtension.getTestDir; + +import java.io.File; +import java.util.function.Supplier; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hdfs.MiniDFSCluster; import org.junit.jupiter.api.extension.AfterAllCallback; import org.junit.jupiter.api.extension.BeforeAllCallback; import org.junit.jupiter.api.extension.ExtensionContext; -import java.io.File; -import java.util.function.Supplier; - -import static org.apache.storm.hdfs.testing.MiniDFSClusterExtension.getTestDir; - public class MiniDFSClusterExtensionClassLevel implements BeforeAllCallback, AfterAllCallback { private static final String TEST_BUILD_DATA = "test.build.data"; diff --git a/external/storm-hdfs-oci/pom.xml b/external/storm-hdfs-oci/pom.xml index f991e45da2e..565e9e8ceb0 100644 --- a/external/storm-hdfs-oci/pom.xml +++ b/external/storm-hdfs-oci/pom.xml @@ -104,6 +104,11 @@ + + org.codehaus.gmavenplus + gmavenplus-plugin + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/external/storm-hdfs-oci/src/main/java/org/apache/storm/container/oci/HdfsOciResourcesLocalizer.java b/external/storm-hdfs-oci/src/main/java/org/apache/storm/container/oci/HdfsOciResourcesLocalizer.java index ef749c25f7a..015824baad9 100644 --- a/external/storm-hdfs-oci/src/main/java/org/apache/storm/container/oci/HdfsOciResourcesLocalizer.java +++ b/external/storm-hdfs-oci/src/main/java/org/apache/storm/container/oci/HdfsOciResourcesLocalizer.java @@ -21,7 +21,6 @@ import java.io.File; import java.io.IOException; import java.util.Map; - import org.apache.commons.io.FileDeleteStrategy; import org.apache.commons.io.FileUtils; import org.apache.hadoop.conf.Configuration; @@ -31,7 +30,6 @@ import org.apache.storm.utils.ConfigUtils; import org.apache.storm.utils.HadoopLoginUtil; import org.apache.storm.utils.ObjectReader; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/external/storm-hdfs-oci/src/main/java/org/apache/storm/container/oci/LocalOrHdfsImageTagToManifestPlugin.java b/external/storm-hdfs-oci/src/main/java/org/apache/storm/container/oci/LocalOrHdfsImageTagToManifestPlugin.java index c3244436531..54045158adc 100644 --- a/external/storm-hdfs-oci/src/main/java/org/apache/storm/container/oci/LocalOrHdfsImageTagToManifestPlugin.java +++ b/external/storm-hdfs-oci/src/main/java/org/apache/storm/container/oci/LocalOrHdfsImageTagToManifestPlugin.java @@ -23,8 +23,8 @@ import java.io.File; import java.io.FileReader; import java.io.IOException; -import java.io.UncheckedIOException; import java.io.InputStreamReader; +import java.io.UncheckedIOException; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml index 3ff2abf29b9..c1ef9d822ff 100644 --- a/external/storm-hdfs/pom.xml +++ b/external/storm-hdfs/pom.xml @@ -145,6 +145,11 @@ 1 + + org.codehaus.gmavenplus + gmavenplus-plugin + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java index ee820663350..021da85f08c 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java @@ -226,9 +226,9 @@ void doRotationAndRemoveWriter(String writerKey, Writer writer) { } catch (IOException e) { this.collector.reportError(e); LOG.error("File could not be rotated"); - //At this point there is nothing to do. In all likelihood any filesystem operations will fail. - //The next tuple will almost certainly fail to write and/or sync, which force a rotation. That - //will give rotateAndReset() a chance to work which includes creating a fresh file handle. + //At this point there is nothing to do. In all likelihood any filesystem operations will fail. + //The next tuple will almost certainly fail to write and/or sync, which force a rotation. That + //will give rotateAndReset() a chance to work which includes creating a fresh file handle. } finally { //rotateOutputFile(writer) has closed the writer. It's safe to remove the writer from the map here. writers.remove(writerKey); diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/avro/TestFixedAvroSerializer.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/avro/TestFixedAvroSerializer.java index 0fd27fdab76..81a0ec626b6 100644 --- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/avro/TestFixedAvroSerializer.java +++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/avro/TestFixedAvroSerializer.java @@ -12,13 +12,13 @@ package org.apache.storm.hdfs.avro; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; + import org.apache.avro.Schema; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotEquals; - public class TestFixedAvroSerializer { //These should match FixedAvroSerializer.config in the test resources private static final String schemaString1 = "{\"type\":\"record\"," + diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/avro/TestGenericAvroSerializer.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/avro/TestGenericAvroSerializer.java index 20435bc5126..1c747274e51 100644 --- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/avro/TestGenericAvroSerializer.java +++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/avro/TestGenericAvroSerializer.java @@ -12,13 +12,13 @@ package org.apache.storm.hdfs.avro; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; + import org.apache.avro.Schema; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotEquals; - public class TestGenericAvroSerializer { private static final String schemaString1 = "{\"type\":\"record\"," + "\"name\":\"stormtest1\"," + diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/AvroGenericRecordBoltTest.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/AvroGenericRecordBoltTest.java index bcd31e47f7e..5801aaf24e0 100644 --- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/AvroGenericRecordBoltTest.java +++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/AvroGenericRecordBoltTest.java @@ -12,6 +12,8 @@ package org.apache.storm.hdfs.bolt; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -54,8 +56,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import static org.junit.jupiter.api.Assertions.assertEquals; - @ExtendWith(MockitoExtension.class) public class AvroGenericRecordBoltTest { diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/TestHdfsBolt.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/TestHdfsBolt.java index 2a6faa0f4be..b304d04115e 100644 --- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/TestHdfsBolt.java +++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/TestHdfsBolt.java @@ -12,10 +12,14 @@ package org.apache.storm.hdfs.bolt; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoInteractions; + import java.io.File; import java.io.IOException; import java.util.HashMap; - import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; @@ -52,11 +56,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoInteractions; - @ExtendWith(MockitoExtension.class) public class TestHdfsBolt { diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/TestSequenceFileBolt.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/TestSequenceFileBolt.java index 3fe4be69335..eb992a6a0ba 100644 --- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/TestSequenceFileBolt.java +++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/TestSequenceFileBolt.java @@ -12,6 +12,11 @@ package org.apache.storm.hdfs.bolt; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoInteractions; + import java.io.File; import java.io.IOException; import java.util.HashMap; @@ -50,11 +55,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoInteractions; - @ExtendWith(MockitoExtension.class) public class TestSequenceFileBolt { diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/TestWritersMap.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/TestWritersMap.java index 1fabcee4e73..abfd930c971 100644 --- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/TestWritersMap.java +++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/TestWritersMap.java @@ -12,6 +12,9 @@ package org.apache.storm.hdfs.bolt; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.hadoop.fs.Path; import org.apache.storm.hdfs.bolt.rotation.FileRotationPolicy; import org.apache.storm.hdfs.bolt.rotation.FileSizeRotationPolicy; @@ -19,9 +22,6 @@ import org.apache.storm.tuple.Tuple; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class TestWritersMap { AbstractHdfsBolt.WritersMap map = new AbstractHdfsBolt.WritersMap(2, null); diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/format/TestSimpleFileNameFormat.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/format/TestSimpleFileNameFormat.java index 4ac1257dca7..607383091bf 100644 --- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/format/TestSimpleFileNameFormat.java +++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/format/TestSimpleFileNameFormat.java @@ -12,6 +12,9 @@ package org.apache.storm.hdfs.bolt.format; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + import java.net.UnknownHostException; import java.text.SimpleDateFormat; import java.util.HashMap; @@ -20,9 +23,6 @@ import org.apache.storm.utils.Utils; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; - public class TestSimpleFileNameFormat { @Test diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/spout/ConfigsTest.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/spout/ConfigsTest.java index 56cc1694d3a..dd37155d50a 100644 --- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/spout/ConfigsTest.java +++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/spout/ConfigsTest.java @@ -12,13 +12,13 @@ package org.apache.storm.hdfs.spout; +import static org.junit.jupiter.api.Assertions.fail; + import java.util.HashMap; import java.util.Map; import org.apache.storm.validation.ConfigValidation; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.fail; - public class ConfigsTest { public static void verifyBad(String key, Object value) { diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/spout/TestDirLock.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/spout/TestDirLock.java index 629249c4d84..f5b01632704 100644 --- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/spout/TestDirLock.java +++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/spout/TestDirLock.java @@ -12,6 +12,11 @@ package org.apache.storm.hdfs.spout; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.IOException; import org.apache.hadoop.fs.CommonConfigurationKeys; import org.apache.hadoop.fs.FileSystem; @@ -23,11 +28,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class TestDirLock { private static final int LOCK_EXPIRY_SEC = 1; diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/spout/TestFileLock.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/spout/TestFileLock.java index 54e7ab6f1e3..ded47f08504 100644 --- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/spout/TestFileLock.java +++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/spout/TestFileLock.java @@ -12,6 +12,12 @@ package org.apache.storm.hdfs.spout; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.BufferedReader; import java.io.FileNotFoundException; import java.io.IOException; @@ -30,12 +36,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class TestFileLock { private final Path filesDir = new Path("/tmp/filesdir"); diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/spout/TestHdfsSemantics.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/spout/TestHdfsSemantics.java index d17e8ac96b7..6f83e555eee 100644 --- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/spout/TestHdfsSemantics.java +++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/spout/TestHdfsSemantics.java @@ -14,6 +14,11 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsNull.notNullValue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import org.apache.hadoop.fs.CommonConfigurationKeys; @@ -30,12 +35,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; - public class TestHdfsSemantics { private final HdfsConfiguration conf = new HdfsConfiguration(); diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/spout/TestHdfsSpout.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/spout/TestHdfsSpout.java index f6f72142339..fc5e69b2629 100644 --- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/spout/TestHdfsSpout.java +++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/spout/TestHdfsSpout.java @@ -40,8 +40,8 @@ import org.apache.hadoop.io.Writable; import org.apache.hadoop.util.ReflectionUtils; import org.apache.storm.Config; -import org.apache.storm.hdfs.common.HdfsUtils; import org.apache.storm.hdfs.common.HdfsUtils.Pair; +import org.apache.storm.hdfs.common.HdfsUtils; import org.apache.storm.hdfs.testing.MiniDFSClusterExtensionClassLevel; import org.apache.storm.spout.SpoutOutputCollector; import org.apache.storm.task.TopologyContext; diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/spout/TestProgressTracker.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/spout/TestProgressTracker.java index fbcd67449d9..faa94e365b0 100644 --- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/spout/TestProgressTracker.java +++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/spout/TestProgressTracker.java @@ -12,6 +12,8 @@ package org.apache.storm.hdfs.spout; +import static org.junit.jupiter.api.Assertions.*; + import java.io.File; import java.io.IOException; import org.apache.hadoop.conf.Configuration; @@ -22,8 +24,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import static org.junit.jupiter.api.Assertions.*; - public class TestProgressTracker { @TempDir diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/testing/MiniDFSClusterExtension.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/testing/MiniDFSClusterExtension.java index 93a0eab106b..7e02eb761ed 100644 --- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/testing/MiniDFSClusterExtension.java +++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/testing/MiniDFSClusterExtension.java @@ -17,6 +17,10 @@ */ package org.apache.storm.hdfs.testing; +import static org.apache.hadoop.test.GenericTestUtils.DEFAULT_TEST_DATA_DIR; +import static org.apache.hadoop.test.GenericTestUtils.SYSPROP_TEST_DATA_DIR; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; import java.util.function.Supplier; import org.apache.hadoop.conf.Configuration; @@ -25,10 +29,6 @@ import org.junit.jupiter.api.extension.BeforeEachCallback; import org.junit.jupiter.api.extension.ExtensionContext; -import static org.apache.hadoop.test.GenericTestUtils.DEFAULT_TEST_DATA_DIR; -import static org.apache.hadoop.test.GenericTestUtils.SYSPROP_TEST_DATA_DIR; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class MiniDFSClusterExtension implements BeforeEachCallback, AfterEachCallback { private static final String TEST_BUILD_DATA = "test.build.data"; diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/testing/MiniDFSClusterExtensionClassLevel.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/testing/MiniDFSClusterExtensionClassLevel.java index d13208a7c4a..6795c56214e 100644 --- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/testing/MiniDFSClusterExtensionClassLevel.java +++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/testing/MiniDFSClusterExtensionClassLevel.java @@ -17,6 +17,8 @@ */ package org.apache.storm.hdfs.testing; +import static org.apache.storm.hdfs.testing.MiniDFSClusterExtension.getTestDir; + import java.io.File; import java.util.function.Supplier; import org.apache.hadoop.conf.Configuration; @@ -25,8 +27,6 @@ import org.junit.jupiter.api.extension.BeforeAllCallback; import org.junit.jupiter.api.extension.ExtensionContext; -import static org.apache.storm.hdfs.testing.MiniDFSClusterExtension.getTestDir; - public class MiniDFSClusterExtensionClassLevel implements BeforeAllCallback, AfterAllCallback { private static final String TEST_BUILD_DATA = "test.build.data"; diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/HdfsStateTest.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/HdfsStateTest.java index 8c02191b4b8..efcbdc622ad 100644 --- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/HdfsStateTest.java +++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/HdfsStateTest.java @@ -12,6 +12,13 @@ package org.apache.storm.hdfs.trident; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import java.io.File; import java.io.IOException; import java.nio.charset.Charset; @@ -35,13 +42,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - public class HdfsStateTest { diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/format/TestSimpleFileNameFormat.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/format/TestSimpleFileNameFormat.java index cd40a278ffe..950641f07e1 100644 --- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/format/TestSimpleFileNameFormat.java +++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/format/TestSimpleFileNameFormat.java @@ -12,14 +12,14 @@ package org.apache.storm.hdfs.trident.format; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + import java.net.UnknownHostException; import java.text.SimpleDateFormat; import org.apache.storm.utils.Utils; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; - public class TestSimpleFileNameFormat { @Test diff --git a/external/storm-jdbc/pom.xml b/external/storm-jdbc/pom.xml index 4d982dc211d..2ec1812d21e 100644 --- a/external/storm-jdbc/pom.xml +++ b/external/storm-jdbc/pom.xml @@ -77,6 +77,11 @@ + + org.codehaus.gmavenplus + gmavenplus-plugin + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/bolt/JdbcInsertBoltTest.java b/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/bolt/JdbcInsertBoltTest.java index d421b0b9872..d81f7eaabbf 100644 --- a/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/bolt/JdbcInsertBoltTest.java +++ b/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/bolt/JdbcInsertBoltTest.java @@ -12,6 +12,8 @@ package org.apache.storm.jdbc.bolt; +import static org.junit.jupiter.api.Assertions.assertThrows; + import com.google.common.collect.Lists; import java.util.HashMap; import org.apache.storm.jdbc.common.Column; @@ -21,8 +23,6 @@ import org.apache.storm.jdbc.mapper.SimpleJdbcMapper; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertThrows; - /** * Created by pbrahmbhatt on 10/29/15. */ diff --git a/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/bolt/JdbcLookupBoltTest.java b/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/bolt/JdbcLookupBoltTest.java index 3185f62f699..52573023dae 100644 --- a/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/bolt/JdbcLookupBoltTest.java +++ b/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/bolt/JdbcLookupBoltTest.java @@ -12,6 +12,8 @@ package org.apache.storm.jdbc.bolt; +import static org.junit.jupiter.api.Assertions.assertThrows; + import com.google.common.collect.Lists; import java.util.HashMap; import org.apache.storm.jdbc.common.Column; @@ -22,8 +24,6 @@ import org.apache.storm.tuple.Fields; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertThrows; - /** * Created by pbrahmbhatt on 10/29/15. */ diff --git a/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/common/JdbcClientTest.java b/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/common/JdbcClientTest.java index 0304c4c018b..2c7238e5cd4 100644 --- a/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/common/JdbcClientTest.java +++ b/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/common/JdbcClientTest.java @@ -12,6 +12,9 @@ package org.apache.storm.jdbc.common; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + import com.google.common.collect.Lists; import com.google.common.collect.Maps; import java.sql.Connection; @@ -24,9 +27,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; - public class JdbcClientTest { private static final String tableName = "user_details"; diff --git a/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/common/UtilTest.java b/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/common/UtilTest.java index 19f578bd24f..6d0cd62b8b0 100644 --- a/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/common/UtilTest.java +++ b/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/common/UtilTest.java @@ -12,15 +12,15 @@ package org.apache.storm.jdbc.common; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + import java.sql.Date; import java.sql.Time; import java.sql.Timestamp; import java.sql.Types; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; - public class UtilTest { @Test diff --git a/external/storm-jms/pom.xml b/external/storm-jms/pom.xml index cf39888859e..368fed63854 100644 --- a/external/storm-jms/pom.xml +++ b/external/storm-jms/pom.xml @@ -80,6 +80,11 @@ -Xdoclint:none + + org.codehaus.gmavenplus + gmavenplus-plugin + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/external/storm-jms/src/main/java/org/apache/storm/jms/JmsMessageProducer.java b/external/storm-jms/src/main/java/org/apache/storm/jms/JmsMessageProducer.java index 8b9479d0f3b..053b11c1fbf 100644 --- a/external/storm-jms/src/main/java/org/apache/storm/jms/JmsMessageProducer.java +++ b/external/storm-jms/src/main/java/org/apache/storm/jms/JmsMessageProducer.java @@ -16,7 +16,6 @@ import jakarta.jms.Message; import jakarta.jms.Session; import java.io.Serializable; - import org.apache.storm.tuple.ITuple; /** diff --git a/external/storm-jms/src/main/java/org/apache/storm/jms/JmsProvider.java b/external/storm-jms/src/main/java/org/apache/storm/jms/JmsProvider.java index 34b8db39f0e..9aa8e27ef01 100644 --- a/external/storm-jms/src/main/java/org/apache/storm/jms/JmsProvider.java +++ b/external/storm-jms/src/main/java/org/apache/storm/jms/JmsProvider.java @@ -14,7 +14,6 @@ import jakarta.jms.ConnectionFactory; import jakarta.jms.Destination; - import java.io.Serializable; /** diff --git a/external/storm-jms/src/main/java/org/apache/storm/jms/spout/JmsSpout.java b/external/storm-jms/src/main/java/org/apache/storm/jms/spout/JmsSpout.java index dbd4782da55..5d5ec838a15 100644 --- a/external/storm-jms/src/main/java/org/apache/storm/jms/spout/JmsSpout.java +++ b/external/storm-jms/src/main/java/org/apache/storm/jms/spout/JmsSpout.java @@ -25,12 +25,10 @@ import jakarta.jms.Message; import jakarta.jms.MessageConsumer; import jakarta.jms.Session; - import java.io.Serializable; import java.util.Collections; import java.util.HashMap; import java.util.Map; - import org.apache.storm.Config; import org.apache.storm.jms.JmsProvider; import org.apache.storm.jms.JmsTupleProducer; diff --git a/external/storm-jms/src/test/java/org/apache/storm/jms/spout/JmsSpoutTest.java b/external/storm-jms/src/test/java/org/apache/storm/jms/spout/JmsSpoutTest.java index 325c26e6cb0..e28731aba75 100644 --- a/external/storm-jms/src/test/java/org/apache/storm/jms/spout/JmsSpoutTest.java +++ b/external/storm-jms/src/test/java/org/apache/storm/jms/spout/JmsSpoutTest.java @@ -18,6 +18,8 @@ package org.apache.storm.jms.spout; +import static org.junit.jupiter.api.Assertions.assertTrue; + import jakarta.jms.ConnectionFactory; import jakarta.jms.Destination; import jakarta.jms.JMSException; @@ -25,6 +27,11 @@ import jakarta.jms.MessageProducer; import jakarta.jms.Session; import jakarta.jms.TextMessage; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectOutputStream; +import java.util.HashMap; +import java.util.Map; import org.apache.storm.Config; import org.apache.storm.jms.JmsProvider; import org.apache.storm.spout.SpoutOutputCollector; @@ -32,14 +39,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectOutputStream; -import java.util.HashMap; -import java.util.Map; - -import static org.junit.jupiter.api.Assertions.assertTrue; - public class JmsSpoutTest { private static final Logger LOG = LoggerFactory.getLogger(JmsSpoutTest.class); diff --git a/external/storm-jms/src/test/java/org/apache/storm/jms/spout/MockJmsProvider.java b/external/storm-jms/src/test/java/org/apache/storm/jms/spout/MockJmsProvider.java index da26877ecbe..bde94d5725d 100644 --- a/external/storm-jms/src/test/java/org/apache/storm/jms/spout/MockJmsProvider.java +++ b/external/storm-jms/src/test/java/org/apache/storm/jms/spout/MockJmsProvider.java @@ -20,12 +20,11 @@ import jakarta.jms.ConnectionFactory; import jakarta.jms.Destination; -import org.apache.activemq.ActiveMQConnectionFactory; -import org.apache.storm.jms.JmsProvider; - import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.storm.jms.JmsProvider; public class MockJmsProvider implements JmsProvider { private static final long serialVersionUID = 1L; diff --git a/external/storm-jms/src/test/java/org/apache/storm/jms/spout/MockSpoutOutputCollector.java b/external/storm-jms/src/test/java/org/apache/storm/jms/spout/MockSpoutOutputCollector.java index 025194a40d9..4fec8303b64 100644 --- a/external/storm-jms/src/test/java/org/apache/storm/jms/spout/MockSpoutOutputCollector.java +++ b/external/storm-jms/src/test/java/org/apache/storm/jms/spout/MockSpoutOutputCollector.java @@ -18,10 +18,9 @@ package org.apache.storm.jms.spout; -import org.apache.storm.spout.ISpoutOutputCollector; - import java.util.ArrayList; import java.util.List; +import org.apache.storm.spout.ISpoutOutputCollector; public class MockSpoutOutputCollector implements ISpoutOutputCollector { boolean emitted = false; @@ -39,7 +38,7 @@ public void emitDirect(int taskId, String streamId, List tuple, Object m @Override public void flush() { - //NO-OP + //NO-OP } @Override diff --git a/external/storm-kafka-client/pom.xml b/external/storm-kafka-client/pom.xml index 41118145cb2..756566b9992 100644 --- a/external/storm-kafka-client/pom.xml +++ b/external/storm-kafka-client/pom.xml @@ -173,6 +173,11 @@ + + org.codehaus.gmavenplus + gmavenplus-plugin + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/bolt/PreparableCallback.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/bolt/PreparableCallback.java index 33814356876..4ef0a36dcb3 100644 --- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/bolt/PreparableCallback.java +++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/bolt/PreparableCallback.java @@ -20,7 +20,6 @@ import java.io.Serializable; import java.util.Map; - import org.apache.kafka.clients.producer.Callback; import org.apache.storm.task.TopologyContext; diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java index 73582dd4c8a..984ecf83075 100644 --- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java +++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java @@ -24,7 +24,6 @@ import static org.apache.storm.kafka.spout.FirstPollOffsetStrategy.UNCOMMITTED_LATEST; import com.google.common.annotations.VisibleForTesting; - import java.time.Duration; import java.util.ArrayList; import java.util.Collection; @@ -34,12 +33,11 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import java.util.Map; import java.util.Map.Entry; +import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; - import org.apache.commons.lang3.Validate; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.consumer.Consumer; diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/internal/ClientFactory.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/internal/ClientFactory.java index 2aafd3e8b01..1a8106d57db 100644 --- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/internal/ClientFactory.java +++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/internal/ClientFactory.java @@ -18,7 +18,6 @@ import java.io.Serializable; import java.util.Map; - import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.consumer.Consumer; diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/internal/ClientFactoryDefault.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/internal/ClientFactoryDefault.java index a470ce51442..2667160e47c 100644 --- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/internal/ClientFactoryDefault.java +++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/internal/ClientFactoryDefault.java @@ -17,7 +17,6 @@ package org.apache.storm.kafka.spout.internal; import java.util.Map; - import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.KafkaAdminClient; import org.apache.kafka.clients.consumer.KafkaConsumer; diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/metrics2/KafkaOffsetTopicMetrics.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/metrics2/KafkaOffsetTopicMetrics.java index 8bdcef37485..d1a84cbeae0 100644 --- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/metrics2/KafkaOffsetTopicMetrics.java +++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/metrics2/KafkaOffsetTopicMetrics.java @@ -24,13 +24,11 @@ import com.codahale.metrics.Gauge; import com.codahale.metrics.Metric; import com.codahale.metrics.MetricSet; - import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Set; import java.util.function.Supplier; - import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.common.TopicPartition; import org.apache.storm.kafka.spout.internal.OffsetManager; diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentOpaqueSpoutEmitter.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentOpaqueSpoutEmitter.java index fd68bdd9083..9e005a95cf6 100644 --- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentOpaqueSpoutEmitter.java +++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentOpaqueSpoutEmitter.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.Map; import java.util.Set; - import org.apache.storm.trident.operation.TridentCollector; import org.apache.storm.trident.spout.IOpaquePartitionedTridentSpout; import org.apache.storm.trident.topology.TransactionAttempt; diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutEmitter.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutEmitter.java index 1c0a6ba41ad..f086b19a08d 100644 --- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutEmitter.java +++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutEmitter.java @@ -37,7 +37,6 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; - import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerRebalanceListener; import org.apache.kafka.clients.consumer.ConsumerRecord; diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentTransactionalSpoutEmitter.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentTransactionalSpoutEmitter.java index 61a8b179b69..270e162a3f0 100644 --- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentTransactionalSpoutEmitter.java +++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentTransactionalSpoutEmitter.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.Map; import java.util.Set; - import org.apache.storm.trident.operation.TridentCollector; import org.apache.storm.trident.spout.IPartitionedTridentSpout; import org.apache.storm.trident.topology.TransactionAttempt; diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/bolt/KafkaBoltTest.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/bolt/KafkaBoltTest.java index 63b98eb6a36..5c2ea22283a 100644 --- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/bolt/KafkaBoltTest.java +++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/bolt/KafkaBoltTest.java @@ -28,7 +28,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; - import org.apache.kafka.clients.producer.MockProducer; import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.clients.producer.ProducerRecord; diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/DefaultRecordTranslatorTest.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/DefaultRecordTranslatorTest.java index f9a4b453ba0..8d6df24235f 100644 --- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/DefaultRecordTranslatorTest.java +++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/DefaultRecordTranslatorTest.java @@ -21,7 +21,6 @@ import java.util.Arrays; import java.util.Collections; - import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.storm.tuple.Fields; import org.junit.jupiter.api.Test; diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutAbstractTest.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutAbstractTest.java index 6f92f6d331d..e980c45483b 100644 --- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutAbstractTest.java +++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutAbstractTest.java @@ -28,7 +28,6 @@ import java.util.HashMap; import java.util.Map; - import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.KafkaAdminClient; import org.apache.kafka.clients.consumer.KafkaConsumer; diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutEmitTest.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutEmitTest.java index 4d69633f1bd..e000513c988 100755 --- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutEmitTest.java +++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutEmitTest.java @@ -22,6 +22,7 @@ import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.inOrder; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; @@ -45,15 +46,12 @@ import org.apache.storm.kafka.spout.subscription.TopicFilter; import org.apache.storm.spout.SpoutOutputCollector; import org.apache.storm.task.TopologyContext; -import org.apache.storm.utils.Time; import org.apache.storm.utils.Time.SimulatedTime; -import org.mockito.ArgumentCaptor; -import org.mockito.InOrder; - -import static org.mockito.Mockito.mock; - +import org.apache.storm.utils.Time; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.mockito.ArgumentCaptor; +import org.mockito.InOrder; public class KafkaSpoutEmitTest { diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutLogCompactionSupportTest.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutLogCompactionSupportTest.java index a19bb9d265f..8bc8d34a40e 100644 --- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutLogCompactionSupportTest.java +++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutLogCompactionSupportTest.java @@ -21,8 +21,8 @@ import static org.hamcrest.Matchers.hasKey; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; @@ -44,8 +44,8 @@ import org.apache.storm.kafka.spout.subscription.TopicFilter; import org.apache.storm.spout.SpoutOutputCollector; import org.apache.storm.task.TopologyContext; -import org.apache.storm.utils.Time; import org.apache.storm.utils.Time.SimulatedTime; +import org.apache.storm.utils.Time; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; @@ -256,4 +256,4 @@ public void testCommitTupleAfterCompactionGap() { } } -} \ No newline at end of file +} diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutMessagingGuaranteeTest.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutMessagingGuaranteeTest.java index 44c5d0a031e..ba2d07a8606 100644 --- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutMessagingGuaranteeTest.java +++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutMessagingGuaranteeTest.java @@ -51,8 +51,8 @@ import org.apache.storm.kafka.spout.subscription.TopicFilter; import org.apache.storm.spout.SpoutOutputCollector; import org.apache.storm.task.TopologyContext; -import org.apache.storm.utils.Time; import org.apache.storm.utils.Time.SimulatedTime; +import org.apache.storm.utils.Time; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutReactivationTest.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutReactivationTest.java index b7ae2824b7f..8b50e4777a0 100644 --- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutReactivationTest.java +++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutReactivationTest.java @@ -33,7 +33,6 @@ import com.codahale.metrics.Metric; import java.util.HashMap; import java.util.Map; - import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerConfig; diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutRebalanceTest.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutRebalanceTest.java index c8847750cf4..23f7206b2d6 100644 --- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutRebalanceTest.java +++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutRebalanceTest.java @@ -34,7 +34,6 @@ import java.util.List; import java.util.Map; import java.util.Set; - import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.consumer.*; import org.apache.kafka.common.TopicPartition; @@ -45,8 +44,8 @@ import org.apache.storm.kafka.spout.subscription.TopicFilter; import org.apache.storm.spout.SpoutOutputCollector; import org.apache.storm.task.TopologyContext; -import org.apache.storm.utils.Time; import org.apache.storm.utils.Time.SimulatedTime; +import org.apache.storm.utils.Time; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutRetryExponentialBackoffTest.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutRetryExponentialBackoffTest.java index 269794a62f9..82cfad054b8 100644 --- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutRetryExponentialBackoffTest.java +++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutRetryExponentialBackoffTest.java @@ -25,8 +25,8 @@ import java.util.Map; import org.apache.kafka.common.TopicPartition; import org.apache.storm.kafka.spout.KafkaSpoutRetryExponentialBackoff.TimeInterval; -import org.apache.storm.utils.Time; import org.apache.storm.utils.Time.SimulatedTime; +import org.apache.storm.utils.Time; import org.junit.jupiter.api.Test; public class KafkaSpoutRetryExponentialBackoffTest { diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutRetryLimitTest.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutRetryLimitTest.java index 381796b7340..339318cfa83 100644 --- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutRetryLimitTest.java +++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutRetryLimitTest.java @@ -18,8 +18,8 @@ import static org.apache.storm.kafka.spout.config.builder.SingleTopicKafkaSpoutConfiguration.createKafkaSpoutConfigBuilder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; @@ -38,8 +38,8 @@ import org.apache.storm.kafka.spout.subscription.TopicFilter; import org.apache.storm.spout.SpoutOutputCollector; import org.apache.storm.task.TopologyContext; -import org.apache.storm.utils.Time; import org.apache.storm.utils.Time.SimulatedTime; +import org.apache.storm.utils.Time; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/SimpleRecordTranslatorTest.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/SimpleRecordTranslatorTest.java index 7db07f533f8..3939e83f409 100644 --- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/SimpleRecordTranslatorTest.java +++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/SimpleRecordTranslatorTest.java @@ -17,16 +17,15 @@ */ package org.apache.storm.kafka.spout; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + +import java.util.Collections; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.storm.tuple.Fields; import org.apache.storm.tuple.Values; import org.junit.jupiter.api.Test; -import java.util.Collections; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; - public class SimpleRecordTranslatorTest { @Test public void testBasic() { diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/SpoutWithMockedConsumerSetupHelper.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/SpoutWithMockedConsumerSetupHelper.java index 70fae9073b2..5345caaff76 100644 --- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/SpoutWithMockedConsumerSetupHelper.java +++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/SpoutWithMockedConsumerSetupHelper.java @@ -33,10 +33,9 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Map.Entry; +import java.util.Map; import java.util.Set; - import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.MockAdminClient; import org.apache.kafka.clients.consumer.*; diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/metric2/KafkaOffsetTopicMetricsTest.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/metric2/KafkaOffsetTopicMetricsTest.java index 26462503389..5dc95e9f789 100644 --- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/metric2/KafkaOffsetTopicMetricsTest.java +++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/metric2/KafkaOffsetTopicMetricsTest.java @@ -18,8 +18,15 @@ package org.apache.storm.kafka.spout.metric2; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.mockito.ArgumentMatchers.anyMap; +import static org.mockito.Mockito.*; + import com.codahale.metrics.Gauge; import com.codahale.metrics.Metric; +import java.util.*; +import java.util.concurrent.ExecutionException; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.ListOffsetsResult; import org.apache.kafka.common.KafkaFuture; @@ -31,14 +38,6 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; -import java.util.*; -import java.util.concurrent.ExecutionException; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.mockito.ArgumentMatchers.anyMap; -import static org.mockito.Mockito.*; - @ExtendWith(MockitoExtension.class) public class KafkaOffsetTopicMetricsTest { @@ -130,7 +129,7 @@ public void registerMetricsGetSpoutLagAndPartitionRecords() throws ExecutionExce Gauge gATotal = (Gauge) result.get("topicA/totalRecordsInPartitions"); assertEquals(297L, gATotal.getValue()); - //get again the values from the Gauge. Values cannot change + //get again the values from the Gauge. Values cannot change gATotal = (Gauge) result.get("topicA/totalRecordsInPartitions"); assertEquals(297L, gATotal.getValue()); diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutEmitterEmitTest.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutEmitterEmitTest.java index 22a53ae4014..110f5489d20 100644 --- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutEmitterEmitTest.java +++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutEmitterEmitTest.java @@ -30,7 +30,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; - import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.MockAdminClient; import org.apache.kafka.clients.consumer.Consumer; diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutEmitterPartitioningTest.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutEmitterPartitioningTest.java index b10f040f22b..cc5c3557e90 100644 --- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutEmitterPartitioningTest.java +++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutEmitterPartitioningTest.java @@ -31,7 +31,6 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; - import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.MockAdminClient; import org.apache.kafka.clients.consumer.Consumer; diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutOpaqueCoordinatorTest.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutOpaqueCoordinatorTest.java index 07dfc40815e..fc4002b4aa3 100644 --- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutOpaqueCoordinatorTest.java +++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutOpaqueCoordinatorTest.java @@ -31,7 +31,6 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; - import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.KafkaConsumer; @@ -40,8 +39,8 @@ import org.apache.storm.kafka.spout.subscription.ManualPartitioner; import org.apache.storm.kafka.spout.subscription.TopicFilter; import org.apache.storm.kafka.spout.trident.config.builder.SingleTopicKafkaTridentSpoutConfiguration; -import org.apache.storm.utils.Time; import org.apache.storm.utils.Time.SimulatedTime; +import org.apache.storm.utils.Time; import org.junit.jupiter.api.Test; public class KafkaTridentSpoutOpaqueCoordinatorTest { diff --git a/external/storm-kafka-migration/pom.xml b/external/storm-kafka-migration/pom.xml index 1371c84f136..4ba3daf424c 100644 --- a/external/storm-kafka-migration/pom.xml +++ b/external/storm-kafka-migration/pom.xml @@ -81,6 +81,11 @@ + + org.codehaus.gmavenplus + gmavenplus-plugin + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/external/storm-kafka-migration/src/main/java/org/apache/storm/kafka/migration/KafkaTridentSpoutMigration.java b/external/storm-kafka-migration/src/main/java/org/apache/storm/kafka/migration/KafkaTridentSpoutMigration.java index f27ecef03be..eb848301135 100644 --- a/external/storm-kafka-migration/src/main/java/org/apache/storm/kafka/migration/KafkaTridentSpoutMigration.java +++ b/external/storm-kafka-migration/src/main/java/org/apache/storm/kafka/migration/KafkaTridentSpoutMigration.java @@ -21,8 +21,8 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Map.Entry; +import java.util.Map; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.curator.framework.CuratorFramework; @@ -30,7 +30,6 @@ import org.apache.curator.framework.api.PathAndBytesable; import org.apache.curator.retry.RetryNTimes; import org.apache.kafka.common.TopicPartition; - import org.apache.storm.utils.Utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/external/storm-kafka-monitor/pom.xml b/external/storm-kafka-monitor/pom.xml index 9035cb5f0d5..09d3ab80f6a 100644 --- a/external/storm-kafka-monitor/pom.xml +++ b/external/storm-kafka-monitor/pom.xml @@ -81,6 +81,11 @@ + + org.codehaus.gmavenplus + gmavenplus-plugin + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/external/storm-kafka-monitor/src/main/java/org/apache/storm/kafka/monitor/KafkaOffsetLagUtil.java b/external/storm-kafka-monitor/src/main/java/org/apache/storm/kafka/monitor/KafkaOffsetLagUtil.java index d5918f78443..39ddc7b0057 100644 --- a/external/storm-kafka-monitor/src/main/java/org/apache/storm/kafka/monitor/KafkaOffsetLagUtil.java +++ b/external/storm-kafka-monitor/src/main/java/org/apache/storm/kafka/monitor/KafkaOffsetLagUtil.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.Map; import java.util.Properties; - import net.minidev.json.JSONValue; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; diff --git a/external/storm-metrics/pom.xml b/external/storm-metrics/pom.xml index 7f370bdf352..6fc97528c8e 100644 --- a/external/storm-metrics/pom.xml +++ b/external/storm-metrics/pom.xml @@ -99,6 +99,11 @@ + + org.codehaus.gmavenplus + gmavenplus-plugin + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/external/storm-metrics/src/main/java/org/apache/storm/metrics/sigar/CPUMetric.java b/external/storm-metrics/src/main/java/org/apache/storm/metrics/sigar/CPUMetric.java index 59dac4216c1..3186fb2c704 100644 --- a/external/storm-metrics/src/main/java/org/apache/storm/metrics/sigar/CPUMetric.java +++ b/external/storm-metrics/src/main/java/org/apache/storm/metrics/sigar/CPUMetric.java @@ -19,9 +19,7 @@ package org.apache.storm.metrics.sigar; import java.util.HashMap; - import org.apache.storm.metric.api.IMetric; - import org.hyperic.sigar.ProcCpu; import org.hyperic.sigar.Sigar; diff --git a/external/storm-redis/pom.xml b/external/storm-redis/pom.xml index 8caaa993b8c..09cd91aedc8 100644 --- a/external/storm-redis/pom.xml +++ b/external/storm-redis/pom.xml @@ -100,6 +100,11 @@ + + org.codehaus.gmavenplus + gmavenplus-plugin + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/bolt/RedisFilterBolt.java b/external/storm-redis/src/main/java/org/apache/storm/redis/bolt/RedisFilterBolt.java index d9228d32d2e..604c2dd9217 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/bolt/RedisFilterBolt.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/bolt/RedisFilterBolt.java @@ -14,7 +14,6 @@ import java.util.List; import java.util.Objects; - import org.apache.storm.redis.common.config.JedisClusterConfig; import org.apache.storm.redis.common.config.JedisPoolConfig; import org.apache.storm.redis.common.container.JedisCommandsContainer; diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/common/commands/RedisCommands.java b/external/storm-redis/src/main/java/org/apache/storm/redis/common/commands/RedisCommands.java index 5a7170eb2a6..90b3a9d163c 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/common/commands/RedisCommands.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/common/commands/RedisCommands.java @@ -19,7 +19,6 @@ package org.apache.storm.redis.common.commands; import java.util.Map; - import redis.clients.jedis.params.ScanParams; import redis.clients.jedis.resps.ScanResult; diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/JedisContainer.java b/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/JedisContainer.java index 1eed610dc6e..faf053f2e81 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/JedisContainer.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/JedisContainer.java @@ -16,7 +16,6 @@ import java.io.IOException; import java.util.List; import java.util.function.Function; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import redis.clients.jedis.GeoCoordinate; diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/RedisClusterContainer.java b/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/RedisClusterContainer.java index 600d4fec683..0ac02af2c80 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/RedisClusterContainer.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/RedisClusterContainer.java @@ -52,7 +52,7 @@ public RedisCommands getInstance() { */ @Override public void returnInstance(RedisCommands redisCommands) { - // do nothing + // do nothing } /** diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterMapState.java b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterMapState.java index ae634d686f3..72849688724 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterMapState.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterMapState.java @@ -15,7 +15,6 @@ import com.google.common.collect.Lists; import java.util.List; import java.util.Map; - import org.apache.commons.pool2.impl.GenericObjectPoolConfig; import org.apache.storm.redis.common.config.JedisClusterConfig; import org.apache.storm.redis.common.mapper.RedisDataTypeDescription; diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterState.java b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterState.java index e052dd1b66b..0541f5a5df4 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterState.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterState.java @@ -13,7 +13,6 @@ package org.apache.storm.redis.trident.state; import java.util.Map; - import org.apache.commons.pool2.impl.GenericObjectPoolConfig; import org.apache.storm.redis.common.config.JedisClusterConfig; import org.apache.storm.task.IMetricsContext; diff --git a/external/storm-redis/src/test/java/org/apache/storm/redis/bolt/RedisFilterBoltTest.java b/external/storm-redis/src/test/java/org/apache/storm/redis/bolt/RedisFilterBoltTest.java index dc80361a600..568d9662e5e 100644 --- a/external/storm-redis/src/test/java/org/apache/storm/redis/bolt/RedisFilterBoltTest.java +++ b/external/storm-redis/src/test/java/org/apache/storm/redis/bolt/RedisFilterBoltTest.java @@ -18,6 +18,20 @@ package org.apache.storm.redis.bolt; +import static org.apache.storm.redis.common.mapper.RedisDataTypeDescription.RedisDataType.GEO; +import static org.apache.storm.redis.common.mapper.RedisDataTypeDescription.RedisDataType.HASH; +import static org.apache.storm.redis.common.mapper.RedisDataTypeDescription.RedisDataType.HYPER_LOG_LOG; +import static org.apache.storm.redis.common.mapper.RedisDataTypeDescription.RedisDataType.SET; +import static org.apache.storm.redis.common.mapper.RedisDataTypeDescription.RedisDataType.SORTED_SET; +import static org.apache.storm.redis.common.mapper.RedisDataTypeDescription.RedisDataType.STRING; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verifyNoMoreInteractions; + +import java.util.HashMap; +import java.util.Map; import org.apache.storm.redis.common.config.JedisPoolConfig; import org.apache.storm.redis.common.mapper.RedisDataTypeDescription; import org.apache.storm.redis.common.mapper.RedisFilterMapper; @@ -40,21 +54,6 @@ import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; -import java.util.HashMap; -import java.util.Map; - -import static org.apache.storm.redis.common.mapper.RedisDataTypeDescription.RedisDataType.GEO; -import static org.apache.storm.redis.common.mapper.RedisDataTypeDescription.RedisDataType.HASH; -import static org.apache.storm.redis.common.mapper.RedisDataTypeDescription.RedisDataType.HYPER_LOG_LOG; -import static org.apache.storm.redis.common.mapper.RedisDataTypeDescription.RedisDataType.SET; -import static org.apache.storm.redis.common.mapper.RedisDataTypeDescription.RedisDataType.SORTED_SET; -import static org.apache.storm.redis.common.mapper.RedisDataTypeDescription.RedisDataType.STRING; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verifyNoMoreInteractions; - @Testcontainers class RedisFilterBoltTest { @@ -506,4 +505,4 @@ public String getValueFromTuple(final ITuple tuple) { return tuple.getStringByField("value"); } } -} \ No newline at end of file +} diff --git a/external/storm-redis/src/test/java/org/apache/storm/redis/state/RedisKeyValueStateIteratorTest.java b/external/storm-redis/src/test/java/org/apache/storm/redis/state/RedisKeyValueStateIteratorTest.java index 00f4a0eb498..72dabd83d17 100644 --- a/external/storm-redis/src/test/java/org/apache/storm/redis/state/RedisKeyValueStateIteratorTest.java +++ b/external/storm-redis/src/test/java/org/apache/storm/redis/state/RedisKeyValueStateIteratorTest.java @@ -12,6 +12,14 @@ package org.apache.storm.redis.state; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import com.google.common.primitives.UnsignedBytes; import java.util.ArrayList; import java.util.Map; @@ -27,14 +35,6 @@ import redis.clients.jedis.params.ScanParams; import redis.clients.jedis.resps.ScanResult; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - /** * Test for RedisKeyValueStateIterator. */ @@ -207,4 +207,4 @@ private void putTombstoneToMap(NavigableMap map, byte[] key) { private TreeMap getBinaryTreeMap() { return new TreeMap<>(UnsignedBytes.lexicographicalComparator()); } -} \ No newline at end of file +} diff --git a/external/storm-redis/src/test/java/org/apache/storm/redis/state/RedisKeyValueStateProviderTest.java b/external/storm-redis/src/test/java/org/apache/storm/redis/state/RedisKeyValueStateProviderTest.java index 318ec30923d..096127e97f6 100644 --- a/external/storm-redis/src/test/java/org/apache/storm/redis/state/RedisKeyValueStateProviderTest.java +++ b/external/storm-redis/src/test/java/org/apache/storm/redis/state/RedisKeyValueStateProviderTest.java @@ -12,14 +12,14 @@ package org.apache.storm.redis.state; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import java.util.HashMap; import java.util.Map; import org.apache.storm.Config; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; - /** * Unit tests for {@link RedisKeyValueStateProvider} */ diff --git a/external/storm-redis/src/test/java/org/apache/storm/redis/state/RedisKeyValueStateTest.java b/external/storm-redis/src/test/java/org/apache/storm/redis/state/RedisKeyValueStateTest.java index f82ef6fa4df..096134eaa0b 100644 --- a/external/storm-redis/src/test/java/org/apache/storm/redis/state/RedisKeyValueStateTest.java +++ b/external/storm-redis/src/test/java/org/apache/storm/redis/state/RedisKeyValueStateTest.java @@ -12,6 +12,10 @@ package org.apache.storm.redis.state; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + import com.google.common.primitives.UnsignedBytes; import java.util.Arrays; import java.util.HashMap; @@ -29,10 +33,6 @@ import org.mockito.stubbing.Answer; import redis.clients.jedis.util.SafeEncoder; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; - /** * Unit tests for {@link RedisKeyValueState} * diff --git a/external/storm-redis/src/test/java/org/apache/storm/redis/util/TupleTestHelper.java b/external/storm-redis/src/test/java/org/apache/storm/redis/util/TupleTestHelper.java index 0580ec18cf9..b3e9a9b53f8 100644 --- a/external/storm-redis/src/test/java/org/apache/storm/redis/util/TupleTestHelper.java +++ b/external/storm-redis/src/test/java/org/apache/storm/redis/util/TupleTestHelper.java @@ -12,14 +12,14 @@ package org.apache.storm.redis.util; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import java.util.List; import java.util.Objects; import org.apache.storm.redis.util.outputcollector.EmittedTuple; import org.apache.storm.tuple.Tuple; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; - /** * Utility for common test validations. */ diff --git a/external/storm-redis/src/test/java/org/apache/storm/redis/util/outputcollector/EmittedTuple.java b/external/storm-redis/src/test/java/org/apache/storm/redis/util/outputcollector/EmittedTuple.java index 0196db92b72..7bda0283ea9 100644 --- a/external/storm-redis/src/test/java/org/apache/storm/redis/util/outputcollector/EmittedTuple.java +++ b/external/storm-redis/src/test/java/org/apache/storm/redis/util/outputcollector/EmittedTuple.java @@ -12,12 +12,11 @@ package org.apache.storm.redis.util.outputcollector; -import org.apache.storm.tuple.Tuple; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; +import org.apache.storm.tuple.Tuple; /** * Used with StubOutputCollector for testing. diff --git a/flux/flux-core/pom.xml b/flux/flux-core/pom.xml index bf4c877481e..cb032f3adf3 100644 --- a/flux/flux-core/pom.xml +++ b/flux/flux-core/pom.xml @@ -114,6 +114,11 @@ + + org.codehaus.gmavenplus + gmavenplus-plugin + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/flux/flux-core/src/main/java/org/apache/storm/flux/Flux.java b/flux/flux-core/src/main/java/org/apache/storm/flux/Flux.java index 815a7bc1b18..c43873a23de 100644 --- a/flux/flux-core/src/main/java/org/apache/storm/flux/Flux.java +++ b/flux/flux-core/src/main/java/org/apache/storm/flux/Flux.java @@ -24,7 +24,6 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.util.Properties; - import org.apache.commons.cli.BasicParser; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; diff --git a/flux/flux-core/src/main/java/org/apache/storm/flux/FluxBuilder.java b/flux/flux-core/src/main/java/org/apache/storm/flux/FluxBuilder.java index b715727bb31..2c935c66ea1 100644 --- a/flux/flux-core/src/main/java/org/apache/storm/flux/FluxBuilder.java +++ b/flux/flux-core/src/main/java/org/apache/storm/flux/FluxBuilder.java @@ -29,7 +29,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; - import org.apache.storm.Config; import org.apache.storm.flux.model.BeanDef; import org.apache.storm.flux.model.BeanListReference; diff --git a/flux/flux-core/src/main/java/org/apache/storm/flux/api/TopologySource.java b/flux/flux-core/src/main/java/org/apache/storm/flux/api/TopologySource.java index a18b65056a5..7ac3b31a9d2 100644 --- a/flux/flux-core/src/main/java/org/apache/storm/flux/api/TopologySource.java +++ b/flux/flux-core/src/main/java/org/apache/storm/flux/api/TopologySource.java @@ -19,7 +19,6 @@ package org.apache.storm.flux.api; import java.util.Map; - import org.apache.storm.generated.StormTopology; /** diff --git a/flux/flux-core/src/main/java/org/apache/storm/flux/model/ExecutionContext.java b/flux/flux-core/src/main/java/org/apache/storm/flux/model/ExecutionContext.java index ec0529e832f..741854e077e 100644 --- a/flux/flux-core/src/main/java/org/apache/storm/flux/model/ExecutionContext.java +++ b/flux/flux-core/src/main/java/org/apache/storm/flux/model/ExecutionContext.java @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; - import org.apache.storm.Config; import org.apache.storm.task.IBolt; import org.apache.storm.topology.IRichSpout; diff --git a/flux/flux-core/src/main/java/org/apache/storm/flux/model/TopologyDef.java b/flux/flux-core/src/main/java/org/apache/storm/flux/model/TopologyDef.java index fe05275b7e0..08cadb66588 100644 --- a/flux/flux-core/src/main/java/org/apache/storm/flux/model/TopologyDef.java +++ b/flux/flux-core/src/main/java/org/apache/storm/flux/model/TopologyDef.java @@ -23,7 +23,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flux/flux-core/src/main/java/org/apache/storm/flux/parser/FluxParser.java b/flux/flux-core/src/main/java/org/apache/storm/flux/parser/FluxParser.java index c96a5fe10ac..e2eb956114a 100644 --- a/flux/flux-core/src/main/java/org/apache/storm/flux/parser/FluxParser.java +++ b/flux/flux-core/src/main/java/org/apache/storm/flux/parser/FluxParser.java @@ -29,7 +29,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; - import org.apache.storm.flux.model.BoltDef; import org.apache.storm.flux.model.IncludeDef; import org.apache.storm.flux.model.SpoutDef; diff --git a/flux/flux-core/src/test/java/org/apache/storm/flux/FluxBuilderTest.java b/flux/flux-core/src/test/java/org/apache/storm/flux/FluxBuilderTest.java index f3b82dc2abc..afbcd6334cd 100644 --- a/flux/flux-core/src/test/java/org/apache/storm/flux/FluxBuilderTest.java +++ b/flux/flux-core/src/test/java/org/apache/storm/flux/FluxBuilderTest.java @@ -17,16 +17,16 @@ */ package org.apache.storm.flux; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.HashMap; import java.util.Map; - import org.apache.storm.Config; import org.apache.storm.flux.model.TopologyDef; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; public class FluxBuilderTest { diff --git a/flux/flux-core/src/test/java/org/apache/storm/flux/TCKTest.java b/flux/flux-core/src/test/java/org/apache/storm/flux/TCKTest.java index 2135046648b..92494a45ef7 100644 --- a/flux/flux-core/src/test/java/org/apache/storm/flux/TCKTest.java +++ b/flux/flux-core/src/test/java/org/apache/storm/flux/TCKTest.java @@ -17,21 +17,22 @@ */ package org.apache.storm.flux; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.*; + +import java.util.Collections; +import java.util.Map; +import java.util.Properties; import org.apache.storm.Config; -import org.apache.storm.generated.StormTopology; import org.apache.storm.flux.model.ExecutionContext; import org.apache.storm.flux.model.TopologyDef; import org.apache.storm.flux.parser.FluxParser; import org.apache.storm.flux.test.TestBolt; +import org.apache.storm.generated.StormTopology; import org.apache.storm.shade.net.minidev.json.JSONValue; import org.apache.storm.utils.Utils; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import java.util.Collections; -import java.util.Map; -import java.util.Properties; public class TCKTest { diff --git a/flux/flux-core/src/test/java/org/apache/storm/flux/multilang/MultilangEnvironmentTest.java b/flux/flux-core/src/test/java/org/apache/storm/flux/multilang/MultilangEnvironmentTest.java index b29285b4aee..e647df21db0 100644 --- a/flux/flux-core/src/test/java/org/apache/storm/flux/multilang/MultilangEnvironmentTest.java +++ b/flux/flux-core/src/test/java/org/apache/storm/flux/multilang/MultilangEnvironmentTest.java @@ -18,15 +18,14 @@ package org.apache.storm.flux.multilang; -import org.junit.jupiter.api.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.io.OutputStream; - -import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Sanity checks to make sure we can at least invoke the shells used. diff --git a/flux/flux-core/src/test/java/org/apache/storm/flux/test/SimpleTopology.java b/flux/flux-core/src/test/java/org/apache/storm/flux/test/SimpleTopology.java index ff65a8a1c9b..73f71791903 100644 --- a/flux/flux-core/src/test/java/org/apache/storm/flux/test/SimpleTopology.java +++ b/flux/flux-core/src/test/java/org/apache/storm/flux/test/SimpleTopology.java @@ -17,12 +17,11 @@ */ package org.apache.storm.flux.test; -import org.apache.storm.generated.StormTopology; -import org.apache.storm.topology.TopologyBuilder; +import java.util.Map; import org.apache.storm.flux.wrappers.bolts.LogInfoBolt; import org.apache.storm.flux.wrappers.spouts.FluxShellSpout; - -import java.util.Map; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.topology.TopologyBuilder; /** * Test topology source that does not implement TopologySource, but has the same diff --git a/flux/flux-core/src/test/java/org/apache/storm/flux/test/SimpleTopologySource.java b/flux/flux-core/src/test/java/org/apache/storm/flux/test/SimpleTopologySource.java index 2fadacff7d2..8f9acf12d22 100644 --- a/flux/flux-core/src/test/java/org/apache/storm/flux/test/SimpleTopologySource.java +++ b/flux/flux-core/src/test/java/org/apache/storm/flux/test/SimpleTopologySource.java @@ -17,13 +17,12 @@ */ package org.apache.storm.flux.test; -import org.apache.storm.generated.StormTopology; -import org.apache.storm.topology.TopologyBuilder; +import java.util.Map; import org.apache.storm.flux.api.TopologySource; import org.apache.storm.flux.wrappers.bolts.LogInfoBolt; import org.apache.storm.flux.wrappers.spouts.FluxShellSpout; - -import java.util.Map; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.topology.TopologyBuilder; public class SimpleTopologySource implements TopologySource { diff --git a/flux/flux-core/src/test/java/org/apache/storm/flux/test/SimpleTopologyWithConfigParam.java b/flux/flux-core/src/test/java/org/apache/storm/flux/test/SimpleTopologyWithConfigParam.java index 78195b517c9..166898541f8 100644 --- a/flux/flux-core/src/test/java/org/apache/storm/flux/test/SimpleTopologyWithConfigParam.java +++ b/flux/flux-core/src/test/java/org/apache/storm/flux/test/SimpleTopologyWithConfigParam.java @@ -18,10 +18,10 @@ package org.apache.storm.flux.test; import org.apache.storm.Config; -import org.apache.storm.generated.StormTopology; -import org.apache.storm.topology.TopologyBuilder; import org.apache.storm.flux.wrappers.bolts.LogInfoBolt; import org.apache.storm.flux.wrappers.spouts.FluxShellSpout; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.topology.TopologyBuilder; /** * Test topology source that does not implement TopologySource, but has the same diff --git a/flux/flux-core/src/test/java/org/apache/storm/flux/test/TestBolt.java b/flux/flux-core/src/test/java/org/apache/storm/flux/test/TestBolt.java index 45f0a18d9a5..b571b6e005d 100644 --- a/flux/flux-core/src/test/java/org/apache/storm/flux/test/TestBolt.java +++ b/flux/flux-core/src/test/java/org/apache/storm/flux/test/TestBolt.java @@ -17,6 +17,8 @@ */ package org.apache.storm.flux.test; +import java.io.Serializable; +import java.time.Duration; import org.apache.storm.topology.BasicOutputCollector; import org.apache.storm.topology.OutputFieldsDeclarer; import org.apache.storm.topology.base.BaseBasicBolt; @@ -24,9 +26,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.Serializable; -import java.time.Duration; - public class TestBolt extends BaseBasicBolt { private static final Logger LOG = LoggerFactory.getLogger(TestBolt.class); diff --git a/flux/flux-core/src/test/java/org/apache/storm/flux/test/TridentTopologySource.java b/flux/flux-core/src/test/java/org/apache/storm/flux/test/TridentTopologySource.java index b39d771a164..51f04370bab 100644 --- a/flux/flux-core/src/test/java/org/apache/storm/flux/test/TridentTopologySource.java +++ b/flux/flux-core/src/test/java/org/apache/storm/flux/test/TridentTopologySource.java @@ -19,8 +19,6 @@ import org.apache.storm.Config; import org.apache.storm.generated.StormTopology; -import org.apache.storm.tuple.Fields; -import org.apache.storm.tuple.Values; import org.apache.storm.trident.TridentTopology; import org.apache.storm.trident.operation.BaseFunction; import org.apache.storm.trident.operation.TridentCollector; @@ -28,6 +26,8 @@ import org.apache.storm.trident.testing.FixedBatchSpout; import org.apache.storm.trident.testing.MemoryMapState; import org.apache.storm.trident.tuple.TridentTuple; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Values; /** * Basic Trident example that will return a `StormTopology` from a `getTopology()` method. diff --git a/flux/flux-examples/pom.xml b/flux/flux-examples/pom.xml index 3c698412cda..bb3b90509e1 100644 --- a/flux/flux-examples/pom.xml +++ b/flux/flux-examples/pom.xml @@ -121,6 +121,11 @@ + + org.codehaus.gmavenplus + gmavenplus-plugin + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/StatefulWordCounter.java b/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/StatefulWordCounter.java index aa36af9d5f3..a72db880a23 100644 --- a/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/StatefulWordCounter.java +++ b/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/StatefulWordCounter.java @@ -19,7 +19,6 @@ package org.apache.storm.flux.examples; import java.util.Map; - import org.apache.storm.state.KeyValueState; import org.apache.storm.task.OutputCollector; import org.apache.storm.task.TopologyContext; diff --git a/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/TestWindowBolt.java b/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/TestWindowBolt.java index 57826b547e5..8fb01d7c7ea 100644 --- a/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/TestWindowBolt.java +++ b/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/TestWindowBolt.java @@ -19,7 +19,6 @@ package org.apache.storm.flux.examples; import java.util.Map; - import org.apache.storm.task.OutputCollector; import org.apache.storm.task.TopologyContext; import org.apache.storm.topology.OutputFieldsDeclarer; diff --git a/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/WordCountClient.java b/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/WordCountClient.java index b216eb5045f..a2734f01c2f 100644 --- a/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/WordCountClient.java +++ b/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/WordCountClient.java @@ -20,7 +20,6 @@ import java.io.FileInputStream; import java.util.Properties; - import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.TableName; diff --git a/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/WordCounter.java b/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/WordCounter.java index 1604b791950..51b36c04d3d 100644 --- a/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/WordCounter.java +++ b/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/WordCounter.java @@ -21,7 +21,6 @@ import static org.apache.storm.utils.Utils.tuple; import java.util.Map; - import org.apache.storm.task.TopologyContext; import org.apache.storm.topology.BasicOutputCollector; import org.apache.storm.topology.OutputFieldsDeclarer; diff --git a/flux/flux-wrappers/pom.xml b/flux/flux-wrappers/pom.xml index d04c5c0755e..13778108506 100644 --- a/flux/flux-wrappers/pom.xml +++ b/flux/flux-wrappers/pom.xml @@ -52,6 +52,11 @@ + + org.codehaus.gmavenplus + gmavenplus-plugin + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/flux/flux-wrappers/src/main/java/org/apache/storm/flux/wrappers/bolts/FluxShellBolt.java b/flux/flux-wrappers/src/main/java/org/apache/storm/flux/wrappers/bolts/FluxShellBolt.java index 3881e93be78..3172fd03b92 100644 --- a/flux/flux-wrappers/src/main/java/org/apache/storm/flux/wrappers/bolts/FluxShellBolt.java +++ b/flux/flux-wrappers/src/main/java/org/apache/storm/flux/wrappers/bolts/FluxShellBolt.java @@ -22,7 +22,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; - import org.apache.storm.task.ShellBolt; import org.apache.storm.topology.IRichBolt; import org.apache.storm.topology.OutputFieldsDeclarer; diff --git a/flux/flux-wrappers/src/main/java/org/apache/storm/flux/wrappers/spouts/FluxShellSpout.java b/flux/flux-wrappers/src/main/java/org/apache/storm/flux/wrappers/spouts/FluxShellSpout.java index caa920f5b06..fc6dba13155 100644 --- a/flux/flux-wrappers/src/main/java/org/apache/storm/flux/wrappers/spouts/FluxShellSpout.java +++ b/flux/flux-wrappers/src/main/java/org/apache/storm/flux/wrappers/spouts/FluxShellSpout.java @@ -22,7 +22,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; - import org.apache.storm.spout.ShellSpout; import org.apache.storm.topology.IRichSpout; import org.apache.storm.topology.OutputFieldsDeclarer; diff --git a/flux/pom.xml b/flux/pom.xml index 9263dc2667f..d6bcdd1f4f0 100644 --- a/flux/pom.xml +++ b/flux/pom.xml @@ -60,6 +60,11 @@ + + org.codehaus.gmavenplus + gmavenplus-plugin + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/integration-test/pom.xml b/integration-test/pom.xml index 297f59f3e4e..d0f54fd254e 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -164,6 +164,11 @@ + + org.codehaus.gmavenplus + gmavenplus-plugin + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/integration-test/src/main/java/org/apache/storm/debug/DebugHelper.java b/integration-test/src/main/java/org/apache/storm/debug/DebugHelper.java index 61ba9d93045..f9efc764f4f 100644 --- a/integration-test/src/main/java/org/apache/storm/debug/DebugHelper.java +++ b/integration-test/src/main/java/org/apache/storm/debug/DebugHelper.java @@ -19,7 +19,6 @@ import java.net.URL; import java.net.URLClassLoader; - import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/integration-test/src/main/java/org/apache/storm/st/topology/window/SlidingTimeCorrectness.java b/integration-test/src/main/java/org/apache/storm/st/topology/window/SlidingTimeCorrectness.java index 88fcdf4bda3..8eb25ad81d3 100644 --- a/integration-test/src/main/java/org/apache/storm/st/topology/window/SlidingTimeCorrectness.java +++ b/integration-test/src/main/java/org/apache/storm/st/topology/window/SlidingTimeCorrectness.java @@ -18,17 +18,14 @@ package org.apache.storm.st.topology.window; import com.google.common.collect.Lists; - import java.util.List; import java.util.concurrent.TimeUnit; - import org.apache.storm.generated.StormTopology; import org.apache.storm.st.topology.TestableTopology; import org.apache.storm.st.topology.window.data.TimeData; import org.apache.storm.st.utils.StringDecorator; import org.apache.storm.topology.TopologyBuilder; import org.apache.storm.topology.base.BaseWindowedBolt; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/integration-test/src/main/java/org/apache/storm/st/topology/window/SlidingWindowCorrectness.java b/integration-test/src/main/java/org/apache/storm/st/topology/window/SlidingWindowCorrectness.java index 5e11abef6b7..1bf7322592c 100644 --- a/integration-test/src/main/java/org/apache/storm/st/topology/window/SlidingWindowCorrectness.java +++ b/integration-test/src/main/java/org/apache/storm/st/topology/window/SlidingWindowCorrectness.java @@ -18,15 +18,12 @@ package org.apache.storm.st.topology.window; import com.google.common.collect.Lists; - import java.util.List; - import org.apache.storm.generated.StormTopology; import org.apache.storm.st.topology.TestableTopology; import org.apache.storm.st.utils.StringDecorator; import org.apache.storm.topology.TopologyBuilder; import org.apache.storm.topology.base.BaseWindowedBolt; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/integration-test/src/main/java/org/apache/storm/st/topology/window/TumblingTimeCorrectness.java b/integration-test/src/main/java/org/apache/storm/st/topology/window/TumblingTimeCorrectness.java index 934940ffd50..cde1921c674 100644 --- a/integration-test/src/main/java/org/apache/storm/st/topology/window/TumblingTimeCorrectness.java +++ b/integration-test/src/main/java/org/apache/storm/st/topology/window/TumblingTimeCorrectness.java @@ -18,17 +18,14 @@ package org.apache.storm.st.topology.window; import com.google.common.collect.Lists; - import java.util.List; import java.util.concurrent.TimeUnit; - import org.apache.storm.generated.StormTopology; import org.apache.storm.st.topology.TestableTopology; import org.apache.storm.st.topology.window.data.TimeData; import org.apache.storm.st.utils.StringDecorator; import org.apache.storm.topology.TopologyBuilder; import org.apache.storm.topology.base.BaseWindowedBolt; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/integration-test/src/main/java/org/apache/storm/st/topology/window/TumblingWindowCorrectness.java b/integration-test/src/main/java/org/apache/storm/st/topology/window/TumblingWindowCorrectness.java index 81d46b974d4..857da0f5da2 100644 --- a/integration-test/src/main/java/org/apache/storm/st/topology/window/TumblingWindowCorrectness.java +++ b/integration-test/src/main/java/org/apache/storm/st/topology/window/TumblingWindowCorrectness.java @@ -18,15 +18,12 @@ package org.apache.storm.st.topology.window; import com.google.common.collect.Lists; - import java.util.List; - import org.apache.storm.generated.StormTopology; import org.apache.storm.st.topology.TestableTopology; import org.apache.storm.st.utils.StringDecorator; import org.apache.storm.topology.TopologyBuilder; import org.apache.storm.topology.base.BaseWindowedBolt; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/integration-test/src/main/java/org/apache/storm/st/topology/window/data/TimeData.java b/integration-test/src/main/java/org/apache/storm/st/topology/window/data/TimeData.java index 4a1fc96ff2d..d21648fc76e 100644 --- a/integration-test/src/main/java/org/apache/storm/st/topology/window/data/TimeData.java +++ b/integration-test/src/main/java/org/apache/storm/st/topology/window/data/TimeData.java @@ -19,10 +19,8 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; - import java.util.Collection; import java.util.Date; - import org.apache.storm.tuple.Fields; import org.apache.storm.tuple.Tuple; import org.apache.storm.tuple.Values; diff --git a/integration-test/src/main/java/org/apache/storm/st/utils/TimeUtil.java b/integration-test/src/main/java/org/apache/storm/st/utils/TimeUtil.java index fb99e99fced..800a521cad7 100644 --- a/integration-test/src/main/java/org/apache/storm/st/utils/TimeUtil.java +++ b/integration-test/src/main/java/org/apache/storm/st/utils/TimeUtil.java @@ -20,7 +20,6 @@ import java.time.Duration; import java.time.ZonedDateTime; import java.util.concurrent.TimeUnit; - import org.apache.commons.lang3.exception.ExceptionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/integration-test/src/test/java/org/apache/storm/st/DemoTest.java b/integration-test/src/test/java/org/apache/storm/st/DemoTest.java index 4c148f71f3d..bd538e4c8d5 100644 --- a/integration-test/src/test/java/org/apache/storm/st/DemoTest.java +++ b/integration-test/src/test/java/org/apache/storm/st/DemoTest.java @@ -17,6 +17,11 @@ package org.apache.storm.st; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; import org.apache.storm.ExclamationTopology; import org.apache.storm.st.helper.AbstractTest; import org.apache.storm.st.wrapper.TopoWrap; @@ -25,12 +30,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - -import static org.junit.jupiter.api.Assertions.assertTrue; - public final class DemoTest extends AbstractTest { private static final Logger log = LoggerFactory.getLogger(DemoTest.class); private static final List exclaim2Output = ExclamationTopology.FixedOrderWordSpout.WORDS.stream() diff --git a/integration-test/src/test/java/org/apache/storm/st/meta/TestngListener.java b/integration-test/src/test/java/org/apache/storm/st/meta/TestngListener.java index cb9018cd41c..cbb87834c66 100644 --- a/integration-test/src/test/java/org/apache/storm/st/meta/TestngListener.java +++ b/integration-test/src/test/java/org/apache/storm/st/meta/TestngListener.java @@ -17,6 +17,7 @@ package org.apache.storm.st.meta; +import java.util.Arrays; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.log4j.Logger; @@ -26,8 +27,6 @@ import org.testng.ITestListener; import org.testng.ITestResult; -import java.util.Arrays; - /** * Testng listener class. This is useful for things that are applicable to all the tests as well * taking actions that depend on test results. diff --git a/integration-test/src/test/java/org/apache/storm/st/tests/window/SlidingWindowTest.java b/integration-test/src/test/java/org/apache/storm/st/tests/window/SlidingWindowTest.java index 11ca2ae3c69..7338640acb9 100644 --- a/integration-test/src/test/java/org/apache/storm/st/tests/window/SlidingWindowTest.java +++ b/integration-test/src/test/java/org/apache/storm/st/tests/window/SlidingWindowTest.java @@ -17,6 +17,8 @@ package org.apache.storm.st.tests.window; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.apache.storm.st.helper.AbstractTest; import org.apache.storm.st.topology.window.SlidingTimeCorrectness; import org.apache.storm.st.topology.window.SlidingWindowCorrectness; @@ -24,7 +26,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import static org.junit.jupiter.api.Assertions.assertThrows; public final class SlidingWindowTest extends AbstractTest { private final WindowVerifier windowVerifier = new WindowVerifier(); diff --git a/integration-test/src/test/java/org/apache/storm/st/tests/window/TumblingWindowTest.java b/integration-test/src/test/java/org/apache/storm/st/tests/window/TumblingWindowTest.java index 99c8d313cf7..0db986bc752 100644 --- a/integration-test/src/test/java/org/apache/storm/st/tests/window/TumblingWindowTest.java +++ b/integration-test/src/test/java/org/apache/storm/st/tests/window/TumblingWindowTest.java @@ -17,17 +17,17 @@ package org.apache.storm.st.tests.window; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.fail; + import org.apache.storm.st.helper.AbstractTest; -import org.apache.storm.st.wrapper.TopoWrap; import org.apache.storm.st.topology.window.TumblingTimeCorrectness; import org.apache.storm.st.topology.window.TumblingWindowCorrectness; +import org.apache.storm.st.wrapper.TopoWrap; import org.testng.annotations.AfterMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.fail; - public final class TumblingWindowTest extends AbstractTest { private final WindowVerifier windowVerifier = new WindowVerifier(); private TopoWrap topo; diff --git a/integration-test/src/test/java/org/apache/storm/st/tests/window/WindowVerifier.java b/integration-test/src/test/java/org/apache/storm/st/tests/window/WindowVerifier.java index fda6d44c97c..72e9d6f23db 100644 --- a/integration-test/src/test/java/org/apache/storm/st/tests/window/WindowVerifier.java +++ b/integration-test/src/test/java/org/apache/storm/st/tests/window/WindowVerifier.java @@ -16,6 +16,8 @@ package org.apache.storm.st.tests.window; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.IOException; import java.time.ZoneOffset; import java.time.ZonedDateTime; @@ -32,8 +34,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class WindowVerifier { public static final Logger LOG = LoggerFactory.getLogger(WindowVerifier.class); diff --git a/integration-test/src/test/java/org/apache/storm/st/utils/AssertUtil.java b/integration-test/src/test/java/org/apache/storm/st/utils/AssertUtil.java index 582e1593c27..3f9d3bd988f 100644 --- a/integration-test/src/test/java/org/apache/storm/st/utils/AssertUtil.java +++ b/integration-test/src/test/java/org/apache/storm/st/utils/AssertUtil.java @@ -17,17 +17,16 @@ package org.apache.storm.st.utils; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; import java.util.Collection; import java.util.List; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class AssertUtil { private static final Logger log = LoggerFactory.getLogger(AssertUtil.class); diff --git a/integration-test/src/test/java/org/apache/storm/st/wrapper/DecoratedLogLine.java b/integration-test/src/test/java/org/apache/storm/st/wrapper/DecoratedLogLine.java index c3090c1a993..c45d168a96f 100644 --- a/integration-test/src/test/java/org/apache/storm/st/wrapper/DecoratedLogLine.java +++ b/integration-test/src/test/java/org/apache/storm/st/wrapper/DecoratedLogLine.java @@ -17,14 +17,13 @@ package org.apache.storm.st.wrapper; -import org.apache.storm.st.utils.AssertUtil; -import org.apache.commons.lang3.StringUtils; -import org.apache.storm.st.utils.StringDecorator; - import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.util.Arrays; import java.util.List; +import org.apache.commons.lang3.StringUtils; +import org.apache.storm.st.utils.AssertUtil; +import org.apache.storm.st.utils.StringDecorator; /** * Convenience class splitting log lines decorated with {@link StringDecorator}. diff --git a/integration-test/src/test/java/org/apache/storm/st/wrapper/StormCluster.java b/integration-test/src/test/java/org/apache/storm/st/wrapper/StormCluster.java index 33f9dbbfc7a..d7a27d2a342 100644 --- a/integration-test/src/test/java/org/apache/storm/st/wrapper/StormCluster.java +++ b/integration-test/src/test/java/org/apache/storm/st/wrapper/StormCluster.java @@ -17,8 +17,16 @@ package org.apache.storm.st.wrapper; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.google.common.base.Predicate; import com.google.common.collect.Collections2; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import javax.annotation.Nullable; import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.storm.generated.ClusterSummary; import org.apache.storm.generated.KillOptions; @@ -32,15 +40,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; - -import static org.junit.jupiter.api.Assertions.assertEquals; - public class StormCluster { private static final Logger log = LoggerFactory.getLogger(StormCluster.class); private final Nimbus.Iface client; diff --git a/pom.xml b/pom.xml index fd98e747629..17595e9e8a1 100644 --- a/pom.xml +++ b/pom.xml @@ -69,6 +69,17 @@ 25 + + storm_checkstyle + 4.2.0 + 4.0.29 false false @@ -1094,6 +1105,48 @@ + + + org.codehaus.gmavenplus + gmavenplus-plugin + ${gmavenplus.version} + + + org.apache.groovy + groovy + ${groovy.version} + + + + org.apache.groovy + groovy-xml + ${groovy.version} + + + + + checkstyle-autofix + validate + + execute + + + + + + + + + org.apache.maven.plugins @@ -1118,7 +1171,7 @@ validate validate - storm/storm_checkstyle.xml + storm/${storm.checkstyle.config}.xml org.checkstyle.google.severity=error UTF-8 true diff --git a/storm-checkstyle/README.md b/storm-checkstyle/README.md new file mode 100644 index 00000000000..e06b05df86a --- /dev/null +++ b/storm-checkstyle/README.md @@ -0,0 +1,93 @@ +# Checkstyle auto-fix + +`storm_checkstyle.xml` is the Checkstyle ruleset enforced on every `mvn` build (bound +to the `validate` phase, `violationSeverity=error`, `failOnViolation=true` - a build +fails on any violation). + +`src/main/resources/storm/checkstyle-autofix.groovy` auto-corrects a subset of that +ruleset's violations in your source files. It runs via `gmavenplus-plugin`, bound to +`validate` immediately before `maven-checkstyle-plugin`, so by the time Checkstyle +checks your code, the fixable violations are already gone. + +The fixer reads its parameters (indent width, import group order, etc.) straight out +of the active ruleset XML at build time via `XmlSlurper` - it has no formatter engine +or preset style of its own. If you change the ruleset, the fixer's behavior changes +with it, with no code change required. + +## What it fixes + +| Checkstyle module | Fix | +|---|---| +| `FileTabCharacter` | Tabs replaced with `basicOffset` spaces | +| `NoWhitespaceBeforeCaseDefaultColon` | `case FOO :` -> `case FOO:` | +| `NoWhitespaceBefore` (labeled statements) | `LOOP : for (...)` -> `LOOP: for (...)` | +| `CommentsIndentation` | Standalone comments realigned to the code they attach to | +| `CustomImportOrder` | Imports regrouped/sorted per the ruleset's declared rules | + +Everything else Checkstyle flags (line length, missing Javadoc, final parameters, +brace placement, most whitespace rules, ...) is **not** auto-fixed and must still be +corrected by hand - those need real Java-parser-level understanding to fix safely +without risking a wrong edit, or are a style/policy call rather than a mechanical one. + +## Running it + +### As part of a normal build + +Nothing to do - it runs automatically at `validate`: + +```sh +mvn clean install +``` + +### For the whole project, without the rest of the build + +Runs the fixer across every module's `compileSourceRoots`/`testCompileSourceRoots` +and stops: + +```sh +mvn validate +``` + +### For a single module + +Substitute the module's artifact id (or a relative path via `-f`): + +```sh +mvn -pl storm-client org.codehaus.gmavenplus:gmavenplus-plugin:execute@checkstyle-autofix +``` + +`mvn -pl validate` also works, but additionally runs every other plugin +bound to `validate` for that module (including the Checkstyle check itself, which +will still fail on whatever the fixer doesn't cover) - use the `gmavenplus-plugin` +goal directly if you only want the auto-fix step in isolation. + +### Skipping it + +To build without running the fixer (e.g. to inspect Checkstyle's raw output, or to +review the fixer's own diff before it runs again): + +```sh +mvn -Dgmavenplus.skip=true +``` + +### Using a different ruleset + +`storm.checkstyle.config` (root `pom.xml` property) names the active ruleset by +basename - both the fixer and `maven-checkstyle-plugin`'s `configLocation` read the +same property, so they never drift out of sync. To point at a sibling ruleset file +in this module's `src/main/resources/storm/` directory: + +```sh +mvn -Dstorm.checkstyle.config= # no .xml extension +``` + +## Standalone auto-fix commands, per module + +```sh +mvn -pl storm-client org.codehaus.gmavenplus:gmavenplus-plugin:execute@checkstyle-autofix +mvn -pl storm-core org.codehaus.gmavenplus:gmavenplus-plugin:execute@checkstyle-autofix +mvn -pl storm-server org.codehaus.gmavenplus:gmavenplus-plugin:execute@checkstyle-autofix +mvn -pl external/storm-kafka-client org.codehaus.gmavenplus:gmavenplus-plugin:execute@checkstyle-autofix +``` + +(Any module under the reactor works the same way - swap in its path or artifact id.) diff --git a/storm-checkstyle/src/main/resources/storm/checkstyle-autofix.groovy b/storm-checkstyle/src/main/resources/storm/checkstyle-autofix.groovy new file mode 100644 index 00000000000..b18cdd32ca5 --- /dev/null +++ b/storm-checkstyle/src/main/resources/storm/checkstyle-autofix.groovy @@ -0,0 +1,450 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Auto-fixes storm_checkstyle.xml violations. Every fixer below reads the values it + * needs (basicOffset, CustomImportOrder's rule string, etc.) straight out of the + * ruleset XML itself via XmlSlurper - there is no formatter engine, preset style, or + * hand-copied config anywhere in this script. If a value isn't declared in the + * ruleset, the fixer that depends on it is skipped rather than guessing a default + * borrowed from some other tool's convention. + * + * One fixer per checkstyle module below, each named and documented against the exact + * module it closes: + * + * Checkstyle module | Fixer + * --------------------------------------------|-------------------------------- + * FileTabCharacter | fixFileTabCharacter + * NoWhitespaceBeforeCaseDefaultColon | fixNoWhitespaceBeforeCaseDefaultColon + * NoWhitespaceBefore (LABELED_STAT token only) | fixNoWhitespaceBeforeLabeledStat + * CommentsIndentation | fixCommentsIndentation + * CustomImportOrder | fixCustomImportOrder + * + * Rules with no fixer here (LeftCurly/RightCurly brace placement, WhitespaceAround, + * Indentation's statement re-nesting) need a real Java parser to fix correctly + * without risking a semantic change or a wrong edit on ambiguous input - a plain + * text/line pass isn't a safe way to move code across brace boundaries. Checkstyle + * keeps checking them; nothing here silently claims to fix them. + * + * Run via gmavenplus-plugin's `execute` goal at the `validate` phase, before the + * checkstyle check. Bound per-module (root pom pluginManagement, activated the same + * way as Checkstyle) since project.compileSourceRoots / testCompileSourceRoots are + * module-specific. + */ + +import groovy.io.FileType +import groovy.xml.XmlSlurper + +// --------------------------------------------------------------------------------- +// Load the active ruleset directly - storm.checkstyle.config picks the basename, +// same property maven-checkstyle-plugin's configLocation uses (root pom). +// --------------------------------------------------------------------------------- + +String rulesetName = project.properties.getProperty('storm.checkstyle.config', 'storm_checkstyle') +String multiModuleDir = System.getProperty('maven.multiModuleProjectDirectory') +File rulesetFile = new File("${multiModuleDir}/storm-checkstyle/src/main/resources/storm/${rulesetName}.xml") +if (!rulesetFile.exists()) { + println "[checkstyle-autofix] ${project.artifactId}: ruleset ${rulesetFile} not found, skipping." + return +} + +// Checkstyle rulesets always carry a pointing at the +// public checkstyle DTD. XmlSlurper's default SAXParser rejects any DOCTYPE outright +// (disallow-doctype-decl=true, a blanket XXE hardening default), so it must be turned +// off here - but external entity/DTD fetching stays disabled so this doesn't reopen +// an XXE hole; the doctype is parsed, its external subset never is. +def xmlSlurper = new XmlSlurper() +xmlSlurper.setFeature('http://apache.org/xml/features/disallow-doctype-decl', false) +xmlSlurper.setFeature('http://xml.org/sax/features/external-general-entities', false) +xmlSlurper.setFeature('http://xml.org/sax/features/external-parameter-entities', false) +xmlSlurper.setFeature('http://apache.org/xml/features/nonvalidating/load-external-dtd', false) +def checker = xmlSlurper.parse(rulesetFile) +def treeWalker = checker.module.find { it.@name == 'TreeWalker' } + +def findModule = { String name -> treeWalker.module.find { it.@name == name } } +def findModuleById = { String name, String id -> treeWalker.module.findAll { it.@name == name }.find { it.module.@id == id || it.@id.text() == id } } +def moduleProperty = { module, String propName, String defaultValue = null -> + def prop = module?.property?.find { it.@name == propName } + prop ? prop.@value.text() : defaultValue +} + +def indentationModule = findModule('Indentation') +Integer basicOffset = (moduleProperty(indentationModule, 'basicOffset', '4')).toInteger() + +def customImportOrderModule = findModule('CustomImportOrder') + +boolean fileTabCharacterEnabled = findModule('FileTabCharacter') != null || checker.module.any { it.@name == 'FileTabCharacter' } + +// --------------------------------------------------------------------------------- +// Shared line classification (comment vs. code vs. blank), reused by every fixer +// below that needs to tell them apart. +// --------------------------------------------------------------------------------- + +def leadingWhitespace = { String line -> + def m = (line =~ /^[ \t]*/) + m.find() + m.group() +} + +// True if a CODE line's own (non-comment) content ends with a real statement +// terminator - ';', '{', or '}' - meaning whatever comes after it starts a new +// statement rather than continuing this one. A trailing "// ..." comment on the +// same line is stripped first so it can't hide the terminator. +def codeEndsWithTerminator = { String line -> + int commentIdx = line.indexOf('//') + String codeOnly = (commentIdx >= 0 ? line.substring(0, commentIdx) : line).trim() + if (codeOnly.isEmpty()) { + return false + } + def lastChar = codeOnly[-1] + lastChar == ';' || lastChar == '{' || lastChar == '}' +} + +// Line classification, tracked as a single top-to-bottom pass so a javadoc/block-comment +// continuation line (e.g. " * Provides a way...", which starts with "*" - not "//" or "/*") +// is correctly recognized as still being inside a comment rather than mistaken for code. +def classifyLines = { List lines -> + List kinds = new ArrayList<>(lines.size()) // one of: BLANK, COMMENT, CODE + boolean inBlock = false + lines.each { String line -> + String trimmed = line.trim() + if (inBlock) { + kinds << 'COMMENT' + if (trimmed.contains('*/')) { + inBlock = false + } + } else if (trimmed.isEmpty()) { + kinds << 'BLANK' + } else if (trimmed.startsWith('//')) { + kinds << 'COMMENT' + } else if (trimmed.startsWith('/*')) { + kinds << 'COMMENT' + if (!trimmed.contains('*/')) { + inBlock = true + } + } else { + kinds << 'CODE' + } + } + kinds +} + +/* + * Checkstyle module: FileTabCharacter (property eachLine=true - every tab anywhere + * in the file is flagged, not just leading indentation). + * Fix: replace each tab with `basicOffset` spaces (Indentation module's own + * basicOffset property - the ruleset's declared unit of indentation, not a + * hardcoded width). + */ +def fixFileTabCharacter = { String line -> line.replace('\t', ' ' * basicOffset) } + +/* + * Checkstyle module: NoWhitespaceBeforeCaseDefaultColon + * Flags: "case FOO :" and "default :" - a space between a switch label + * (case value or the bare "default" keyword) and its colon. + * Fix: drop that space. Restricted by the caller to CODE lines only, so a + * comment containing the English words "case"/"default" ahead of an + * unrelated colon elsewhere on the line can't be misread as a switch label. + */ +def fixNoWhitespaceBeforeCaseDefaultColon = { String line -> + line + .replaceAll(/\bdefault[ \t]+:/, 'default:') + .replaceAll(/\bcase\b([^:{};]*)[ \t]+:/, 'case$1:') +} + +/* + * Checkstyle module: NoWhitespaceBefore, token LABELED_STAT only (the + * module's other tokens - COMMA, SEMI, POST_INC, POST_DEC, DOT, METHOD_REF, + * ELLIPSIS - are already handled correctly by any sane formatter and haven't + * been observed to violate here, so they're not covered by this fixer). + * Flags: "OUTERMOST_LOOP : for (...)" - a space between a statement label + * and its colon. + * Fix: drop that space. Matches only a line whose sole content before the + * colon is a single identifier, so it can't be confused with a ternary + * expression's colon or any other non-label use. + */ +def labeledStatSpacingPattern = ~/^([ \t]*[A-Za-z_$][A-Za-z0-9_$]*)[ \t]+(:.*)$/ + +def fixNoWhitespaceBeforeLabeledStat = { String line -> + def m = labeledStatSpacingPattern.matcher(line) + m.matches() ? (m.group(1) + m.group(2)) : line +} + +/* + * Checkstyle module: CommentsIndentation (tokens SINGLE_LINE_COMMENT, + * BLOCK_COMMENT_BEGIN). + * Flags: a standalone comment line (nothing but whitespace before "//" or + * "/*") whose indentation doesn't match the line it logically attaches to: + * - normally, the next non-blank line; + * - but if that next line is only closing punctuation (e.g. a lone "}"), + * the comment is a trailing comment for the *previous* statement instead, + * and must match that statement's own starting indentation - skipping + * over any of that statement's wrapped continuation lines, which sit + * deeper than the statement's first line. + * Fix: realign the comment (or, for a block comment, shift the whole block + * as a unit to preserve javadoc "*" alignment) to whichever target applies. + * Trailing end-of-line comments (code precedes "//" on the same line) are + * untouched - CommentsIndentation doesn't check those either. + * Mutates `result` in place; returns the number of lines changed. + */ +def fixCommentsIndentation = { List result, List kinds -> + int linesFixed = 0 + int i = 0 + while (i < result.size()) { + if (kinds[i] != 'COMMENT') { + i++ + continue + } + // Maximal run of COMMENT/BLANK lines starting here, up to (not including) + // the next CODE line or end of file. + int runStart = i + int j = i + while (j < result.size() && kinds[j] != 'CODE') { + j++ + } + int runEnd = j - 1 // inclusive, last COMMENT/BLANK line of the run + if (j >= result.size()) { + i = j + 1 + continue + } + // Trim trailing BLANK lines from the run - only realign comment lines. + while (runEnd >= runStart && kinds[runEnd] == 'BLANK') { + runEnd-- + } + if (runEnd < runStart) { + i = j + 1 + continue + } + + boolean nextIsCloserOnly = result[j].trim() ==~ /[)\}\];,]+/ + String targetIndent = null + if (nextIsCloserOnly) { + // Walk back to the nearest CODE line, then further back only through + // that same statement's own wrapped-continuation lines - stopping as + // soon as the line before it terminates its own, different statement + // (ends with ';', '{', or '}'), which marks where the target + // statement actually begins. Without this stop condition, a run of + // unbroken code above (the common case - most methods have no blank + // lines) would be walked indefinitely, picking up an unrelated, + // unrelated-scope indentation from far earlier in the file. + int p = runStart - 1 + while (p >= 0 && kinds[p] != 'CODE') { + p-- + } + if (p >= 0) { + int stmtStart = p + while (stmtStart - 1 >= 0 && kinds[stmtStart - 1] == 'CODE' + && !codeEndsWithTerminator(result[stmtStart - 1])) { + stmtStart-- + } + targetIndent = leadingWhitespace(result[stmtStart]) + // If the statement found is itself a block opener ("... {"), the + // comment sits *inside* that block (its only content, right before + // the closing brace) rather than beside the opener - one level + // deeper than the opener's own indentation. + if (result[stmtStart].trim().endsWith('{')) { + targetIndent += ' ' * basicOffset + } + } + } + if (targetIndent == null) { + targetIndent = leadingWhitespace(result[j]) + } + + // Single-line "//" comments have no internal structure, so each is set + // directly to the target - a mid-run stray line that merely happens to + // match its immediate neighbor (but not the eventual target) still gets + // corrected. Block comments are shifted as a unit by one delta (computed + // from the block's own opening line) to preserve javadoc "*" alignment. + int x = runStart + while (x <= runEnd) { + if (kinds[x] == 'BLANK') { + x++ + continue + } + String trimmedLine = result[x].trim() + if (trimmedLine.startsWith('/*')) { + int blockStart = x + int blockEnd = x + while (blockEnd < runEnd && !result[blockEnd].contains('*/')) { + blockEnd++ + } + String blockCurIndent = leadingWhitespace(result[blockStart]) + int delta = targetIndent.length() - blockCurIndent.length() + if (delta != 0) { + for (int y = blockStart; y <= blockEnd; y++) { + String curLine = result[y] + String curLead = leadingWhitespace(curLine) + String rest = curLine.substring(curLead.length()) + int newLen = Math.max(0, curLead.length() + delta) + result[y] = (' ' * newLen) + rest + linesFixed++ + } + } + x = blockEnd + 1 + } else { + if (leadingWhitespace(result[x]) != targetIndent) { + result[x] = targetIndent + trimmedLine + linesFixed++ + } + x++ + } + } + i = j + 1 + } + linesFixed +} + +/* + * Checkstyle module: CustomImportOrder. + * Reads customImportOrderRules (e.g. "STATIC###THIRD_PARTY_PACKAGE"), + * sortImportsInGroupAlphabetically, and separateLineBetweenGroups directly from the + * module's own properties - an empty/missing rule list disables this fixer entirely + * rather than assuming a group order the ruleset never declared. + * Fix: re-emit the whole leading import block (the contiguous run of "import "/ + * "import static " lines at the top of the file, before the first non-import, + * non-comment, non-package line) grouped and ordered exactly per those properties, + * with a blank line between groups only if separateLineBetweenGroups=true. + * Only STATIC and THIRD_PARTY_PACKAGE groups are recognized (the two this ruleset + * uses); a rule list naming any other group is left unfixed, since guessing that + * group's package-prefix membership isn't something the ruleset spells out. + * Returns the new list of lines, or the original if the block already matches or + * the fixer doesn't apply. + */ +def fixCustomImportOrder = { List lines -> + if (customImportOrderModule == null) { + return lines + } + String rule = moduleProperty(customImportOrderModule, 'customImportOrderRules', '') + List groupOrder = rule.split('###').findAll { it } + if (groupOrder.isEmpty() || !groupOrder.every { it == 'STATIC' || it == 'THIRD_PARTY_PACKAGE' }) { + return lines + } + boolean alphabetical = moduleProperty(customImportOrderModule, 'sortImportsInGroupAlphabetically', 'false') == 'true' + boolean separateGroups = moduleProperty(customImportOrderModule, 'separateLineBetweenGroups', 'false') == 'true' + + int start = -1 + int end = -1 + for (int i = 0; i < lines.size(); i++) { + String trimmed = lines[i].trim() + if (trimmed.startsWith('import ')) { + if (start < 0) { + start = i + } + end = i + } else if (start >= 0 && !trimmed.isEmpty()) { + break + } + } + if (start < 0) { + return lines + } + + List importLines = lines[start..end].findAll { it.trim().startsWith('import ') } + Map> groups = ['STATIC': [], 'THIRD_PARTY_PACKAGE': []] + importLines.each { String imp -> + String key = imp.trim().startsWith('import static ') ? 'STATIC' : 'THIRD_PARTY_PACKAGE' + groups[key] << imp.trim() + } + groupOrder.each { g -> if (alphabetical) { groups[g] = groups[g].sort() } } + + List rebuilt = [] + groupOrder.eachWithIndex { g, idx -> + if (groups[g].isEmpty()) { + return + } + if (idx > 0 && separateGroups && !rebuilt.isEmpty()) { + rebuilt << '' + } + rebuilt.addAll(groups[g]) + } + + if (rebuilt == lines[start..end]) { + return lines + } + List result = new ArrayList<>(lines.subList(0, start)) + result.addAll(rebuilt) + result.addAll(lines.subList(end + 1, lines.size())) + result +} + +// Line-based fixers (module -> function), applied only to CODE lines. +def lineFixers = [ + NoWhitespaceBeforeCaseDefaultColon: fixNoWhitespaceBeforeCaseDefaultColon, + NoWhitespaceBeforeLabeledStat : fixNoWhitespaceBeforeLabeledStat, +] + (fileTabCharacterEnabled ? [FileTabCharacter: fixFileTabCharacter] : [:]) + +def sourceRoots = ((project.compileSourceRoots ?: []) + (project.testCompileSourceRoots ?: [])).unique() + +int filesChanged = 0 +Map fixCounts = lineFixers.keySet().collectEntries { [(it): 0] } +fixCounts['CommentsIndentation'] = 0 +fixCounts['CustomImportOrder'] = 0 + +sourceRoots.each { rootPath -> + File rootDir = new File(rootPath) + if (!rootDir.exists()) { + return + } + rootDir.eachFileRecurse(FileType.FILES) { file -> + if (!file.name.endsWith('.java')) { + return + } + List result = file.readLines() + boolean changed = false + + List reordered = fixCustomImportOrder(result) + if (reordered != result) { + result = reordered + fixCounts['CustomImportOrder']++ + changed = true + } + + // Classified once up front and reused by every fixer below. None of the + // line-based edits (colon spacing, tabs) add/remove lines or change comment + // boundaries, so the classification stays valid across all of them. + List kinds = classifyLines(result) + + lineFixers.each { moduleName, fixer -> + for (int n = 0; n < result.size(); n++) { + if (kinds[n] != 'CODE') { + continue + } + String original = result[n] + String fixed = fixer(original) + if (fixed != original) { + result[n] = fixed + fixCounts[moduleName]++ + changed = true + } + } + } + + int commentLinesFixed = fixCommentsIndentation(result, kinds) + if (commentLinesFixed > 0) { + fixCounts['CommentsIndentation'] += commentLinesFixed + changed = true + } + + if (changed) { + file.text = result.join('\n') + '\n' + filesChanged++ + } + } +} + +println "[checkstyle-autofix] ${project.artifactId}: fixed ${fixCounts} across ${filesChanged} file(s), ruleset=${rulesetName}.xml (basicOffset=${basicOffset})." diff --git a/storm-client/pom.xml b/storm-client/pom.xml index 06d16d3cd5b..d43a54d88b7 100644 --- a/storm-client/pom.xml +++ b/storm-client/pom.xml @@ -199,6 +199,11 @@ ${project.build.directory}/test-reports + + org.codehaus.gmavenplus + gmavenplus-plugin + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/storm-client/src/jvm/org/apache/storm/Config.java b/storm-client/src/jvm/org/apache/storm/Config.java index 4e3dbe061bf..36a80ed2abe 100644 --- a/storm-client/src/jvm/org/apache/storm/Config.java +++ b/storm-client/src/jvm/org/apache/storm/Config.java @@ -31,14 +31,13 @@ import org.apache.storm.serialization.IKryoFactory; import org.apache.storm.utils.ShellLogHandler; import org.apache.storm.utils.Utils; -import org.apache.storm.validation.ConfigValidation; import org.apache.storm.validation.ConfigValidation.EventLoggerRegistryValidator; import org.apache.storm.validation.ConfigValidation.ListOfListOfStringValidator; import org.apache.storm.validation.ConfigValidation.MapOfStringToMapOfStringToObjectValidator; import org.apache.storm.validation.ConfigValidation.MetricRegistryValidator; import org.apache.storm.validation.ConfigValidation.MetricReportersValidator; import org.apache.storm.validation.ConfigValidation.RasConstraintsTypeValidator; -import org.apache.storm.validation.ConfigValidationAnnotations; +import org.apache.storm.validation.ConfigValidation; import org.apache.storm.validation.ConfigValidationAnnotations.CustomComboValidator; import org.apache.storm.validation.ConfigValidationAnnotations.CustomValidator; import org.apache.storm.validation.ConfigValidationAnnotations.IsBoolean; @@ -58,6 +57,7 @@ import org.apache.storm.validation.ConfigValidationAnnotations.IsType; import org.apache.storm.validation.ConfigValidationAnnotations.NotNull; import org.apache.storm.validation.ConfigValidationAnnotations.Password; +import org.apache.storm.validation.ConfigValidationAnnotations; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/storm-client/src/jvm/org/apache/storm/StormSubmitter.java b/storm-client/src/jvm/org/apache/storm/StormSubmitter.java index 1bc5627e1cb..98b51031659 100644 --- a/storm-client/src/jvm/org/apache/storm/StormSubmitter.java +++ b/storm-client/src/jvm/org/apache/storm/StormSubmitter.java @@ -26,7 +26,6 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; - import org.apache.storm.dependency.DependencyPropertiesParser; import org.apache.storm.dependency.DependencyUploader; import org.apache.storm.generated.AlreadyAliveException; diff --git a/storm-client/src/jvm/org/apache/storm/Thrift.java b/storm-client/src/jvm/org/apache/storm/Thrift.java index 79b169a566b..0f612cb4035 100644 --- a/storm-client/src/jvm/org/apache/storm/Thrift.java +++ b/storm-client/src/jvm/org/apache/storm/Thrift.java @@ -24,8 +24,8 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Map.Entry; +import java.util.Map; import java.util.Set; import org.apache.storm.generated.Bolt; import org.apache.storm.generated.ComponentCommon; @@ -37,8 +37,8 @@ import org.apache.storm.generated.NullStruct; import org.apache.storm.generated.SpoutSpec; import org.apache.storm.generated.StateSpoutSpec; -import org.apache.storm.generated.StormTopology; import org.apache.storm.generated.StormTopology._Fields; +import org.apache.storm.generated.StormTopology; import org.apache.storm.generated.StreamInfo; import org.apache.storm.shade.net.minidev.json.JSONValue; import org.apache.storm.task.IBolt; diff --git a/storm-client/src/jvm/org/apache/storm/blobstore/BlobStoreAclHandler.java b/storm-client/src/jvm/org/apache/storm/blobstore/BlobStoreAclHandler.java index a61fb662405..b073c882a7b 100644 --- a/storm-client/src/jvm/org/apache/storm/blobstore/BlobStoreAclHandler.java +++ b/storm-client/src/jvm/org/apache/storm/blobstore/BlobStoreAclHandler.java @@ -96,7 +96,7 @@ private static int parseAccess(String access) { } else if ('a' == c) { ret = ret | ADMIN; } else if ('-' == c) { - //ignored + //ignored } else { throw new IllegalArgumentException(""); } diff --git a/storm-client/src/jvm/org/apache/storm/blobstore/LocalModeClientBlobStore.java b/storm-client/src/jvm/org/apache/storm/blobstore/LocalModeClientBlobStore.java index 776371fe9da..94b878059d2 100644 --- a/storm-client/src/jvm/org/apache/storm/blobstore/LocalModeClientBlobStore.java +++ b/storm-client/src/jvm/org/apache/storm/blobstore/LocalModeClientBlobStore.java @@ -39,7 +39,7 @@ public void shutdown() { @Override public void prepare(Map conf) { - //NOOP prepare should have already been called + //NOOP prepare should have already been called } @Override @@ -117,7 +117,7 @@ public boolean setClient(Map conf, NimbusClient client) { @Override public void createStateInZookeeper(String key) { - //NOOP + //NOOP } @Override @@ -129,4 +129,4 @@ public void close() { public long getRemoteBlobstoreUpdateTime() throws IOException { return -1L; // not supported } -} \ No newline at end of file +} diff --git a/storm-client/src/jvm/org/apache/storm/cluster/DaemonType.java b/storm-client/src/jvm/org/apache/storm/cluster/DaemonType.java index 27df05b26fa..1cd4be455ce 100644 --- a/storm-client/src/jvm/org/apache/storm/cluster/DaemonType.java +++ b/storm-client/src/jvm/org/apache/storm/cluster/DaemonType.java @@ -50,7 +50,7 @@ public List getZkSecretAcls(WorkerTokenServiceType type, Map topoConf, WorkerUserContext context) { - // NOOP + // NOOP } /** diff --git a/storm-client/src/jvm/org/apache/storm/hooks/info/BoltAckInfo.java b/storm-client/src/jvm/org/apache/storm/hooks/info/BoltAckInfo.java index 3bfd501abd7..97f447e551d 100644 --- a/storm-client/src/jvm/org/apache/storm/hooks/info/BoltAckInfo.java +++ b/storm-client/src/jvm/org/apache/storm/hooks/info/BoltAckInfo.java @@ -13,7 +13,6 @@ package org.apache.storm.hooks.info; import java.util.List; - import org.apache.storm.hooks.ITaskHook; import org.apache.storm.task.TopologyContext; import org.apache.storm.tuple.Tuple; diff --git a/storm-client/src/jvm/org/apache/storm/hooks/info/BoltExecuteInfo.java b/storm-client/src/jvm/org/apache/storm/hooks/info/BoltExecuteInfo.java index 9c5659eaf79..d10ee969f97 100644 --- a/storm-client/src/jvm/org/apache/storm/hooks/info/BoltExecuteInfo.java +++ b/storm-client/src/jvm/org/apache/storm/hooks/info/BoltExecuteInfo.java @@ -13,7 +13,6 @@ package org.apache.storm.hooks.info; import java.util.List; - import org.apache.storm.hooks.ITaskHook; import org.apache.storm.task.TopologyContext; import org.apache.storm.tuple.Tuple; diff --git a/storm-client/src/jvm/org/apache/storm/hooks/info/BoltFailInfo.java b/storm-client/src/jvm/org/apache/storm/hooks/info/BoltFailInfo.java index 59c7e195c17..0b14ecaf978 100644 --- a/storm-client/src/jvm/org/apache/storm/hooks/info/BoltFailInfo.java +++ b/storm-client/src/jvm/org/apache/storm/hooks/info/BoltFailInfo.java @@ -13,7 +13,6 @@ package org.apache.storm.hooks.info; import java.util.List; - import org.apache.storm.hooks.ITaskHook; import org.apache.storm.task.TopologyContext; import org.apache.storm.tuple.Tuple; diff --git a/storm-client/src/jvm/org/apache/storm/hooks/info/SpoutAckInfo.java b/storm-client/src/jvm/org/apache/storm/hooks/info/SpoutAckInfo.java index ac053beb80e..a3e7542f991 100644 --- a/storm-client/src/jvm/org/apache/storm/hooks/info/SpoutAckInfo.java +++ b/storm-client/src/jvm/org/apache/storm/hooks/info/SpoutAckInfo.java @@ -13,7 +13,6 @@ package org.apache.storm.hooks.info; import java.util.List; - import org.apache.storm.hooks.ITaskHook; import org.apache.storm.task.TopologyContext; diff --git a/storm-client/src/jvm/org/apache/storm/hooks/info/SpoutFailInfo.java b/storm-client/src/jvm/org/apache/storm/hooks/info/SpoutFailInfo.java index df7ef294947..acb1999ac33 100644 --- a/storm-client/src/jvm/org/apache/storm/hooks/info/SpoutFailInfo.java +++ b/storm-client/src/jvm/org/apache/storm/hooks/info/SpoutFailInfo.java @@ -13,7 +13,6 @@ package org.apache.storm.hooks.info; import java.util.List; - import org.apache.storm.hooks.ITaskHook; import org.apache.storm.task.TopologyContext; diff --git a/storm-client/src/jvm/org/apache/storm/lambda/LambdaConsumerBolt.java b/storm-client/src/jvm/org/apache/storm/lambda/LambdaConsumerBolt.java index 6dc94c8b2a7..d16ac4876e9 100644 --- a/storm-client/src/jvm/org/apache/storm/lambda/LambdaConsumerBolt.java +++ b/storm-client/src/jvm/org/apache/storm/lambda/LambdaConsumerBolt.java @@ -32,6 +32,6 @@ public void execute(Tuple input, BasicOutputCollector collector) { @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { - // this bolt dosen't emit to downstream bolts + // this bolt dosen't emit to downstream bolts } } diff --git a/storm-client/src/jvm/org/apache/storm/messaging/local/Context.java b/storm-client/src/jvm/org/apache/storm/messaging/local/Context.java index 67ab6ddfda9..7a18d4984d4 100644 --- a/storm-client/src/jvm/org/apache/storm/messaging/local/Context.java +++ b/storm-client/src/jvm/org/apache/storm/messaging/local/Context.java @@ -56,7 +56,7 @@ private LocalServer createLocalServer(String nodeId, int port, IConnectionCallba @Override public void prepare(Map topoConf) { - //NOOP + //NOOP } @Override @@ -71,7 +71,7 @@ public IConnection connect(String stormId, String host, int port, AtomicBoolean[ @Override public void term() { - //NOOP + //NOOP } private class LocalServer implements IConnection { @@ -118,7 +118,7 @@ public int getPort() { @Override public void close() { - //NOOP + //NOOP } } diff --git a/storm-client/src/jvm/org/apache/storm/messaging/netty/Client.java b/storm-client/src/jvm/org/apache/storm/messaging/netty/Client.java index dd579bb6332..d709aad3e0b 100644 --- a/storm-client/src/jvm/org/apache/storm/messaging/netty/Client.java +++ b/storm-client/src/jvm/org/apache/storm/messaging/netty/Client.java @@ -37,8 +37,8 @@ import org.apache.storm.messaging.ConnectionWithStatus; import org.apache.storm.messaging.TaskMessage; import org.apache.storm.metrics2.StormMetricRegistry; -import org.apache.storm.policy.IWaitStrategy; import org.apache.storm.policy.IWaitStrategy.WaitSituation; +import org.apache.storm.policy.IWaitStrategy; import org.apache.storm.policy.WaitStrategyProgressive; import org.apache.storm.shade.io.netty.bootstrap.Bootstrap; import org.apache.storm.shade.io.netty.buffer.PooledByteBufAllocator; diff --git a/storm-client/src/jvm/org/apache/storm/metric/SystemBolt.java b/storm-client/src/jvm/org/apache/storm/metric/SystemBolt.java index e6bc50e4a8c..8a9bcf91592 100644 --- a/storm-client/src/jvm/org/apache/storm/metric/SystemBolt.java +++ b/storm-client/src/jvm/org/apache/storm/metric/SystemBolt.java @@ -22,7 +22,6 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; - import org.apache.storm.Config; import org.apache.storm.metric.api.IMetric; import org.apache.storm.metrics2.PerReporterGauge; diff --git a/storm-client/src/jvm/org/apache/storm/metric/cgroup/CGroupCpu.java b/storm-client/src/jvm/org/apache/storm/metric/cgroup/CGroupCpu.java index aef62eebe94..25cf92742c9 100644 --- a/storm-client/src/jvm/org/apache/storm/metric/cgroup/CGroupCpu.java +++ b/storm-client/src/jvm/org/apache/storm/metric/cgroup/CGroupCpu.java @@ -20,8 +20,8 @@ import java.util.Map; import org.apache.storm.container.cgroup.SubSystemType; import org.apache.storm.container.cgroup.core.CgroupCore; -import org.apache.storm.container.cgroup.core.CpuacctCore; import org.apache.storm.container.cgroup.core.CpuacctCore.StatType; +import org.apache.storm.container.cgroup.core.CpuacctCore; /** * Report CPU used in the cgroup. diff --git a/storm-client/src/jvm/org/apache/storm/metrics2/EwmaGauge.java b/storm-client/src/jvm/org/apache/storm/metrics2/EwmaGauge.java index 857e34215f0..32a43e96404 100644 --- a/storm-client/src/jvm/org/apache/storm/metrics2/EwmaGauge.java +++ b/storm-client/src/jvm/org/apache/storm/metrics2/EwmaGauge.java @@ -15,7 +15,6 @@ import static org.apache.storm.utils.ConfigUtils.RFC1889_ALPHA; import com.codahale.metrics.Gauge; - import java.util.concurrent.atomic.AtomicLong; /** diff --git a/storm-client/src/jvm/org/apache/storm/metrics2/TaskMetrics.java b/storm-client/src/jvm/org/apache/storm/metrics2/TaskMetrics.java index 059109b0bd8..d8e2b72df51 100644 --- a/storm-client/src/jvm/org/apache/storm/metrics2/TaskMetrics.java +++ b/storm-client/src/jvm/org/apache/storm/metrics2/TaskMetrics.java @@ -17,7 +17,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.function.Supplier; - import org.apache.storm.task.WorkerTopologyContext; import org.apache.storm.utils.ConfigUtils; import org.apache.storm.utils.Utils; diff --git a/storm-client/src/jvm/org/apache/storm/metrics2/cgroup/CGroupCpuStat.java b/storm-client/src/jvm/org/apache/storm/metrics2/cgroup/CGroupCpuStat.java index a26e3e0852c..00a165e0e00 100644 --- a/storm-client/src/jvm/org/apache/storm/metrics2/cgroup/CGroupCpuStat.java +++ b/storm-client/src/jvm/org/apache/storm/metrics2/cgroup/CGroupCpuStat.java @@ -13,7 +13,6 @@ package org.apache.storm.metrics2.cgroup; import com.codahale.metrics.Gauge; - import java.io.IOException; import java.util.Map; import org.apache.storm.container.cgroup.SubSystemType; diff --git a/storm-client/src/jvm/org/apache/storm/metrics2/reporters/ConsoleStormReporter.java b/storm-client/src/jvm/org/apache/storm/metrics2/reporters/ConsoleStormReporter.java index e4478151ee6..83e1ef60560 100644 --- a/storm-client/src/jvm/org/apache/storm/metrics2/reporters/ConsoleStormReporter.java +++ b/storm-client/src/jvm/org/apache/storm/metrics2/reporters/ConsoleStormReporter.java @@ -15,7 +15,6 @@ import com.codahale.metrics.ConsoleReporter; import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.ScheduledReporter; - import java.io.IOException; import java.util.Locale; import java.util.Map; @@ -107,4 +106,4 @@ public void setDimensions(Map dimensions) { public void close() throws IOException { super.close(); } -} \ No newline at end of file +} diff --git a/storm-client/src/jvm/org/apache/storm/metrics2/reporters/CsvStormReporter.java b/storm-client/src/jvm/org/apache/storm/metrics2/reporters/CsvStormReporter.java index 8804c1b54fc..222a3f4c183 100644 --- a/storm-client/src/jvm/org/apache/storm/metrics2/reporters/CsvStormReporter.java +++ b/storm-client/src/jvm/org/apache/storm/metrics2/reporters/CsvStormReporter.java @@ -14,7 +14,6 @@ import com.codahale.metrics.CsvReporter; import com.codahale.metrics.MetricRegistry; - import java.io.File; import java.io.IOException; import java.util.Locale; @@ -93,4 +92,4 @@ public void prepare(MetricRegistry metricsRegistry, Map topoConf public void close() throws IOException { super.close(); } -} \ No newline at end of file +} diff --git a/storm-client/src/jvm/org/apache/storm/metrics2/reporters/GraphiteStormReporter.java b/storm-client/src/jvm/org/apache/storm/metrics2/reporters/GraphiteStormReporter.java index f4efc92d5c5..010d2b8d5d4 100644 --- a/storm-client/src/jvm/org/apache/storm/metrics2/reporters/GraphiteStormReporter.java +++ b/storm-client/src/jvm/org/apache/storm/metrics2/reporters/GraphiteStormReporter.java @@ -17,7 +17,6 @@ import com.codahale.metrics.graphite.GraphiteReporter; import com.codahale.metrics.graphite.GraphiteSender; import com.codahale.metrics.graphite.GraphiteUDP; - import java.io.IOException; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -99,4 +98,4 @@ public void prepare(MetricRegistry metricsRegistry, Map topoConf public void close() throws IOException { super.close(); } -} \ No newline at end of file +} diff --git a/storm-client/src/jvm/org/apache/storm/metrics2/reporters/JmxStormReporter.java b/storm-client/src/jvm/org/apache/storm/metrics2/reporters/JmxStormReporter.java index da10ac1590f..4662b4613df 100644 --- a/storm-client/src/jvm/org/apache/storm/metrics2/reporters/JmxStormReporter.java +++ b/storm-client/src/jvm/org/apache/storm/metrics2/reporters/JmxStormReporter.java @@ -14,7 +14,6 @@ import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.jmx.JmxReporter; - import java.io.IOException; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -92,4 +91,4 @@ public void close() throws IOException { reporter.close(); } } -} \ No newline at end of file +} diff --git a/storm-client/src/jvm/org/apache/storm/metrics2/reporters/ScheduledStormReporter.java b/storm-client/src/jvm/org/apache/storm/metrics2/reporters/ScheduledStormReporter.java index 97220d0e370..006de375651 100644 --- a/storm-client/src/jvm/org/apache/storm/metrics2/reporters/ScheduledStormReporter.java +++ b/storm-client/src/jvm/org/apache/storm/metrics2/reporters/ScheduledStormReporter.java @@ -13,7 +13,6 @@ package org.apache.storm.metrics2.reporters; import com.codahale.metrics.ScheduledReporter; - import java.io.IOException; import java.util.Map; import java.util.concurrent.TimeUnit; diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/ShellBasedGroupsMapping.java b/storm-client/src/jvm/org/apache/storm/security/auth/ShellBasedGroupsMapping.java index c80e293d03f..af0eda22461 100644 --- a/storm-client/src/jvm/org/apache/storm/security/auth/ShellBasedGroupsMapping.java +++ b/storm-client/src/jvm/org/apache/storm/security/auth/ShellBasedGroupsMapping.java @@ -23,8 +23,8 @@ import org.apache.storm.utils.RotatingMap; import org.apache.storm.utils.ShellCommandRunner; import org.apache.storm.utils.ShellCommandRunnerImpl; -import org.apache.storm.utils.ShellUtils; import org.apache.storm.utils.ShellUtils.ExitCodeException; +import org.apache.storm.utils.ShellUtils; import org.apache.storm.utils.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/ThriftClient.java b/storm-client/src/jvm/org/apache/storm/security/auth/ThriftClient.java index f7becc3f385..06e427d79a7 100644 --- a/storm-client/src/jvm/org/apache/storm/security/auth/ThriftClient.java +++ b/storm-client/src/jvm/org/apache/storm/security/auth/ThriftClient.java @@ -27,7 +27,6 @@ import java.security.cert.X509Certificate; import java.util.Map; import java.util.UUID; - import org.apache.storm.Config; import org.apache.storm.thrift.protocol.TBinaryProtocol; import org.apache.storm.thrift.protocol.TProtocol; diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/X509CertOrKerberosPrincipalToLocal.java b/storm-client/src/jvm/org/apache/storm/security/auth/X509CertOrKerberosPrincipalToLocal.java index f7ea86e8884..f8e3b631877 100644 --- a/storm-client/src/jvm/org/apache/storm/security/auth/X509CertOrKerberosPrincipalToLocal.java +++ b/storm-client/src/jvm/org/apache/storm/security/auth/X509CertOrKerberosPrincipalToLocal.java @@ -13,7 +13,6 @@ package org.apache.storm.security.auth; import java.util.Map; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/digest/DigestSaslTransportPlugin.java b/storm-client/src/jvm/org/apache/storm/security/auth/digest/DigestSaslTransportPlugin.java index 5a77d515ee3..21c9ea63ea1 100644 --- a/storm-client/src/jvm/org/apache/storm/security/auth/digest/DigestSaslTransportPlugin.java +++ b/storm-client/src/jvm/org/apache/storm/security/auth/digest/DigestSaslTransportPlugin.java @@ -17,7 +17,6 @@ import javax.security.auth.callback.CallbackHandler; import javax.security.auth.login.AppConfigurationEntry; import javax.security.auth.login.Configuration; - import org.apache.storm.generated.WorkerToken; import org.apache.storm.security.auth.ClientAuthUtils; import org.apache.storm.security.auth.sasl.SaslTransportPlugin; diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/AutoTGTKrb5LoginModuleTest.java b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/AutoTGTKrb5LoginModuleTest.java index 16b8eb080fe..b06bbf6ecd8 100644 --- a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/AutoTGTKrb5LoginModuleTest.java +++ b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/AutoTGTKrb5LoginModuleTest.java @@ -29,7 +29,7 @@ public void setKerbTicket(KerberosTicket ticket) { @Override protected void getKerbTicketFromCache() { - // Do nothing. + // Do nothing. } @Override diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/ServerCallbackHandler.java b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/ServerCallbackHandler.java index daa5fbff9c5..c7a73599377 100644 --- a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/ServerCallbackHandler.java +++ b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/ServerCallbackHandler.java @@ -66,7 +66,7 @@ public void handle(Callback[] callbacks) throws UnsupportedCallbackException { } else if (callback instanceof PasswordCallback) { pc = (PasswordCallback) callback; } else if (callback instanceof RealmCallback) { - //Ignored... + //Ignored... } else { throw new UnsupportedCallbackException(callback, "Unrecognized SASL Callback"); diff --git a/storm-client/src/jvm/org/apache/storm/state/DefaultStateSerializer.java b/storm-client/src/jvm/org/apache/storm/state/DefaultStateSerializer.java index 75ef038c8cb..b73742378c8 100644 --- a/storm-client/src/jvm/org/apache/storm/state/DefaultStateSerializer.java +++ b/storm-client/src/jvm/org/apache/storm/state/DefaultStateSerializer.java @@ -17,7 +17,6 @@ import com.esotericsoftware.kryo.io.Output; import com.esotericsoftware.kryo.util.DefaultClassResolver; import com.esotericsoftware.kryo.util.DefaultInstantiatorStrategy; - import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/storm-client/src/jvm/org/apache/storm/stats/BoltExecutorStats.java b/storm-client/src/jvm/org/apache/storm/stats/BoltExecutorStats.java index 26e3776ce5e..d5442877cc5 100644 --- a/storm-client/src/jvm/org/apache/storm/stats/BoltExecutorStats.java +++ b/storm-client/src/jvm/org/apache/storm/stats/BoltExecutorStats.java @@ -16,7 +16,6 @@ import java.util.List; import java.util.Map; import java.util.Set; - import org.apache.storm.daemon.Task; import org.apache.storm.generated.BoltStats; import org.apache.storm.generated.ExecutorSpecificStats; diff --git a/storm-client/src/jvm/org/apache/storm/streams/windowing/SlidingWindows.java b/storm-client/src/jvm/org/apache/storm/streams/windowing/SlidingWindows.java index 254c3e18c8e..2b116cc5a6d 100644 --- a/storm-client/src/jvm/org/apache/storm/streams/windowing/SlidingWindows.java +++ b/storm-client/src/jvm/org/apache/storm/streams/windowing/SlidingWindows.java @@ -12,9 +12,9 @@ package org.apache.storm.streams.windowing; -import org.apache.storm.topology.base.BaseWindowedBolt; import org.apache.storm.topology.base.BaseWindowedBolt.Count; import org.apache.storm.topology.base.BaseWindowedBolt.Duration; +import org.apache.storm.topology.base.BaseWindowedBolt; /** * A sliding window specification based on a window length and sliding interval. diff --git a/storm-client/src/jvm/org/apache/storm/task/ShellBolt.java b/storm-client/src/jvm/org/apache/storm/task/ShellBolt.java index 6800e625acd..7754735458c 100644 --- a/storm-client/src/jvm/org/apache/storm/task/ShellBolt.java +++ b/storm-client/src/jvm/org/apache/storm/task/ShellBolt.java @@ -366,8 +366,8 @@ public void run() { break; } } catch (InterruptedException e) { - // It's likely that Bolt is shutting down so no need to die. - // just ignore and loop will be terminated eventually + // It's likely that Bolt is shutting down so no need to die. + // just ignore and loop will be terminated eventually } catch (Throwable t) { die(t); } @@ -398,8 +398,8 @@ public void run() { "Unknown class type to write: " + write.getClass().getName()); } } catch (InterruptedException e) { - // It's likely that Bolt is shutting down so no need to die. - // just ignore and loop will be terminated eventually + // It's likely that Bolt is shutting down so no need to die. + // just ignore and loop will be terminated eventually } catch (Throwable t) { die(t); } diff --git a/storm-client/src/jvm/org/apache/storm/topology/CheckpointTupleForwarder.java b/storm-client/src/jvm/org/apache/storm/topology/CheckpointTupleForwarder.java index d4ed032e286..f410f0a5895 100644 --- a/storm-client/src/jvm/org/apache/storm/topology/CheckpointTupleForwarder.java +++ b/storm-client/src/jvm/org/apache/storm/topology/CheckpointTupleForwarder.java @@ -16,7 +16,6 @@ import static org.apache.storm.spout.CheckpointSpout.CHECKPOINT_STREAM_ID; import java.util.Map; - import org.apache.storm.task.OutputCollector; import org.apache.storm.task.TopologyContext; import org.apache.storm.tuple.Tuple; diff --git a/storm-client/src/jvm/org/apache/storm/topology/PersistentWindowedBoltExecutor.java b/storm-client/src/jvm/org/apache/storm/topology/PersistentWindowedBoltExecutor.java index f055acc577e..92a39486db5 100644 --- a/storm-client/src/jvm/org/apache/storm/topology/PersistentWindowedBoltExecutor.java +++ b/storm-client/src/jvm/org/apache/storm/topology/PersistentWindowedBoltExecutor.java @@ -195,9 +195,9 @@ protected WindowLifecycleListener newWindowLifecycleListener() { return new WindowLifecycleListener() { @Override public void onExpiry(List events) { - /* - * NO-OP: the events are ack-ed in execute - */ + /* + * NO-OP: the events are ack-ed in execute + */ } @Override @@ -242,7 +242,7 @@ private static class NoAckOutputCollector extends OutputCollector { @Override public void ack(Tuple input) { - // NOOP + // NOOP } } } diff --git a/storm-client/src/jvm/org/apache/storm/topology/StatefulBoltExecutor.java b/storm-client/src/jvm/org/apache/storm/topology/StatefulBoltExecutor.java index d2202c4c727..bf3563726e6 100644 --- a/storm-client/src/jvm/org/apache/storm/topology/StatefulBoltExecutor.java +++ b/storm-client/src/jvm/org/apache/storm/topology/StatefulBoltExecutor.java @@ -12,11 +12,11 @@ package org.apache.storm.topology; -import static org.apache.storm.spout.CheckPointState.Action; import static org.apache.storm.spout.CheckPointState.Action.COMMIT; import static org.apache.storm.spout.CheckPointState.Action.INITSTATE; import static org.apache.storm.spout.CheckPointState.Action.PREPARE; import static org.apache.storm.spout.CheckPointState.Action.ROLLBACK; +import static org.apache.storm.spout.CheckPointState.Action; import java.util.ArrayList; import java.util.Iterator; diff --git a/storm-client/src/jvm/org/apache/storm/topology/base/BaseStatefulBolt.java b/storm-client/src/jvm/org/apache/storm/topology/base/BaseStatefulBolt.java index 721cc99adbf..03de204a113 100644 --- a/storm-client/src/jvm/org/apache/storm/topology/base/BaseStatefulBolt.java +++ b/storm-client/src/jvm/org/apache/storm/topology/base/BaseStatefulBolt.java @@ -23,17 +23,17 @@ public abstract class BaseStatefulBolt implements IStatefulBolt @Override public void prepare(Map topoConf, TopologyContext context, OutputCollector collector) { - // NOOP + // NOOP } @Override public void cleanup() { - // NOOP + // NOOP } @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { - // NOOP + // NOOP } @Override @@ -43,16 +43,16 @@ public Map getComponentConfiguration() { @Override public void preCommit(long txid) { - // NOOP + // NOOP } @Override public void prePrepare(long txid) { - // NOOP + // NOOP } @Override public void preRollback() { - // NOOP + // NOOP } } diff --git a/storm-client/src/jvm/org/apache/storm/topology/base/BaseStatefulWindowedBolt.java b/storm-client/src/jvm/org/apache/storm/topology/base/BaseStatefulWindowedBolt.java index 063555bddb7..0f2864a908e 100644 --- a/storm-client/src/jvm/org/apache/storm/topology/base/BaseStatefulWindowedBolt.java +++ b/storm-client/src/jvm/org/apache/storm/topology/base/BaseStatefulWindowedBolt.java @@ -185,16 +185,16 @@ public long maxEventsInMemory() { @Override public void preCommit(long txid) { - // NOOP + // NOOP } @Override public void prePrepare(long txid) { - // NOOP + // NOOP } @Override public void preRollback() { - // NOOP + // NOOP } } diff --git a/storm-client/src/jvm/org/apache/storm/topology/base/BaseWindowedBolt.java b/storm-client/src/jvm/org/apache/storm/topology/base/BaseWindowedBolt.java index 318700d5d58..0443cacb7ef 100644 --- a/storm-client/src/jvm/org/apache/storm/topology/base/BaseWindowedBolt.java +++ b/storm-client/src/jvm/org/apache/storm/topology/base/BaseWindowedBolt.java @@ -232,17 +232,17 @@ public BaseWindowedBolt withWatermarkInterval(Duration interval) { @Override public void prepare(Map topoConf, TopologyContext context, OutputCollector collector) { - // NOOP + // NOOP } @Override public void cleanup() { - // NOOP + // NOOP } @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { - // NOOP + // NOOP } @Override diff --git a/storm-client/src/jvm/org/apache/storm/trident/fluent/ChainedAggregatorDeclarer.java b/storm-client/src/jvm/org/apache/storm/trident/fluent/ChainedAggregatorDeclarer.java index 20fe5b33d43..113f1b425e6 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/fluent/ChainedAggregatorDeclarer.java +++ b/storm-client/src/jvm/org/apache/storm/trident/fluent/ChainedAggregatorDeclarer.java @@ -24,8 +24,8 @@ import org.apache.storm.trident.operation.impl.CombinerAggregatorCombineImpl; import org.apache.storm.trident.operation.impl.CombinerAggregatorInitImpl; import org.apache.storm.trident.operation.impl.ReducerAggregatorImpl; -import org.apache.storm.trident.operation.impl.SingleEmitAggregator; import org.apache.storm.trident.operation.impl.SingleEmitAggregator.BatchToPartition; +import org.apache.storm.trident.operation.impl.SingleEmitAggregator; import org.apache.storm.trident.tuple.ComboList; import org.apache.storm.tuple.Fields; diff --git a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/ChainedAggregatorImpl.java b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/ChainedAggregatorImpl.java index ce45291737c..c7b84eac9e3 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/ChainedAggregatorImpl.java +++ b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/ChainedAggregatorImpl.java @@ -19,8 +19,8 @@ import org.apache.storm.trident.operation.TridentOperationContext; import org.apache.storm.trident.tuple.ComboList; import org.apache.storm.trident.tuple.TridentTuple; -import org.apache.storm.trident.tuple.TridentTupleView; import org.apache.storm.trident.tuple.TridentTupleView.ProjectionFactory; +import org.apache.storm.trident.tuple.TridentTupleView; import org.apache.storm.tuple.Fields; public class ChainedAggregatorImpl implements Aggregator { diff --git a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/GroupedAggregator.java b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/GroupedAggregator.java index 8598ffb6e42..bb837288f1c 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/GroupedAggregator.java +++ b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/GroupedAggregator.java @@ -14,15 +14,15 @@ import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Map.Entry; +import java.util.Map; import org.apache.storm.trident.operation.Aggregator; import org.apache.storm.trident.operation.TridentCollector; import org.apache.storm.trident.operation.TridentOperationContext; import org.apache.storm.trident.tuple.ComboList; import org.apache.storm.trident.tuple.TridentTuple; -import org.apache.storm.trident.tuple.TridentTupleView; import org.apache.storm.trident.tuple.TridentTupleView.ProjectionFactory; +import org.apache.storm.trident.tuple.TridentTupleView; import org.apache.storm.tuple.Fields; public class GroupedAggregator implements Aggregator { diff --git a/storm-client/src/jvm/org/apache/storm/trident/planner/SubtopologyBolt.java b/storm-client/src/jvm/org/apache/storm/trident/planner/SubtopologyBolt.java index 59b3f20b0bc..e4d66de6d01 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/planner/SubtopologyBolt.java +++ b/storm-client/src/jvm/org/apache/storm/trident/planner/SubtopologyBolt.java @@ -30,8 +30,8 @@ import org.apache.storm.trident.state.State; import org.apache.storm.trident.topology.BatchInfo; import org.apache.storm.trident.topology.ITridentBatchBolt; -import org.apache.storm.trident.tuple.TridentTuple; import org.apache.storm.trident.tuple.TridentTuple.Factory; +import org.apache.storm.trident.tuple.TridentTuple; import org.apache.storm.trident.tuple.TridentTupleView.ProjectionFactory; import org.apache.storm.trident.tuple.TridentTupleView.RootFactory; import org.apache.storm.trident.util.IndexedEdge; diff --git a/storm-client/src/jvm/org/apache/storm/trident/planner/processor/AggregateProcessor.java b/storm-client/src/jvm/org/apache/storm/trident/planner/processor/AggregateProcessor.java index 61476eeef41..6b3b68a2b78 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/planner/processor/AggregateProcessor.java +++ b/storm-client/src/jvm/org/apache/storm/trident/planner/processor/AggregateProcessor.java @@ -19,8 +19,8 @@ import org.apache.storm.trident.operation.TridentOperationContext; import org.apache.storm.trident.planner.ProcessorContext; import org.apache.storm.trident.planner.TridentProcessor; -import org.apache.storm.trident.tuple.TridentTuple; import org.apache.storm.trident.tuple.TridentTuple.Factory; +import org.apache.storm.trident.tuple.TridentTuple; import org.apache.storm.trident.tuple.TridentTupleView.ProjectionFactory; import org.apache.storm.tuple.Fields; diff --git a/storm-client/src/jvm/org/apache/storm/trident/planner/processor/AppendCollector.java b/storm-client/src/jvm/org/apache/storm/trident/planner/processor/AppendCollector.java index cde0a5e75fc..78b3e2cf10a 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/planner/processor/AppendCollector.java +++ b/storm-client/src/jvm/org/apache/storm/trident/planner/processor/AppendCollector.java @@ -16,10 +16,10 @@ import org.apache.storm.trident.operation.TridentCollector; import org.apache.storm.trident.planner.ProcessorContext; import org.apache.storm.trident.planner.TupleReceiver; -import org.apache.storm.trident.tuple.TridentTuple; import org.apache.storm.trident.tuple.TridentTuple.Factory; -import org.apache.storm.trident.tuple.TridentTupleView; +import org.apache.storm.trident.tuple.TridentTuple; import org.apache.storm.trident.tuple.TridentTupleView.OperationOutputFactory; +import org.apache.storm.trident.tuple.TridentTupleView; public class AppendCollector implements TridentCollector { diff --git a/storm-client/src/jvm/org/apache/storm/trident/planner/processor/EachProcessor.java b/storm-client/src/jvm/org/apache/storm/trident/planner/processor/EachProcessor.java index 386df46eaeb..316219418db 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/planner/processor/EachProcessor.java +++ b/storm-client/src/jvm/org/apache/storm/trident/planner/processor/EachProcessor.java @@ -19,8 +19,8 @@ import org.apache.storm.trident.operation.TridentOperationContext; import org.apache.storm.trident.planner.ProcessorContext; import org.apache.storm.trident.planner.TridentProcessor; -import org.apache.storm.trident.tuple.TridentTuple; import org.apache.storm.trident.tuple.TridentTuple.Factory; +import org.apache.storm.trident.tuple.TridentTuple; import org.apache.storm.trident.tuple.TridentTupleView.ProjectionFactory; import org.apache.storm.tuple.Fields; diff --git a/storm-client/src/jvm/org/apache/storm/trident/planner/processor/FreshCollector.java b/storm-client/src/jvm/org/apache/storm/trident/planner/processor/FreshCollector.java index 21843cc3980..6d66f662059 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/planner/processor/FreshCollector.java +++ b/storm-client/src/jvm/org/apache/storm/trident/planner/processor/FreshCollector.java @@ -16,8 +16,8 @@ import org.apache.storm.trident.operation.TridentCollector; import org.apache.storm.trident.planner.ProcessorContext; import org.apache.storm.trident.planner.TupleReceiver; -import org.apache.storm.trident.tuple.TridentTuple; import org.apache.storm.trident.tuple.TridentTuple.Factory; +import org.apache.storm.trident.tuple.TridentTuple; import org.apache.storm.trident.tuple.TridentTupleView.FreshOutputFactory; diff --git a/storm-client/src/jvm/org/apache/storm/trident/planner/processor/MapProcessor.java b/storm-client/src/jvm/org/apache/storm/trident/planner/processor/MapProcessor.java index 289546305b3..341274c1c6a 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/planner/processor/MapProcessor.java +++ b/storm-client/src/jvm/org/apache/storm/trident/planner/processor/MapProcessor.java @@ -72,12 +72,12 @@ public void flush() { @Override public void startBatch(ProcessorContext processorContext) { - // NOOP + // NOOP } @Override public void finishBatch(ProcessorContext processorContext) { - // NOOP + // NOOP } @Override diff --git a/storm-client/src/jvm/org/apache/storm/trident/planner/processor/MultiReducerProcessor.java b/storm-client/src/jvm/org/apache/storm/trident/planner/processor/MultiReducerProcessor.java index 32b0076d009..ea4cc7edad4 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/planner/processor/MultiReducerProcessor.java +++ b/storm-client/src/jvm/org/apache/storm/trident/planner/processor/MultiReducerProcessor.java @@ -21,8 +21,8 @@ import org.apache.storm.trident.operation.TridentMultiReducerContext; import org.apache.storm.trident.planner.ProcessorContext; import org.apache.storm.trident.planner.TridentProcessor; -import org.apache.storm.trident.tuple.TridentTuple; import org.apache.storm.trident.tuple.TridentTuple.Factory; +import org.apache.storm.trident.tuple.TridentTuple; import org.apache.storm.trident.tuple.TridentTupleView.ProjectionFactory; import org.apache.storm.tuple.Fields; diff --git a/storm-client/src/jvm/org/apache/storm/trident/planner/processor/PartitionPersistProcessor.java b/storm-client/src/jvm/org/apache/storm/trident/planner/processor/PartitionPersistProcessor.java index a82f39bd1f5..1f252d1f074 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/planner/processor/PartitionPersistProcessor.java +++ b/storm-client/src/jvm/org/apache/storm/trident/planner/processor/PartitionPersistProcessor.java @@ -22,8 +22,8 @@ import org.apache.storm.trident.state.State; import org.apache.storm.trident.state.StateUpdater; import org.apache.storm.trident.topology.TransactionAttempt; -import org.apache.storm.trident.tuple.TridentTuple; import org.apache.storm.trident.tuple.TridentTuple.Factory; +import org.apache.storm.trident.tuple.TridentTuple; import org.apache.storm.trident.tuple.TridentTupleView.ProjectionFactory; import org.apache.storm.tuple.Fields; @@ -73,7 +73,7 @@ public void execute(ProcessorContext processorContext, String streamId, TridentT @Override public void flush() { - // NO-OP + // NO-OP } @Override diff --git a/storm-client/src/jvm/org/apache/storm/trident/planner/processor/ProjectedProcessor.java b/storm-client/src/jvm/org/apache/storm/trident/planner/processor/ProjectedProcessor.java index 1ed9012ec8d..d7260cdbb0e 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/planner/processor/ProjectedProcessor.java +++ b/storm-client/src/jvm/org/apache/storm/trident/planner/processor/ProjectedProcessor.java @@ -17,8 +17,8 @@ import org.apache.storm.trident.planner.ProcessorContext; import org.apache.storm.trident.planner.TridentProcessor; import org.apache.storm.trident.planner.TupleReceiver; -import org.apache.storm.trident.tuple.TridentTuple; import org.apache.storm.trident.tuple.TridentTuple.Factory; +import org.apache.storm.trident.tuple.TridentTuple; import org.apache.storm.trident.tuple.TridentTupleView.ProjectionFactory; import org.apache.storm.tuple.Fields; diff --git a/storm-client/src/jvm/org/apache/storm/trident/planner/processor/StateQueryProcessor.java b/storm-client/src/jvm/org/apache/storm/trident/planner/processor/StateQueryProcessor.java index d9126c1420e..885f469230c 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/planner/processor/StateQueryProcessor.java +++ b/storm-client/src/jvm/org/apache/storm/trident/planner/processor/StateQueryProcessor.java @@ -22,8 +22,8 @@ import org.apache.storm.trident.planner.TridentProcessor; import org.apache.storm.trident.state.QueryFunction; import org.apache.storm.trident.state.State; -import org.apache.storm.trident.tuple.TridentTuple; import org.apache.storm.trident.tuple.TridentTuple.Factory; +import org.apache.storm.trident.tuple.TridentTuple; import org.apache.storm.trident.tuple.TridentTupleView.ProjectionFactory; import org.apache.storm.tuple.Fields; @@ -75,7 +75,7 @@ public void execute(ProcessorContext processorContext, String streamId, TridentT @Override public void flush() { - // NO-OP + // NO-OP } @Override diff --git a/storm-client/src/jvm/org/apache/storm/trident/spout/IOpaquePartitionedTridentSpout.java b/storm-client/src/jvm/org/apache/storm/trident/spout/IOpaquePartitionedTridentSpout.java index 240a99b2256..871b4b4b9c6 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/spout/IOpaquePartitionedTridentSpout.java +++ b/storm-client/src/jvm/org/apache/storm/trident/spout/IOpaquePartitionedTridentSpout.java @@ -16,7 +16,6 @@ import java.util.List; import java.util.Map; import java.util.Set; - import org.apache.storm.task.TopologyContext; import org.apache.storm.trident.operation.TridentCollector; import org.apache.storm.trident.topology.TransactionAttempt; diff --git a/storm-client/src/jvm/org/apache/storm/trident/spout/OpaquePartitionedTridentSpoutExecutor.java b/storm-client/src/jvm/org/apache/storm/trident/spout/OpaquePartitionedTridentSpoutExecutor.java index 141d55f6b78..a47c4c1f295 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/spout/OpaquePartitionedTridentSpoutExecutor.java +++ b/storm-client/src/jvm/org/apache/storm/trident/spout/OpaquePartitionedTridentSpoutExecutor.java @@ -15,11 +15,10 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Map.Entry; +import java.util.Map; import java.util.Set; import java.util.TreeMap; - import org.apache.storm.task.TopologyContext; import org.apache.storm.trident.operation.TridentCollector; import org.apache.storm.trident.topology.TransactionAttempt; diff --git a/storm-client/src/jvm/org/apache/storm/trident/state/JSONNonTransactionalSerializer.java b/storm-client/src/jvm/org/apache/storm/trident/state/JSONNonTransactionalSerializer.java index 3eae7dd6a1c..ca2aa1fe807 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/state/JSONNonTransactionalSerializer.java +++ b/storm-client/src/jvm/org/apache/storm/trident/state/JSONNonTransactionalSerializer.java @@ -13,7 +13,6 @@ package org.apache.storm.trident.state; import java.nio.charset.StandardCharsets; - import org.apache.storm.shade.net.minidev.json.JSONValue; import org.apache.storm.shade.net.minidev.json.parser.ParseException; diff --git a/storm-client/src/jvm/org/apache/storm/trident/topology/MasterBatchCoordinator.java b/storm-client/src/jvm/org/apache/storm/trident/topology/MasterBatchCoordinator.java index aed1045a97c..680e2ca1f00 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/topology/MasterBatchCoordinator.java +++ b/storm-client/src/jvm/org/apache/storm/trident/topology/MasterBatchCoordinator.java @@ -15,8 +15,8 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Map.Entry; +import java.util.Map; import java.util.TreeMap; import org.apache.storm.Config; import org.apache.storm.spout.SpoutOutputCollector; diff --git a/storm-client/src/jvm/org/apache/storm/trident/topology/state/TransactionalState.java b/storm-client/src/jvm/org/apache/storm/trident/topology/state/TransactionalState.java index fc3bc8549b4..cff20ebd6e5 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/topology/state/TransactionalState.java +++ b/storm-client/src/jvm/org/apache/storm/trident/topology/state/TransactionalState.java @@ -17,7 +17,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; - import org.apache.storm.Config; import org.apache.storm.cluster.DaemonType; import org.apache.storm.shade.net.minidev.json.JSONValue; @@ -31,7 +30,6 @@ import org.apache.storm.utils.CuratorUtils; import org.apache.storm.utils.Utils; import org.apache.storm.utils.ZookeeperAuthInfo; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/storm-client/src/jvm/org/apache/storm/trident/windowing/AbstractTridentWindowManager.java b/storm-client/src/jvm/org/apache/storm/trident/windowing/AbstractTridentWindowManager.java index 81f218eda6a..3d7cf2e5256 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/windowing/AbstractTridentWindowManager.java +++ b/storm-client/src/jvm/org/apache/storm/trident/windowing/AbstractTridentWindowManager.java @@ -168,7 +168,7 @@ public void emit(List values) { @Override public void flush() { - // NO-OP + // NO-OP } @Override diff --git a/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowTridentProcessor.java b/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowTridentProcessor.java index c5e7f938897..2b58e843ed9 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowTridentProcessor.java +++ b/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowTridentProcessor.java @@ -166,7 +166,7 @@ public void execute(ProcessorContext processorContext, String streamId, TridentT @Override public void flush() { - // NO-OP + // NO-OP } @Override diff --git a/storm-client/src/jvm/org/apache/storm/tuple/MessageId.java b/storm-client/src/jvm/org/apache/storm/tuple/MessageId.java index cb10dd16177..8835b352a7c 100644 --- a/storm-client/src/jvm/org/apache/storm/tuple/MessageId.java +++ b/storm-client/src/jvm/org/apache/storm/tuple/MessageId.java @@ -17,8 +17,8 @@ import java.io.IOException; import java.util.Collections; import java.util.HashMap; -import java.util.Map; import java.util.Map.Entry; +import java.util.Map; import java.util.Random; import java.util.Set; diff --git a/storm-client/src/jvm/org/apache/storm/utils/ConfigUtils.java b/storm-client/src/jvm/org/apache/storm/utils/ConfigUtils.java index c78b38ff58d..4690afc9808 100644 --- a/storm-client/src/jvm/org/apache/storm/utils/ConfigUtils.java +++ b/storm-client/src/jvm/org/apache/storm/utils/ConfigUtils.java @@ -27,7 +27,6 @@ import java.util.function.BooleanSupplier; import java.util.regex.Pattern; import java.util.stream.Collectors; - import org.apache.storm.Config; import org.apache.storm.daemon.supervisor.AdvancedFSOps; import org.apache.storm.generated.StormTopology; diff --git a/storm-client/src/jvm/org/apache/storm/utils/KeyStreamRandom.java b/storm-client/src/jvm/org/apache/storm/utils/KeyStreamRandom.java index a8c7903f5ff..8af3d752c48 100644 --- a/storm-client/src/jvm/org/apache/storm/utils/KeyStreamRandom.java +++ b/storm-client/src/jvm/org/apache/storm/utils/KeyStreamRandom.java @@ -88,7 +88,7 @@ protected int next(int bits) { @Override public void setSeed(long seed) { - // there is nothing to seed, and Random's constructor calls this before this class' fields exist + // there is nothing to seed, and Random's constructor calls this before this class' fields exist } private void fill() { diff --git a/storm-client/src/jvm/org/apache/storm/utils/RotatingMap.java b/storm-client/src/jvm/org/apache/storm/utils/RotatingMap.java index 6283b508bfe..a479cdd751b 100644 --- a/storm-client/src/jvm/org/apache/storm/utils/RotatingMap.java +++ b/storm-client/src/jvm/org/apache/storm/utils/RotatingMap.java @@ -15,8 +15,8 @@ import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; -import java.util.Map; import java.util.Map.Entry; +import java.util.Map; /** * Expires keys that have not been updated in the configured number of seconds. The algorithm used will take between expirationSecs and diff --git a/storm-client/src/jvm/org/apache/storm/utils/Time.java b/storm-client/src/jvm/org/apache/storm/utils/Time.java index 9946b46e8c9..7e72354315b 100644 --- a/storm-client/src/jvm/org/apache/storm/utils/Time.java +++ b/storm-client/src/jvm/org/apache/storm/utils/Time.java @@ -13,8 +13,8 @@ package org.apache.storm.utils; import java.util.Iterator; -import java.util.Map; import java.util.Map.Entry; +import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; diff --git a/storm-client/src/jvm/org/apache/storm/utils/TimeCacheMap.java b/storm-client/src/jvm/org/apache/storm/utils/TimeCacheMap.java index 7d8521969f0..fd437fb2c5f 100644 --- a/storm-client/src/jvm/org/apache/storm/utils/TimeCacheMap.java +++ b/storm-client/src/jvm/org/apache/storm/utils/TimeCacheMap.java @@ -12,8 +12,8 @@ package org.apache.storm.utils; -import java.util.Map; import java.util.Map.Entry; +import java.util.Map; /** * Expires keys that have not been updated in the configured number of seconds. The algorithm used will take between expirationSecs and diff --git a/storm-client/src/jvm/org/apache/storm/utils/TransferDrainer.java b/storm-client/src/jvm/org/apache/storm/utils/TransferDrainer.java index 540d691ec1e..ff1c8839c18 100644 --- a/storm-client/src/jvm/org/apache/storm/utils/TransferDrainer.java +++ b/storm-client/src/jvm/org/apache/storm/utils/TransferDrainer.java @@ -16,8 +16,8 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; -import java.util.Map; import java.util.Map.Entry; +import java.util.Map; import java.util.stream.Stream; import org.apache.storm.generated.NodeInfo; import org.apache.storm.messaging.IConnection; diff --git a/storm-client/src/jvm/org/apache/storm/utils/Utils.java b/storm-client/src/jvm/org/apache/storm/utils/Utils.java index feebf0fabaf..fb99235e6de 100644 --- a/storm-client/src/jvm/org/apache/storm/utils/Utils.java +++ b/storm-client/src/jvm/org/apache/storm/utils/Utils.java @@ -58,8 +58,8 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Map.Entry; +import java.util.Map; import java.util.NavigableMap; import java.util.Objects; import java.util.Set; @@ -355,7 +355,7 @@ public static void addShutdownHookWithDelayedForceKill(Runnable func, int numSec LOG.warn("Forcing Halt... {}", Utils.threadDump()); Runtime.getRuntime().halt(20); } catch (InterruptedException ie) { - //Ignored/expected... + //Ignored/expected... } catch (Exception e) { LOG.warn("Exception in the ShutDownHook", e); } diff --git a/storm-client/src/jvm/org/apache/storm/validation/ConfigValidation.java b/storm-client/src/jvm/org/apache/storm/validation/ConfigValidation.java index 7d59b4a2ebd..0f4e9cc7a6f 100644 --- a/storm-client/src/jvm/org/apache/storm/validation/ConfigValidation.java +++ b/storm-client/src/jvm/org/apache/storm/validation/ConfigValidation.java @@ -28,7 +28,6 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; - import org.apache.storm.Config; import org.apache.storm.utils.ObjectReader; import org.apache.storm.utils.Utils; diff --git a/storm-client/src/jvm/org/apache/storm/windowing/CountEvictionPolicy.java b/storm-client/src/jvm/org/apache/storm/windowing/CountEvictionPolicy.java index 910b600eecb..78d1ac07013 100644 --- a/storm-client/src/jvm/org/apache/storm/windowing/CountEvictionPolicy.java +++ b/storm-client/src/jvm/org/apache/storm/windowing/CountEvictionPolicy.java @@ -75,7 +75,7 @@ public String toString() { @Override public void reset() { - // NOOP + // NOOP } @Override diff --git a/storm-client/src/jvm/org/apache/storm/windowing/CountTriggerPolicy.java b/storm-client/src/jvm/org/apache/storm/windowing/CountTriggerPolicy.java index 096a02c3d99..c35a80dce03 100644 --- a/storm-client/src/jvm/org/apache/storm/windowing/CountTriggerPolicy.java +++ b/storm-client/src/jvm/org/apache/storm/windowing/CountTriggerPolicy.java @@ -56,7 +56,7 @@ public void start() { @Override public void shutdown() { - // NOOP + // NOOP } @Override diff --git a/storm-client/src/jvm/org/apache/storm/windowing/StatefulWindowManager.java b/storm-client/src/jvm/org/apache/storm/windowing/StatefulWindowManager.java index 02225405788..bff9ced4c67 100644 --- a/storm-client/src/jvm/org/apache/storm/windowing/StatefulWindowManager.java +++ b/storm-client/src/jvm/org/apache/storm/windowing/StatefulWindowManager.java @@ -66,7 +66,7 @@ public T next() { @Override protected void compactWindow() { - // NOOP + // NOOP } @Override diff --git a/storm-client/src/jvm/org/apache/storm/windowing/TimeEvictionPolicy.java b/storm-client/src/jvm/org/apache/storm/windowing/TimeEvictionPolicy.java index 8e157508b7f..eef7b42cc8b 100644 --- a/storm-client/src/jvm/org/apache/storm/windowing/TimeEvictionPolicy.java +++ b/storm-client/src/jvm/org/apache/storm/windowing/TimeEvictionPolicy.java @@ -51,7 +51,7 @@ public Action evict(Event event) { @Override public void track(Event event) { - // NOOP + // NOOP } @Override @@ -81,7 +81,7 @@ public void setContext(EvictionContext context) { @Override public void reset() { - // NOOP + // NOOP } @Override diff --git a/storm-client/src/jvm/org/apache/storm/windowing/WatermarkCountEvictionPolicy.java b/storm-client/src/jvm/org/apache/storm/windowing/WatermarkCountEvictionPolicy.java index ca6201a6ace..6152a6d71fb 100644 --- a/storm-client/src/jvm/org/apache/storm/windowing/WatermarkCountEvictionPolicy.java +++ b/storm-client/src/jvm/org/apache/storm/windowing/WatermarkCountEvictionPolicy.java @@ -73,7 +73,7 @@ private Action doEvict(Event event) { @Override public void track(Event event) { - // NOOP + // NOOP } @Override diff --git a/storm-client/src/jvm/org/apache/storm/windowing/WatermarkCountTriggerPolicy.java b/storm-client/src/jvm/org/apache/storm/windowing/WatermarkCountTriggerPolicy.java index 30551874f79..0e44742d966 100644 --- a/storm-client/src/jvm/org/apache/storm/windowing/WatermarkCountTriggerPolicy.java +++ b/storm-client/src/jvm/org/apache/storm/windowing/WatermarkCountTriggerPolicy.java @@ -45,7 +45,7 @@ public void track(Event event) { @Override public void reset() { - // NOOP + // NOOP } @Override @@ -55,7 +55,7 @@ public void start() { @Override public void shutdown() { - // NOOP + // NOOP } /** diff --git a/storm-client/src/jvm/org/apache/storm/windowing/WatermarkTimeTriggerPolicy.java b/storm-client/src/jvm/org/apache/storm/windowing/WatermarkTimeTriggerPolicy.java index 9758eb83f8e..0e8680b951d 100644 --- a/storm-client/src/jvm/org/apache/storm/windowing/WatermarkTimeTriggerPolicy.java +++ b/storm-client/src/jvm/org/apache/storm/windowing/WatermarkTimeTriggerPolicy.java @@ -46,7 +46,7 @@ public void track(Event event) { @Override public void reset() { - // NOOP + // NOOP } @Override @@ -56,7 +56,7 @@ public void start() { @Override public void shutdown() { - // NOOP + // NOOP } /** diff --git a/storm-client/test/jvm/org/apache/storm/PaceMakerStateStorageFactoryTest.java b/storm-client/test/jvm/org/apache/storm/PaceMakerStateStorageFactoryTest.java index 8b482e82389..32ebf0af1cd 100644 --- a/storm-client/test/jvm/org/apache/storm/PaceMakerStateStorageFactoryTest.java +++ b/storm-client/test/jvm/org/apache/storm/PaceMakerStateStorageFactoryTest.java @@ -18,6 +18,8 @@ package org.apache.storm; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -44,9 +46,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; - @ExtendWith(MockitoExtension.class) public class PaceMakerStateStorageFactoryTest { diff --git a/storm-client/test/jvm/org/apache/storm/TestConfigValidate.java b/storm-client/test/jvm/org/apache/storm/TestConfigValidate.java index 32bb1433858..c4f3457979b 100644 --- a/storm-client/test/jvm/org/apache/storm/TestConfigValidate.java +++ b/storm-client/test/jvm/org/apache/storm/TestConfigValidate.java @@ -18,6 +18,12 @@ package org.apache.storm; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import java.math.BigInteger; import java.util.ArrayList; import java.util.Arrays; @@ -30,7 +36,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import javax.security.auth.Subject; - import org.apache.storm.blobstore.BlobStore; import org.apache.storm.blobstore.NimbusBlobStore; import org.apache.storm.generated.AuthorizationException; @@ -40,13 +45,12 @@ import org.apache.storm.shade.com.google.common.collect.ImmutableList; import org.apache.storm.shade.com.google.common.collect.ImmutableMap; import org.apache.storm.utils.Utils; -import org.apache.storm.validation.ConfigValidation; import org.apache.storm.validation.ConfigValidation.ImpersonationAclUserEntryValidator; import org.apache.storm.validation.ConfigValidation.IntegerValidator; import org.apache.storm.validation.ConfigValidation.KryoRegValidator; -import org.apache.storm.validation.ConfigValidation.LongValidator; import org.apache.storm.validation.ConfigValidation.ListEntryTypeValidator; import org.apache.storm.validation.ConfigValidation.ListOfListOfStringValidator; +import org.apache.storm.validation.ConfigValidation.LongValidator; import org.apache.storm.validation.ConfigValidation.NoDuplicateInListValidator; import org.apache.storm.validation.ConfigValidation.NotNullValidator; import org.apache.storm.validation.ConfigValidation.PositiveNumberValidator; @@ -54,6 +58,7 @@ import org.apache.storm.validation.ConfigValidation.RasConstraintsTypeValidator; import org.apache.storm.validation.ConfigValidation.StringValidator; import org.apache.storm.validation.ConfigValidation.UserResourcePoolEntryValidator; +import org.apache.storm.validation.ConfigValidation; import org.apache.storm.validation.ConfigValidationAnnotations.IsExactlyOneOf; import org.apache.storm.validation.ConfigValidationAnnotations.IsImplementationOfClass; import org.apache.storm.validation.ConfigValidationAnnotations.IsListEntryCustom; @@ -63,15 +68,8 @@ import org.apache.storm.validation.ConfigValidationAnnotations.IsNoDuplicateInList; import org.apache.storm.validation.ConfigValidationAnnotations.IsString; import org.apache.storm.validation.ConfigValidationAnnotations.NotNull; - import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - public class TestConfigValidate { @Test diff --git a/storm-client/test/jvm/org/apache/storm/TestStormSubmitter.java b/storm-client/test/jvm/org/apache/storm/TestStormSubmitter.java index c68dd068f58..48fe9e19089 100644 --- a/storm-client/test/jvm/org/apache/storm/TestStormSubmitter.java +++ b/storm-client/test/jvm/org/apache/storm/TestStormSubmitter.java @@ -18,6 +18,8 @@ package org.apache.storm; +import static org.junit.jupiter.api.Assertions.fail; + import java.util.Map; import org.apache.storm.generated.InvalidTopologyException; import org.apache.storm.generated.StormTopology; @@ -27,8 +29,6 @@ import org.apache.storm.topology.TopologyBuilder; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.fail; - public class TestStormSubmitter { @Test diff --git a/storm-client/test/jvm/org/apache/storm/TestStormTimer.java b/storm-client/test/jvm/org/apache/storm/TestStormTimer.java index 6709fdb1f85..8370da17173 100644 --- a/storm-client/test/jvm/org/apache/storm/TestStormTimer.java +++ b/storm-client/test/jvm/org/apache/storm/TestStormTimer.java @@ -12,12 +12,11 @@ package org.apache.storm; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class TestStormTimer { @@ -185,7 +184,7 @@ public boolean isSuccess() { expectedCounterAtCheck = ((sleepSecsBeforeCheck - delaySecs) / recurSecs) * threadCnt; break; default: - // do nothing + // do nothing } } @@ -223,4 +222,4 @@ public boolean isSuccess() { return true; } } -} \ No newline at end of file +} diff --git a/storm-client/test/jvm/org/apache/storm/assignments/LocalAssignmentsBackendTest.java b/storm-client/test/jvm/org/apache/storm/assignments/LocalAssignmentsBackendTest.java index 96f5297e8a9..4b259b2a2b3 100644 --- a/storm-client/test/jvm/org/apache/storm/assignments/LocalAssignmentsBackendTest.java +++ b/storm-client/test/jvm/org/apache/storm/assignments/LocalAssignmentsBackendTest.java @@ -18,6 +18,9 @@ package org.apache.storm.assignments; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -30,9 +33,6 @@ import org.apache.storm.utils.ConfigUtils; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; - public class LocalAssignmentsBackendTest { diff --git a/storm-client/test/jvm/org/apache/storm/blobstore/ClientBlobStoreTest.java b/storm-client/test/jvm/org/apache/storm/blobstore/ClientBlobStoreTest.java index f88e278260d..7aa23845350 100644 --- a/storm-client/test/jvm/org/apache/storm/blobstore/ClientBlobStoreTest.java +++ b/storm-client/test/jvm/org/apache/storm/blobstore/ClientBlobStoreTest.java @@ -12,6 +12,9 @@ package org.apache.storm.blobstore; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; + import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -26,9 +29,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertThrows; - public class ClientBlobStoreTest { private ClientBlobStore client; diff --git a/storm-client/test/jvm/org/apache/storm/bolt/TestJoinBolt.java b/storm-client/test/jvm/org/apache/storm/bolt/TestJoinBolt.java index 5af9ddc8130..be6ca4093dd 100644 --- a/storm-client/test/jvm/org/apache/storm/bolt/TestJoinBolt.java +++ b/storm-client/test/jvm/org/apache/storm/bolt/TestJoinBolt.java @@ -12,6 +12,9 @@ package org.apache.storm.bolt; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -25,8 +28,6 @@ import org.apache.storm.windowing.TupleWindow; import org.apache.storm.windowing.TupleWindowImpl; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestJoinBolt { String[] userFields = { "userId", "name", "city" }; diff --git a/storm-client/test/jvm/org/apache/storm/cluster/DaemonTypeTest.java b/storm-client/test/jvm/org/apache/storm/cluster/DaemonTypeTest.java index fc2aabfcf1a..0b48b597ce4 100644 --- a/storm-client/test/jvm/org/apache/storm/cluster/DaemonTypeTest.java +++ b/storm-client/test/jvm/org/apache/storm/cluster/DaemonTypeTest.java @@ -12,6 +12,9 @@ package org.apache.storm.cluster; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -23,9 +26,6 @@ import org.apache.storm.utils.ConfigUtils; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; - public class DaemonTypeTest { @Test @@ -70,4 +70,4 @@ public void getDefaultZkAclsSecureWorkerConf() { expected.add(new ACL(ZooDefs.Perms.ALL, new Id("sasl", "nimbus"))); assertEquals(expected, DaemonType.WORKER.getDefaultZkAcls(conf)); } -} \ No newline at end of file +} diff --git a/storm-client/test/jvm/org/apache/storm/daemon/worker/BackPressureTrackerTest.java b/storm-client/test/jvm/org/apache/storm/daemon/worker/BackPressureTrackerTest.java index a3963584108..2e6eea9221d 100644 --- a/storm-client/test/jvm/org/apache/storm/daemon/worker/BackPressureTrackerTest.java +++ b/storm-client/test/jvm/org/apache/storm/daemon/worker/BackPressureTrackerTest.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.when; import java.util.Collections; - import org.apache.storm.daemon.worker.BackPressureTracker.BackpressureState; import org.apache.storm.messaging.netty.BackPressureStatus; import org.apache.storm.metrics2.StormMetricRegistry; diff --git a/storm-client/test/jvm/org/apache/storm/daemon/worker/LogConfigManagerTest.java b/storm-client/test/jvm/org/apache/storm/daemon/worker/LogConfigManagerTest.java index 53f84cb2c8c..d7a80087df4 100644 --- a/storm-client/test/jvm/org/apache/storm/daemon/worker/LogConfigManagerTest.java +++ b/storm-client/test/jvm/org/apache/storm/daemon/worker/LogConfigManagerTest.java @@ -12,30 +12,29 @@ package org.apache.storm.daemon.worker; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.eq; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; + import java.util.TreeMap; import java.util.concurrent.atomic.AtomicReference; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.core.LoggerContext; import org.apache.storm.generated.LogConfig; import org.apache.storm.generated.LogLevel; import org.apache.storm.generated.LogLevelAction; -import org.apache.storm.utils.Time; import org.apache.storm.utils.Time.SimulatedTime; +import org.apache.storm.utils.Time; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.eq; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; - public class LogConfigManagerTest { private static final Logger LOG = LoggerFactory.getLogger(LogConfigManagerTest.class); @@ -260,7 +259,7 @@ public LogConfigManagerUnderTest(AtomicReference> late @Override public void setLoggerLevel(LoggerContext logContext, String loggerName, String newLevelStr) { - //NOOP, we don't actually want to change log levels for tests + //NOOP, we don't actually want to change log levels for tests } } } diff --git a/storm-client/test/jvm/org/apache/storm/daemon/worker/TestUtilsForWorkerState.java b/storm-client/test/jvm/org/apache/storm/daemon/worker/TestUtilsForWorkerState.java index 3941f1778e2..7bc08f438d3 100644 --- a/storm-client/test/jvm/org/apache/storm/daemon/worker/TestUtilsForWorkerState.java +++ b/storm-client/test/jvm/org/apache/storm/daemon/worker/TestUtilsForWorkerState.java @@ -16,6 +16,15 @@ package org.apache.storm.daemon.worker; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.io.IOException; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import java.util.function.Supplier; import org.apache.storm.Config; import org.apache.storm.cluster.IStateStorage; import org.apache.storm.cluster.IStormClusterState; @@ -30,16 +39,6 @@ import org.apache.storm.thrift.TException; import org.apache.storm.utils.SupervisorIfaceFactory; -import java.io.IOException; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; -import java.util.function.Supplier; - -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - public class TestUtilsForWorkerState { public static final String RESOURCE_KEY = "resource-key"; diff --git a/storm-client/test/jvm/org/apache/storm/daemon/worker/WorkerStateTest.java b/storm-client/test/jvm/org/apache/storm/daemon/worker/WorkerStateTest.java index d738f61ef77..8f82b1cfae8 100644 --- a/storm-client/test/jvm/org/apache/storm/daemon/worker/WorkerStateTest.java +++ b/storm-client/test/jvm/org/apache/storm/daemon/worker/WorkerStateTest.java @@ -16,24 +16,6 @@ package org.apache.storm.daemon.worker; -import org.apache.storm.Config; -import org.apache.storm.daemon.supervisor.AdvancedFSOps; -import org.apache.storm.generated.StormTopology; -import org.apache.storm.thrift.TException; -import org.apache.storm.tuple.AddressedTuple; -import org.apache.storm.tuple.Tuple; -import org.apache.storm.utils.ConfigUtils; -import org.apache.storm.utils.Utils; -import org.junit.jupiter.api.Test; - -import java.io.IOException; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -44,6 +26,23 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.apache.storm.Config; +import org.apache.storm.daemon.supervisor.AdvancedFSOps; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.thrift.TException; +import org.apache.storm.tuple.AddressedTuple; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.utils.ConfigUtils; +import org.apache.storm.utils.Utils; +import org.junit.jupiter.api.Test; + public class WorkerStateTest { @Test diff --git a/storm-client/test/jvm/org/apache/storm/daemon/worker/WorkerTest.java b/storm-client/test/jvm/org/apache/storm/daemon/worker/WorkerTest.java index b03f3e7d46d..f1593daa284 100644 --- a/storm-client/test/jvm/org/apache/storm/daemon/worker/WorkerTest.java +++ b/storm-client/test/jvm/org/apache/storm/daemon/worker/WorkerTest.java @@ -12,13 +12,13 @@ package org.apache.storm.daemon.worker; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.storm.messaging.ConnectionWithStatus; import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class WorkerTest { @Test public void testWorkerIsConnectionReady() { diff --git a/storm-client/test/jvm/org/apache/storm/dependency/DependencyPropertiesParserTest.java b/storm-client/test/jvm/org/apache/storm/dependency/DependencyPropertiesParserTest.java index 7b38eca086e..a0af009bec9 100644 --- a/storm-client/test/jvm/org/apache/storm/dependency/DependencyPropertiesParserTest.java +++ b/storm-client/test/jvm/org/apache/storm/dependency/DependencyPropertiesParserTest.java @@ -12,16 +12,15 @@ package org.apache.storm.dependency; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + import java.io.File; import java.util.HashMap; import java.util.List; import java.util.Map; - import org.apache.storm.shade.net.minidev.json.JSONValue; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertThrows; - -import static org.junit.jupiter.api.Assertions.assertEquals; public class DependencyPropertiesParserTest { private final DependencyPropertiesParser sut = new DependencyPropertiesParser(); diff --git a/storm-client/test/jvm/org/apache/storm/dependency/DependencyUploaderTest.java b/storm-client/test/jvm/org/apache/storm/dependency/DependencyUploaderTest.java index e549fc83b5c..c4b2d701acc 100644 --- a/storm-client/test/jvm/org/apache/storm/dependency/DependencyUploaderTest.java +++ b/storm-client/test/jvm/org/apache/storm/dependency/DependencyUploaderTest.java @@ -18,6 +18,23 @@ package org.apache.storm.dependency; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.contains; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; @@ -44,23 +61,6 @@ import org.mockito.ArgumentCaptor; import org.mockito.stubbing.Answer; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.contains; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - public class DependencyUploaderTest { private DependencyUploader sut; diff --git a/storm-client/test/jvm/org/apache/storm/executor/ChildEwmaStatsTest.java b/storm-client/test/jvm/org/apache/storm/executor/ChildEwmaStatsTest.java index 2b4be5de9e7..2d32bddf311 100644 --- a/storm-client/test/jvm/org/apache/storm/executor/ChildEwmaStatsTest.java +++ b/storm-client/test/jvm/org/apache/storm/executor/ChildEwmaStatsTest.java @@ -12,14 +12,14 @@ package org.apache.storm.executor; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.HashMap; import java.util.Map; import org.apache.storm.metrics2.TaskMetrics; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - /** * Unit tests for {@link ChildEwmaStats}: the per-source-task aggregation of downstream jitter * reports and the {@link ChildEwmaStats#compareByJitter} ordering used by diff --git a/storm-client/test/jvm/org/apache/storm/executor/EwmaFeedbackRecordTest.java b/storm-client/test/jvm/org/apache/storm/executor/EwmaFeedbackRecordTest.java index 38913d9007b..eafe4abfa12 100644 --- a/storm-client/test/jvm/org/apache/storm/executor/EwmaFeedbackRecordTest.java +++ b/storm-client/test/jvm/org/apache/storm/executor/EwmaFeedbackRecordTest.java @@ -12,6 +12,12 @@ package org.apache.storm.executor; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import com.codahale.metrics.Gauge; import java.util.HashMap; import java.util.LinkedHashMap; @@ -29,12 +35,6 @@ import org.apache.storm.utils.Utils; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertInstanceOf; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - /** * Tests for {@link EwmaFeedbackRecord}, covering three concerns: *
    diff --git a/storm-client/test/jvm/org/apache/storm/executor/ExecutorTransferMultiThreadingTest.java b/storm-client/test/jvm/org/apache/storm/executor/ExecutorTransferMultiThreadingTest.java index 279864b3f1b..9a0557a39f4 100644 --- a/storm-client/test/jvm/org/apache/storm/executor/ExecutorTransferMultiThreadingTest.java +++ b/storm-client/test/jvm/org/apache/storm/executor/ExecutorTransferMultiThreadingTest.java @@ -12,6 +12,11 @@ package org.apache.storm.executor; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import java.lang.reflect.Field; import java.util.Collections; import java.util.HashMap; @@ -42,11 +47,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - /** * Some topologies might spawn extra threads inside components to perform real processing work and emit processed results. * This unit test is to mimic these scenarios in the {@link ExecutorTransfer} level @@ -196,7 +196,7 @@ public void finalCheck() { @Override public void flush() { - //no op + //no op } } -} \ No newline at end of file +} diff --git a/storm-client/test/jvm/org/apache/storm/executor/SpoutExecutorTest.java b/storm-client/test/jvm/org/apache/storm/executor/SpoutExecutorTest.java index b83009f8933..df189b4260c 100644 --- a/storm-client/test/jvm/org/apache/storm/executor/SpoutExecutorTest.java +++ b/storm-client/test/jvm/org/apache/storm/executor/SpoutExecutorTest.java @@ -12,6 +12,14 @@ package org.apache.storm.executor; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; + +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.apache.storm.Constants; import org.apache.storm.cluster.IStateStorage; import org.apache.storm.daemon.worker.WorkerState; @@ -29,15 +37,6 @@ import org.junit.platform.commons.util.ReflectionUtils; import org.mockito.Mockito; -import java.lang.reflect.Field; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import static org.junit.jupiter.api.Assertions.assertInstanceOf; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyString; - public class SpoutExecutorTest { diff --git a/storm-client/test/jvm/org/apache/storm/executor/error/ReportErrorTest.java b/storm-client/test/jvm/org/apache/storm/executor/error/ReportErrorTest.java index f52e6595500..671d75ec136 100644 --- a/storm-client/test/jvm/org/apache/storm/executor/error/ReportErrorTest.java +++ b/storm-client/test/jvm/org/apache/storm/executor/error/ReportErrorTest.java @@ -12,24 +12,24 @@ package org.apache.storm.executor.error; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; import org.apache.storm.Config; import org.apache.storm.cluster.IStormClusterState; import org.apache.storm.task.WorkerTopologyContext; -import org.apache.storm.utils.Time; import org.apache.storm.utils.Time.SimulatedTime; +import org.apache.storm.utils.Time; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - public class ReportErrorTest { @Test diff --git a/storm-client/test/jvm/org/apache/storm/grouping/JitterAwareStreamGroupingTest.java b/storm-client/test/jvm/org/apache/storm/grouping/JitterAwareStreamGroupingTest.java index 558ef0546f7..ad922213bd1 100644 --- a/storm-client/test/jvm/org/apache/storm/grouping/JitterAwareStreamGroupingTest.java +++ b/storm-client/test/jvm/org/apache/storm/grouping/JitterAwareStreamGroupingTest.java @@ -12,6 +12,11 @@ package org.apache.storm.grouping; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import java.util.Arrays; import java.util.Collections; import java.util.HashMap; @@ -26,11 +31,6 @@ import org.apache.storm.task.WorkerTopologyContext; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - /** * Unit tests for {@link JitterAwareStreamGrouping}: power-of-two-choices steering toward the lower-jitter * child once {@link ChildEwmaStats} is populated, and delegation to the embedded diff --git a/storm-client/test/jvm/org/apache/storm/grouping/LoadAwareShuffleGroupingTest.java b/storm-client/test/jvm/org/apache/storm/grouping/LoadAwareShuffleGroupingTest.java index 00755f688b1..c314bfecc09 100644 --- a/storm-client/test/jvm/org/apache/storm/grouping/LoadAwareShuffleGroupingTest.java +++ b/storm-client/test/jvm/org/apache/storm/grouping/LoadAwareShuffleGroupingTest.java @@ -12,6 +12,12 @@ package org.apache.storm.grouping; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import java.util.Arrays; import java.util.Collections; import java.util.HashMap; @@ -41,12 +47,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - public class LoadAwareShuffleGroupingTest { public static final double ACCEPTABLE_MARGIN = 0.015; private static final Logger LOG = LoggerFactory.getLogger(LoadAwareShuffleGroupingTest.class); @@ -561,4 +561,4 @@ private WorkerTopologyContext createLoadSwitchingContext() { return context; } -} \ No newline at end of file +} diff --git a/storm-client/test/jvm/org/apache/storm/grouping/ShuffleGroupingTest.java b/storm-client/test/jvm/org/apache/storm/grouping/ShuffleGroupingTest.java index 5c295331e78..9a26910604b 100644 --- a/storm-client/test/jvm/org/apache/storm/grouping/ShuffleGroupingTest.java +++ b/storm-client/test/jvm/org/apache/storm/grouping/ShuffleGroupingTest.java @@ -12,6 +12,11 @@ package org.apache.storm.grouping; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.mock; + import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; @@ -22,11 +27,6 @@ import org.apache.storm.task.WorkerTopologyContext; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Mockito.mock; - public class ShuffleGroupingTest { /** diff --git a/storm-client/test/jvm/org/apache/storm/grouping/partialKeyGrouping/BalancedTargetSelectorTest.java b/storm-client/test/jvm/org/apache/storm/grouping/partialKeyGrouping/BalancedTargetSelectorTest.java index d0cc0df2dc6..edad0375fde 100644 --- a/storm-client/test/jvm/org/apache/storm/grouping/partialKeyGrouping/BalancedTargetSelectorTest.java +++ b/storm-client/test/jvm/org/apache/storm/grouping/partialKeyGrouping/BalancedTargetSelectorTest.java @@ -12,6 +12,9 @@ package org.apache.storm.grouping.partialKeyGrouping; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; + import java.util.Arrays; import java.util.stream.Collectors; import org.apache.storm.grouping.PartialKeyGrouping; @@ -19,9 +22,6 @@ import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; - public class BalancedTargetSelectorTest { diff --git a/storm-client/test/jvm/org/apache/storm/grouping/partialKeyGrouping/PartialKeyGroupingTest.java b/storm-client/test/jvm/org/apache/storm/grouping/partialKeyGrouping/PartialKeyGroupingTest.java index 0811985c778..d967b4c2dd7 100644 --- a/storm-client/test/jvm/org/apache/storm/grouping/partialKeyGrouping/PartialKeyGroupingTest.java +++ b/storm-client/test/jvm/org/apache/storm/grouping/partialKeyGrouping/PartialKeyGroupingTest.java @@ -12,6 +12,13 @@ package org.apache.storm.grouping.partialKeyGrouping; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import java.util.List; import org.apache.storm.generated.GlobalStreamId; import org.apache.storm.grouping.PartialKeyGrouping; @@ -22,13 +29,6 @@ import org.apache.storm.utils.Utils; import org.junit.jupiter.api.Test; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - public class PartialKeyGroupingTest { @Test diff --git a/storm-client/test/jvm/org/apache/storm/grouping/partialKeyGrouping/RandomTwoTaskAssignmentCreatorTest.java b/storm-client/test/jvm/org/apache/storm/grouping/partialKeyGrouping/RandomTwoTaskAssignmentCreatorTest.java index fc556f3599b..3f53932cd6e 100644 --- a/storm-client/test/jvm/org/apache/storm/grouping/partialKeyGrouping/RandomTwoTaskAssignmentCreatorTest.java +++ b/storm-client/test/jvm/org/apache/storm/grouping/partialKeyGrouping/RandomTwoTaskAssignmentCreatorTest.java @@ -12,15 +12,15 @@ package org.apache.storm.grouping.partialKeyGrouping; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.not; + import org.apache.storm.grouping.PartialKeyGrouping; import org.apache.storm.shade.com.google.common.collect.Lists; import org.apache.storm.utils.Utils; import org.junit.jupiter.api.Test; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.not; - public class RandomTwoTaskAssignmentCreatorTest { private static final byte[] GROUPING_KEY_ONE = "some_key_one".getBytes(); diff --git a/storm-client/test/jvm/org/apache/storm/messaging/DeserializingConnectionCallbackTest.java b/storm-client/test/jvm/org/apache/storm/messaging/DeserializingConnectionCallbackTest.java index f622ade12ce..b28cc78c1bd 100644 --- a/storm-client/test/jvm/org/apache/storm/messaging/DeserializingConnectionCallbackTest.java +++ b/storm-client/test/jvm/org/apache/storm/messaging/DeserializingConnectionCallbackTest.java @@ -12,6 +12,12 @@ package org.apache.storm.messaging; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import java.util.HashMap; import java.util.Map; import org.apache.storm.Config; @@ -20,12 +26,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - public class DeserializingConnectionCallbackTest { private static final byte[] messageBytes = new byte[3]; private static TaskMessage message; diff --git a/storm-client/test/jvm/org/apache/storm/messaging/netty/MessageDecoderTest.java b/storm-client/test/jvm/org/apache/storm/messaging/netty/MessageDecoderTest.java index 96915882302..6ec815e33b1 100644 --- a/storm-client/test/jvm/org/apache/storm/messaging/netty/MessageDecoderTest.java +++ b/storm-client/test/jvm/org/apache/storm/messaging/netty/MessageDecoderTest.java @@ -12,14 +12,6 @@ package org.apache.storm.messaging.netty; -import java.util.List; -import org.apache.storm.messaging.TaskMessage; -import org.apache.storm.serialization.KryoValuesDeserializer; -import org.apache.storm.shade.io.netty.buffer.ByteBuf; -import org.apache.storm.shade.io.netty.buffer.Unpooled; -import org.apache.storm.shade.io.netty.channel.embedded.EmbeddedChannel; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -31,6 +23,14 @@ import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; +import java.util.List; +import org.apache.storm.messaging.TaskMessage; +import org.apache.storm.serialization.KryoValuesDeserializer; +import org.apache.storm.shade.io.netty.buffer.ByteBuf; +import org.apache.storm.shade.io.netty.buffer.Unpooled; +import org.apache.storm.shade.io.netty.channel.embedded.EmbeddedChannel; +import org.junit.jupiter.api.Test; + public class MessageDecoderTest { private static final short TASK_ID = 1; diff --git a/storm-client/test/jvm/org/apache/storm/metric/FileBasedEventLoggerTest.java b/storm-client/test/jvm/org/apache/storm/metric/FileBasedEventLoggerTest.java index 1db39b4ac5b..6e021f6248d 100644 --- a/storm-client/test/jvm/org/apache/storm/metric/FileBasedEventLoggerTest.java +++ b/storm-client/test/jvm/org/apache/storm/metric/FileBasedEventLoggerTest.java @@ -18,6 +18,10 @@ package org.apache.storm.metric; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -31,9 +35,6 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; public class FileBasedEventLoggerTest { diff --git a/storm-client/test/jvm/org/apache/storm/metric/filter/FilterByMetricNameTest.java b/storm-client/test/jvm/org/apache/storm/metric/filter/FilterByMetricNameTest.java index 888422049dc..214c9eb8642 100644 --- a/storm-client/test/jvm/org/apache/storm/metric/filter/FilterByMetricNameTest.java +++ b/storm-client/test/jvm/org/apache/storm/metric/filter/FilterByMetricNameTest.java @@ -12,6 +12,9 @@ package org.apache.storm.metric.filter; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + import java.util.List; import java.util.Map; import org.apache.storm.metric.api.IMetricsConsumer; @@ -20,9 +23,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; - public class FilterByMetricNameTest { @BeforeEach public void setUp() throws Exception { diff --git a/storm-client/test/jvm/org/apache/storm/metric/internal/CountStatTest.java b/storm-client/test/jvm/org/apache/storm/metric/internal/CountStatTest.java index d5fc82e692c..89dba85df17 100644 --- a/storm-client/test/jvm/org/apache/storm/metric/internal/CountStatTest.java +++ b/storm-client/test/jvm/org/apache/storm/metric/internal/CountStatTest.java @@ -12,12 +12,12 @@ package org.apache.storm.metric.internal; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.HashMap; import java.util.Map; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - /** * Unit test for CountStat */ diff --git a/storm-client/test/jvm/org/apache/storm/metric/internal/LatencyStatTest.java b/storm-client/test/jvm/org/apache/storm/metric/internal/LatencyStatTest.java index 29a6906d43f..116d138892b 100644 --- a/storm-client/test/jvm/org/apache/storm/metric/internal/LatencyStatTest.java +++ b/storm-client/test/jvm/org/apache/storm/metric/internal/LatencyStatTest.java @@ -12,11 +12,11 @@ package org.apache.storm.metric.internal; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.Map; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - /** * Unit test for LatencyStat */ diff --git a/storm-client/test/jvm/org/apache/storm/metric/internal/RateTrackerTest.java b/storm-client/test/jvm/org/apache/storm/metric/internal/RateTrackerTest.java index 7760d36fc6d..c8b5491f978 100644 --- a/storm-client/test/jvm/org/apache/storm/metric/internal/RateTrackerTest.java +++ b/storm-client/test/jvm/org/apache/storm/metric/internal/RateTrackerTest.java @@ -12,10 +12,10 @@ package org.apache.storm.metric.internal; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; + /** * Unit test for RateTracker */ diff --git a/storm-client/test/jvm/org/apache/storm/metric/util/DataPointExpanderTest.java b/storm-client/test/jvm/org/apache/storm/metric/util/DataPointExpanderTest.java index 53ca205a6b6..00f967b1cc7 100644 --- a/storm-client/test/jvm/org/apache/storm/metric/util/DataPointExpanderTest.java +++ b/storm-client/test/jvm/org/apache/storm/metric/util/DataPointExpanderTest.java @@ -12,6 +12,9 @@ package org.apache.storm.metric.util; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -20,9 +23,6 @@ import org.apache.storm.shade.com.google.common.collect.Lists; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class DataPointExpanderTest { @Test diff --git a/storm-client/test/jvm/org/apache/storm/metrics2/EwmaGaugeTest.java b/storm-client/test/jvm/org/apache/storm/metrics2/EwmaGaugeTest.java index ed1b5009ceb..fd8f037937b 100644 --- a/storm-client/test/jvm/org/apache/storm/metrics2/EwmaGaugeTest.java +++ b/storm-client/test/jvm/org/apache/storm/metrics2/EwmaGaugeTest.java @@ -12,21 +12,20 @@ package org.apache.storm.metrics2; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Nested; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; class EwmaGaugeTest { diff --git a/storm-client/test/jvm/org/apache/storm/metrics2/RollingAverageGaugeTest.java b/storm-client/test/jvm/org/apache/storm/metrics2/RollingAverageGaugeTest.java index 38b3fef64ea..a98d986d8d2 100644 --- a/storm-client/test/jvm/org/apache/storm/metrics2/RollingAverageGaugeTest.java +++ b/storm-client/test/jvm/org/apache/storm/metrics2/RollingAverageGaugeTest.java @@ -12,10 +12,10 @@ package org.apache.storm.metrics2; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; + public class RollingAverageGaugeTest { @Test @@ -33,4 +33,4 @@ public void testAverage() { gauge.addValue(0); assertEquals(40.0, gauge.getValue(), 0.001); } -} \ No newline at end of file +} diff --git a/storm-client/test/jvm/org/apache/storm/metrics2/TaskMetricsTest.java b/storm-client/test/jvm/org/apache/storm/metrics2/TaskMetricsTest.java index c812994280c..2ecaf8080e1 100644 --- a/storm-client/test/jvm/org/apache/storm/metrics2/TaskMetricsTest.java +++ b/storm-client/test/jvm/org/apache/storm/metrics2/TaskMetricsTest.java @@ -12,7 +12,18 @@ package org.apache.storm.metrics2; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.Mockito.*; + import com.codahale.metrics.Gauge; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import org.apache.storm.task.WorkerTopologyContext; import org.apache.storm.utils.ConfigUtils; import org.junit.jupiter.api.BeforeEach; @@ -23,18 +34,6 @@ import org.mockito.MockedStatic; import org.mockito.junit.jupiter.MockitoExtension; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.ArgumentMatchers.*; -import static org.mockito.Mockito.*; - @ExtendWith(MockitoExtension.class) class TaskMetricsTest { diff --git a/storm-client/test/jvm/org/apache/storm/nimbus/NimbusInfoTest.java b/storm-client/test/jvm/org/apache/storm/nimbus/NimbusInfoTest.java index 95080e9ce8f..8464bfe2cf2 100644 --- a/storm-client/test/jvm/org/apache/storm/nimbus/NimbusInfoTest.java +++ b/storm-client/test/jvm/org/apache/storm/nimbus/NimbusInfoTest.java @@ -12,12 +12,12 @@ package org.apache.storm.nimbus; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Test; + class NimbusInfoTest { @Test @@ -55,4 +55,4 @@ void parseInvalidTlsPort() { actualMessage = exception.getMessage(); assertTrue(actualMessage.contains(expectedMessage)); } -} \ No newline at end of file +} diff --git a/storm-client/test/jvm/org/apache/storm/security/auth/AutoSSLTest.java b/storm-client/test/jvm/org/apache/storm/security/auth/AutoSSLTest.java index d5035490862..595963ec553 100644 --- a/storm-client/test/jvm/org/apache/storm/security/auth/AutoSSLTest.java +++ b/storm-client/test/jvm/org/apache/storm/security/auth/AutoSSLTest.java @@ -12,6 +12,11 @@ package org.apache.storm.security.auth; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -30,11 +35,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class AutoSSLTest { final static Logger LOG = LoggerFactory.getLogger(AutoSSLTest.class); diff --git a/storm-client/test/jvm/org/apache/storm/security/auth/ClientAuthUtilsTest.java b/storm-client/test/jvm/org/apache/storm/security/auth/ClientAuthUtilsTest.java index 6854ecbd35a..b2886b7efbe 100644 --- a/storm-client/test/jvm/org/apache/storm/security/auth/ClientAuthUtilsTest.java +++ b/storm-client/test/jvm/org/apache/storm/security/auth/ClientAuthUtilsTest.java @@ -18,6 +18,13 @@ package org.apache.storm.security.auth; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; import java.io.IOException; import java.util.Arrays; @@ -33,13 +40,6 @@ import org.junit.jupiter.api.io.TempDir; import org.mockito.Mockito; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.assertThrows; - public class ClientAuthUtilsTest { // JUnit ensures that the temporary folder is removed after diff --git a/storm-client/test/jvm/org/apache/storm/security/auth/MultiThriftServerTest.java b/storm-client/test/jvm/org/apache/storm/security/auth/MultiThriftServerTest.java index c96e532e633..10ad21c1ca2 100644 --- a/storm-client/test/jvm/org/apache/storm/security/auth/MultiThriftServerTest.java +++ b/storm-client/test/jvm/org/apache/storm/security/auth/MultiThriftServerTest.java @@ -12,12 +12,13 @@ package org.apache.storm.security.auth; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.*; + import java.util.*; import org.apache.storm.*; import org.apache.storm.generated.Nimbus; import org.junit.jupiter.api.*; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.*; public class MultiThriftServerTest { diff --git a/storm-client/test/jvm/org/apache/storm/security/auth/ReqContextTest.java b/storm-client/test/jvm/org/apache/storm/security/auth/ReqContextTest.java index bdb97af86f9..d2714742c69 100644 --- a/storm-client/test/jvm/org/apache/storm/security/auth/ReqContextTest.java +++ b/storm-client/test/jvm/org/apache/storm/security/auth/ReqContextTest.java @@ -12,6 +12,11 @@ package org.apache.storm.security.auth; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + import java.net.InetAddress; import java.net.UnknownHostException; import java.security.Principal; @@ -22,11 +27,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; - public class ReqContextTest { private ReqContext rc; diff --git a/storm-client/test/jvm/org/apache/storm/security/auth/SaslTransportPluginTest.java b/storm-client/test/jvm/org/apache/storm/security/auth/SaslTransportPluginTest.java index 8f8039b2943..adafd922e8e 100644 --- a/storm-client/test/jvm/org/apache/storm/security/auth/SaslTransportPluginTest.java +++ b/storm-client/test/jvm/org/apache/storm/security/auth/SaslTransportPluginTest.java @@ -12,13 +12,13 @@ package org.apache.storm.security.auth; -import org.apache.storm.security.auth.sasl.SaslTransportPlugin; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.apache.storm.security.auth.sasl.SaslTransportPlugin; +import org.junit.jupiter.api.Test; + public class SaslTransportPluginTest { @Test diff --git a/storm-client/test/jvm/org/apache/storm/security/auth/ShellBasedGroupsMappingTest.java b/storm-client/test/jvm/org/apache/storm/security/auth/ShellBasedGroupsMappingTest.java index 60920b0a958..a4acfd451b7 100644 --- a/storm-client/test/jvm/org/apache/storm/security/auth/ShellBasedGroupsMappingTest.java +++ b/storm-client/test/jvm/org/apache/storm/security/auth/ShellBasedGroupsMappingTest.java @@ -16,27 +16,27 @@ package org.apache.storm.security.auth; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import java.util.HashMap; import java.util.Map; import java.util.Set; import org.apache.storm.Config; import org.apache.storm.utils.ShellCommandRunner; import org.apache.storm.utils.ShellUtils; -import org.apache.storm.utils.Time; import org.apache.storm.utils.Time.SimulatedTime; +import org.apache.storm.utils.Time; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.contains; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - public class ShellBasedGroupsMappingTest { private static final String TEST_TWO_GROUPS = "group1 group2"; diff --git a/storm-client/test/jvm/org/apache/storm/security/auth/SubjectCompatTest.java b/storm-client/test/jvm/org/apache/storm/security/auth/SubjectCompatTest.java index f938eab4d09..26e0b43304f 100644 --- a/storm-client/test/jvm/org/apache/storm/security/auth/SubjectCompatTest.java +++ b/storm-client/test/jvm/org/apache/storm/security/auth/SubjectCompatTest.java @@ -12,15 +12,15 @@ package org.apache.storm.security.auth; -import java.io.IOException; -import javax.security.auth.Subject; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows; +import java.io.IOException; +import javax.security.auth.Subject; +import org.junit.jupiter.api.Test; + class SubjectCompatTest { @Test diff --git a/storm-client/test/jvm/org/apache/storm/security/auth/ThriftClientTest.java b/storm-client/test/jvm/org/apache/storm/security/auth/ThriftClientTest.java index 7c386ac6c46..daf5e361ddd 100644 --- a/storm-client/test/jvm/org/apache/storm/security/auth/ThriftClientTest.java +++ b/storm-client/test/jvm/org/apache/storm/security/auth/ThriftClientTest.java @@ -12,6 +12,9 @@ package org.apache.storm.security.auth; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.Map; import org.apache.storm.Config; import org.apache.storm.thrift.transport.TTransportException; @@ -19,9 +22,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class ThriftClientTest { private final int NIMBUS_TIMEOUT = 3 * 1000; diff --git a/storm-client/test/jvm/org/apache/storm/security/auth/TlsTransportPluginTest.java b/storm-client/test/jvm/org/apache/storm/security/auth/TlsTransportPluginTest.java index 5e66be3f643..7568f34758f 100644 --- a/storm-client/test/jvm/org/apache/storm/security/auth/TlsTransportPluginTest.java +++ b/storm-client/test/jvm/org/apache/storm/security/auth/TlsTransportPluginTest.java @@ -13,6 +13,12 @@ package org.apache.storm.security.auth; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.mockito.Mockito.mock; + import java.io.IOException; import java.io.InputStream; import java.net.InetAddress; @@ -34,13 +40,8 @@ import org.apache.storm.security.auth.tls.ReloadableTsslTransportFactory; import org.apache.storm.security.auth.tls.TlsTransportPlugin; import org.apache.storm.thrift.transport.TServerSocket; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.mockito.Mockito.mock; class TlsTransportPluginTest { static private final Map conf = new HashMap<>(); @@ -146,4 +147,4 @@ void testClientAuthRequiredRejectsUnauthenticatedClient() throws Exception { serverTransport.close(); } } -} \ No newline at end of file +} diff --git a/storm-client/test/jvm/org/apache/storm/security/auth/X509CertPrincipalToLocalTest.java b/storm-client/test/jvm/org/apache/storm/security/auth/X509CertPrincipalToLocalTest.java index 8ee550cf854..e95c0f786ce 100644 --- a/storm-client/test/jvm/org/apache/storm/security/auth/X509CertPrincipalToLocalTest.java +++ b/storm-client/test/jvm/org/apache/storm/security/auth/X509CertPrincipalToLocalTest.java @@ -12,16 +12,14 @@ package org.apache.storm.security.auth; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; + import java.security.AccessControlException; import java.util.HashMap; - import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.fail; - public class X509CertPrincipalToLocalTest { private static X509CertPrincipalToLocal x509CertPrincipalToLocal; @BeforeAll diff --git a/storm-client/test/jvm/org/apache/storm/security/auth/authorizer/DRPCSimpleACLAuthorizerTest.java b/storm-client/test/jvm/org/apache/storm/security/auth/authorizer/DRPCSimpleACLAuthorizerTest.java index f439fd5cb86..065c8b7b497 100644 --- a/storm-client/test/jvm/org/apache/storm/security/auth/authorizer/DRPCSimpleACLAuthorizerTest.java +++ b/storm-client/test/jvm/org/apache/storm/security/auth/authorizer/DRPCSimpleACLAuthorizerTest.java @@ -12,6 +12,11 @@ package org.apache.storm.security.auth.authorizer; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; @@ -29,11 +34,6 @@ import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class DRPCSimpleACLAuthorizerTest { private static final String function = "jump"; diff --git a/storm-client/test/jvm/org/apache/storm/security/auth/authorizer/SimpleACLAuthorizerTest.java b/storm-client/test/jvm/org/apache/storm/security/auth/authorizer/SimpleACLAuthorizerTest.java index 7d67b034c77..da2271b2242 100644 --- a/storm-client/test/jvm/org/apache/storm/security/auth/authorizer/SimpleACLAuthorizerTest.java +++ b/storm-client/test/jvm/org/apache/storm/security/auth/authorizer/SimpleACLAuthorizerTest.java @@ -12,16 +12,9 @@ package org.apache.storm.security.auth.authorizer; -import org.apache.storm.Config; -import org.apache.storm.security.auth.IAuthorizer; -import org.apache.storm.security.auth.IGroupMappingServiceProvider; -import org.apache.storm.security.auth.ReqContext; -import org.apache.storm.utils.ConfigUtils; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledOnOs; -import org.junit.jupiter.api.condition.OS; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.security.auth.Subject; import java.security.Principal; import java.util.Collection; import java.util.Collections; @@ -29,9 +22,15 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; - -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import javax.security.auth.Subject; +import org.apache.storm.Config; +import org.apache.storm.security.auth.IAuthorizer; +import org.apache.storm.security.auth.IGroupMappingServiceProvider; +import org.apache.storm.security.auth.ReqContext; +import org.apache.storm.utils.ConfigUtils; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; public class SimpleACLAuthorizerTest { @@ -474,7 +473,7 @@ public static class SimpleACLTopologyReadOnlyGroupAuthTestMock implements IGroup @Override public void prepare(Map conf) { - //Ignored + //Ignored } @Override @@ -486,4 +485,4 @@ public Set getGroups(String user) { } } } -} \ No newline at end of file +} diff --git a/storm-client/test/jvm/org/apache/storm/security/auth/authorizer/SupervisorSimpleACLAuthorizerTest.java b/storm-client/test/jvm/org/apache/storm/security/auth/authorizer/SupervisorSimpleACLAuthorizerTest.java index 058727b44fa..3f94395d3f5 100644 --- a/storm-client/test/jvm/org/apache/storm/security/auth/authorizer/SupervisorSimpleACLAuthorizerTest.java +++ b/storm-client/test/jvm/org/apache/storm/security/auth/authorizer/SupervisorSimpleACLAuthorizerTest.java @@ -12,6 +12,9 @@ package org.apache.storm.security.auth.authorizer; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.security.Principal; import java.util.Collections; import java.util.HashMap; @@ -27,9 +30,6 @@ import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class SupervisorSimpleACLAuthorizerTest { @Test diff --git a/storm-client/test/jvm/org/apache/storm/security/auth/kerberos/AutoLoginModuleTest.java b/storm-client/test/jvm/org/apache/storm/security/auth/kerberos/AutoLoginModuleTest.java index 1f570a378ec..417c296e2fa 100644 --- a/storm-client/test/jvm/org/apache/storm/security/auth/kerberos/AutoLoginModuleTest.java +++ b/storm-client/test/jvm/org/apache/storm/security/auth/kerberos/AutoLoginModuleTest.java @@ -16,25 +16,24 @@ package org.apache.storm.security.auth.kerberos; -import org.apache.storm.security.auth.kerberos.AutoTGTKrb5LoginModule; -import org.apache.storm.security.auth.kerberos.AutoTGTKrb5LoginModuleTest; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.mockito.Mockito; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.security.auth.Subject; -import javax.security.auth.kerberos.KerberosPrincipal; -import javax.security.auth.kerberos.KerberosTicket; -import javax.security.auth.login.LoginException; import java.net.InetAddress; import java.security.Principal; import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.Collections; import java.util.Date; - -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import javax.security.auth.Subject; +import javax.security.auth.kerberos.KerberosPrincipal; +import javax.security.auth.kerberos.KerberosTicket; +import javax.security.auth.login.LoginException; +import org.apache.storm.security.auth.kerberos.AutoTGTKrb5LoginModule; +import org.apache.storm.security.auth.kerberos.AutoTGTKrb5LoginModuleTest; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; public class AutoLoginModuleTest { diff --git a/storm-client/test/jvm/org/apache/storm/security/serialization/BlowfishTupleSerializerTest.java b/storm-client/test/jvm/org/apache/storm/security/serialization/BlowfishTupleSerializerTest.java index 8ab530f0d98..0eeceaafca0 100644 --- a/storm-client/test/jvm/org/apache/storm/security/serialization/BlowfishTupleSerializerTest.java +++ b/storm-client/test/jvm/org/apache/storm/security/serialization/BlowfishTupleSerializerTest.java @@ -12,6 +12,9 @@ package org.apache.storm.security.serialization; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; @@ -24,9 +27,6 @@ import org.apache.storm.utils.ListDelegate; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; - public class BlowfishTupleSerializerTest { /** diff --git a/storm-client/test/jvm/org/apache/storm/serialization/GzipBridgeThriftSerializationDelegateTest.java b/storm-client/test/jvm/org/apache/storm/serialization/GzipBridgeThriftSerializationDelegateTest.java index 47c9147d54c..7ee45dca530 100644 --- a/storm-client/test/jvm/org/apache/storm/serialization/GzipBridgeThriftSerializationDelegateTest.java +++ b/storm-client/test/jvm/org/apache/storm/serialization/GzipBridgeThriftSerializationDelegateTest.java @@ -12,13 +12,13 @@ package org.apache.storm.serialization; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.Collections; import org.apache.storm.generated.GlobalStreamId; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - public class GzipBridgeThriftSerializationDelegateTest { SerializationDelegate testDelegate; diff --git a/storm-client/test/jvm/org/apache/storm/serialization/KryoTupleSerializerDeserializerTest.java b/storm-client/test/jvm/org/apache/storm/serialization/KryoTupleSerializerDeserializerTest.java index bbd03697075..b4a5c81945a 100644 --- a/storm-client/test/jvm/org/apache/storm/serialization/KryoTupleSerializerDeserializerTest.java +++ b/storm-client/test/jvm/org/apache/storm/serialization/KryoTupleSerializerDeserializerTest.java @@ -12,6 +12,16 @@ package org.apache.storm.serialization; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.mockStatic; +import static org.mockito.Mockito.when; + import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -33,16 +43,6 @@ import org.junit.jupiter.api.Test; import org.mockito.MockedStatic; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.mockStatic; -import static org.mockito.Mockito.when; - /** * Unit tests for {@link KryoTupleSerializer} and {@link KryoTupleDeserializer}, covering the compressed and * uncompressed code paths, round-trip fidelity, mixing both encodings through a single (de)serializer instance, diff --git a/storm-client/test/jvm/org/apache/storm/serialization/SerializationFactoryTest.java b/storm-client/test/jvm/org/apache/storm/serialization/SerializationFactoryTest.java index d7e7bfcd43b..0736bcea96b 100644 --- a/storm-client/test/jvm/org/apache/storm/serialization/SerializationFactoryTest.java +++ b/storm-client/test/jvm/org/apache/storm/serialization/SerializationFactoryTest.java @@ -12,6 +12,9 @@ package org.apache.storm.serialization; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + import com.esotericsoftware.kryo.Kryo; import java.util.Map; import org.apache.storm.Config; @@ -20,9 +23,6 @@ import org.apache.storm.utils.Utils; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; - public class SerializationFactoryTest { @Test diff --git a/storm-client/test/jvm/org/apache/storm/serialization/ThriftBridgeSerializationDelegateTest.java b/storm-client/test/jvm/org/apache/storm/serialization/ThriftBridgeSerializationDelegateTest.java index f986ccc42c3..9346c040c82 100644 --- a/storm-client/test/jvm/org/apache/storm/serialization/ThriftBridgeSerializationDelegateTest.java +++ b/storm-client/test/jvm/org/apache/storm/serialization/ThriftBridgeSerializationDelegateTest.java @@ -12,12 +12,12 @@ package org.apache.storm.serialization; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.storm.generated.ErrorInfo; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - public class ThriftBridgeSerializationDelegateTest { diff --git a/storm-client/test/jvm/org/apache/storm/spout/CheckpointSpoutTest.java b/storm-client/test/jvm/org/apache/storm/spout/CheckpointSpoutTest.java index b3e77c756e0..b9a6fd878da 100644 --- a/storm-client/test/jvm/org/apache/storm/spout/CheckpointSpoutTest.java +++ b/storm-client/test/jvm/org/apache/storm/spout/CheckpointSpoutTest.java @@ -12,6 +12,10 @@ package org.apache.storm.spout; +import static org.apache.storm.spout.CheckPointState.Action; +import static org.apache.storm.spout.CheckPointState.State.COMMITTED; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.HashMap; import java.util.Map; import org.apache.storm.Config; @@ -25,10 +29,6 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mockito; -import static org.apache.storm.spout.CheckPointState.Action; -import static org.apache.storm.spout.CheckPointState.State.COMMITTED; -import static org.junit.jupiter.api.Assertions.assertEquals; - /** * Unit test for {@link CheckpointSpout} */ diff --git a/storm-client/test/jvm/org/apache/storm/state/BaseBinaryStateIteratorTest.java b/storm-client/test/jvm/org/apache/storm/state/BaseBinaryStateIteratorTest.java index d9b82958cb9..8a0e38c6fed 100644 --- a/storm-client/test/jvm/org/apache/storm/state/BaseBinaryStateIteratorTest.java +++ b/storm-client/test/jvm/org/apache/storm/state/BaseBinaryStateIteratorTest.java @@ -12,6 +12,10 @@ package org.apache.storm.state; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.Arrays; import java.util.Iterator; import java.util.Map; @@ -21,10 +25,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - /** * Unit tests for {@link BaseBinaryStateIterator}. */ diff --git a/storm-client/test/jvm/org/apache/storm/state/DefaultStateSerializerTest.java b/storm-client/test/jvm/org/apache/storm/state/DefaultStateSerializerTest.java index 15718b2d4d6..04d041a5ae1 100644 --- a/storm-client/test/jvm/org/apache/storm/state/DefaultStateSerializerTest.java +++ b/storm-client/test/jvm/org/apache/storm/state/DefaultStateSerializerTest.java @@ -18,6 +18,11 @@ package org.apache.storm.state; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; + import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.io.Output; import com.esotericsoftware.kryo.util.DefaultInstantiatorStrategy; @@ -31,11 +36,6 @@ import org.junit.jupiter.api.Test; import org.objenesis.strategy.StdInstantiatorStrategy; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertThrows; - /** * Unit tests for {@link DefaultStateSerializer} */ diff --git a/storm-client/test/jvm/org/apache/storm/state/InMemoryKeyValueStateTest.java b/storm-client/test/jvm/org/apache/storm/state/InMemoryKeyValueStateTest.java index ed4b7045354..370c5bf59ac 100644 --- a/storm-client/test/jvm/org/apache/storm/state/InMemoryKeyValueStateTest.java +++ b/storm-client/test/jvm/org/apache/storm/state/InMemoryKeyValueStateTest.java @@ -12,13 +12,13 @@ package org.apache.storm.state; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + /** * Unit tests for {@link InMemoryKeyValueState} */ diff --git a/storm-client/test/jvm/org/apache/storm/streams/ProcessorBoltTest.java b/storm-client/test/jvm/org/apache/storm/streams/ProcessorBoltTest.java index 8cd97e71f4a..982d4e7b10b 100644 --- a/storm-client/test/jvm/org/apache/storm/streams/ProcessorBoltTest.java +++ b/storm-client/test/jvm/org/apache/storm/streams/ProcessorBoltTest.java @@ -12,6 +12,9 @@ package org.apache.storm.streams; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -36,9 +39,6 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mockito; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertEquals; - /** * Unit tests for {@link ProcessorBolt} */ diff --git a/storm-client/test/jvm/org/apache/storm/streams/StatefulProcessorBoltTest.java b/storm-client/test/jvm/org/apache/storm/streams/StatefulProcessorBoltTest.java index 2dd14cc6ca6..44673a62d6d 100644 --- a/storm-client/test/jvm/org/apache/storm/streams/StatefulProcessorBoltTest.java +++ b/storm-client/test/jvm/org/apache/storm/streams/StatefulProcessorBoltTest.java @@ -12,6 +12,9 @@ package org.apache.storm.streams; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -32,9 +35,6 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mockito; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertEquals; - /** * Unit tests for {@link StatefulProcessorBolt} */ diff --git a/storm-client/test/jvm/org/apache/storm/streams/StreamBuilderTest.java b/storm-client/test/jvm/org/apache/storm/streams/StreamBuilderTest.java index dc109661c81..827a70c4720 100644 --- a/storm-client/test/jvm/org/apache/storm/streams/StreamBuilderTest.java +++ b/storm-client/test/jvm/org/apache/storm/streams/StreamBuilderTest.java @@ -12,6 +12,10 @@ package org.apache.storm.streams; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -42,10 +46,6 @@ import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - /** * Unit tests for {@link StreamBuilder} */ diff --git a/storm-client/test/jvm/org/apache/storm/streams/WindowedProcessorBoltTest.java b/storm-client/test/jvm/org/apache/storm/streams/WindowedProcessorBoltTest.java index efc76e021f7..853e971d470 100644 --- a/storm-client/test/jvm/org/apache/storm/streams/WindowedProcessorBoltTest.java +++ b/storm-client/test/jvm/org/apache/storm/streams/WindowedProcessorBoltTest.java @@ -12,6 +12,8 @@ package org.apache.storm.streams; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.Arrays; import java.util.Collections; import java.util.HashMap; @@ -35,8 +37,6 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mockito; -import static org.junit.jupiter.api.Assertions.assertEquals; - /** * Unit test for {@link WindowedProcessorBolt} */ diff --git a/storm-client/test/jvm/org/apache/storm/streams/processors/CoGroupByKeyProcessorTest.java b/storm-client/test/jvm/org/apache/storm/streams/processors/CoGroupByKeyProcessorTest.java index 9e6fd276aee..55e68025efc 100644 --- a/storm-client/test/jvm/org/apache/storm/streams/processors/CoGroupByKeyProcessorTest.java +++ b/storm-client/test/jvm/org/apache/storm/streams/processors/CoGroupByKeyProcessorTest.java @@ -12,6 +12,8 @@ package org.apache.storm.streams.processors; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -20,8 +22,6 @@ import org.apache.storm.streams.Pair; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - public class CoGroupByKeyProcessorTest { private CoGroupByKeyProcessor coGroupByKeyProcessor; private final String firstStream = "first"; diff --git a/storm-client/test/jvm/org/apache/storm/streams/processors/JoinProcessorTest.java b/storm-client/test/jvm/org/apache/storm/streams/processors/JoinProcessorTest.java index 436461a83be..acdc3721ccd 100644 --- a/storm-client/test/jvm/org/apache/storm/streams/processors/JoinProcessorTest.java +++ b/storm-client/test/jvm/org/apache/storm/streams/processors/JoinProcessorTest.java @@ -12,6 +12,8 @@ package org.apache.storm.streams.processors; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -20,8 +22,6 @@ import org.apache.storm.streams.operations.PairValueJoiner; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - public class JoinProcessorTest { JoinProcessor, Integer, Integer> joinProcessor; String leftStream = "left"; diff --git a/storm-client/test/jvm/org/apache/storm/topology/PersistentWindowedBoltExecutorTest.java b/storm-client/test/jvm/org/apache/storm/topology/PersistentWindowedBoltExecutorTest.java index 7343ac98408..473fe774473 100644 --- a/storm-client/test/jvm/org/apache/storm/topology/PersistentWindowedBoltExecutorTest.java +++ b/storm-client/test/jvm/org/apache/storm/topology/PersistentWindowedBoltExecutorTest.java @@ -12,6 +12,12 @@ package org.apache.storm.topology; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.contains; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.AdditionalAnswers.returnsArgAt; + import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -48,12 +54,6 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.stubbing.Answer; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.contains; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.AdditionalAnswers.returnsArgAt; - /** * Unit tests for {@link PersistentWindowedBoltExecutor} */ @@ -282,4 +282,4 @@ private List getMockTuples(long count) { } return tuples; } -} \ No newline at end of file +} diff --git a/storm-client/test/jvm/org/apache/storm/topology/SimpleWindowPartitionCacheTest.java b/storm-client/test/jvm/org/apache/storm/topology/SimpleWindowPartitionCacheTest.java index 52523c2cd0b..95f9b905b3c 100644 --- a/storm-client/test/jvm/org/apache/storm/topology/SimpleWindowPartitionCacheTest.java +++ b/storm-client/test/jvm/org/apache/storm/topology/SimpleWindowPartitionCacheTest.java @@ -12,6 +12,11 @@ package org.apache.storm.topology; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -23,11 +28,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - /** * Unit tests for {@link SimpleWindowPartitionCache} */ @@ -221,4 +221,4 @@ public void testEviction() { cache.get(2); assertEquals(Collections.singletonList(0), removed); } -} \ No newline at end of file +} diff --git a/storm-client/test/jvm/org/apache/storm/topology/StatefulBoltExecutorTest.java b/storm-client/test/jvm/org/apache/storm/topology/StatefulBoltExecutorTest.java index 1824828183d..8ce6b89700e 100644 --- a/storm-client/test/jvm/org/apache/storm/topology/StatefulBoltExecutorTest.java +++ b/storm-client/test/jvm/org/apache/storm/topology/StatefulBoltExecutorTest.java @@ -12,6 +12,14 @@ package org.apache.storm.topology; +import static org.apache.storm.spout.CheckPointState.Action.COMMIT; +import static org.apache.storm.spout.CheckPointState.Action.INITSTATE; +import static org.apache.storm.spout.CheckPointState.Action.PREPARE; +import static org.apache.storm.spout.CheckPointState.Action.ROLLBACK; +import static org.apache.storm.spout.CheckpointSpout.CHECKPOINT_FIELD_ACTION; +import static org.apache.storm.spout.CheckpointSpout.CHECKPOINT_FIELD_TXID; +import static org.mockito.Mockito.mock; + import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -26,14 +34,6 @@ import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import static org.apache.storm.spout.CheckPointState.Action.COMMIT; -import static org.apache.storm.spout.CheckPointState.Action.INITSTATE; -import static org.apache.storm.spout.CheckPointState.Action.PREPARE; -import static org.apache.storm.spout.CheckPointState.Action.ROLLBACK; -import static org.apache.storm.spout.CheckpointSpout.CHECKPOINT_FIELD_ACTION; -import static org.apache.storm.spout.CheckpointSpout.CHECKPOINT_FIELD_TXID; -import static org.mockito.Mockito.mock; - /** * Unit tests for {@link StatefulBoltExecutor} */ diff --git a/storm-client/test/jvm/org/apache/storm/topology/StatefulWindowedBoltExecutorTest.java b/storm-client/test/jvm/org/apache/storm/topology/StatefulWindowedBoltExecutorTest.java index 248658337ae..d313acbbc9d 100644 --- a/storm-client/test/jvm/org/apache/storm/topology/StatefulWindowedBoltExecutorTest.java +++ b/storm-client/test/jvm/org/apache/storm/topology/StatefulWindowedBoltExecutorTest.java @@ -12,6 +12,10 @@ package org.apache.storm.topology; +import static org.apache.storm.topology.StatefulWindowedBoltExecutor.TaskStream; +import static org.apache.storm.topology.StatefulWindowedBoltExecutor.WindowState; +import static org.junit.jupiter.api.Assertions.assertThrows; + import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -30,10 +34,6 @@ import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import static org.apache.storm.topology.StatefulWindowedBoltExecutor.TaskStream; -import static org.apache.storm.topology.StatefulWindowedBoltExecutor.WindowState; -import static org.junit.jupiter.api.Assertions.assertThrows; - /** * Unit tests for {@link StatefulWindowedBoltExecutor} */ diff --git a/storm-client/test/jvm/org/apache/storm/topology/TopologyBuilderTest.java b/storm-client/test/jvm/org/apache/storm/topology/TopologyBuilderTest.java index 68992704790..6d195036bd3 100644 --- a/storm-client/test/jvm/org/apache/storm/topology/TopologyBuilderTest.java +++ b/storm-client/test/jvm/org/apache/storm/topology/TopologyBuilderTest.java @@ -12,6 +12,11 @@ package org.apache.storm.topology; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.Mockito.mock; + import java.util.Map; import java.util.Set; import org.apache.storm.generated.GlobalStreamId; @@ -25,11 +30,6 @@ import org.apache.storm.tuple.Tuple; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.mockito.Mockito.mock; - public class TopologyBuilderTest { private final TopologyBuilder builder = new TopologyBuilder(); diff --git a/storm-client/test/jvm/org/apache/storm/topology/WindowedBoltExecutorTest.java b/storm-client/test/jvm/org/apache/storm/topology/WindowedBoltExecutorTest.java index 98c8be8de49..f78e1be9020 100644 --- a/storm-client/test/jvm/org/apache/storm/topology/WindowedBoltExecutorTest.java +++ b/storm-client/test/jvm/org/apache/storm/topology/WindowedBoltExecutorTest.java @@ -12,6 +12,15 @@ package org.apache.storm.topology; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -40,15 +49,6 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mockito; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.Is.is; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertInstanceOf; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; - /** * Unit tests for {@link WindowedBoltExecutor} */ diff --git a/storm-client/test/jvm/org/apache/storm/trident/TestTridentTopology.java b/storm-client/test/jvm/org/apache/storm/trident/TestTridentTopology.java index 866a76de893..8a0a6617461 100644 --- a/storm-client/test/jvm/org/apache/storm/trident/TestTridentTopology.java +++ b/storm-client/test/jvm/org/apache/storm/trident/TestTridentTopology.java @@ -12,6 +12,8 @@ package org.apache.storm.trident; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.Map; import java.util.Set; import org.apache.storm.generated.Bolt; @@ -25,8 +27,6 @@ import org.apache.storm.tuple.Values; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - public class TestTridentTopology { private StormTopology buildTopology() { diff --git a/storm-client/test/jvm/org/apache/storm/trident/TridentWindowingTest.java b/storm-client/test/jvm/org/apache/storm/trident/TridentWindowingTest.java index 84437dfc89d..c08fa3626f7 100644 --- a/storm-client/test/jvm/org/apache/storm/trident/TridentWindowingTest.java +++ b/storm-client/test/jvm/org/apache/storm/trident/TridentWindowingTest.java @@ -12,6 +12,9 @@ package org.apache.storm.trident; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.concurrent.TimeUnit; import org.apache.storm.topology.base.BaseWindowedBolt; import org.apache.storm.trident.windowing.InMemoryWindowsStore; @@ -26,9 +29,6 @@ import org.apache.storm.trident.windowing.strategy.WindowStrategy; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - /** * */ diff --git a/storm-client/test/jvm/org/apache/storm/tuple/DetachedTupleTest.java b/storm-client/test/jvm/org/apache/storm/tuple/DetachedTupleTest.java index 6d56f143142..9733f2ac0e0 100644 --- a/storm-client/test/jvm/org/apache/storm/tuple/DetachedTupleTest.java +++ b/storm-client/test/jvm/org/apache/storm/tuple/DetachedTupleTest.java @@ -12,6 +12,14 @@ package org.apache.storm.tuple; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -26,14 +34,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertInstanceOf; -import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - /** * Unit tests for {@link DetachedTuple}. */ diff --git a/storm-client/test/jvm/org/apache/storm/tuple/FieldsTest.java b/storm-client/test/jvm/org/apache/storm/tuple/FieldsTest.java index 37a46e3835d..7928e242e15 100644 --- a/storm-client/test/jvm/org/apache/storm/tuple/FieldsTest.java +++ b/storm-client/test/jvm/org/apache/storm/tuple/FieldsTest.java @@ -12,16 +12,16 @@ package org.apache.storm.tuple; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import org.junit.jupiter.api.Test; + public class FieldsTest { @Test diff --git a/storm-client/test/jvm/org/apache/storm/tuple/MessageIdTest.java b/storm-client/test/jvm/org/apache/storm/tuple/MessageIdTest.java index a8ef0559bd4..6daaced86c0 100644 --- a/storm-client/test/jvm/org/apache/storm/tuple/MessageIdTest.java +++ b/storm-client/test/jvm/org/apache/storm/tuple/MessageIdTest.java @@ -12,16 +12,16 @@ package org.apache.storm.tuple; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import java.util.HashSet; import java.util.Random; import java.util.Set; import org.apache.storm.utils.KeyStreamRandom; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; - public class MessageIdTest { private static final long LCG_MULTIPLIER = 0x5DEECE66DL; diff --git a/storm-client/test/jvm/org/apache/storm/utils/ConfigUtilsTest.java b/storm-client/test/jvm/org/apache/storm/utils/ConfigUtilsTest.java index 9897eb75b8b..d4b73bf346c 100644 --- a/storm-client/test/jvm/org/apache/storm/utils/ConfigUtilsTest.java +++ b/storm-client/test/jvm/org/apache/storm/utils/ConfigUtilsTest.java @@ -12,6 +12,12 @@ package org.apache.storm.utils; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.net.UnknownHostException; import java.util.Arrays; import java.util.Collections; @@ -22,12 +28,6 @@ import org.apache.storm.Config; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class ConfigUtilsTest { private Map mockMap(String key, Object value) { diff --git a/storm-client/test/jvm/org/apache/storm/utils/CuratorUtilsTest.java b/storm-client/test/jvm/org/apache/storm/utils/CuratorUtilsTest.java index 68f730fc6fe..3b7cfb55296 100644 --- a/storm-client/test/jvm/org/apache/storm/utils/CuratorUtilsTest.java +++ b/storm-client/test/jvm/org/apache/storm/utils/CuratorUtilsTest.java @@ -18,13 +18,16 @@ package org.apache.storm.utils; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.io.File; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; - import org.apache.curator.test.InstanceSpec; +import org.apache.curator.test.TestingServer; import org.apache.storm.Config; import org.apache.storm.cluster.DaemonType; import org.apache.storm.shade.org.apache.curator.ensemble.fixed.FixedEnsembleProvider; @@ -36,14 +39,9 @@ import org.apache.storm.shade.org.apache.zookeeper.client.ZKClientConfig; import org.apache.storm.shade.org.apache.zookeeper.common.ClientX509Util; import org.junit.jupiter.api.Test; -import org.apache.curator.test.TestingServer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertEquals; - public class CuratorUtilsTest { private static final Logger LOG = LoggerFactory.getLogger(CuratorUtilsTest.class); private static final int JUTE_MAXBUFFER = 400000000; @@ -229,10 +227,10 @@ private void validateSSLConfiguration(String keystoreLocation, String keystorePa @Test public void testTruststoreKeystoreConfiguration() { LOG.info("Entered to the testTruststoreKeystoreConfiguration test case."); - /* - By default the truststore/keystore configurations are not set, hence the values are null. - Validate that the null values are converted into empty strings by the class. - */ + /* + By default the truststore/keystore configurations are not set, hence the values are null. + Validate that the null values are converted into empty strings by the class. + */ Map conf = new HashMap<>(); CuratorUtils.SslConf zkSslConf = CuratorUtils.getSslConf(conf); diff --git a/storm-client/test/jvm/org/apache/storm/utils/DefaultShellLogHandlerTest.java b/storm-client/test/jvm/org/apache/storm/utils/DefaultShellLogHandlerTest.java index bae38507839..7929bfca9ed 100644 --- a/storm-client/test/jvm/org/apache/storm/utils/DefaultShellLogHandlerTest.java +++ b/storm-client/test/jvm/org/apache/storm/utils/DefaultShellLogHandlerTest.java @@ -12,16 +12,16 @@ package org.apache.storm.utils; -import org.apache.storm.multilang.ShellMsg; -import org.apache.storm.multilang.ShellMsg.ShellLogLevel; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import org.apache.storm.multilang.ShellMsg.ShellLogLevel; +import org.apache.storm.multilang.ShellMsg; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + public class DefaultShellLogHandlerTest { private DefaultShellLogHandler logHandler; @@ -98,4 +98,4 @@ public void handleLog_valid() { verify(msg).getMsg(); verify(process).getProcessInfoString(); } -} \ No newline at end of file +} diff --git a/storm-client/test/jvm/org/apache/storm/utils/JCQueueBackpressureTest.java b/storm-client/test/jvm/org/apache/storm/utils/JCQueueBackpressureTest.java index 6762382157c..126a5dbe5a4 100644 --- a/storm-client/test/jvm/org/apache/storm/utils/JCQueueBackpressureTest.java +++ b/storm-client/test/jvm/org/apache/storm/utils/JCQueueBackpressureTest.java @@ -12,16 +12,16 @@ package org.apache.storm.utils; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.Collections; import org.apache.storm.metrics2.StormMetricRegistry; import org.apache.storm.policy.WaitStrategyPark; import org.apache.storm.utils.JCQueue.Consumer; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class JCQueueBackpressureTest { private static JCQueue createQueue(String name, int queueSize) { diff --git a/storm-client/test/jvm/org/apache/storm/utils/ShellBoltMessageQueueTest.java b/storm-client/test/jvm/org/apache/storm/utils/ShellBoltMessageQueueTest.java index c8f0c525ffc..6281aa32546 100644 --- a/storm-client/test/jvm/org/apache/storm/utils/ShellBoltMessageQueueTest.java +++ b/storm-client/test/jvm/org/apache/storm/utils/ShellBoltMessageQueueTest.java @@ -12,6 +12,10 @@ package org.apache.storm.utils; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; @@ -19,10 +23,6 @@ import org.apache.storm.shade.com.google.common.collect.Lists; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class ShellBoltMessageQueueTest { @Test public void testPollTaskIdsFirst() throws InterruptedException { diff --git a/storm-client/test/jvm/org/apache/storm/utils/ShellUtilsTest.java b/storm-client/test/jvm/org/apache/storm/utils/ShellUtilsTest.java index 746bca2d8ed..5be8dfa87fe 100644 --- a/storm-client/test/jvm/org/apache/storm/utils/ShellUtilsTest.java +++ b/storm-client/test/jvm/org/apache/storm/utils/ShellUtilsTest.java @@ -12,6 +12,9 @@ package org.apache.storm.utils; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; + import java.util.HashMap; import java.util.Map; import org.apache.storm.Config; @@ -19,9 +22,6 @@ import org.apache.storm.task.TopologyContext; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.api.Assertions.assertThrows; - public class ShellUtilsTest { private Map configureLogHandler(String className) { @@ -94,4 +94,4 @@ public void setUpContext(Class owner, ShellProcess process, TopologyContext c public void log(ShellMsg msg) { } } -} \ No newline at end of file +} diff --git a/storm-client/test/jvm/org/apache/storm/utils/SimpleVersionTest.java b/storm-client/test/jvm/org/apache/storm/utils/SimpleVersionTest.java index 2949ff016fe..9668777afe5 100644 --- a/storm-client/test/jvm/org/apache/storm/utils/SimpleVersionTest.java +++ b/storm-client/test/jvm/org/apache/storm/utils/SimpleVersionTest.java @@ -19,10 +19,10 @@ package org.apache.storm.utils; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; + public class SimpleVersionTest { @Test @@ -67,4 +67,4 @@ public void testParseStorm0xSnapshot() { assertEquals(10, version.getMinor()); } -} \ No newline at end of file +} diff --git a/storm-client/test/jvm/org/apache/storm/utils/StormBoundedExponentialBackoffRetryTest.java b/storm-client/test/jvm/org/apache/storm/utils/StormBoundedExponentialBackoffRetryTest.java index 36dfacc8059..db805201312 100644 --- a/storm-client/test/jvm/org/apache/storm/utils/StormBoundedExponentialBackoffRetryTest.java +++ b/storm-client/test/jvm/org/apache/storm/utils/StormBoundedExponentialBackoffRetryTest.java @@ -12,12 +12,12 @@ package org.apache.storm.utils; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class StormBoundedExponentialBackoffRetryTest { private static final Logger LOG = LoggerFactory.getLogger(StormBoundedExponentialBackoffRetryTest.class); diff --git a/storm-client/test/jvm/org/apache/storm/utils/ThriftTopologyUtilsTest.java b/storm-client/test/jvm/org/apache/storm/utils/ThriftTopologyUtilsTest.java index 7181da984e9..b9012492f62 100644 --- a/storm-client/test/jvm/org/apache/storm/utils/ThriftTopologyUtilsTest.java +++ b/storm-client/test/jvm/org/apache/storm/utils/ThriftTopologyUtilsTest.java @@ -18,6 +18,10 @@ package org.apache.storm.utils; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.nio.ByteBuffer; import java.util.Set; import org.apache.storm.generated.Bolt; @@ -30,10 +34,6 @@ import org.apache.storm.shade.com.google.common.collect.ImmutableSet; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class ThriftTopologyUtilsTest { @Test public void testIsWorkerHook() { diff --git a/storm-client/test/jvm/org/apache/storm/utils/TimeTest.java b/storm-client/test/jvm/org/apache/storm/utils/TimeTest.java index eca418a3d11..ab6f0aad563 100644 --- a/storm-client/test/jvm/org/apache/storm/utils/TimeTest.java +++ b/storm-client/test/jvm/org/apache/storm/utils/TimeTest.java @@ -12,14 +12,14 @@ package org.apache.storm.utils; -import org.apache.storm.utils.Time.SimulatedTime; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.apache.storm.utils.Time.SimulatedTime; +import org.junit.jupiter.api.Test; + public class TimeTest { @Test diff --git a/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java b/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java index ed0c82cfe2c..38b7ddcf4c1 100644 --- a/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java +++ b/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java @@ -18,6 +18,9 @@ package org.apache.storm.utils; +import static org.apache.storm.utils.Utils.handleUncaughtException; +import static org.junit.jupiter.api.Assertions.*; + import java.io.IOException; import java.net.SocketException; import java.nio.charset.StandardCharsets; @@ -32,7 +35,6 @@ import java.util.Set; import java.util.concurrent.ThreadLocalRandom; import java.util.stream.Collectors; - import org.apache.storm.Config; import org.apache.storm.generated.StormTopology; import org.apache.storm.shade.com.google.common.collect.ImmutableList; @@ -48,9 +50,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.storm.utils.Utils.handleUncaughtException; -import static org.junit.jupiter.api.Assertions.*; - public class UtilsTest { public static final Logger LOG = LoggerFactory.getLogger(UtilsTest.class); diff --git a/storm-client/test/jvm/org/apache/storm/windowing/WaterMarkEventGeneratorTest.java b/storm-client/test/jvm/org/apache/storm/windowing/WaterMarkEventGeneratorTest.java index 5479ab8d6d5..b37c49d8ba4 100644 --- a/storm-client/test/jvm/org/apache/storm/windowing/WaterMarkEventGeneratorTest.java +++ b/storm-client/test/jvm/org/apache/storm/windowing/WaterMarkEventGeneratorTest.java @@ -12,6 +12,10 @@ package org.apache.storm.windowing; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; @@ -22,10 +26,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - /** * Unit tests for {@link WaterMarkEventGenerator} */ diff --git a/storm-client/test/jvm/org/apache/storm/windowing/WindowManagerTest.java b/storm-client/test/jvm/org/apache/storm/windowing/WindowManagerTest.java index 7d0cae96c7b..aa66b014384 100644 --- a/storm-client/test/jvm/org/apache/storm/windowing/WindowManagerTest.java +++ b/storm-client/test/jvm/org/apache/storm/windowing/WindowManagerTest.java @@ -12,6 +12,14 @@ package org.apache.storm.windowing; +import static org.apache.storm.topology.base.BaseWindowedBolt.Duration; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.empty; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -23,14 +31,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.apache.storm.topology.base.BaseWindowedBolt.Duration; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.empty; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - /** * Unit tests for {@link WindowManager} */ diff --git a/storm-client/test/jvm/org/apache/storm/windowing/persistence/WindowStateTest.java b/storm-client/test/jvm/org/apache/storm/windowing/persistence/WindowStateTest.java index 8f3e89c43a1..643d977c81a 100644 --- a/storm-client/test/jvm/org/apache/storm/windowing/persistence/WindowStateTest.java +++ b/storm-client/test/jvm/org/apache/storm/windowing/persistence/WindowStateTest.java @@ -12,6 +12,10 @@ package org.apache.storm.windowing.persistence; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.mockito.AdditionalAnswers.returnsArgAt; + import java.util.ArrayList; import java.util.Collections; import java.util.Deque; @@ -33,10 +37,6 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.stubbing.Answer; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.mockito.AdditionalAnswers.returnsArgAt; - /** * Unit tests for {@link WindowState} */ @@ -207,4 +207,4 @@ private WindowState getWindowState(int maxEvents) { return new WindowState<>(windowState, partitionIdsState, systemState, supplier, maxEvents); } -} \ No newline at end of file +} diff --git a/storm-core/pom.xml b/storm-core/pom.xml index 58aa2e770dc..11497f5c399 100644 --- a/storm-core/pom.xml +++ b/storm-core/pom.xml @@ -233,6 +233,11 @@ + + org.codehaus.gmavenplus + gmavenplus-plugin + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/storm-core/src/jvm/org/apache/storm/command/ShellSubmission.java b/storm-core/src/jvm/org/apache/storm/command/ShellSubmission.java index fcc29fca065..6f79b940aff 100644 --- a/storm-core/src/jvm/org/apache/storm/command/ShellSubmission.java +++ b/storm-core/src/jvm/org/apache/storm/command/ShellSubmission.java @@ -14,7 +14,6 @@ import java.util.Arrays; import java.util.Map; - import org.apache.commons.lang3.ArrayUtils; import org.apache.storm.StormSubmitter; import org.apache.storm.generated.NimbusSummary; @@ -43,4 +42,4 @@ public static void main(String[] args) throws Exception { ServerUtils.execCommand(newArgs); } } -} \ No newline at end of file +} diff --git a/storm-core/src/jvm/org/apache/storm/testing/MockLeaderElector.java b/storm-core/src/jvm/org/apache/storm/testing/MockLeaderElector.java index 2599b4eb5f9..2b1ab11ac5f 100644 --- a/storm-core/src/jvm/org/apache/storm/testing/MockLeaderElector.java +++ b/storm-core/src/jvm/org/apache/storm/testing/MockLeaderElector.java @@ -38,17 +38,17 @@ public MockLeaderElector(boolean isLeader, String host, int port) { @Override public void prepare(Map conf) { - //NOOP + //NOOP } @Override public void addToLeaderLockQueue() throws Exception { - //NOOP + //NOOP } @Override public void quitElectionFor(int delayMs) throws Exception { - //NOOP + //NOOP } @Override @@ -73,6 +73,6 @@ public List getAllNimbuses() throws Exception { @Override public void close() { - //NOOP + //NOOP } } diff --git a/storm-core/src/jvm/org/apache/storm/utils/TopologySpoutLag.java b/storm-core/src/jvm/org/apache/storm/utils/TopologySpoutLag.java index d9bbc92b7f1..b8ec9b46a7a 100644 --- a/storm-core/src/jvm/org/apache/storm/utils/TopologySpoutLag.java +++ b/storm-core/src/jvm/org/apache/storm/utils/TopologySpoutLag.java @@ -18,7 +18,6 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Strings; - import java.io.File; import java.io.FileOutputStream; import java.io.IOException; diff --git a/storm-core/test/jvm/org/apache/storm/SubmitterTest.java b/storm-core/test/jvm/org/apache/storm/SubmitterTest.java index 64b50383d0e..2d2ce8b3287 100644 --- a/storm-core/test/jvm/org/apache/storm/SubmitterTest.java +++ b/storm-core/test/jvm/org/apache/storm/SubmitterTest.java @@ -16,14 +16,13 @@ package org.apache.storm; -import org.apache.commons.lang3.StringUtils; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import java.util.HashMap; import java.util.Map; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; +import org.apache.commons.lang3.StringUtils; +import org.junit.jupiter.api.Test; public class SubmitterTest { diff --git a/storm-core/test/jvm/org/apache/storm/command/RebalanceTest.java b/storm-core/test/jvm/org/apache/storm/command/RebalanceTest.java index 3eb84ab7f97..2aa003fefb2 100644 --- a/storm-core/test/jvm/org/apache/storm/command/RebalanceTest.java +++ b/storm-core/test/jvm/org/apache/storm/command/RebalanceTest.java @@ -13,12 +13,12 @@ package org.apache.storm.command; -import java.util.Map; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; +import java.util.Map; +import org.junit.jupiter.api.Test; + public class RebalanceTest { @Test diff --git a/storm-core/test/jvm/org/apache/storm/command/SetLogLevelTest.java b/storm-core/test/jvm/org/apache/storm/command/SetLogLevelTest.java index 4c6c7effeb3..89bb3f4c674 100644 --- a/storm-core/test/jvm/org/apache/storm/command/SetLogLevelTest.java +++ b/storm-core/test/jvm/org/apache/storm/command/SetLogLevelTest.java @@ -12,14 +12,14 @@ package org.apache.storm.command; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + import java.util.Map; import org.apache.storm.generated.LogLevel; import org.apache.storm.generated.LogLevelAction; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; - public class SetLogLevelTest { @Test diff --git a/storm-core/test/jvm/org/apache/storm/command/TestCLI.java b/storm-core/test/jvm/org/apache/storm/command/TestCLI.java index 8521424d82c..acf953120d4 100644 --- a/storm-core/test/jvm/org/apache/storm/command/TestCLI.java +++ b/storm-core/test/jvm/org/apache/storm/command/TestCLI.java @@ -12,15 +12,15 @@ package org.apache.storm.command; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.fail; + import java.util.HashMap; import java.util.List; import java.util.Map; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.fail; - public class TestCLI { @Test diff --git a/storm-core/test/jvm/org/apache/storm/integration/TestingTest.java b/storm-core/test/jvm/org/apache/storm/integration/TestingTest.java index e96d3f35cc5..64f91dfb1ce 100644 --- a/storm-core/test/jvm/org/apache/storm/integration/TestingTest.java +++ b/storm-core/test/jvm/org/apache/storm/integration/TestingTest.java @@ -40,8 +40,8 @@ import org.apache.storm.tuple.Fields; import org.apache.storm.tuple.Tuple; import org.apache.storm.tuple.Values; -import org.apache.storm.utils.Time; import org.apache.storm.utils.Time.SimulatedTime; +import org.apache.storm.utils.Time; import org.apache.storm.utils.Utils; import org.junit.jupiter.api.Test; diff --git a/storm-core/test/jvm/org/apache/storm/integration/TopologyIntegrationTest.java b/storm-core/test/jvm/org/apache/storm/integration/TopologyIntegrationTest.java index 7926c1b7199..8dcb4277d93 100644 --- a/storm-core/test/jvm/org/apache/storm/integration/TopologyIntegrationTest.java +++ b/storm-core/test/jvm/org/apache/storm/integration/TopologyIntegrationTest.java @@ -36,7 +36,6 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import java.util.stream.Stream; - import org.apache.storm.Config; import org.apache.storm.LocalCluster; import org.apache.storm.Testing; diff --git a/storm-core/test/jvm/org/apache/storm/messaging/NettyIntegrationTest.java b/storm-core/test/jvm/org/apache/storm/messaging/NettyIntegrationTest.java index d581a81ccef..5c12eae118b 100644 --- a/storm-core/test/jvm/org/apache/storm/messaging/NettyIntegrationTest.java +++ b/storm-core/test/jvm/org/apache/storm/messaging/NettyIntegrationTest.java @@ -16,9 +16,17 @@ package org.apache.storm.messaging; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; import org.apache.storm.Config; -import org.apache.storm.LocalCluster; import org.apache.storm.LocalCluster.Builder; +import org.apache.storm.LocalCluster; import org.apache.storm.Testing; import org.apache.storm.generated.StormTopology; import org.apache.storm.testing.CompleteTopologyParam; @@ -31,15 +39,6 @@ import org.apache.storm.tuple.Values; import org.junit.jupiter.api.Test; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import static org.junit.jupiter.api.Assertions.assertEquals; - @IntegrationTest public class NettyIntegrationTest { diff --git a/storm-core/test/jvm/org/apache/storm/metric/MetricsIntegrationTest.java b/storm-core/test/jvm/org/apache/storm/metric/MetricsIntegrationTest.java index 7074d23960e..3ce8f823cfa 100644 --- a/storm-core/test/jvm/org/apache/storm/metric/MetricsIntegrationTest.java +++ b/storm-core/test/jvm/org/apache/storm/metric/MetricsIntegrationTest.java @@ -18,13 +18,14 @@ package org.apache.storm.metric; +import static org.junit.jupiter.api.Assertions.*; + import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; - import org.apache.storm.Config; import org.apache.storm.LocalCluster; import org.apache.storm.Testing; @@ -43,8 +44,6 @@ import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Integration tests for custom metrics with FakeMetricConsumer. * diff --git a/storm-core/test/jvm/org/apache/storm/nimbus/InMemoryTopologyActionNotifier.java b/storm-core/test/jvm/org/apache/storm/nimbus/InMemoryTopologyActionNotifier.java index 2328c751412..f2f38ba92be 100644 --- a/storm-core/test/jvm/org/apache/storm/nimbus/InMemoryTopologyActionNotifier.java +++ b/storm-core/test/jvm/org/apache/storm/nimbus/InMemoryTopologyActionNotifier.java @@ -26,7 +26,7 @@ public class InMemoryTopologyActionNotifier implements ITopologyActionNotifierPl @Override public void prepare(Map stormConf) { - //no-op + //no-op } @Override @@ -43,6 +43,6 @@ public List getTopologyActions(String topologyName) { @Override public void cleanup() { - //no-op + //no-op } } diff --git a/storm-core/test/jvm/org/apache/storm/serialization/SerializationTest.java b/storm-core/test/jvm/org/apache/storm/serialization/SerializationTest.java index 343588b957c..f5b99c6eb4e 100644 --- a/storm-core/test/jvm/org/apache/storm/serialization/SerializationTest.java +++ b/storm-core/test/jvm/org/apache/storm/serialization/SerializationTest.java @@ -18,6 +18,8 @@ package org.apache.storm.serialization; +import static org.junit.jupiter.api.Assertions.*; + import com.google.common.collect.Lists; import java.io.IOException; import java.util.HashMap; @@ -28,8 +30,6 @@ import org.apache.storm.utils.Utils; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - // FIXME: it should be moved to storm-client when serialization-test.clj can be removed public class SerializationTest { diff --git a/storm-core/test/jvm/org/apache/storm/stats/TestStatsUtil.java b/storm-core/test/jvm/org/apache/storm/stats/TestStatsUtil.java index 6973a302644..dbc73a532cf 100644 --- a/storm-core/test/jvm/org/apache/storm/stats/TestStatsUtil.java +++ b/storm-core/test/jvm/org/apache/storm/stats/TestStatsUtil.java @@ -12,13 +12,22 @@ package org.apache.storm.stats; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; - import org.apache.storm.cluster.IStormClusterState; import org.apache.storm.generated.ComponentAggregateStats; import org.apache.storm.generated.ComponentType; @@ -29,16 +38,6 @@ import org.apache.storm.scheduler.WorkerSlot; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - public class TestStatsUtil { /* diff --git a/storm-core/test/jvm/org/apache/storm/trident/StateTest.java b/storm-core/test/jvm/org/apache/storm/trident/StateTest.java index 68f615d2a24..49a9b9c5ee7 100644 --- a/storm-core/test/jvm/org/apache/storm/trident/StateTest.java +++ b/storm-core/test/jvm/org/apache/storm/trident/StateTest.java @@ -16,12 +16,17 @@ package org.apache.storm.trident; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; + +import java.util.Collections; +import java.util.List; import org.apache.storm.shade.org.apache.curator.framework.CuratorFramework; import org.apache.storm.shade.org.apache.curator.framework.api.CreateBuilder; import org.apache.storm.shade.org.apache.curator.framework.api.ProtectACLCreateModeStatPathAndBytesable; import org.apache.storm.shade.org.apache.zookeeper.CreateMode; -import org.apache.storm.shade.org.apache.zookeeper.data.ACL; import org.apache.storm.shade.org.apache.zookeeper.ZooDefs; +import org.apache.storm.shade.org.apache.zookeeper.data.ACL; import org.apache.storm.trident.operation.builtin.Count; import org.apache.storm.trident.state.CombinerValueUpdater; import org.apache.storm.trident.state.OpaqueValue; @@ -38,12 +43,6 @@ import org.mockito.ArgumentMatchers; import org.mockito.Mockito; -import java.util.Collections; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotEquals; - public class StateTest { private void singleRemove(MemoryMapState map, Object key){ diff --git a/storm-core/test/jvm/org/apache/storm/trident/TridentTupleViewTest.java b/storm-core/test/jvm/org/apache/storm/trident/TridentTupleViewTest.java index 21b02e64734..9dbd77005ba 100644 --- a/storm-core/test/jvm/org/apache/storm/trident/TridentTupleViewTest.java +++ b/storm-core/test/jvm/org/apache/storm/trident/TridentTupleViewTest.java @@ -24,14 +24,13 @@ import java.util.Arrays; import java.util.List; - import org.apache.storm.Testing; import org.apache.storm.trident.tuple.TridentTuple; -import org.apache.storm.trident.tuple.TridentTupleView; import org.apache.storm.trident.tuple.TridentTupleView.FreshOutputFactory; import org.apache.storm.trident.tuple.TridentTupleView.OperationOutputFactory; import org.apache.storm.trident.tuple.TridentTupleView.ProjectionFactory; import org.apache.storm.trident.tuple.TridentTupleView.RootFactory; +import org.apache.storm.trident.tuple.TridentTupleView; import org.apache.storm.tuple.Fields; import org.apache.storm.tuple.Tuple; import org.junit.jupiter.api.Test; diff --git a/storm-core/test/jvm/org/apache/storm/utils/TopologySpoutLagTest.java b/storm-core/test/jvm/org/apache/storm/utils/TopologySpoutLagTest.java index 86459687730..36aff9976cf 100644 --- a/storm-core/test/jvm/org/apache/storm/utils/TopologySpoutLagTest.java +++ b/storm-core/test/jvm/org/apache/storm/utils/TopologySpoutLagTest.java @@ -28,7 +28,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; - import org.junit.jupiter.api.Test; public class TopologySpoutLagTest { diff --git a/storm-core/test/jvm/org/apache/storm/utils/VersionedStoreTest.java b/storm-core/test/jvm/org/apache/storm/utils/VersionedStoreTest.java index d1252ed4a08..d4d43a99c05 100644 --- a/storm-core/test/jvm/org/apache/storm/utils/VersionedStoreTest.java +++ b/storm-core/test/jvm/org/apache/storm/utils/VersionedStoreTest.java @@ -22,7 +22,6 @@ import java.io.File; import java.io.IOException; - import org.apache.commons.io.FileUtils; import org.apache.storm.testing.TmpPath; import org.junit.jupiter.api.Test; diff --git a/storm-multilang/javascript/pom.xml b/storm-multilang/javascript/pom.xml index e64e80956b7..7f658de3b53 100644 --- a/storm-multilang/javascript/pom.xml +++ b/storm-multilang/javascript/pom.xml @@ -33,6 +33,11 @@ + + org.codehaus.gmavenplus + gmavenplus-plugin + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/storm-multilang/ruby/pom.xml b/storm-multilang/ruby/pom.xml index a662bba6084..f11932a8260 100644 --- a/storm-multilang/ruby/pom.xml +++ b/storm-multilang/ruby/pom.xml @@ -33,6 +33,11 @@ + + org.codehaus.gmavenplus + gmavenplus-plugin + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/storm-server/pom.xml b/storm-server/pom.xml index 057f9cc4764..8c068b44f14 100644 --- a/storm-server/pom.xml +++ b/storm-server/pom.xml @@ -198,6 +198,11 @@ ${project.build.directory}/test-reports + + org.codehaus.gmavenplus + gmavenplus-plugin + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/storm-server/src/main/java/org/apache/storm/LocalCluster.java b/storm-server/src/main/java/org/apache/storm/LocalCluster.java index 71ee890c6cc..0b42dc117df 100644 --- a/storm-server/src/main/java/org/apache/storm/LocalCluster.java +++ b/storm-server/src/main/java/org/apache/storm/LocalCluster.java @@ -45,8 +45,8 @@ import org.apache.storm.daemon.DaemonCommon; import org.apache.storm.daemon.Shutdownable; import org.apache.storm.daemon.StormCommon; -import org.apache.storm.daemon.nimbus.Nimbus; import org.apache.storm.daemon.nimbus.Nimbus.StandaloneINimbus; +import org.apache.storm.daemon.nimbus.Nimbus; import org.apache.storm.daemon.nimbus.TopoCache; import org.apache.storm.daemon.supervisor.ReadClusterState; import org.apache.storm.daemon.supervisor.StandaloneSupervisor; @@ -108,8 +108,8 @@ import org.apache.storm.utils.ObjectReader; import org.apache.storm.utils.RegisteredGlobalState; import org.apache.storm.utils.StormCommonInstaller; -import org.apache.storm.utils.Time; import org.apache.storm.utils.Time.SimulatedTime; +import org.apache.storm.utils.Time; import org.apache.storm.utils.Utils; import org.apache.storm.utils.WrappedAuthorizationException; import org.apache.storm.utils.WrappedKeyNotFoundException; @@ -972,12 +972,12 @@ public String beginFileUpload() throws AuthorizationException, TException { @Override public void uploadChunk(String location, ByteBuffer chunk) throws AuthorizationException, TException { - //Just throw it away in local mode + //Just throw it away in local mode } @Override public void finishFileUpload(String location) throws AuthorizationException, TException { - //Just throw it away in local mode + //Just throw it away in local mode } @Override diff --git a/storm-server/src/main/java/org/apache/storm/Testing.java b/storm-server/src/main/java/org/apache/storm/Testing.java index 45e585c440f..9e77f39a934 100644 --- a/storm-server/src/main/java/org/apache/storm/Testing.java +++ b/storm-server/src/main/java/org/apache/storm/Testing.java @@ -16,8 +16,8 @@ import java.util.Collection; import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Map.Entry; +import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; @@ -49,8 +49,8 @@ import org.apache.storm.tuple.TupleImpl; import org.apache.storm.utils.ConfigUtils; import org.apache.storm.utils.RegisteredGlobalState; -import org.apache.storm.utils.Time; import org.apache.storm.utils.Time.SimulatedTime; +import org.apache.storm.utils.Time; import org.apache.storm.utils.Utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/storm-server/src/main/java/org/apache/storm/blobstore/LocalFsBlobStore.java b/storm-server/src/main/java/org/apache/storm/blobstore/LocalFsBlobStore.java index 5ec0b2357a4..cd6b6b07b78 100644 --- a/storm-server/src/main/java/org/apache/storm/blobstore/LocalFsBlobStore.java +++ b/storm-server/src/main/java/org/apache/storm/blobstore/LocalFsBlobStore.java @@ -55,7 +55,6 @@ import org.apache.storm.utils.Utils; import org.apache.storm.utils.WrappedKeyAlreadyExistsException; import org.apache.storm.utils.WrappedKeyNotFoundException; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/storm-server/src/main/java/org/apache/storm/blobstore/LocalFsBlobStoreFile.java b/storm-server/src/main/java/org/apache/storm/blobstore/LocalFsBlobStoreFile.java index 128377f9811..555a97634ac 100644 --- a/storm-server/src/main/java/org/apache/storm/blobstore/LocalFsBlobStoreFile.java +++ b/storm-server/src/main/java/org/apache/storm/blobstore/LocalFsBlobStoreFile.java @@ -23,7 +23,6 @@ import java.util.regex.Matcher; import java.util.zip.CRC32C; import java.util.zip.Checksum; - import org.apache.commons.io.FileUtils; import org.apache.storm.generated.SettableBlobMeta; diff --git a/storm-server/src/main/java/org/apache/storm/container/DefaultResourceIsolationManager.java b/storm-server/src/main/java/org/apache/storm/container/DefaultResourceIsolationManager.java index c5a0466b4b6..7b6e631ad04 100644 --- a/storm-server/src/main/java/org/apache/storm/container/DefaultResourceIsolationManager.java +++ b/storm-server/src/main/java/org/apache/storm/container/DefaultResourceIsolationManager.java @@ -46,12 +46,12 @@ public void prepare(Map conf) throws IOException { @Override public void reserveResourcesForWorker(String workerId, Integer workerMemory, Integer workerCpu, String numaId) { - //NO OP + //NO OP } @Override public void cleanup(String user, String workerId, int port) throws IOException { - //NO OP + //NO OP } @Override diff --git a/storm-server/src/main/java/org/apache/storm/container/cgroup/CgroupManager.java b/storm-server/src/main/java/org/apache/storm/container/cgroup/CgroupManager.java index cf8b4edc8a8..2f603020516 100644 --- a/storm-server/src/main/java/org/apache/storm/container/cgroup/CgroupManager.java +++ b/storm-server/src/main/java/org/apache/storm/container/cgroup/CgroupManager.java @@ -26,7 +26,6 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; - import org.apache.commons.lang3.SystemUtils; import org.apache.storm.Config; import org.apache.storm.DaemonConfig; diff --git a/storm-server/src/main/java/org/apache/storm/container/oci/OciContainerExecutorConfig.java b/storm-server/src/main/java/org/apache/storm/container/oci/OciContainerExecutorConfig.java index fedb8365b72..a3b351dd647 100644 --- a/storm-server/src/main/java/org/apache/storm/container/oci/OciContainerExecutorConfig.java +++ b/storm-server/src/main/java/org/apache/storm/container/oci/OciContainerExecutorConfig.java @@ -21,7 +21,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonRawValue; - import java.util.List; import java.util.Map; @@ -1201,7 +1200,7 @@ public String getMemBwSchema() { @JsonInclude(JsonInclude.Include.NON_DEFAULT) static class Sysctl { - // for kernel params + // for kernel params } @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/storm-server/src/main/java/org/apache/storm/container/oci/OciContainerManager.java b/storm-server/src/main/java/org/apache/storm/container/oci/OciContainerManager.java index 4d5f4c5c1ea..e9904ba11b9 100644 --- a/storm-server/src/main/java/org/apache/storm/container/oci/OciContainerManager.java +++ b/storm-server/src/main/java/org/apache/storm/container/oci/OciContainerManager.java @@ -30,7 +30,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; - import org.apache.storm.Config; import org.apache.storm.DaemonConfig; import org.apache.storm.container.ResourceIsolationInterface; diff --git a/storm-server/src/main/java/org/apache/storm/container/oci/RuncLibContainerManager.java b/storm-server/src/main/java/org/apache/storm/container/oci/RuncLibContainerManager.java index 033f7542376..4a6aeff48f2 100644 --- a/storm-server/src/main/java/org/apache/storm/container/oci/RuncLibContainerManager.java +++ b/storm-server/src/main/java/org/apache/storm/container/oci/RuncLibContainerManager.java @@ -39,21 +39,19 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; - import net.minidev.json.JSONObject; import net.minidev.json.parser.JSONParser; import net.minidev.json.parser.ParseException; - import org.apache.commons.lang3.StringUtils; import org.apache.storm.DaemonConfig; import org.apache.storm.StormTimer; import org.apache.storm.container.cgroup.CgroupUtils; import org.apache.storm.container.cgroup.core.MemoryCore; import org.apache.storm.container.oci.OciContainerExecutorConfig.OciLayer; -import org.apache.storm.container.oci.OciContainerExecutorConfig.OciRuntimeConfig; import org.apache.storm.container.oci.OciContainerExecutorConfig.OciRuntimeConfig.OciLinuxConfig; import org.apache.storm.container.oci.OciContainerExecutorConfig.OciRuntimeConfig.OciMount; import org.apache.storm.container.oci.OciContainerExecutorConfig.OciRuntimeConfig.OciProcessConfig; +import org.apache.storm.container.oci.OciContainerExecutorConfig.OciRuntimeConfig; import org.apache.storm.daemon.supervisor.ClientSupervisorUtils; import org.apache.storm.daemon.supervisor.ExitCodeCallback; import org.apache.storm.utils.ConfigUtils; @@ -61,7 +59,6 @@ import org.apache.storm.utils.ReflectionUtils; import org.apache.storm.utils.ServerUtils; import org.apache.storm.utils.Utils; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.yaml.snakeyaml.DumperOptions; diff --git a/storm-server/src/main/java/org/apache/storm/daemon/drpc/DRPC.java b/storm-server/src/main/java/org/apache/storm/daemon/drpc/DRPC.java index df9ed364f46..a9e095c9187 100644 --- a/storm-server/src/main/java/org/apache/storm/daemon/drpc/DRPC.java +++ b/storm-server/src/main/java/org/apache/storm/daemon/drpc/DRPC.java @@ -21,8 +21,8 @@ import com.codahale.metrics.Meter; import java.security.Principal; import java.util.HashMap; -import java.util.Map; import java.util.Map.Entry; +import java.util.Map; import java.util.Timer; import java.util.TimerTask; import java.util.concurrent.ConcurrentHashMap; diff --git a/storm-server/src/main/java/org/apache/storm/daemon/metrics/reporters/ConsolePreparableReporter.java b/storm-server/src/main/java/org/apache/storm/daemon/metrics/reporters/ConsolePreparableReporter.java index 8b81128d1aa..2dff33c5e14 100644 --- a/storm-server/src/main/java/org/apache/storm/daemon/metrics/reporters/ConsolePreparableReporter.java +++ b/storm-server/src/main/java/org/apache/storm/daemon/metrics/reporters/ConsolePreparableReporter.java @@ -17,7 +17,6 @@ import java.util.Locale; import java.util.Map; import java.util.concurrent.TimeUnit; - import org.apache.storm.DaemonConfig; import org.apache.storm.daemon.metrics.MetricsUtils; import org.apache.storm.utils.ObjectReader; diff --git a/storm-server/src/main/java/org/apache/storm/daemon/metrics/reporters/CsvPreparableReporter.java b/storm-server/src/main/java/org/apache/storm/daemon/metrics/reporters/CsvPreparableReporter.java index a58ce19c8ff..4beaf4ad33a 100644 --- a/storm-server/src/main/java/org/apache/storm/daemon/metrics/reporters/CsvPreparableReporter.java +++ b/storm-server/src/main/java/org/apache/storm/daemon/metrics/reporters/CsvPreparableReporter.java @@ -18,7 +18,6 @@ import java.util.Locale; import java.util.Map; import java.util.concurrent.TimeUnit; - import org.apache.storm.DaemonConfig; import org.apache.storm.daemon.metrics.MetricsUtils; import org.apache.storm.utils.ObjectReader; diff --git a/storm-server/src/main/java/org/apache/storm/daemon/metrics/reporters/JmxPreparableReporter.java b/storm-server/src/main/java/org/apache/storm/daemon/metrics/reporters/JmxPreparableReporter.java index 718df7ee7ee..3336fe05e1f 100644 --- a/storm-server/src/main/java/org/apache/storm/daemon/metrics/reporters/JmxPreparableReporter.java +++ b/storm-server/src/main/java/org/apache/storm/daemon/metrics/reporters/JmxPreparableReporter.java @@ -14,7 +14,6 @@ import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.jmx.JmxReporter; - import java.util.Map; import java.util.concurrent.TimeUnit; import org.apache.storm.DaemonConfig; diff --git a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/HeartbeatCache.java b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/HeartbeatCache.java index 128b06da579..45b74a6d2ca 100644 --- a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/HeartbeatCache.java +++ b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/HeartbeatCache.java @@ -27,7 +27,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; - import org.apache.storm.generated.Assignment; import org.apache.storm.generated.ExecutorInfo; import org.apache.storm.generated.SupervisorWorkerHeartbeat; diff --git a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java index 1698a5ce855..473c0b5ec9e 100644 --- a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java +++ b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java @@ -26,7 +26,6 @@ import com.codahale.metrics.MetricSet; import com.codahale.metrics.SlidingTimeWindowReservoir; import com.codahale.metrics.Timer; - import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -51,8 +50,8 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Map.Entry; +import java.util.Map; import java.util.NavigableMap; import java.util.Set; import java.util.TreeSet; @@ -65,9 +64,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import javax.security.auth.Subject; - import net.minidev.json.JSONValue; - import org.apache.storm.Config; import org.apache.storm.Constants; import org.apache.storm.DaemonConfig; @@ -156,8 +153,8 @@ import org.apache.storm.metric.ClusterMetricsConsumerExecutor; import org.apache.storm.metric.StormMetricsRegistry; import org.apache.storm.metric.api.DataPoint; -import org.apache.storm.metric.api.IClusterMetricsConsumer; import org.apache.storm.metric.api.IClusterMetricsConsumer.ClusterInfo; +import org.apache.storm.metric.api.IClusterMetricsConsumer; import org.apache.storm.metricstore.AggLevel; import org.apache.storm.metricstore.Metric; import org.apache.storm.metricstore.MetricStore; @@ -224,8 +221,8 @@ import org.apache.storm.utils.Time; import org.apache.storm.utils.TimeCacheMap; import org.apache.storm.utils.TupleUtils; -import org.apache.storm.utils.Utils; import org.apache.storm.utils.Utils.UptimeComputer; +import org.apache.storm.utils.Utils; import org.apache.storm.utils.VersionInfo; import org.apache.storm.utils.WrappedAlreadyAliveException; import org.apache.storm.utils.WrappedAuthorizationException; @@ -1049,8 +1046,8 @@ private static Map tryReadTopoConf(String topoId, TopoCache tc) throws NotAliveException, AuthorizationException, IOException { try { return readTopoConfAsNimbus(topoId, tc); - //Was a try-cause but I looked at the code around this and key not found is not wrapped in runtime, - // so it is not needed + //Was a try-cause but I looked at the code around this and key not found is not wrapped in runtime, + // so it is not needed } catch (KeyNotFoundException e) { if (topoId == null) { throw new NullPointerException(); @@ -1478,7 +1475,7 @@ private static void setResourcesDefaultIfNotSet(Map conf) throws IOException { int port = ObjectReader.getInt(conf.get(Config.NIMBUS_THRIFT_PORT)); try (ServerSocket socket = new ServerSocket(port)) { - //Nothing + //Nothing } catch (BindException e) { LOG.error("{} is not available. Check if another process is already listening on {}", port, port); System.exit(0); @@ -5524,7 +5521,7 @@ public static class StandaloneINimbus implements INimbus { @Override public void prepare(Map topoConf, String schedulerLocalDir) { - //NOOP + //NOOP } @SuppressWarnings("unchecked") @@ -5543,7 +5540,7 @@ public Collection allSlotsAvailableForScheduling(Collection> newSlotsByTopologyId) { - //NOOP + //NOOP } @Override diff --git a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/TimedWritableByteChannel.java b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/TimedWritableByteChannel.java index e179477fb0d..0de49abe7ed 100644 --- a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/TimedWritableByteChannel.java +++ b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/TimedWritableByteChannel.java @@ -18,7 +18,6 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.WritableByteChannel; - import org.apache.storm.metric.timed.TimedResource; public class TimedWritableByteChannel extends TimedResource implements WritableByteChannel { diff --git a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/TopologyResources.java b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/TopologyResources.java index 0daa7c70c0a..eb246215ffd 100644 --- a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/TopologyResources.java +++ b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/TopologyResources.java @@ -15,7 +15,6 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; - import org.apache.storm.generated.Assignment; import org.apache.storm.generated.NodeInfo; import org.apache.storm.generated.WorkerResources; diff --git a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/BasicContainer.java b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/BasicContainer.java index 35ce6c56f7e..eff05ed46e2 100644 --- a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/BasicContainer.java +++ b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/BasicContainer.java @@ -31,8 +31,8 @@ import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; -import java.util.Map; import java.util.Map.Entry; +import java.util.Map; import java.util.NavigableMap; import org.apache.commons.lang3.StringUtils; import org.apache.storm.Config; diff --git a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Container.java b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Container.java index d45f1a639d1..02c2f81cb7e 100644 --- a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Container.java +++ b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Container.java @@ -32,7 +32,6 @@ import java.util.Optional; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; - import org.apache.commons.lang3.StringUtils; import org.apache.storm.Config; import org.apache.storm.DaemonConfig; diff --git a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/LocalContainer.java b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/LocalContainer.java index b74bbf95889..e589b0ff3f8 100644 --- a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/LocalContainer.java +++ b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/LocalContainer.java @@ -43,12 +43,12 @@ public LocalContainer(Map conf, String supervisorId, int supervi @Override protected void createArtifactsLink() { - //NOOP no need to create links in local mode + //NOOP no need to create links in local mode } @Override protected void createBlobstoreLinks() { - // NOOP no need to create links in local mode + // NOOP no need to create links in local mode } @Override diff --git a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/ReadClusterState.java b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/ReadClusterState.java index 0186230d075..01b1eccebeb 100644 --- a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/ReadClusterState.java +++ b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/ReadClusterState.java @@ -17,8 +17,8 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Map.Entry; +import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; diff --git a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Slot.java b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Slot.java index 27b8d7cc612..74a4e80646f 100644 --- a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Slot.java +++ b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Slot.java @@ -838,7 +838,7 @@ private static DynamicState handleRunning(DynamicState dynamicState, StaticState if (!action.topoId.equals(dynamicState.currentAssignment.get_topology_id())) { iter.remove(); LOG.warn("Dropping {} wrong topology is running", action); - //Not for this topology so skip it + //Not for this topology so skip it } else { if (modPending.contains(action)) { boolean isTimeForStop = Time.currentTimeMillis() > action.request.get_time_stamp(); diff --git a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Supervisor.java b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Supervisor.java index 50b1bba9f44..41f124907e1 100644 --- a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Supervisor.java +++ b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Supervisor.java @@ -19,7 +19,6 @@ package org.apache.storm.daemon.supervisor; import com.codahale.metrics.Meter; - import java.io.File; import java.io.IOException; import java.net.BindException; diff --git a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/SupervisorUtils.java b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/SupervisorUtils.java index 5948a5483c8..9dd0dfafc49 100644 --- a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/SupervisorUtils.java +++ b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/SupervisorUtils.java @@ -29,7 +29,6 @@ import java.util.List; import java.util.Map; import java.util.Set; - import org.apache.storm.DaemonConfig; import org.apache.storm.generated.LSWorkerHeartbeat; import org.apache.storm.localizer.LocalResource; diff --git a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/TimerDecoratedAssignment.java b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/TimerDecoratedAssignment.java index ad2e6bb6846..72c6325ea83 100644 --- a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/TimerDecoratedAssignment.java +++ b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/TimerDecoratedAssignment.java @@ -15,7 +15,6 @@ package org.apache.storm.daemon.supervisor; import com.codahale.metrics.Timer; - import org.apache.storm.generated.LocalAssignment; import org.apache.storm.metric.timed.TimerDecorated; diff --git a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/timer/SupervisorHeartbeat.java b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/timer/SupervisorHeartbeat.java index b613f36ee9a..01ee5bbbdb2 100644 --- a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/timer/SupervisorHeartbeat.java +++ b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/timer/SupervisorHeartbeat.java @@ -18,7 +18,6 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; - import org.apache.storm.Config; import org.apache.storm.DaemonConfig; import org.apache.storm.ServerConstants; diff --git a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/timer/SynchronizeAssignments.java b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/timer/SynchronizeAssignments.java index da7e676aa04..0d6b7fa63cd 100644 --- a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/timer/SynchronizeAssignments.java +++ b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/timer/SynchronizeAssignments.java @@ -17,7 +17,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; - import org.apache.storm.ServerConstants; import org.apache.storm.cluster.IStormClusterState; import org.apache.storm.daemon.supervisor.ReadClusterState; diff --git a/storm-server/src/main/java/org/apache/storm/healthcheck/HealthChecker.java b/storm-server/src/main/java/org/apache/storm/healthcheck/HealthChecker.java index ab26881bcb8..deddfe24b7e 100644 --- a/storm-server/src/main/java/org/apache/storm/healthcheck/HealthChecker.java +++ b/storm-server/src/main/java/org/apache/storm/healthcheck/HealthChecker.java @@ -19,7 +19,6 @@ package org.apache.storm.healthcheck; import com.codahale.metrics.Meter; - import java.io.BufferedReader; import java.io.File; import java.io.IOException; @@ -29,7 +28,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; - import org.apache.storm.Constants; import org.apache.storm.DaemonConfig; import org.apache.storm.metric.StormMetricsRegistry; diff --git a/storm-server/src/main/java/org/apache/storm/localizer/LocalizedResource.java b/storm-server/src/main/java/org/apache/storm/localizer/LocalizedResource.java index 123920aef54..f93783de4e1 100644 --- a/storm-server/src/main/java/org/apache/storm/localizer/LocalizedResource.java +++ b/storm-server/src/main/java/org/apache/storm/localizer/LocalizedResource.java @@ -43,7 +43,6 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; - import org.apache.commons.io.FileUtils; import org.apache.storm.Config; import org.apache.storm.blobstore.ClientBlobStore; @@ -264,7 +263,7 @@ public long fetchUnzipToTemp(ClientBlobStore store) throws IOException, KeyNotFo try { Files.createDirectories(parent); } catch (FileAlreadyExistsException e) { - //Ignored + //Ignored } catch (IOException e) { LOG.error("Failed to create parent directory {}", parent, e); throw e; diff --git a/storm-server/src/main/java/org/apache/storm/localizer/LocallyCachedBlob.java b/storm-server/src/main/java/org/apache/storm/localizer/LocallyCachedBlob.java index 56ca33891ca..feea21b67dd 100644 --- a/storm-server/src/main/java/org/apache/storm/localizer/LocallyCachedBlob.java +++ b/storm-server/src/main/java/org/apache/storm/localizer/LocallyCachedBlob.java @@ -15,7 +15,6 @@ import com.codahale.metrics.Histogram; import com.codahale.metrics.Meter; import com.codahale.metrics.Timer; - import java.io.File; import java.io.IOException; import java.io.OutputStream; @@ -31,7 +30,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import java.util.stream.Stream; - import org.apache.storm.blobstore.ClientBlobStore; import org.apache.storm.blobstore.InputStreamWithMeta; import org.apache.storm.generated.AuthorizationException; diff --git a/storm-server/src/main/java/org/apache/storm/logging/filters/AccessLoggingFilter.java b/storm-server/src/main/java/org/apache/storm/logging/filters/AccessLoggingFilter.java index 09be1dfb484..dd42f1fdac2 100644 --- a/storm-server/src/main/java/org/apache/storm/logging/filters/AccessLoggingFilter.java +++ b/storm-server/src/main/java/org/apache/storm/logging/filters/AccessLoggingFilter.java @@ -20,9 +20,7 @@ import jakarta.servlet.ServletResponse; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; - import java.io.IOException; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +30,7 @@ public class AccessLoggingFilter implements Filter { @Override public void init(FilterConfig config) throws ServletException { - //NOOP + //NOOP } @Override @@ -50,6 +48,6 @@ public void handle(HttpServletRequest request, HttpServletResponse response, Fil @Override public void destroy() { - //NOOP + //NOOP } } diff --git a/storm-server/src/main/java/org/apache/storm/nimbus/AssignmentDistributionService.java b/storm-server/src/main/java/org/apache/storm/nimbus/AssignmentDistributionService.java index ce11722f950..b6f9a4b0431 100644 --- a/storm-server/src/main/java/org/apache/storm/nimbus/AssignmentDistributionService.java +++ b/storm-server/src/main/java/org/apache/storm/nimbus/AssignmentDistributionService.java @@ -21,7 +21,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; - import org.apache.storm.Constants; import org.apache.storm.DaemonConfig; import org.apache.storm.daemon.supervisor.Supervisor; diff --git a/storm-server/src/main/java/org/apache/storm/nimbus/LeaderListenerCallback.java b/storm-server/src/main/java/org/apache/storm/nimbus/LeaderListenerCallback.java index 7255581f1c3..167a6b48369 100644 --- a/storm-server/src/main/java/org/apache/storm/nimbus/LeaderListenerCallback.java +++ b/storm-server/src/main/java/org/apache/storm/nimbus/LeaderListenerCallback.java @@ -13,7 +13,6 @@ package org.apache.storm.nimbus; import com.codahale.metrics.Meter; - import java.io.IOException; import java.util.HashSet; import java.util.List; @@ -21,7 +20,6 @@ import java.util.Set; import java.util.TreeSet; import javax.security.auth.Subject; - import org.apache.commons.io.IOUtils; import org.apache.storm.Config; import org.apache.storm.DaemonConfig; diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/Cluster.java b/storm-server/src/main/java/org/apache/storm/scheduler/Cluster.java index c01b6fbd808..e63a6dfaa4b 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/Cluster.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/Cluster.java @@ -24,8 +24,8 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Map.Entry; +import java.util.Map; import java.util.Set; import java.util.stream.Collectors; import org.apache.storm.Config; diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/DefaultScheduler.java b/storm-server/src/main/java/org/apache/storm/scheduler/DefaultScheduler.java index b8a287ec704..472dd1fd1de 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/DefaultScheduler.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/DefaultScheduler.java @@ -22,8 +22,8 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Map.Entry; +import java.util.Map; import java.util.Set; import org.apache.storm.metric.StormMetricsRegistry; import org.apache.storm.utils.Utils; @@ -112,7 +112,7 @@ public static void defaultSchedule(Topologies topologies, Cluster cluster) { @Override public void prepare(Map conf, StormMetricsRegistry metricsRegistry) { - //noop + //noop } @Override diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/EvenScheduler.java b/storm-server/src/main/java/org/apache/storm/scheduler/EvenScheduler.java index dfd0ec23b55..c292c1ec0ab 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/EvenScheduler.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/EvenScheduler.java @@ -376,7 +376,7 @@ static void scheduleTopologiesEvenly(Topologies topologies, Cluster cluster, boo @Override public void prepare(Map conf, StormMetricsRegistry metricsRegistry) { - //noop + //noop } @Override diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/ISchedulingState.java b/storm-server/src/main/java/org/apache/storm/scheduler/ISchedulingState.java index e530a45e651..235080e644f 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/ISchedulingState.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/ISchedulingState.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.Map; import java.util.Set; - import org.apache.storm.daemon.nimbus.TopologyResources; import org.apache.storm.generated.WorkerResources; import org.apache.storm.networktopography.DNSToSwitchMapping; diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/SupervisorResources.java b/storm-server/src/main/java/org/apache/storm/scheduler/SupervisorResources.java index 2c578d6bbfb..368dccd8709 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/SupervisorResources.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/SupervisorResources.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.Map; - import org.apache.storm.generated.WorkerResources; import org.apache.storm.scheduler.resource.normalization.NormalizedResourceRequest; diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/blacklist/strategies/RasBlacklistStrategy.java b/storm-server/src/main/java/org/apache/storm/scheduler/blacklist/strategies/RasBlacklistStrategy.java index 4273f79aadd..7bec3ee2a17 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/blacklist/strategies/RasBlacklistStrategy.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/blacklist/strategies/RasBlacklistStrategy.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.Set; - import org.apache.storm.generated.InvalidTopologyException; import org.apache.storm.scheduler.Cluster; import org.apache.storm.scheduler.SupervisorDetails; diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/multitenant/FreePool.java b/storm-server/src/main/java/org/apache/storm/scheduler/multitenant/FreePool.java index 867baa4a032..4f50477b1d2 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/multitenant/FreePool.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/multitenant/FreePool.java @@ -107,7 +107,7 @@ public NodeAndSlotCounts getNodeAndSlotCountIfSlotsWereTaken(int slotsNeeded) { @Override public void scheduleAsNeeded(NodePool... lesserPools) { - //No topologies running so NOOP + //No topologies running so NOOP } @Override diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/multitenant/IsolatedPool.java b/storm-server/src/main/java/org/apache/storm/scheduler/multitenant/IsolatedPool.java index 77f9a3d3990..1ab69e99113 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/multitenant/IsolatedPool.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/multitenant/IsolatedPool.java @@ -16,8 +16,8 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; -import java.util.Map; import java.util.Map.Entry; +import java.util.Map; import java.util.Set; import org.apache.storm.Config; import org.apache.storm.scheduler.SchedulerAssignment; diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/multitenant/Node.java b/storm-server/src/main/java/org/apache/storm/scheduler/multitenant/Node.java index 0c2ba56df5b..ec20d963e86 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/multitenant/Node.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/multitenant/Node.java @@ -16,8 +16,8 @@ import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; -import java.util.Map; import java.util.Map.Entry; +import java.util.Map; import java.util.Set; import org.apache.storm.scheduler.Cluster; import org.apache.storm.scheduler.ExecutorDetails; diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/multitenant/NodePool.java b/storm-server/src/main/java/org/apache/storm/scheduler/multitenant/NodePool.java index 477f2430965..2aa31949022 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/multitenant/NodePool.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/multitenant/NodePool.java @@ -18,8 +18,8 @@ import java.util.HashSet; import java.util.LinkedList; import java.util.List; -import java.util.Map; import java.util.Map.Entry; +import java.util.Map; import java.util.Set; import org.apache.storm.Config; import org.apache.storm.scheduler.Cluster; diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/resource/RasNode.java b/storm-server/src/main/java/org/apache/storm/scheduler/resource/RasNode.java index afdb9b288a7..af4320bff0a 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/resource/RasNode.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/resource/RasNode.java @@ -23,10 +23,9 @@ import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; -import java.util.Map; import java.util.Map.Entry; +import java.util.Map; import java.util.Set; - import org.apache.storm.Config; import org.apache.storm.scheduler.Cluster; import org.apache.storm.scheduler.ExecutorDetails; diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/resource/ResourceAwareScheduler.java b/storm-server/src/main/java/org/apache/storm/scheduler/resource/ResourceAwareScheduler.java index a113a425db0..820474b973a 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/resource/ResourceAwareScheduler.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/resource/ResourceAwareScheduler.java @@ -247,7 +247,7 @@ private void scheduleTopology(TopologyDetails td, Cluster cluster, final User to markFailedTopology(topologySubmitter, cluster, td, message.toString()); return; } - //Only place we fall though to do the loop over again... + //Only place we fall though to do the loop over again... } else { //Any other failure result topologySubmitter.markTopoUnsuccess(td, cluster, result.toString()); return; diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/resource/User.java b/storm-server/src/main/java/org/apache/storm/scheduler/resource/User.java index 3bda9227271..ca8187fd003 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/resource/User.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/resource/User.java @@ -25,7 +25,6 @@ import java.util.Map; import java.util.Set; import java.util.TreeSet; - import org.apache.storm.daemon.nimbus.TopologyResources; import org.apache.storm.scheduler.Cluster; import org.apache.storm.scheduler.ISchedulingState; diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/priority/GenericResourceAwareSchedulingPriorityStrategy.java b/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/priority/GenericResourceAwareSchedulingPriorityStrategy.java index c2a5eda538b..0849828ba60 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/priority/GenericResourceAwareSchedulingPriorityStrategy.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/priority/GenericResourceAwareSchedulingPriorityStrategy.java @@ -25,11 +25,9 @@ import java.util.List; import java.util.Map; import java.util.Set; - import org.apache.storm.scheduler.ISchedulingState; import org.apache.storm.scheduler.TopologyDetails; import org.apache.storm.scheduler.resource.User; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/BaseResourceAwareStrategy.java b/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/BaseResourceAwareStrategy.java index e686e1a093f..e295fa20da8 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/BaseResourceAwareStrategy.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/BaseResourceAwareStrategy.java @@ -26,7 +26,6 @@ import java.util.List; import java.util.Map; import java.util.Set; - import org.apache.storm.Config; import org.apache.storm.DaemonConfig; import org.apache.storm.daemon.Acker; diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/ConstraintSolverConfig.java b/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/ConstraintSolverConfig.java index 041fc375692..c5004747c2d 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/ConstraintSolverConfig.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/ConstraintSolverConfig.java @@ -19,7 +19,6 @@ import java.util.List; import java.util.Map; import java.util.Set; - import org.apache.storm.Config; import org.apache.storm.scheduler.TopologyDetails; import org.slf4j.Logger; diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/RoundRobinResourceAwareStrategy.java b/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/RoundRobinResourceAwareStrategy.java index 1bb5a4bf502..c557d300f4d 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/RoundRobinResourceAwareStrategy.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/RoundRobinResourceAwareStrategy.java @@ -23,7 +23,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; - import org.apache.storm.Config; import org.apache.storm.scheduler.ExecutorDetails; import org.apache.storm.scheduler.WorkerSlot; diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/SchedulingSearcherState.java b/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/SchedulingSearcherState.java index 6d65a3e437a..18c6551e252 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/SchedulingSearcherState.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/SchedulingSearcherState.java @@ -27,7 +27,6 @@ import java.util.Set; import java.util.TreeSet; import java.util.stream.Collectors; - import org.apache.storm.Config; import org.apache.storm.daemon.Acker; import org.apache.storm.scheduler.ExecutorDetails; diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/sorter/ExecSorterByConnectionCount.java b/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/sorter/ExecSorterByConnectionCount.java index 699af94a574..42d383365c5 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/sorter/ExecSorterByConnectionCount.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/sorter/ExecSorterByConnectionCount.java @@ -26,7 +26,6 @@ import java.util.Queue; import java.util.Set; import java.util.TreeSet; - import org.apache.storm.scheduler.Component; import org.apache.storm.scheduler.ExecutorDetails; import org.apache.storm.scheduler.TopologyDetails; diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/sorter/ExecSorterByConstraintSeverity.java b/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/sorter/ExecSorterByConstraintSeverity.java index 918e865cd58..66b03fe5577 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/sorter/ExecSorterByConstraintSeverity.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/sorter/ExecSorterByConstraintSeverity.java @@ -22,7 +22,6 @@ import java.util.Set; import java.util.TreeMap; import java.util.stream.Collectors; - import org.apache.storm.scheduler.Cluster; import org.apache.storm.scheduler.ExecutorDetails; import org.apache.storm.scheduler.TopologyDetails; diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/sorter/ExecSorterByProximity.java b/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/sorter/ExecSorterByProximity.java index 788eb1d997c..cba7188fd1e 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/sorter/ExecSorterByProximity.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/sorter/ExecSorterByProximity.java @@ -28,7 +28,6 @@ import java.util.Set; import java.util.TreeSet; import java.util.stream.Collectors; - import org.apache.storm.generated.GlobalStreamId; import org.apache.storm.generated.Grouping; import org.apache.storm.scheduler.Component; diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/sorter/IExecSorter.java b/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/sorter/IExecSorter.java index 5371928057b..e730a3d9b8f 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/sorter/IExecSorter.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/sorter/IExecSorter.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.Set; - import org.apache.storm.scheduler.ExecutorDetails; diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/sorter/NodeSorter.java b/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/sorter/NodeSorter.java index 0286a8a0f3d..81dd9534117 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/sorter/NodeSorter.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/sorter/NodeSorter.java @@ -32,7 +32,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; import java.util.stream.Stream; - import org.apache.storm.Config; import org.apache.storm.networktopography.DNSToSwitchMapping; import org.apache.storm.scheduler.Cluster; diff --git a/storm-server/src/main/java/org/apache/storm/security/auth/DefaultHttpCredentialsPlugin.java b/storm-server/src/main/java/org/apache/storm/security/auth/DefaultHttpCredentialsPlugin.java index 41e2f0b980b..dab1e84c732 100644 --- a/storm-server/src/main/java/org/apache/storm/security/auth/DefaultHttpCredentialsPlugin.java +++ b/storm-server/src/main/java/org/apache/storm/security/auth/DefaultHttpCredentialsPlugin.java @@ -31,7 +31,7 @@ public class DefaultHttpCredentialsPlugin implements IHttpCredentialsPlugin { */ @Override public void prepare(Map topoConf) { - // Do nothing. + // Do nothing. } @Override diff --git a/storm-server/src/main/java/org/apache/storm/stats/StatsUtil.java b/storm-server/src/main/java/org/apache/storm/stats/StatsUtil.java index f449e2553ea..6b2d3cd2da3 100644 --- a/storm-server/src/main/java/org/apache/storm/stats/StatsUtil.java +++ b/storm-server/src/main/java/org/apache/storm/stats/StatsUtil.java @@ -24,8 +24,8 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Map.Entry; +import java.util.Map; import java.util.Set; import org.apache.storm.cluster.ExecutorBeat; import org.apache.storm.cluster.IStormClusterState; diff --git a/storm-server/src/main/java/org/apache/storm/utils/ServerUtils.java b/storm-server/src/main/java/org/apache/storm/utils/ServerUtils.java index 066334c83ea..a41b77db944 100644 --- a/storm-server/src/main/java/org/apache/storm/utils/ServerUtils.java +++ b/storm-server/src/main/java/org/apache/storm/utils/ServerUtils.java @@ -1145,7 +1145,7 @@ public static int getUserId(String user) { try { exitCode = new ProcessBuilder(cmdArgs).start().waitFor(); } catch (Exception e) { - // Ignore + // Ignore } finally { if (exitCode != 0) { LOG.debug("CMD: '{}' returned exit code of {}", String.join(" ", cmdArgs), exitCode); diff --git a/storm-server/src/main/java/org/apache/storm/utils/ZookeeperServerCnxnFactory.java b/storm-server/src/main/java/org/apache/storm/utils/ZookeeperServerCnxnFactory.java index 07a6eb3312d..d9344989c01 100644 --- a/storm-server/src/main/java/org/apache/storm/utils/ZookeeperServerCnxnFactory.java +++ b/storm-server/src/main/java/org/apache/storm/utils/ZookeeperServerCnxnFactory.java @@ -44,7 +44,7 @@ public ZookeeperServerCnxnFactory(int port, int maxClientCnxns) { LOG.debug("Zookeeper server successfully binded at port " + this.port); break; } catch (BindException e1) { - //ignore + //ignore } catch (IOException e2) { this.port = 0; factory = null; diff --git a/storm-server/src/main/java/org/apache/storm/zookeeper/LeaderElectorImp.java b/storm-server/src/main/java/org/apache/storm/zookeeper/LeaderElectorImp.java index 7e887fbb431..509d7767c19 100644 --- a/storm-server/src/main/java/org/apache/storm/zookeeper/LeaderElectorImp.java +++ b/storm-server/src/main/java/org/apache/storm/zookeeper/LeaderElectorImp.java @@ -48,7 +48,7 @@ public LeaderElectorImp(CuratorFramework zk, String id, LeaderListenerCallbackFa @Override public void prepare(Map conf) { - // no-op for zookeeper implementation + // no-op for zookeeper implementation } @Override diff --git a/storm-server/src/test/java/org/apache/storm/DaemonConfigTest.java b/storm-server/src/test/java/org/apache/storm/DaemonConfigTest.java index a6bd97afcc3..7c8b3000510 100644 --- a/storm-server/src/test/java/org/apache/storm/DaemonConfigTest.java +++ b/storm-server/src/test/java/org/apache/storm/DaemonConfigTest.java @@ -12,18 +12,17 @@ package org.apache.storm; +import static org.junit.jupiter.api.Assertions.*; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.LinkedList; import java.util.Map; - import org.apache.storm.utils.ConfigUtils; import org.apache.storm.validation.ConfigValidation; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - public class DaemonConfigTest { private void stringOrStringListTest(String key) { diff --git a/storm-server/src/test/java/org/apache/storm/LocalStateTest.java b/storm-server/src/test/java/org/apache/storm/LocalStateTest.java index 4b7651ddce8..9d4c1253046 100644 --- a/storm-server/src/test/java/org/apache/storm/LocalStateTest.java +++ b/storm-server/src/test/java/org/apache/storm/LocalStateTest.java @@ -12,6 +12,10 @@ package org.apache.storm; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -23,10 +27,6 @@ import org.apache.storm.utils.LocalState; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class LocalStateTest { @Test diff --git a/storm-server/src/test/java/org/apache/storm/MessagingTest.java b/storm-server/src/test/java/org/apache/storm/MessagingTest.java index 72cf7b8fe8a..133f61d36d0 100644 --- a/storm-server/src/test/java/org/apache/storm/MessagingTest.java +++ b/storm-server/src/test/java/org/apache/storm/MessagingTest.java @@ -12,6 +12,8 @@ package org.apache.storm; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -26,8 +28,6 @@ import org.apache.storm.topology.TopologyBuilder; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - public class MessagingTest { @Test diff --git a/storm-server/src/test/java/org/apache/storm/PacemakerTest.java b/storm-server/src/test/java/org/apache/storm/PacemakerTest.java index e8ea2a441c7..c11a297a68a 100644 --- a/storm-server/src/test/java/org/apache/storm/PacemakerTest.java +++ b/storm-server/src/test/java/org/apache/storm/PacemakerTest.java @@ -12,6 +12,11 @@ package org.apache.storm; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; import java.util.List; @@ -27,11 +32,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class PacemakerTest { private HBMessage hbMessage; diff --git a/storm-server/src/test/java/org/apache/storm/TestCgroups.java b/storm-server/src/test/java/org/apache/storm/TestCgroups.java index 9becdeda2e7..50ee425dc8a 100644 --- a/storm-server/src/test/java/org/apache/storm/TestCgroups.java +++ b/storm-server/src/test/java/org/apache/storm/TestCgroups.java @@ -12,6 +12,11 @@ package org.apache.storm; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; + import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -24,11 +29,6 @@ import org.apache.storm.utils.Utils; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assumptions.assumeTrue; - /** * Unit tests for CGroups */ diff --git a/storm-server/src/test/java/org/apache/storm/TestDaemonConfigValidate.java b/storm-server/src/test/java/org/apache/storm/TestDaemonConfigValidate.java index 483bd148a4b..b42d03fb0fd 100644 --- a/storm-server/src/test/java/org/apache/storm/TestDaemonConfigValidate.java +++ b/storm-server/src/test/java/org/apache/storm/TestDaemonConfigValidate.java @@ -18,6 +18,8 @@ package org.apache.storm; +import static org.junit.jupiter.api.Assertions.assertThrows; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -26,8 +28,6 @@ import org.apache.storm.validation.ConfigValidation; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertThrows; - public class TestDaemonConfigValidate { @Test diff --git a/storm-server/src/test/java/org/apache/storm/TestRebalance.java b/storm-server/src/test/java/org/apache/storm/TestRebalance.java index f365e2b9d49..c72ec3f4993 100644 --- a/storm-server/src/test/java/org/apache/storm/TestRebalance.java +++ b/storm-server/src/test/java/org/apache/storm/TestRebalance.java @@ -12,15 +12,16 @@ package org.apache.storm; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.HashMap; import java.util.Map; - import net.minidev.json.JSONObject; import net.minidev.json.parser.JSONParser; - import org.apache.storm.generated.ClusterSummary; -import org.apache.storm.generated.RebalanceOptions; import org.apache.storm.generated.NotAliveException; +import org.apache.storm.generated.RebalanceOptions; import org.apache.storm.generated.StormTopology; import org.apache.storm.generated.TopologySummary; import org.apache.storm.scheduler.resource.ResourceAwareScheduler; @@ -36,14 +37,10 @@ import org.apache.storm.topology.SpoutDeclarer; import org.apache.storm.topology.TopologyBuilder; import org.apache.storm.utils.Utils; - import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class TestRebalance { private static final Class[] strategyClasses = { DefaultResourceAwareStrategy.class, diff --git a/storm-server/src/test/java/org/apache/storm/TickTupleTest.java b/storm-server/src/test/java/org/apache/storm/TickTupleTest.java index c36d96df32a..2da479ee7dc 100644 --- a/storm-server/src/test/java/org/apache/storm/TickTupleTest.java +++ b/storm-server/src/test/java/org/apache/storm/TickTupleTest.java @@ -12,6 +12,9 @@ package org.apache.storm; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertNull; + import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; @@ -30,16 +33,13 @@ import org.apache.storm.tuple.Values; import org.apache.storm.utils.Time; import org.apache.storm.utils.TupleUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.awaitility.Awaitility; import org.awaitility.core.ConditionTimeoutException; import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.jupiter.api.Assertions.assertNull; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TickTupleTest { private final static Logger LOG = LoggerFactory.getLogger(TickTupleTest.class); diff --git a/storm-server/src/test/java/org/apache/storm/blobstore/BlobStoreUtilsTest.java b/storm-server/src/test/java/org/apache/storm/blobstore/BlobStoreUtilsTest.java index 24fb1b59bab..455b33b8fc6 100644 --- a/storm-server/src/test/java/org/apache/storm/blobstore/BlobStoreUtilsTest.java +++ b/storm-server/src/test/java/org/apache/storm/blobstore/BlobStoreUtilsTest.java @@ -12,12 +12,24 @@ package org.apache.storm.blobstore; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyMap; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import java.io.IOException; import java.io.InputStream; import java.util.Collections; import java.util.List; import java.util.Map; - +import javax.security.auth.Subject; import org.apache.storm.generated.*; import org.apache.storm.nimbus.NimbusInfo; import org.apache.storm.thrift.TException; @@ -26,20 +38,6 @@ import org.mockito.MockedStatic; import org.mockito.Mockito; -import javax.security.auth.Subject; - -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyMap; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.when; -import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.atLeastOnce; - public class BlobStoreUtilsTest { diff --git a/storm-server/src/test/java/org/apache/storm/blobstore/LocalFsBlobStoreFileTest.java b/storm-server/src/test/java/org/apache/storm/blobstore/LocalFsBlobStoreFileTest.java index 2faae2a5185..8d930ce2de3 100644 --- a/storm-server/src/test/java/org/apache/storm/blobstore/LocalFsBlobStoreFileTest.java +++ b/storm-server/src/test/java/org/apache/storm/blobstore/LocalFsBlobStoreFileTest.java @@ -12,18 +12,17 @@ package org.apache.storm.blobstore; -import org.apache.commons.io.FileUtils; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.nio.file.Files; import java.util.zip.CRC32C; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotEquals; +import org.apache.commons.io.FileUtils; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; class LocalFsBlobStoreFileTest { diff --git a/storm-server/src/test/java/org/apache/storm/blobstore/LocalFsBlobStoreSynchronizerTest.java b/storm-server/src/test/java/org/apache/storm/blobstore/LocalFsBlobStoreSynchronizerTest.java index f1f9473958e..e866b17cc81 100644 --- a/storm-server/src/test/java/org/apache/storm/blobstore/LocalFsBlobStoreSynchronizerTest.java +++ b/storm-server/src/test/java/org/apache/storm/blobstore/LocalFsBlobStoreSynchronizerTest.java @@ -12,6 +12,9 @@ package org.apache.storm.blobstore; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -29,16 +32,13 @@ import org.apache.storm.shade.org.apache.curator.framework.CuratorFramework; import org.apache.storm.shade.org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.storm.shade.org.apache.curator.retry.ExponentialBackoffRetry; -import org.apache.storm.utils.Utils; import org.apache.storm.testing.InProcessZookeeper; +import org.apache.storm.utils.Utils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - /** * Unit tests for most of the testable utility methods * and LocalFsBlobStoreSynchronizer class methods diff --git a/storm-server/src/test/java/org/apache/storm/blobstore/LocalFsBlobStoreTest.java b/storm-server/src/test/java/org/apache/storm/blobstore/LocalFsBlobStoreTest.java index 51f392725a6..ea54e8b5740 100644 --- a/storm-server/src/test/java/org/apache/storm/blobstore/LocalFsBlobStoreTest.java +++ b/storm-server/src/test/java/org/apache/storm/blobstore/LocalFsBlobStoreTest.java @@ -12,6 +12,11 @@ package org.apache.storm.blobstore; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.mockito.Mockito.spy; + import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -43,11 +48,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; -import static org.mockito.Mockito.spy; - public class LocalFsBlobStoreTest { private static final Logger LOG = LoggerFactory.getLogger(LocalFsBlobStoreTest.class); URI base; diff --git a/storm-server/src/test/java/org/apache/storm/blobstore/MockZookeeperClientBuilder.java b/storm-server/src/test/java/org/apache/storm/blobstore/MockZookeeperClientBuilder.java index 19cdfed25d8..8c0bdc80589 100644 --- a/storm-server/src/test/java/org/apache/storm/blobstore/MockZookeeperClientBuilder.java +++ b/storm-server/src/test/java/org/apache/storm/blobstore/MockZookeeperClientBuilder.java @@ -12,6 +12,11 @@ package org.apache.storm.blobstore; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import java.util.Arrays; import java.util.List; import org.apache.log4j.Logger; @@ -21,11 +26,6 @@ import org.apache.storm.shade.org.apache.curator.framework.api.Pathable; import org.apache.storm.shade.org.apache.zookeeper.data.Stat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - public class MockZookeeperClientBuilder { private static final Logger LOG = Logger.getLogger(MockZookeeperClientBuilder.class); diff --git a/storm-server/src/test/java/org/apache/storm/cluster/ClusterStateTest.java b/storm-server/src/test/java/org/apache/storm/cluster/ClusterStateTest.java index fff2fdf4bb4..88887c20c56 100644 --- a/storm-server/src/test/java/org/apache/storm/cluster/ClusterStateTest.java +++ b/storm-server/src/test/java/org/apache/storm/cluster/ClusterStateTest.java @@ -18,6 +18,8 @@ package org.apache.storm.cluster; +import static org.junit.jupiter.api.Assertions.*; + import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; @@ -26,8 +28,8 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; - import org.apache.storm.Config; +import org.apache.storm.callback.WatcherCallBack; import org.apache.storm.callback.ZKStateChangedCallback; import org.apache.storm.generated.Assignment; import org.apache.storm.generated.Credentials; @@ -39,29 +41,26 @@ import org.apache.storm.generated.TopologyStatus; import org.apache.storm.generated.WorkerResources; import org.apache.storm.nimbus.NimbusInfo; +import org.apache.storm.shade.org.apache.curator.framework.CuratorFramework; +import org.apache.storm.shade.org.apache.curator.framework.CuratorFrameworkFactory; +import org.apache.storm.shade.org.apache.curator.framework.api.BackgroundVersionable; +import org.apache.storm.shade.org.apache.curator.framework.api.DeleteBuilder; +import org.apache.storm.shade.org.apache.curator.framework.api.ExistsBuilder; +import org.apache.storm.shade.org.apache.zookeeper.KeeperException; import org.apache.storm.shade.org.apache.zookeeper.Watcher; import org.apache.storm.shade.org.apache.zookeeper.ZooDefs; import org.apache.storm.shade.org.apache.zookeeper.data.ACL; +import org.apache.storm.shade.org.apache.zookeeper.data.Stat; import org.apache.storm.testing.InProcessZookeeper; import org.apache.storm.utils.CuratorUtils; import org.apache.storm.utils.Time; import org.apache.storm.utils.Utils; import org.apache.storm.utils.ZookeeperAuthInfo; -import org.apache.storm.shade.org.apache.curator.framework.CuratorFramework; -import org.apache.storm.shade.org.apache.curator.framework.CuratorFrameworkFactory; -import org.apache.storm.callback.WatcherCallBack; -import org.apache.storm.shade.org.apache.curator.framework.api.BackgroundVersionable; -import org.apache.storm.shade.org.apache.curator.framework.api.DeleteBuilder; -import org.apache.storm.shade.org.apache.curator.framework.api.ExistsBuilder; -import org.apache.storm.shade.org.apache.zookeeper.KeeperException; -import org.apache.storm.shade.org.apache.zookeeper.data.Stat; import org.apache.storm.zookeeper.ClientZookeeper; -import org.junit.jupiter.api.Test; import org.awaitility.Awaitility; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import static org.junit.jupiter.api.Assertions.*; - /** * Tests for IStateStorage (ZKStateStorage) and IStormClusterState (StormClusterStateImpl) * using an in-process ZooKeeper. diff --git a/storm-server/src/test/java/org/apache/storm/container/docker/DockerInspectCommandTest.java b/storm-server/src/test/java/org/apache/storm/container/docker/DockerInspectCommandTest.java index 5e3a259f44c..b99c88f37d7 100644 --- a/storm-server/src/test/java/org/apache/storm/container/docker/DockerInspectCommandTest.java +++ b/storm-server/src/test/java/org/apache/storm/container/docker/DockerInspectCommandTest.java @@ -14,7 +14,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -39,4 +38,4 @@ public void getCommandWithArguments() { assertEquals("inspect --format='{{.State.Status}}' container_name", dockerInspectCommand.getCommandWithArguments()); } -} \ No newline at end of file +} diff --git a/storm-server/src/test/java/org/apache/storm/container/docker/DockerPsCommandTest.java b/storm-server/src/test/java/org/apache/storm/container/docker/DockerPsCommandTest.java index 4e72f2f5184..a19628e7a2e 100644 --- a/storm-server/src/test/java/org/apache/storm/container/docker/DockerPsCommandTest.java +++ b/storm-server/src/test/java/org/apache/storm/container/docker/DockerPsCommandTest.java @@ -20,7 +20,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -45,4 +44,4 @@ public void getCommandWithArguments() { assertEquals("ps --filter=name=container_name --quiet=true", dockerPsCommand.getCommandWithArguments()); } -} \ No newline at end of file +} diff --git a/storm-server/src/test/java/org/apache/storm/container/docker/DockerRmCommandTest.java b/storm-server/src/test/java/org/apache/storm/container/docker/DockerRmCommandTest.java index 9dd8b0664cf..3f2038ee573 100644 --- a/storm-server/src/test/java/org/apache/storm/container/docker/DockerRmCommandTest.java +++ b/storm-server/src/test/java/org/apache/storm/container/docker/DockerRmCommandTest.java @@ -14,7 +14,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -38,4 +37,4 @@ public void getCommandWithArguments() { assertEquals("rm --force container_name", dockerRmCommand.getCommandWithArguments()); } -} \ No newline at end of file +} diff --git a/storm-server/src/test/java/org/apache/storm/container/docker/DockerRunCommandTest.java b/storm-server/src/test/java/org/apache/storm/container/docker/DockerRunCommandTest.java index 5436bdaf44e..dca1a6fd0fd 100644 --- a/storm-server/src/test/java/org/apache/storm/container/docker/DockerRunCommandTest.java +++ b/storm-server/src/test/java/org/apache/storm/container/docker/DockerRunCommandTest.java @@ -14,7 +14,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; - import java.io.IOException; import java.util.Arrays; import java.util.List; @@ -51,4 +50,4 @@ public void getCommandOption() throws IOException { + "image_name bash launch_command", dockerRunCommand.getCommandWithArguments()); } -} \ No newline at end of file +} diff --git a/storm-server/src/test/java/org/apache/storm/container/docker/DockerStopCommandTest.java b/storm-server/src/test/java/org/apache/storm/container/docker/DockerStopCommandTest.java index 1d243cfc120..f3c82b984b4 100644 --- a/storm-server/src/test/java/org/apache/storm/container/docker/DockerStopCommandTest.java +++ b/storm-server/src/test/java/org/apache/storm/container/docker/DockerStopCommandTest.java @@ -14,7 +14,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -39,4 +38,4 @@ public void getCommandWithArguments() { assertEquals("stop --time=3 container_name", dockerStopCommand.getCommandWithArguments()); } -} \ No newline at end of file +} diff --git a/storm-server/src/test/java/org/apache/storm/container/docker/DockerWaitCommandTest.java b/storm-server/src/test/java/org/apache/storm/container/docker/DockerWaitCommandTest.java index de5b4f9fb38..55de0f32bb0 100644 --- a/storm-server/src/test/java/org/apache/storm/container/docker/DockerWaitCommandTest.java +++ b/storm-server/src/test/java/org/apache/storm/container/docker/DockerWaitCommandTest.java @@ -14,7 +14,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -37,4 +36,4 @@ public void getCommandWithArguments() { assertEquals("wait container_name", dockerWaitCommand.getCommandWithArguments()); } -} \ No newline at end of file +} diff --git a/storm-server/src/test/java/org/apache/storm/container/oci/OciUtilsTest.java b/storm-server/src/test/java/org/apache/storm/container/oci/OciUtilsTest.java index 69deeafcc55..b2d3a661cd5 100644 --- a/storm-server/src/test/java/org/apache/storm/container/oci/OciUtilsTest.java +++ b/storm-server/src/test/java/org/apache/storm/container/oci/OciUtilsTest.java @@ -18,6 +18,10 @@ package org.apache.storm.container.oci; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -28,10 +32,6 @@ import org.apache.storm.utils.WrappedInvalidTopologyException; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertThrows; - public class OciUtilsTest { @Test @@ -158,4 +158,4 @@ public void adjustImageConfigForTopoNotInAllowedList() { assertThrows(WrappedInvalidTopologyException.class, () -> OciUtils.adjustImageConfigForTopo(conf, topoConf, topoId)); } -} \ No newline at end of file +} diff --git a/storm-server/src/test/java/org/apache/storm/daemon/drpc/DRPCTest.java b/storm-server/src/test/java/org/apache/storm/daemon/drpc/DRPCTest.java index a9fd7f1d1b6..2097eef29b3 100644 --- a/storm-server/src/test/java/org/apache/storm/daemon/drpc/DRPCTest.java +++ b/storm-server/src/test/java/org/apache/storm/daemon/drpc/DRPCTest.java @@ -18,6 +18,11 @@ package org.apache.storm.daemon.drpc; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -37,24 +42,18 @@ import org.apache.storm.generated.DRPCExceptionType; import org.apache.storm.generated.DRPCExecutionException; import org.apache.storm.generated.DRPCRequest; +import org.apache.storm.metric.StormMetricsRegistry; import org.apache.storm.security.auth.DefaultPrincipalToLocal; import org.apache.storm.security.auth.ReqContext; import org.apache.storm.security.auth.SingleUserPrincipal; -import org.apache.storm.security.auth.authorizer.DRPCSimpleACLAuthorizer; import org.apache.storm.security.auth.authorizer.DRPCSimpleACLAuthorizer.AclFunctionEntry; +import org.apache.storm.security.auth.authorizer.DRPCSimpleACLAuthorizer; import org.apache.storm.security.auth.authorizer.DenyAuthorizer; import org.apache.storm.utils.Time; import org.awaitility.Awaitility; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; - -import org.apache.storm.metric.StormMetricsRegistry; - public class DRPCTest { private static final ExecutorService exec = Executors.newCachedThreadPool(); diff --git a/storm-server/src/test/java/org/apache/storm/daemon/nimbus/HeartbeatCacheTest.java b/storm-server/src/test/java/org/apache/storm/daemon/nimbus/HeartbeatCacheTest.java index 5ae1ee31546..6dae801c863 100644 --- a/storm-server/src/test/java/org/apache/storm/daemon/nimbus/HeartbeatCacheTest.java +++ b/storm-server/src/test/java/org/apache/storm/daemon/nimbus/HeartbeatCacheTest.java @@ -18,13 +18,15 @@ package org.apache.storm.daemon.nimbus; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; - import org.apache.storm.generated.Assignment; import org.apache.storm.generated.ExecutorInfo; import org.apache.storm.generated.NodeInfo; @@ -33,9 +35,6 @@ import org.apache.storm.utils.Time; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - class HeartbeatCacheTest { private static final String TOPO_ID = "test-topology-1"; private static final int TIMEOUT_SECS = 30; diff --git a/storm-server/src/test/java/org/apache/storm/daemon/nimbus/NimbusClojurePortTest.java b/storm-server/src/test/java/org/apache/storm/daemon/nimbus/NimbusClojurePortTest.java index 0975e52a57f..b10fa5712b3 100644 --- a/storm-server/src/test/java/org/apache/storm/daemon/nimbus/NimbusClojurePortTest.java +++ b/storm-server/src/test/java/org/apache/storm/daemon/nimbus/NimbusClojurePortTest.java @@ -18,6 +18,16 @@ package org.apache.storm.daemon.nimbus; +import static java.util.concurrent.TimeUnit.MILLISECONDS; +import static java.util.concurrent.TimeUnit.SECONDS; +import static org.awaitility.Awaitility.await; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -31,9 +41,8 @@ import java.util.Set; import java.util.function.UnaryOperator; import java.util.stream.Collectors; - import javax.security.auth.Subject; - +import net.minidev.json.JSONValue; import org.apache.commons.io.FileUtils; import org.apache.storm.Config; import org.apache.storm.DaemonConfig; @@ -75,22 +84,10 @@ import org.apache.storm.utils.ConfigUtils; import org.apache.storm.utils.Time; import org.apache.storm.utils.Utils; - -import net.minidev.json.JSONValue; import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; -import static java.util.concurrent.TimeUnit.MILLISECONDS; -import static java.util.concurrent.TimeUnit.SECONDS; -import static org.awaitility.Awaitility.await; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - /** * Tests ported from storm-core/test/clj/org/apache/storm/nimbus_test.clj. * Batch 7a: Simple/unit-like tests. diff --git a/storm-server/src/test/java/org/apache/storm/daemon/nimbus/NimbusGetNimbusConfTest.java b/storm-server/src/test/java/org/apache/storm/daemon/nimbus/NimbusGetNimbusConfTest.java index c348697c8de..957e97edc5e 100644 --- a/storm-server/src/test/java/org/apache/storm/daemon/nimbus/NimbusGetNimbusConfTest.java +++ b/storm-server/src/test/java/org/apache/storm/daemon/nimbus/NimbusGetNimbusConfTest.java @@ -18,17 +18,16 @@ package org.apache.storm.daemon.nimbus; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.HashMap; import java.util.Map; - import net.minidev.json.JSONValue; import org.apache.storm.Config; import org.apache.storm.DaemonConfig; import org.apache.storm.LocalCluster; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - public class NimbusGetNimbusConfTest { private static final String MASKED = "*****"; diff --git a/storm-server/src/test/java/org/apache/storm/daemon/nimbus/NimbusGetTopologyConfTest.java b/storm-server/src/test/java/org/apache/storm/daemon/nimbus/NimbusGetTopologyConfTest.java index fae4ad566b3..584f0d0a0e1 100644 --- a/storm-server/src/test/java/org/apache/storm/daemon/nimbus/NimbusGetTopologyConfTest.java +++ b/storm-server/src/test/java/org/apache/storm/daemon/nimbus/NimbusGetTopologyConfTest.java @@ -18,24 +18,22 @@ package org.apache.storm.daemon.nimbus; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.HashMap; import java.util.Map; import java.util.Optional; - +import net.minidev.json.JSONValue; import org.apache.storm.Config; import org.apache.storm.DaemonConfig; import org.apache.storm.LocalCluster; import org.apache.storm.blobstore.BlobStore; import org.apache.storm.cluster.IStormClusterState; -import net.minidev.json.JSONValue; - import org.apache.storm.security.serialization.BlowfishTupleSerializer; import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; -import static org.junit.jupiter.api.Assertions.assertEquals; - public class NimbusGetTopologyConfTest { private static final String MASKED = "*****"; diff --git a/storm-server/src/test/java/org/apache/storm/daemon/nimbus/NimbusTest.java b/storm-server/src/test/java/org/apache/storm/daemon/nimbus/NimbusTest.java index e27b5b4ec2d..724879930d0 100644 --- a/storm-server/src/test/java/org/apache/storm/daemon/nimbus/NimbusTest.java +++ b/storm-server/src/test/java/org/apache/storm/daemon/nimbus/NimbusTest.java @@ -18,6 +18,27 @@ package org.apache.storm.daemon.nimbus; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.mockConstruction; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import com.codahale.metrics.Meter; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -31,8 +52,6 @@ import java.util.Optional; import java.util.Set; import javax.security.auth.Subject; - -import com.codahale.metrics.Meter; import net.minidev.json.JSONValue; import org.apache.commons.io.FileUtils; import org.apache.storm.Config; @@ -48,8 +67,8 @@ import org.apache.storm.generated.InvalidTopologyException; import org.apache.storm.generated.KeyNotFoundException; import org.apache.storm.generated.ListBlobsResult; -import org.apache.storm.generated.RebalanceOptions; import org.apache.storm.generated.ReadableBlobMeta; +import org.apache.storm.generated.RebalanceOptions; import org.apache.storm.generated.SettableBlobMeta; import org.apache.storm.generated.StormTopology; import org.apache.storm.generated.SubmitOptions; @@ -84,26 +103,6 @@ import org.mockito.MockedConstruction; import org.mockito.MockitoAnnotations; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; -import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.mockConstruction; -import static org.mockito.Mockito.atLeastOnce; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - class NimbusTest { private static final String BLOB_FILE_KEY = "file-key"; private static final String TOPO_NAME = "topo"; diff --git a/storm-server/src/test/java/org/apache/storm/daemon/nimbus/Y2038HeartbeatTest.java b/storm-server/src/test/java/org/apache/storm/daemon/nimbus/Y2038HeartbeatTest.java index e4cc6d573d8..e8ba0d58b3b 100644 --- a/storm-server/src/test/java/org/apache/storm/daemon/nimbus/Y2038HeartbeatTest.java +++ b/storm-server/src/test/java/org/apache/storm/daemon/nimbus/Y2038HeartbeatTest.java @@ -18,13 +18,17 @@ package org.apache.storm.daemon.nimbus; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; - import org.apache.storm.generated.Assignment; import org.apache.storm.generated.ClusterWorkerHeartbeat; import org.apache.storm.generated.LSWorkerHeartbeat; @@ -43,11 +47,6 @@ import org.apache.storm.utils.Time; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - /** * Regression tests for the Y2038 heartbeat overflow (STORM issue #7897). * diff --git a/storm-server/src/test/java/org/apache/storm/daemon/supervisor/BasicContainerTest.java b/storm-server/src/test/java/org/apache/storm/daemon/supervisor/BasicContainerTest.java index 4f941d42ef4..0750090ad70 100644 --- a/storm-server/src/test/java/org/apache/storm/daemon/supervisor/BasicContainerTest.java +++ b/storm-server/src/test/java/org/apache/storm/daemon/supervisor/BasicContainerTest.java @@ -12,6 +12,15 @@ package org.apache.storm.daemon.supervisor; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import java.io.File; import java.io.IOException; import java.util.Arrays; @@ -28,24 +37,14 @@ import org.apache.storm.generated.ProfileAction; import org.apache.storm.generated.ProfileRequest; import org.apache.storm.generated.StormTopology; +import org.apache.storm.metric.StormMetricsRegistry; +import org.apache.storm.utils.ConfigUtils; import org.apache.storm.utils.LocalState; import org.apache.storm.utils.SimpleVersion; import org.apache.storm.utils.Utils; import org.apache.storm.utils.VersionInfo; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import org.apache.storm.metric.StormMetricsRegistry; -import org.apache.storm.utils.ConfigUtils; - public class BasicContainerTest { private static void setSystemProp(String key, String value) { if (value == null) { diff --git a/storm-server/src/test/java/org/apache/storm/daemon/supervisor/ContainerTest.java b/storm-server/src/test/java/org/apache/storm/daemon/supervisor/ContainerTest.java index bf17ea2a185..cc908970687 100644 --- a/storm-server/src/test/java/org/apache/storm/daemon/supervisor/ContainerTest.java +++ b/storm-server/src/test/java/org/apache/storm/daemon/supervisor/ContainerTest.java @@ -12,8 +12,18 @@ package org.apache.storm.daemon.supervisor; -import com.google.common.base.Joiner; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.fail; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import com.google.common.base.Joiner; import java.io.File; import java.io.IOException; import java.io.StringWriter; @@ -24,7 +34,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; - import org.apache.storm.Config; import org.apache.storm.DaemonConfig; import org.apache.storm.container.ResourceIsolationInterface; @@ -32,23 +41,11 @@ import org.apache.storm.daemon.supervisor.Container.ContainerType; import org.apache.storm.generated.LocalAssignment; import org.apache.storm.generated.ProfileRequest; +import org.apache.storm.metric.StormMetricsRegistry; import org.apache.storm.utils.ObjectReader; import org.junit.jupiter.api.Test; import org.yaml.snakeyaml.Yaml; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.fail; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import org.apache.storm.metric.StormMetricsRegistry; - public class ContainerTest { private static final Joiner PATH_JOIN = Joiner.on(File.separator).skipNulls(); private static final String DOUBLE_SEP = File.separator + File.separator; @@ -355,7 +352,7 @@ public boolean runProfilingCommand(String user, String workerId, List co @Override public void cleanup(String user, String workerId, int port) { - //NO OP + //NO OP } @Override diff --git a/storm-server/src/test/java/org/apache/storm/daemon/supervisor/SlotTest.java b/storm-server/src/test/java/org/apache/storm/daemon/supervisor/SlotTest.java index 5dacb3fa2e3..285ec7dfb1e 100644 --- a/storm-server/src/test/java/org/apache/storm/daemon/supervisor/SlotTest.java +++ b/storm-server/src/test/java/org/apache/storm/daemon/supervisor/SlotTest.java @@ -14,6 +14,15 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.lessThan; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.*; import java.util.ArrayList; import java.util.Collections; @@ -21,6 +30,7 @@ import java.util.List; import java.util.Set; import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import org.apache.storm.daemon.supervisor.Slot.DynamicState; import org.apache.storm.daemon.supervisor.Slot.MachineState; @@ -37,25 +47,13 @@ import org.apache.storm.localizer.BlobChangingCallback; import org.apache.storm.localizer.GoodToGo; import org.apache.storm.localizer.LocallyCachedBlob; +import org.apache.storm.metric.StormMetricsRegistry; import org.apache.storm.scheduler.ISupervisor; import org.apache.storm.utils.LocalState; -import org.apache.storm.utils.Time; import org.apache.storm.utils.Time.SimulatedTime; +import org.apache.storm.utils.Time; import org.junit.jupiter.api.Test; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.Matchers.lessThan; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Mockito.*; - -import java.util.concurrent.ExecutionException; -import org.apache.storm.metric.StormMetricsRegistry; - public class SlotTest { static WorkerResources mkWorkerResources(Double cpu, Double mem_on_heap, Double mem_off_heap) { diff --git a/storm-server/src/test/java/org/apache/storm/drpc/DRPCIntegrationTest.java b/storm-server/src/test/java/org/apache/storm/drpc/DRPCIntegrationTest.java index 885282eabc9..5a5d03ffdb7 100644 --- a/storm-server/src/test/java/org/apache/storm/drpc/DRPCIntegrationTest.java +++ b/storm-server/src/test/java/org/apache/storm/drpc/DRPCIntegrationTest.java @@ -18,9 +18,10 @@ package org.apache.storm.drpc; +import static org.junit.jupiter.api.Assertions.*; + import java.util.Map; import java.util.concurrent.ConcurrentHashMap; - import org.apache.storm.ILocalDRPC; import org.apache.storm.LocalCluster; import org.apache.storm.LocalDRPC; @@ -47,8 +48,6 @@ import org.mockito.ArgumentMatchers; import org.mockito.Mockito; -import static org.junit.jupiter.api.Assertions.*; - /** * Integration and unit tests for DRPC topology patterns. * diff --git a/storm-server/src/test/java/org/apache/storm/grouping/GroupingIntegrationTest.java b/storm-server/src/test/java/org/apache/storm/grouping/GroupingIntegrationTest.java index c61bb492209..94ced664a6f 100644 --- a/storm-server/src/test/java/org/apache/storm/grouping/GroupingIntegrationTest.java +++ b/storm-server/src/test/java/org/apache/storm/grouping/GroupingIntegrationTest.java @@ -18,12 +18,13 @@ package org.apache.storm.grouping; +import static org.junit.jupiter.api.Assertions.*; + import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; - import org.apache.storm.Config; import org.apache.storm.LocalCluster; import org.apache.storm.Testing; @@ -39,17 +40,15 @@ import org.apache.storm.testing.NGrouping; import org.apache.storm.testing.TestWordBytesCounter; import org.apache.storm.testing.TestWordSpout; -import org.apache.storm.tuple.Values; import org.apache.storm.topology.BasicOutputCollector; import org.apache.storm.topology.OutputFieldsDeclarer; import org.apache.storm.topology.base.BaseBasicBolt; import org.apache.storm.tuple.Fields; import org.apache.storm.tuple.Tuple; +import org.apache.storm.tuple.Values; import org.apache.storm.utils.Utils; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Tests for shuffle, field, and custom grouping behaviors. * diff --git a/storm-server/src/test/java/org/apache/storm/localizer/AsyncLocalizerTest.java b/storm-server/src/test/java/org/apache/storm/localizer/AsyncLocalizerTest.java index 30cfdc4f94b..20e7d44cee9 100644 --- a/storm-server/src/test/java/org/apache/storm/localizer/AsyncLocalizerTest.java +++ b/storm-server/src/test/java/org/apache/storm/localizer/AsyncLocalizerTest.java @@ -12,6 +12,24 @@ package org.apache.storm.localizer; +import static org.apache.storm.blobstore.BlobStoreAclHandler.WORLD_EVERYTHING; +import static org.apache.storm.localizer.LocalizedResource.USERCACHE; +import static org.apache.storm.localizer.LocallyCachedTopologyBlob.LOCAL_MODE_JAR_VERSION; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import com.codahale.metrics.Timer; import com.google.common.base.Joiner; import java.io.File; @@ -34,7 +52,6 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; - import org.apache.commons.io.IOUtils; import org.apache.storm.Config; import org.apache.storm.DaemonConfig; @@ -52,6 +69,7 @@ import org.apache.storm.generated.ReadableBlobMeta; import org.apache.storm.generated.SettableBlobMeta; import org.apache.storm.generated.StormTopology; +import org.apache.storm.metric.StormMetricsRegistry; import org.apache.storm.security.auth.DefaultPrincipalToLocal; import org.apache.storm.testing.InProcessZookeeper; import org.apache.storm.testing.TmpPath; @@ -66,26 +84,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.storm.blobstore.BlobStoreAclHandler.WORLD_EVERYTHING; -import static org.apache.storm.localizer.LocalizedResource.USERCACHE; -import static org.apache.storm.localizer.LocallyCachedTopologyBlob.LOCAL_MODE_JAR_VERSION; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import org.apache.storm.metric.StormMetricsRegistry; - public class AsyncLocalizerTest { private static final Logger LOG = LoggerFactory.getLogger(AsyncLocalizerTest.class); diff --git a/storm-server/src/test/java/org/apache/storm/localizer/LocalizedResourceRetentionSetTest.java b/storm-server/src/test/java/org/apache/storm/localizer/LocalizedResourceRetentionSetTest.java index 39fd6fc7f9a..825fcfcace3 100644 --- a/storm-server/src/test/java/org/apache/storm/localizer/LocalizedResourceRetentionSetTest.java +++ b/storm-server/src/test/java/org/apache/storm/localizer/LocalizedResourceRetentionSetTest.java @@ -13,6 +13,14 @@ package org.apache.storm.localizer; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; + import java.nio.file.Paths; import java.util.ArrayList; import java.util.Collections; @@ -27,19 +35,10 @@ import org.apache.storm.generated.LocalAssignment; import org.apache.storm.generated.ReadableBlobMeta; import org.apache.storm.generated.SettableBlobMeta; +import org.apache.storm.metric.StormMetricsRegistry; import org.apache.storm.utils.EquivalenceUtils; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; - -import org.apache.storm.metric.StormMetricsRegistry; - public class LocalizedResourceRetentionSetTest { @Test diff --git a/storm-server/src/test/java/org/apache/storm/localizer/LocallyCachedBlobTest.java b/storm-server/src/test/java/org/apache/storm/localizer/LocallyCachedBlobTest.java index 505a3eb0311..07e2d895132 100644 --- a/storm-server/src/test/java/org/apache/storm/localizer/LocallyCachedBlobTest.java +++ b/storm-server/src/test/java/org/apache/storm/localizer/LocallyCachedBlobTest.java @@ -12,6 +12,9 @@ package org.apache.storm.localizer; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.nio.file.Path; import java.nio.file.Paths; import java.util.HashMap; @@ -26,9 +29,6 @@ import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class LocallyCachedBlobTest { private static final ClientBlobStore blobStore = Mockito.mock(ClientBlobStore.class); private static final PortAndAssignment pna = new PortAndAssignmentImpl(6077, new LocalAssignment()); diff --git a/storm-server/src/test/java/org/apache/storm/metric/ClusterMetricsConsumerExecutorTest.java b/storm-server/src/test/java/org/apache/storm/metric/ClusterMetricsConsumerExecutorTest.java index aa79fdb3ef2..806413f0b33 100644 --- a/storm-server/src/test/java/org/apache/storm/metric/ClusterMetricsConsumerExecutorTest.java +++ b/storm-server/src/test/java/org/apache/storm/metric/ClusterMetricsConsumerExecutorTest.java @@ -12,6 +12,9 @@ package org.apache.storm.metric; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.mock; + import java.util.Collection; import java.util.Collections; import org.apache.storm.metric.api.DataPoint; @@ -19,9 +22,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.mock; - public class ClusterMetricsConsumerExecutorTest { @BeforeEach diff --git a/storm-server/src/test/java/org/apache/storm/metricstore/rocksdb/RocksDbKeyTest.java b/storm-server/src/test/java/org/apache/storm/metricstore/rocksdb/RocksDbKeyTest.java index 72d5a9430e4..6e381e3d57f 100644 --- a/storm-server/src/test/java/org/apache/storm/metricstore/rocksdb/RocksDbKeyTest.java +++ b/storm-server/src/test/java/org/apache/storm/metricstore/rocksdb/RocksDbKeyTest.java @@ -18,12 +18,12 @@ package org.apache.storm.metricstore.rocksdb; -import org.apache.storm.metricstore.AggLevel; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.apache.storm.metricstore.AggLevel; +import org.junit.jupiter.api.Test; + public class RocksDbKeyTest { @Test diff --git a/storm-server/src/test/java/org/apache/storm/metricstore/rocksdb/RocksDbStoreTest.java b/storm-server/src/test/java/org/apache/storm/metricstore/rocksdb/RocksDbStoreTest.java index f34c4c2519c..e3aee8a8466 100644 --- a/storm-server/src/test/java/org/apache/storm/metricstore/rocksdb/RocksDbStoreTest.java +++ b/storm-server/src/test/java/org/apache/storm/metricstore/rocksdb/RocksDbStoreTest.java @@ -18,8 +18,20 @@ package org.apache.storm.metricstore.rocksdb; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.apache.commons.io.FileUtils; import org.apache.storm.DaemonConfig; +import org.apache.storm.metric.StormMetricsRegistry; import org.apache.storm.metricstore.AggLevel; import org.apache.storm.metricstore.FilterOptions; import org.apache.storm.metricstore.Metric; @@ -31,19 +43,6 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import org.apache.storm.metric.StormMetricsRegistry; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class RocksDbStoreTest { static MetricStore store; static Path tempDirForTest; diff --git a/storm-server/src/test/java/org/apache/storm/metricstore/rocksdb/RocksDbValueTest.java b/storm-server/src/test/java/org/apache/storm/metricstore/rocksdb/RocksDbValueTest.java index 7e9c1e0e7ac..5814ce16a61 100644 --- a/storm-server/src/test/java/org/apache/storm/metricstore/rocksdb/RocksDbValueTest.java +++ b/storm-server/src/test/java/org/apache/storm/metricstore/rocksdb/RocksDbValueTest.java @@ -18,13 +18,13 @@ package org.apache.storm.metricstore.rocksdb; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.storm.metricstore.AggLevel; import org.apache.storm.metricstore.Metric; import org.apache.storm.metricstore.MetricException; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - public class RocksDbValueTest { @Test diff --git a/storm-server/src/test/java/org/apache/storm/metricstore/rocksdb/StringMetadataCacheTest.java b/storm-server/src/test/java/org/apache/storm/metricstore/rocksdb/StringMetadataCacheTest.java index fe6e63bc402..68739e97daf 100644 --- a/storm-server/src/test/java/org/apache/storm/metricstore/rocksdb/StringMetadataCacheTest.java +++ b/storm-server/src/test/java/org/apache/storm/metricstore/rocksdb/StringMetadataCacheTest.java @@ -18,18 +18,18 @@ package org.apache.storm.metricstore.rocksdb; -import org.apache.storm.metricstore.MetricException; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.rocksdb.RocksDB; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; +import org.apache.storm.metricstore.MetricException; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.rocksdb.RocksDB; + public class StringMetadataCacheTest { @BeforeEach diff --git a/storm-server/src/test/java/org/apache/storm/nimbus/InMemoryTopologyActionNotifier.java b/storm-server/src/test/java/org/apache/storm/nimbus/InMemoryTopologyActionNotifier.java index 83c46f63f7b..54f57368791 100644 --- a/storm-server/src/test/java/org/apache/storm/nimbus/InMemoryTopologyActionNotifier.java +++ b/storm-server/src/test/java/org/apache/storm/nimbus/InMemoryTopologyActionNotifier.java @@ -29,7 +29,7 @@ public class InMemoryTopologyActionNotifier implements ITopologyActionNotifierPl @Override public void prepare(Map stormConf) { - //no-op + //no-op } @Override @@ -46,6 +46,6 @@ public List getTopologyActions(String topologyName) { @Override public void cleanup() { - //no-op + //no-op } } diff --git a/storm-server/src/test/java/org/apache/storm/nimbus/LocalNimbusTest.java b/storm-server/src/test/java/org/apache/storm/nimbus/LocalNimbusTest.java index ad1137def32..9b068bf3ad8 100644 --- a/storm-server/src/test/java/org/apache/storm/nimbus/LocalNimbusTest.java +++ b/storm-server/src/test/java/org/apache/storm/nimbus/LocalNimbusTest.java @@ -19,6 +19,8 @@ package org.apache.storm.nimbus; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -37,8 +39,6 @@ import org.apache.storm.utils.Utils; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - /** * Tests local cluster with nimbus and a plugin for {@link Config#STORM_TOPOLOGY_SUBMISSION_NOTIFIER_PLUGIN}. */ diff --git a/storm-server/src/test/java/org/apache/storm/scheduler/ClusterTest.java b/storm-server/src/test/java/org/apache/storm/scheduler/ClusterTest.java index 54280e62a97..bbd638597fc 100644 --- a/storm-server/src/test/java/org/apache/storm/scheduler/ClusterTest.java +++ b/storm-server/src/test/java/org/apache/storm/scheduler/ClusterTest.java @@ -12,13 +12,13 @@ package org.apache.storm.scheduler; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.HashMap; import java.util.Map; import org.apache.storm.Config; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - /** * Unit tests for {@link Cluster}. */ diff --git a/storm-server/src/test/java/org/apache/storm/scheduler/IsolationSchedulerTest.java b/storm-server/src/test/java/org/apache/storm/scheduler/IsolationSchedulerTest.java index 6c8cd246436..705d30882c1 100644 --- a/storm-server/src/test/java/org/apache/storm/scheduler/IsolationSchedulerTest.java +++ b/storm-server/src/test/java/org/apache/storm/scheduler/IsolationSchedulerTest.java @@ -12,6 +12,8 @@ package org.apache.storm.scheduler; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -24,8 +26,6 @@ import org.apache.storm.scheduler.resource.normalization.ResourceMetrics; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - /** * Unit tests for {@link IsolationScheduler}. */ @@ -102,4 +102,4 @@ public void hostAssignableSlots_breaksTiesByHostName() { assertEquals(2, ranked.get(1).getFreeSlots()); assertEquals(hostOrder(ranked), List.of("host-aaa", "host-bbb")); } -} \ No newline at end of file +} diff --git a/storm-server/src/test/java/org/apache/storm/scheduler/SchedulerModelTest.java b/storm-server/src/test/java/org/apache/storm/scheduler/SchedulerModelTest.java index 2ce32057ab2..53620cb3ccd 100644 --- a/storm-server/src/test/java/org/apache/storm/scheduler/SchedulerModelTest.java +++ b/storm-server/src/test/java/org/apache/storm/scheduler/SchedulerModelTest.java @@ -18,6 +18,11 @@ package org.apache.storm.scheduler; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.Arrays; import java.util.Collections; import java.util.HashMap; @@ -26,7 +31,6 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; - import org.apache.storm.Config; import org.apache.storm.daemon.nimbus.Nimbus.StandaloneINimbus; import org.apache.storm.generated.StormTopology; @@ -34,11 +38,6 @@ import org.apache.storm.scheduler.resource.normalization.ResourceMetrics; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class SchedulerModelTest { @Test diff --git a/storm-server/src/test/java/org/apache/storm/scheduler/TestEvenSchedulerIdleSupervisor.java b/storm-server/src/test/java/org/apache/storm/scheduler/TestEvenSchedulerIdleSupervisor.java index 32756a4ec7c..19ddb7d01b5 100644 --- a/storm-server/src/test/java/org/apache/storm/scheduler/TestEvenSchedulerIdleSupervisor.java +++ b/storm-server/src/test/java/org/apache/storm/scheduler/TestEvenSchedulerIdleSupervisor.java @@ -17,12 +17,15 @@ */ package org.apache.storm.scheduler; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.Collections; import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; - import org.apache.storm.Config; import org.apache.storm.DaemonConfig; import org.apache.storm.generated.StormTopology; @@ -34,10 +37,6 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - /** * Tests for the idle-supervisor rebalance behavior added to * {@link EvenScheduler#redistributeOntoIdleSupervisors(Topologies, Cluster)} and its per-supervisor eligibility predicate diff --git a/storm-server/src/test/java/org/apache/storm/scheduler/blacklist/FaultGenerateUtils.java b/storm-server/src/test/java/org/apache/storm/scheduler/blacklist/FaultGenerateUtils.java index 9a34080a5a3..4c8db263519 100644 --- a/storm-server/src/test/java/org/apache/storm/scheduler/blacklist/FaultGenerateUtils.java +++ b/storm-server/src/test/java/org/apache/storm/scheduler/blacklist/FaultGenerateUtils.java @@ -17,17 +17,16 @@ */ package org.apache.storm.scheduler.blacklist; -import org.apache.storm.scheduler.Cluster; -import org.apache.storm.scheduler.INimbus; -import org.apache.storm.scheduler.SchedulerAssignmentImpl; -import org.apache.storm.scheduler.SupervisorDetails; -import org.apache.storm.scheduler.Topologies; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import org.apache.storm.metric.StormMetricsRegistry; +import org.apache.storm.scheduler.Cluster; +import org.apache.storm.scheduler.INimbus; +import org.apache.storm.scheduler.SchedulerAssignmentImpl; +import org.apache.storm.scheduler.SupervisorDetails; +import org.apache.storm.scheduler.Topologies; import org.apache.storm.scheduler.resource.normalization.ResourceMetrics; public class FaultGenerateUtils { diff --git a/storm-server/src/test/java/org/apache/storm/scheduler/blacklist/TestBlacklistScheduler.java b/storm-server/src/test/java/org/apache/storm/scheduler/blacklist/TestBlacklistScheduler.java index abc5f25a289..9f5d6886a72 100644 --- a/storm-server/src/test/java/org/apache/storm/scheduler/blacklist/TestBlacklistScheduler.java +++ b/storm-server/src/test/java/org/apache/storm/scheduler/blacklist/TestBlacklistScheduler.java @@ -17,9 +17,20 @@ */ package org.apache.storm.scheduler.blacklist; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.core.config.Configurator; @@ -30,6 +41,7 @@ import org.apache.storm.generated.InvalidTopologyException; import org.apache.storm.generated.SpoutSpec; import org.apache.storm.generated.StormTopology; +import org.apache.storm.metric.StormMetricsRegistry; import org.apache.storm.scheduler.Cluster; import org.apache.storm.scheduler.DefaultScheduler; import org.apache.storm.scheduler.ExecutorDetails; @@ -41,6 +53,7 @@ import org.apache.storm.scheduler.TopologyDetails; import org.apache.storm.scheduler.resource.ResourceAwareScheduler; import org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler; +import org.apache.storm.scheduler.resource.normalization.ResourceMetrics; import org.apache.storm.scheduler.resource.strategies.scheduling.DefaultResourceAwareStrategy; import org.apache.storm.scheduler.resource.strategies.scheduling.DefaultResourceAwareStrategyOld; import org.apache.storm.scheduler.resource.strategies.scheduling.GenericResourceAwareStrategy; @@ -55,20 +68,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.List; -import java.util.ArrayList; -import org.apache.storm.metric.StormMetricsRegistry; -import org.apache.storm.scheduler.resource.normalization.ResourceMetrics; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class TestBlacklistScheduler { private static final Logger LOG = LoggerFactory.getLogger(TestBlacklistScheduler.class); diff --git a/storm-server/src/test/java/org/apache/storm/scheduler/blacklist/TestUtilsForBlacklistScheduler.java b/storm-server/src/test/java/org/apache/storm/scheduler/blacklist/TestUtilsForBlacklistScheduler.java index 403cb99e722..e538b5b3426 100644 --- a/storm-server/src/test/java/org/apache/storm/scheduler/blacklist/TestUtilsForBlacklistScheduler.java +++ b/storm-server/src/test/java/org/apache/storm/scheduler/blacklist/TestUtilsForBlacklistScheduler.java @@ -17,6 +17,14 @@ */ package org.apache.storm.scheduler.blacklist; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.Set; import org.apache.storm.Config; import org.apache.storm.Constants; import org.apache.storm.generated.Bolt; @@ -47,15 +55,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.Set; - public class TestUtilsForBlacklistScheduler { diff --git a/storm-server/src/test/java/org/apache/storm/scheduler/multitenant/MultitenantSchedulerTest.java b/storm-server/src/test/java/org/apache/storm/scheduler/multitenant/MultitenantSchedulerTest.java index 90522a617e3..6513f9909fb 100644 --- a/storm-server/src/test/java/org/apache/storm/scheduler/multitenant/MultitenantSchedulerTest.java +++ b/storm-server/src/test/java/org/apache/storm/scheduler/multitenant/MultitenantSchedulerTest.java @@ -19,9 +19,9 @@ package org.apache.storm.scheduler.multitenant; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.assertFalse; import java.util.Arrays; import java.util.Collection; @@ -31,11 +31,10 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; - import org.apache.storm.Config; import org.apache.storm.DaemonConfig; -import org.apache.storm.generated.StormTopology; import org.apache.storm.daemon.nimbus.Nimbus.StandaloneINimbus; +import org.apache.storm.generated.StormTopology; import org.apache.storm.metric.StormMetricsRegistry; import org.apache.storm.scheduler.Cluster; import org.apache.storm.scheduler.ExecutorDetails; diff --git a/storm-server/src/test/java/org/apache/storm/scheduler/resource/TestResourceAwareScheduler.java b/storm-server/src/test/java/org/apache/storm/scheduler/resource/TestResourceAwareScheduler.java index a4804202abc..a85f7ea3086 100644 --- a/storm-server/src/test/java/org/apache/storm/scheduler/resource/TestResourceAwareScheduler.java +++ b/storm-server/src/test/java/org/apache/storm/scheduler/resource/TestResourceAwareScheduler.java @@ -12,6 +12,11 @@ package org.apache.storm.scheduler.resource; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.time.Duration; import java.util.ArrayList; import java.util.Arrays; @@ -21,12 +26,11 @@ import java.util.HashSet; import java.util.LinkedList; import java.util.List; -import java.util.Map; import java.util.Map.Entry; +import java.util.Map; import java.util.Set; import java.util.TreeMap; import java.util.concurrent.atomic.AtomicLong; - import org.apache.storm.Config; import org.apache.storm.DaemonConfig; import org.apache.storm.generated.StormTopology; @@ -43,6 +47,7 @@ import org.apache.storm.scheduler.TopologyDetails; import org.apache.storm.scheduler.WorkerSlot; import org.apache.storm.scheduler.resource.normalization.NormalizedResources; +import org.apache.storm.scheduler.resource.normalization.ResourceMetrics; import org.apache.storm.scheduler.resource.strategies.scheduling.BaseResourceAwareStrategy; import org.apache.storm.scheduler.resource.strategies.scheduling.ConstraintSolverStrategy; import org.apache.storm.scheduler.resource.strategies.scheduling.DefaultResourceAwareStrategy; @@ -50,7 +55,6 @@ import org.apache.storm.scheduler.resource.strategies.scheduling.GenericResourceAwareStrategy; import org.apache.storm.scheduler.resource.strategies.scheduling.GenericResourceAwareStrategyOld; import org.apache.storm.scheduler.resource.strategies.scheduling.RoundRobinResourceAwareStrategy; -import org.apache.storm.scheduler.resource.normalization.ResourceMetrics; import org.apache.storm.testing.PerformanceTest; import org.apache.storm.testing.TestWordCounter; import org.apache.storm.testing.TestWordSpout; @@ -67,11 +71,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.*; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; - public class TestResourceAwareScheduler { diff --git a/storm-server/src/test/java/org/apache/storm/scheduler/resource/TestUser.java b/storm-server/src/test/java/org/apache/storm/scheduler/resource/TestUser.java index d3f989dd00a..84639ee5bc2 100644 --- a/storm-server/src/test/java/org/apache/storm/scheduler/resource/TestUser.java +++ b/storm-server/src/test/java/org/apache/storm/scheduler/resource/TestUser.java @@ -12,6 +12,13 @@ package org.apache.storm.scheduler.resource; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.genSupervisors; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.genTopology; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.toDouble; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.userRes; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.userResourcePool; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.HashMap; import java.util.Map; import org.apache.storm.Config; @@ -22,8 +29,8 @@ import org.apache.storm.scheduler.Topologies; import org.apache.storm.scheduler.TopologyDetails; import org.apache.storm.scheduler.WorkerSlot; -import org.apache.storm.scheduler.resource.normalization.ResourceMetrics; import org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.INimbusTest; +import org.apache.storm.scheduler.resource.normalization.ResourceMetrics; import org.apache.storm.scheduler.resource.strategies.scheduling.DefaultResourceAwareStrategy; import org.apache.storm.scheduler.resource.strategies.scheduling.DefaultResourceAwareStrategyOld; import org.apache.storm.scheduler.resource.strategies.scheduling.GenericResourceAwareStrategy; @@ -32,13 +39,6 @@ import org.apache.storm.utils.Time; import org.junit.jupiter.api.Test; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.genSupervisors; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.genTopology; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.toDouble; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.userRes; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.userResourcePool; -import static org.junit.jupiter.api.Assertions.assertEquals; - public class TestUser { private static final Class[] strategyClasses = { diff --git a/storm-server/src/test/java/org/apache/storm/scheduler/resource/TestUtilsForResourceAwareScheduler.java b/storm-server/src/test/java/org/apache/storm/scheduler/resource/TestUtilsForResourceAwareScheduler.java index 3647aa664f4..ecd3f5d703b 100644 --- a/storm-server/src/test/java/org/apache/storm/scheduler/resource/TestUtilsForResourceAwareScheduler.java +++ b/storm-server/src/test/java/org/apache/storm/scheduler/resource/TestUtilsForResourceAwareScheduler.java @@ -12,14 +12,27 @@ package org.apache.storm.scheduler.resource; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map.Entry; +import java.util.Map; +import java.util.Random; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import org.apache.storm.networktopography.DNSToSwitchMapping; -import org.apache.storm.scheduler.resource.normalization.NormalizedResources; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import org.apache.storm.Config; import org.apache.storm.DaemonConfig; import org.apache.storm.generated.Bolt; import org.apache.storm.generated.SpoutSpec; import org.apache.storm.generated.StormTopology; +import org.apache.storm.networktopography.DNSToSwitchMapping; import org.apache.storm.scheduler.Cluster; import org.apache.storm.scheduler.ExecutorDetails; import org.apache.storm.scheduler.INimbus; @@ -30,6 +43,7 @@ import org.apache.storm.scheduler.Topologies; import org.apache.storm.scheduler.TopologyDetails; import org.apache.storm.scheduler.WorkerSlot; +import org.apache.storm.scheduler.resource.normalization.NormalizedResources; import org.apache.storm.scheduler.resource.strategies.priority.DefaultSchedulingPriorityStrategy; import org.apache.storm.scheduler.resource.strategies.scheduling.ConstraintSolverStrategy; import org.apache.storm.scheduler.resource.strategies.scheduling.DefaultResourceAwareStrategy; @@ -52,21 +66,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Random; -import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import static org.junit.jupiter.api.Assertions.assertEquals; - public class TestUtilsForResourceAwareScheduler { private static final Logger LOG = LoggerFactory.getLogger(TestUtilsForResourceAwareScheduler.class); diff --git a/storm-server/src/test/java/org/apache/storm/scheduler/resource/normalization/NormalizedResourceOfferTest.java b/storm-server/src/test/java/org/apache/storm/scheduler/resource/normalization/NormalizedResourceOfferTest.java index d193e09df3f..d55c8ca13f0 100644 --- a/storm-server/src/test/java/org/apache/storm/scheduler/resource/normalization/NormalizedResourceOfferTest.java +++ b/storm-server/src/test/java/org/apache/storm/scheduler/resource/normalization/NormalizedResourceOfferTest.java @@ -18,14 +18,14 @@ package org.apache.storm.scheduler.resource.normalization; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.HashMap; import java.util.Map; import org.apache.storm.Constants; import org.apache.storm.metric.StormMetricsRegistry; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - public class NormalizedResourceOfferTest { @Test public void testNodeOverExtendedCpu() { diff --git a/storm-server/src/test/java/org/apache/storm/scheduler/resource/normalization/NormalizedResourceRequestTest.java b/storm-server/src/test/java/org/apache/storm/scheduler/resource/normalization/NormalizedResourceRequestTest.java index 9d590f166c0..4a3563967e2 100644 --- a/storm-server/src/test/java/org/apache/storm/scheduler/resource/normalization/NormalizedResourceRequestTest.java +++ b/storm-server/src/test/java/org/apache/storm/scheduler/resource/normalization/NormalizedResourceRequestTest.java @@ -18,6 +18,9 @@ package org.apache.storm.scheduler.resource.normalization; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import java.util.HashMap; import java.util.Map; import org.apache.storm.Config; @@ -25,9 +28,6 @@ import org.apache.storm.daemon.Acker; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; - public class NormalizedResourceRequestTest { @Test diff --git a/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/eviction/TestDefaultEvictionStrategy.java b/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/eviction/TestDefaultEvictionStrategy.java index 1f0302d6475..04a29f10336 100644 --- a/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/eviction/TestDefaultEvictionStrategy.java +++ b/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/eviction/TestDefaultEvictionStrategy.java @@ -18,7 +18,12 @@ package org.apache.storm.scheduler.resource.strategies.eviction; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.*; + +import java.util.HashMap; +import java.util.Map; import org.apache.storm.Config; +import org.apache.storm.metric.StormMetricsRegistry; import org.apache.storm.scheduler.Cluster; import org.apache.storm.scheduler.INimbus; import org.apache.storm.scheduler.IScheduler; @@ -26,6 +31,7 @@ import org.apache.storm.scheduler.Topologies; import org.apache.storm.scheduler.resource.ResourceAwareScheduler; import org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler; +import org.apache.storm.scheduler.resource.normalization.ResourceMetrics; import org.apache.storm.scheduler.resource.strategies.scheduling.DefaultResourceAwareStrategy; import org.apache.storm.scheduler.resource.strategies.scheduling.DefaultResourceAwareStrategyOld; import org.apache.storm.scheduler.resource.strategies.scheduling.GenericResourceAwareStrategy; @@ -36,14 +42,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.HashMap; -import java.util.Map; - -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.*; - -import org.apache.storm.metric.StormMetricsRegistry; -import org.apache.storm.scheduler.resource.normalization.ResourceMetrics; - public class TestDefaultEvictionStrategy { private static final Logger LOG = LoggerFactory.getLogger(TestDefaultEvictionStrategy.class); private static final Class[] strategyClasses = { diff --git a/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/priority/TestFIFOSchedulingPriorityStrategy.java b/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/priority/TestFIFOSchedulingPriorityStrategy.java index 7977cfaff41..d24f79da53d 100644 --- a/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/priority/TestFIFOSchedulingPriorityStrategy.java +++ b/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/priority/TestFIFOSchedulingPriorityStrategy.java @@ -18,14 +18,20 @@ package org.apache.storm.scheduler.resource.strategies.priority; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.*; + +import java.util.HashMap; +import java.util.Map; import org.apache.storm.Config; import org.apache.storm.DaemonConfig; +import org.apache.storm.metric.StormMetricsRegistry; import org.apache.storm.scheduler.Cluster; import org.apache.storm.scheduler.INimbus; import org.apache.storm.scheduler.SupervisorDetails; import org.apache.storm.scheduler.Topologies; import org.apache.storm.scheduler.resource.ResourceAwareScheduler; import org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler; +import org.apache.storm.scheduler.resource.normalization.ResourceMetrics; import org.apache.storm.scheduler.resource.strategies.scheduling.DefaultResourceAwareStrategy; import org.apache.storm.scheduler.resource.strategies.scheduling.DefaultResourceAwareStrategyOld; import org.apache.storm.scheduler.resource.strategies.scheduling.GenericResourceAwareStrategy; @@ -33,17 +39,9 @@ import org.apache.storm.scheduler.resource.strategies.scheduling.RoundRobinResourceAwareStrategy; import org.apache.storm.utils.Time; import org.junit.jupiter.api.Test; - -import java.util.HashMap; -import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.*; - -import org.apache.storm.metric.StormMetricsRegistry; -import org.apache.storm.scheduler.resource.normalization.ResourceMetrics; - public class TestFIFOSchedulingPriorityStrategy { private static final Logger LOG = LoggerFactory.getLogger(TestFIFOSchedulingPriorityStrategy.class); private static final Class[] strategyClasses = { diff --git a/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/priority/TestGenericResourceAwareSchedulingPriorityStrategy.java b/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/priority/TestGenericResourceAwareSchedulingPriorityStrategy.java index 74cc5247dcb..1bc8f8bf49c 100644 --- a/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/priority/TestGenericResourceAwareSchedulingPriorityStrategy.java +++ b/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/priority/TestGenericResourceAwareSchedulingPriorityStrategy.java @@ -18,6 +18,21 @@ package org.apache.storm.scheduler.resource.strategies.priority; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.addTopologies; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.assertTopologiesBeenEvicted; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.assertTopologiesFullyScheduled; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.assertTopologiesNotBeenEvicted; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.assertTopologiesNotScheduled; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.genSupervisors; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.genTopology; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.userRes; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.userResourcePool; + +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; import org.apache.storm.Config; import org.apache.storm.DaemonConfig; import org.apache.storm.metric.StormMetricsRegistry; @@ -38,22 +53,6 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.addTopologies; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.assertTopologiesBeenEvicted; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.assertTopologiesFullyScheduled; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.assertTopologiesNotBeenEvicted; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.assertTopologiesNotScheduled; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.genSupervisors; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.genTopology; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.userRes; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.userResourcePool; - public class TestGenericResourceAwareSchedulingPriorityStrategy { private static final Class[] strategyClasses = { GenericResourceAwareStrategy.class, diff --git a/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/TestConstraintSolverStrategy.java b/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/TestConstraintSolverStrategy.java index e408f99d8ef..092792fc21d 100644 --- a/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/TestConstraintSolverStrategy.java +++ b/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/TestConstraintSolverStrategy.java @@ -18,16 +18,30 @@ package org.apache.storm.scheduler.resource.strategies.scheduling; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.HashMap; import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.Set; - +import java.util.stream.Stream; +import net.minidev.json.JSONValue; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.core.config.Configurator; import org.apache.storm.Config; import org.apache.storm.DaemonConfig; +import org.apache.storm.metric.StormMetricsRegistry; import org.apache.storm.scheduler.Cluster; import org.apache.storm.scheduler.ExecutorDetails; import org.apache.storm.scheduler.SchedulerAssignment; @@ -38,35 +52,18 @@ import org.apache.storm.scheduler.WorkerSlot; import org.apache.storm.scheduler.resource.ResourceAwareScheduler; import org.apache.storm.scheduler.resource.SchedulingResult; +import org.apache.storm.scheduler.resource.normalization.ResourceMetrics; import org.apache.storm.scheduler.resource.strategies.scheduling.sorter.ExecSorterByConstraintSeverity; import org.apache.storm.scheduler.resource.strategies.scheduling.sorter.IExecSorter; import org.apache.storm.scheduler.resource.strategies.scheduling.sorter.NodeSorterHostProximity; import org.apache.storm.utils.Time; import org.apache.storm.utils.Utils; -import net.minidev.json.JSONValue; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.stream.Stream; - -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.*; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; - -import org.apache.storm.metric.StormMetricsRegistry; -import org.apache.storm.scheduler.resource.normalization.ResourceMetrics; - public class TestConstraintSolverStrategy { public static Stream data() { return Stream.of( diff --git a/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/TestDefaultResourceAwareStrategy.java b/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/TestDefaultResourceAwareStrategy.java index 0fa0f86fb8b..13712bd8d77 100644 --- a/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/TestDefaultResourceAwareStrategy.java +++ b/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/TestDefaultResourceAwareStrategy.java @@ -18,6 +18,33 @@ package org.apache.storm.scheduler.resource.strategies.scheduling; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.INimbusTest; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.TestBolt; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.TestSpout; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.assertTopologiesFullyScheduled; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.assertTopologiesNotScheduled; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.genExecsAndComps; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.genSupervisors; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.genTopology; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.closeTo; +import static org.hamcrest.Matchers.is; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map.Entry; +import java.util.Map; +import java.util.stream.Collectors; import org.apache.storm.Config; import org.apache.storm.daemon.StormCommon; import org.apache.storm.daemon.nimbus.Nimbus; @@ -57,34 +84,6 @@ import org.junit.jupiter.params.provider.EnumSource; import org.junit.jupiter.params.provider.ValueSource; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.stream.Collectors; - -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.INimbusTest; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.TestBolt; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.TestSpout; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.assertTopologiesFullyScheduled; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.assertTopologiesNotScheduled; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.genExecsAndComps; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.genSupervisors; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.genTopology; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.closeTo; -import static org.hamcrest.Matchers.is; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - @ExtendWith({NormalizedResourcesExtension.class}) public class TestDefaultResourceAwareStrategy { private static final Class[] strategyClasses = { @@ -504,8 +503,8 @@ public void testDefaultResourceAwareStrategyWithoutSettingAckerExecutors(int num // but with ackers added, probably more worker will be launched. // Parameterized test on different numOfAckersPerWorker if (numOfAckersPerWorker == -1) { - // Both Config.TOPOLOGY_ACKER_EXECUTORS and Config.TOPOLOGY_RAS_ACKER_EXECUTORS_PER_WORKER are not set - // Default will be 2 (estimate num of workers) and 1 respectively + // Both Config.TOPOLOGY_ACKER_EXECUTORS and Config.TOPOLOGY_RAS_ACKER_EXECUTORS_PER_WORKER are not set + // Default will be 2 (estimate num of workers) and 1 respectively } else { conf.put(Config.TOPOLOGY_RAS_ACKER_EXECUTORS_PER_WORKER, numOfAckersPerWorker); } @@ -622,7 +621,7 @@ public void testDefaultResourceAwareStrategyWithSettingAckerExecutors(int numOfA if (numOfAckersPerWorker == -1) { - // Leave topology.acker.executors.per.worker unset + // Leave topology.acker.executors.per.worker unset } else { conf.put(Config.TOPOLOGY_RAS_ACKER_EXECUTORS_PER_WORKER, numOfAckersPerWorker); } diff --git a/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/TestGenericResourceAwareStrategy.java b/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/TestGenericResourceAwareStrategy.java index abdd9ae8661..acaa9562dc8 100644 --- a/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/TestGenericResourceAwareStrategy.java +++ b/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/TestGenericResourceAwareStrategy.java @@ -18,13 +18,16 @@ package org.apache.storm.scheduler.resource.strategies.scheduling; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.*; +import static org.junit.jupiter.api.Assertions.*; + import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; -import java.util.Map; import java.util.Map.Entry; +import java.util.Map; import java.util.Set; import java.util.TreeMap; import java.util.concurrent.atomic.AtomicLong; @@ -35,6 +38,7 @@ import org.apache.storm.generated.InvalidTopologyException; import org.apache.storm.generated.StormTopology; import org.apache.storm.generated.WorkerResources; +import org.apache.storm.metric.StormMetricsRegistry; import org.apache.storm.scheduler.Cluster; import org.apache.storm.scheduler.ExecutorDetails; import org.apache.storm.scheduler.INimbus; @@ -47,6 +51,7 @@ import org.apache.storm.scheduler.WorkerSlot; import org.apache.storm.scheduler.resource.ResourceAwareScheduler; import org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler; +import org.apache.storm.scheduler.resource.normalization.ResourceMetrics; import org.apache.storm.topology.SharedOffHeapWithinNode; import org.apache.storm.topology.SharedOffHeapWithinWorker; import org.apache.storm.topology.SharedOnHeap; @@ -59,12 +64,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.*; -import static org.junit.jupiter.api.Assertions.*; - -import org.apache.storm.metric.StormMetricsRegistry; -import org.apache.storm.scheduler.resource.normalization.ResourceMetrics; - public class TestGenericResourceAwareStrategy { private static final Logger LOG = LoggerFactory.getLogger(TestGenericResourceAwareStrategy.class); private static final Class[] strategyClasses = { @@ -229,8 +228,8 @@ public void testGenericResourceAwareStrategyWithoutSettingAckerExecutors(int num // but with ackers added, probably more worker will be launched. // Parameterized test on different numOfAckersPerWorker if (numOfAckersPerWorker == -1) { - // Both Config.TOPOLOGY_ACKER_EXECUTORS and Config.TOPOLOGY_RAS_ACKER_EXECUTORS_PER_WORKER are not set - // Default will be 2 (estimate num of workers) and 1 respectively + // Both Config.TOPOLOGY_ACKER_EXECUTORS and Config.TOPOLOGY_RAS_ACKER_EXECUTORS_PER_WORKER are not set + // Default will be 2 (estimate num of workers) and 1 respectively } else { conf.put(Config.TOPOLOGY_RAS_ACKER_EXECUTORS_PER_WORKER, numOfAckersPerWorker); } @@ -276,7 +275,7 @@ public void testGenericResourceAwareStrategyWithoutSettingAckerExecutors(int num new ExecutorDetails(1, 1), //bolt-1 - 500 MB, 50% CPU, 0 GPU new ExecutorDetails(0, 0), //Spout - 500 MB, 50% CPU, 0 GPU new ExecutorDetails(7, 7)))); //acker - 250 MB, 50% CPU, 0 GPU - //Total 1750 MB, 200% CPU, 2 GPU -> this node has 250 MB, 0% CPU, 0 GPU left + //Total 1750 MB, 200% CPU, 2 GPU -> this node has 250 MB, 0% CPU, 0 GPU left } else if (numOfAckersPerWorker == 0) { expectedScheduling.add(new HashSet<>(Collections.singletonList( new ExecutorDetails(3, 3)))); //bolt-3 - 500 MB, 50% CPU, 2 GPU @@ -290,7 +289,7 @@ public void testGenericResourceAwareStrategyWithoutSettingAckerExecutors(int num expectedScheduling.add(new HashSet<>(Arrays.asList( new ExecutorDetails(0, 0), //Spout - 500 MB, 50% CPU, 0 GPU new ExecutorDetails(4, 4)))); //bolt-3 500 MB, 50% cpu, 2 GPU - //Total 1000 MB, 100% CPU, 2 GPU -> this node has 1000 MB, 100% CPU, 0 GPU left + //Total 1000 MB, 100% CPU, 2 GPU -> this node has 1000 MB, 100% CPU, 0 GPU left } else if (numOfAckersPerWorker == 2) { expectedScheduling.add(new HashSet<>(Collections.singletonList( new ExecutorDetails(3, 3)))); //bolt-3 - 500 MB, 50% CPU, 2 GPU @@ -363,7 +362,7 @@ public void testGenericResourceAwareStrategyWithSettingAckerExecutors(int numOfA conf.put(Config.TOPOLOGY_ACKER_EXECUTORS, 4); if (numOfAckersPerWorker == -1) { - // Leave topology.acker.executors.per.worker unset + // Leave topology.acker.executors.per.worker unset } else { conf.put(Config.TOPOLOGY_RAS_ACKER_EXECUTORS_PER_WORKER, numOfAckersPerWorker); } diff --git a/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/TestLargeCluster.java b/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/TestLargeCluster.java index ea15b2f620f..ce36a971459 100644 --- a/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/TestLargeCluster.java +++ b/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/TestLargeCluster.java @@ -18,6 +18,26 @@ package org.apache.storm.scheduler.resource.strategies.scheduling; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; +import java.util.concurrent.atomic.AtomicInteger; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.core.config.Configurator; import org.apache.storm.Config; @@ -45,27 +65,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.BufferedReader; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; -import java.util.concurrent.atomic.AtomicInteger; - -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - @ExtendWith({NormalizedResourcesExtension.class}) public class TestLargeCluster { private static final Logger LOG = LoggerFactory.getLogger(TestLargeCluster.class); diff --git a/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/TestRoundRobinNodeSorterHostIsolation.java b/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/TestRoundRobinNodeSorterHostIsolation.java index 3d436a63d3f..e7c3e2b5191 100644 --- a/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/TestRoundRobinNodeSorterHostIsolation.java +++ b/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/TestRoundRobinNodeSorterHostIsolation.java @@ -18,7 +18,26 @@ package org.apache.storm.scheduler.resource.strategies.scheduling; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.INimbusTest; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.createRoundRobinClusterConfig; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.genSupervisorsWithRacksAndNuma; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.genTopology; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.supervisorIdToRackName; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + import com.google.common.collect.Sets; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; import org.apache.storm.Config; import org.apache.storm.metric.StormMetricsRegistry; import org.apache.storm.networktopography.DNSToSwitchMapping; @@ -39,26 +58,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.INimbusTest; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.createRoundRobinClusterConfig; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.genSupervisorsWithRacksAndNuma; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.genTopology; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.supervisorIdToRackName; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; - @ExtendWith({NormalizedResourcesExtension.class}) public class TestRoundRobinNodeSorterHostIsolation { private static final Logger LOG = LoggerFactory.getLogger(TestRoundRobinNodeSorterHostIsolation.class); @@ -262,4 +261,4 @@ void testTopologyIsolation() { assertEquals(numRacks - 1, assignedRacks.size(), "After reassigning topology " + td2.getId() + ", racks for topology=" + td1.getId() + " is " + assignedRacks); } -} \ No newline at end of file +} diff --git a/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/TestTopologyAnonymizerUtils.java b/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/TestTopologyAnonymizerUtils.java index bd677d0d62b..08e3685105b 100644 --- a/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/TestTopologyAnonymizerUtils.java +++ b/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/TestTopologyAnonymizerUtils.java @@ -18,19 +18,6 @@ package org.apache.storm.scheduler.resource.strategies.scheduling; -import org.apache.storm.Config; -import org.apache.storm.DaemonConfig; -import org.apache.storm.generated.Bolt; -import org.apache.storm.generated.GlobalStreamId; -import org.apache.storm.generated.SpoutSpec; -import org.apache.storm.generated.StormTopology; -import org.apache.storm.serialization.GzipThriftSerializationDelegate; -import org.apache.storm.utils.Utils; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.BufferedReader; import java.io.ByteArrayOutputStream; import java.io.File; @@ -43,6 +30,18 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.storm.Config; +import org.apache.storm.DaemonConfig; +import org.apache.storm.generated.Bolt; +import org.apache.storm.generated.GlobalStreamId; +import org.apache.storm.generated.SpoutSpec; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.serialization.GzipThriftSerializationDelegate; +import org.apache.storm.utils.Utils; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Anonymize Serialized Topologies and Configs with the goal of taking internally developed topologies and configuration diff --git a/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/sorter/TestNodeSorterHostProximity.java b/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/sorter/TestNodeSorterHostProximity.java index 50e50326fe2..f77dd947ff6 100644 --- a/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/sorter/TestNodeSorterHostProximity.java +++ b/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/sorter/TestNodeSorterHostProximity.java @@ -18,6 +18,30 @@ package org.apache.storm.scheduler.resource.strategies.scheduling.sorter; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; +import java.util.stream.Collectors; +import java.util.stream.StreamSupport; import org.apache.storm.Config; import org.apache.storm.metric.StormMetricsRegistry; import org.apache.storm.networktopography.DNSToSwitchMapping; @@ -46,31 +70,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; -import java.util.stream.Collectors; -import java.util.stream.StreamSupport; - -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.*; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; - @ExtendWith({NormalizedResourcesExtension.class}) public class TestNodeSorterHostProximity { private static final Logger LOG = LoggerFactory.getLogger(TestNodeSorterHostProximity.class); @@ -1035,4 +1034,4 @@ private void impairClusterRack(Cluster cluster, String rackId, boolean clearNetw } } } -} \ No newline at end of file +} diff --git a/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/sorter/TestRoundRobinNodeSorterHostProximity.java b/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/sorter/TestRoundRobinNodeSorterHostProximity.java index c43ffa71ad9..5fa8ed32423 100644 --- a/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/sorter/TestRoundRobinNodeSorterHostProximity.java +++ b/storm-server/src/test/java/org/apache/storm/scheduler/resource/strategies/scheduling/sorter/TestRoundRobinNodeSorterHostProximity.java @@ -18,6 +18,38 @@ package org.apache.storm.scheduler.resource.strategies.scheduling.sorter; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.INimbusTest; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.TestBolt; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.createRoundRobinClusterConfig; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.genSupervisorsWithRacks; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.genSupervisorsWithRacksAndNuma; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.genTopology; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.supervisorIdToRackName; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.topoToTopologyDetails; +import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.topologyBuilder; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; +import java.util.stream.Collectors; +import java.util.stream.StreamSupport; import org.apache.storm.Config; import org.apache.storm.metric.StormMetricsRegistry; import org.apache.storm.networktopography.DNSToSwitchMapping; @@ -45,39 +77,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; -import java.util.stream.Collectors; -import java.util.stream.StreamSupport; - -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.INimbusTest; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.TestBolt; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.createRoundRobinClusterConfig; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.genSupervisorsWithRacks; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.genSupervisorsWithRacksAndNuma; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.genTopology; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.supervisorIdToRackName; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.topoToTopologyDetails; -import static org.apache.storm.scheduler.resource.TestUtilsForResourceAwareScheduler.topologyBuilder; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; - @ExtendWith({NormalizedResourcesExtension.class}) public class TestRoundRobinNodeSorterHostProximity { private static final Logger LOG = LoggerFactory.getLogger(TestRoundRobinNodeSorterHostProximity.class); @@ -941,4 +940,4 @@ private void impairClusterRack(Cluster cluster, String rackId, boolean clearNetw } } } -} \ No newline at end of file +} diff --git a/storm-server/src/test/java/org/apache/storm/scheduler/utils/ArtifactoryConfigLoaderTest.java b/storm-server/src/test/java/org/apache/storm/scheduler/utils/ArtifactoryConfigLoaderTest.java index 933cd81cb64..49a42380b81 100644 --- a/storm-server/src/test/java/org/apache/storm/scheduler/utils/ArtifactoryConfigLoaderTest.java +++ b/storm-server/src/test/java/org/apache/storm/scheduler/utils/ArtifactoryConfigLoaderTest.java @@ -12,6 +12,10 @@ package org.apache.storm.scheduler.utils; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + import java.io.File; import java.nio.file.Files; import java.nio.file.Path; @@ -20,16 +24,12 @@ import org.apache.commons.io.FileUtils; import org.apache.storm.Config; import org.apache.storm.DaemonConfig; -import org.apache.storm.utils.Time; import org.apache.storm.utils.Time.SimulatedTime; +import org.apache.storm.utils.Time; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; - public class ArtifactoryConfigLoaderTest { private static final String ARTIFACTORY_HTTP_SCHEME_PREFIX = "artifactory+http://"; @@ -229,4 +229,4 @@ protected String doGet(String api, String artifact, String host, Integer port) { return getDataMap.get(artifact); } } -} \ No newline at end of file +} diff --git a/storm-server/src/test/java/org/apache/storm/scheduler/utils/FileConfigLoaderTest.java b/storm-server/src/test/java/org/apache/storm/scheduler/utils/FileConfigLoaderTest.java index c89875248be..a0a80122823 100644 --- a/storm-server/src/test/java/org/apache/storm/scheduler/utils/FileConfigLoaderTest.java +++ b/storm-server/src/test/java/org/apache/storm/scheduler/utils/FileConfigLoaderTest.java @@ -12,6 +12,10 @@ package org.apache.storm.scheduler.utils; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + import java.io.File; import java.io.FileWriter; import java.nio.file.Files; @@ -22,10 +26,6 @@ import org.junit.jupiter.api.Test; import org.yaml.snakeyaml.Yaml; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; - public class FileConfigLoaderTest { private static final String FILE_SCHEME_PREFIX = "file://"; @@ -105,4 +105,4 @@ public void testValidFile() throws Exception { assertEquals(expectedValue, returnedValue, "Bad value for key=" + key); } } -} \ No newline at end of file +} diff --git a/storm-server/src/test/java/org/apache/storm/security/auth/AuthTest.java b/storm-server/src/test/java/org/apache/storm/security/auth/AuthTest.java index cc2e4acaee7..0b58e066ddb 100644 --- a/storm-server/src/test/java/org/apache/storm/security/auth/AuthTest.java +++ b/storm-server/src/test/java/org/apache/storm/security/auth/AuthTest.java @@ -12,6 +12,14 @@ package org.apache.storm.security.auth; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.mockito.Mockito.*; + import java.io.File; import java.io.IOException; import java.net.InetAddress; @@ -39,25 +47,17 @@ import org.apache.storm.security.auth.workertoken.WorkerTokenManager; import org.apache.storm.testing.InProcessZookeeper; import org.apache.storm.thrift.transport.TTransportException; -import org.awaitility.Awaitility; import org.apache.storm.utils.ConfigUtils; import org.apache.storm.utils.NimbusClient; import org.apache.storm.utils.Time; import org.apache.storm.utils.Utils; +import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; -import static org.mockito.Mockito.*; - public class AuthTest { //3 seconds in milliseconds public static final int NIMBUS_TIMEOUT = 3_000; @@ -647,4 +647,4 @@ public void impersonationAuthorizerTest() throws Exception { public interface MyBiConsumer { void accept(T t, U u) throws Exception; } -} \ No newline at end of file +} diff --git a/storm-server/src/test/java/org/apache/storm/security/auth/DefaultHttpCredentialsPluginTest.java b/storm-server/src/test/java/org/apache/storm/security/auth/DefaultHttpCredentialsPluginTest.java index 93d43b73e02..0abc9b746e4 100644 --- a/storm-server/src/test/java/org/apache/storm/security/auth/DefaultHttpCredentialsPluginTest.java +++ b/storm-server/src/test/java/org/apache/storm/security/auth/DefaultHttpCredentialsPluginTest.java @@ -12,19 +12,19 @@ package org.apache.storm.security.auth; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import jakarta.servlet.http.HttpServletRequest; import java.security.Principal; import java.util.HashMap; import java.util.HashSet; import javax.security.auth.Subject; -import jakarta.servlet.http.HttpServletRequest; import org.apache.storm.shade.com.google.common.collect.ImmutableSet; import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class DefaultHttpCredentialsPluginTest { @Test diff --git a/storm-server/src/test/java/org/apache/storm/security/auth/NimbusAuthTest.java b/storm-server/src/test/java/org/apache/storm/security/auth/NimbusAuthTest.java index f8826c69480..59e96117fe5 100644 --- a/storm-server/src/test/java/org/apache/storm/security/auth/NimbusAuthTest.java +++ b/storm-server/src/test/java/org/apache/storm/security/auth/NimbusAuthTest.java @@ -18,10 +18,11 @@ package org.apache.storm.security.auth; +import static org.junit.jupiter.api.Assertions.*; + import java.util.HashMap; import java.util.Map; import java.util.Optional; - import org.apache.storm.Config; import org.apache.storm.DaemonConfig; import org.apache.storm.LocalCluster; @@ -40,8 +41,6 @@ import org.mockito.ArgumentMatchers; import org.mockito.Mockito; -import static org.junit.jupiter.api.Assertions.*; - /** * Tests for Nimbus authentication and authorization with various transport plugins. * diff --git a/storm-server/src/test/java/org/apache/storm/security/auth/ServerAuthUtilsTest.java b/storm-server/src/test/java/org/apache/storm/security/auth/ServerAuthUtilsTest.java index 960d005059f..90900ba8e6a 100644 --- a/storm-server/src/test/java/org/apache/storm/security/auth/ServerAuthUtilsTest.java +++ b/storm-server/src/test/java/org/apache/storm/security/auth/ServerAuthUtilsTest.java @@ -18,13 +18,12 @@ package org.apache.storm.security.auth; -import org.apache.storm.DaemonConfig; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertSame; import java.util.HashMap; import java.util.Map; - -import static org.junit.jupiter.api.Assertions.assertSame; +import org.apache.storm.DaemonConfig; +import org.junit.jupiter.api.Test; public class ServerAuthUtilsTest { @@ -32,7 +31,7 @@ public static class AuthUtilsTestMock implements IHttpCredentialsPlugin { @Override public void prepare(Map topoConf) { - //NO OP + //NO OP } @Override @@ -57,4 +56,4 @@ public void uiHttpCredentialsPluginTest() { assertSame(ServerAuthUtils.getUiHttpCredentialsPlugin(conf).getClass(), AuthUtilsTestMock.class); assertSame(ServerAuthUtils.getDrpcHttpCredentialsPlugin(conf).getClass(), AuthUtilsTestMock.class); } -} \ No newline at end of file +} diff --git a/storm-server/src/test/java/org/apache/storm/security/auth/workertoken/WorkerTokenTest.java b/storm-server/src/test/java/org/apache/storm/security/auth/workertoken/WorkerTokenTest.java index ec38c8e79a6..6a21057daba 100644 --- a/storm-server/src/test/java/org/apache/storm/security/auth/workertoken/WorkerTokenTest.java +++ b/storm-server/src/test/java/org/apache/storm/security/auth/workertoken/WorkerTokenTest.java @@ -18,6 +18,13 @@ package org.apache.storm.security.auth.workertoken; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.mockito.Mockito.*; + import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -31,13 +38,6 @@ import org.apache.storm.utils.Time; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; -import static org.mockito.Mockito.*; - public class WorkerTokenTest { public static final long ONE_DAY_MILLIS = TimeUnit.HOURS.toMillis(24); diff --git a/storm-server/src/test/java/org/apache/storm/trident/TridentIntegrationTest.java b/storm-server/src/test/java/org/apache/storm/trident/TridentIntegrationTest.java index e39d8ce59ef..136cc71bcb6 100644 --- a/storm-server/src/test/java/org/apache/storm/trident/TridentIntegrationTest.java +++ b/storm-server/src/test/java/org/apache/storm/trident/TridentIntegrationTest.java @@ -18,16 +18,23 @@ package org.apache.storm.trident; +import static org.awaitility.Awaitility.await; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; - +import net.minidev.json.JSONValue; +import net.minidev.json.parser.JSONParser; +import net.minidev.json.parser.ParseException; import org.apache.storm.Config; -import org.apache.storm.LocalCluster; import org.apache.storm.LocalCluster.LocalTopology; +import org.apache.storm.LocalCluster; import org.apache.storm.LocalDRPC; import org.apache.storm.Testing; import org.apache.storm.generated.Bolt; @@ -50,16 +57,8 @@ import org.apache.storm.trident.tuple.TridentTuple; import org.apache.storm.tuple.Fields; import org.apache.storm.tuple.Values; -import net.minidev.json.JSONValue; -import net.minidev.json.parser.JSONParser; -import net.minidev.json.parser.ParseException; import org.junit.jupiter.api.Test; -import static org.awaitility.Awaitility.await; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - /** * Ported from storm-core/test/clj/integration/org/apache/storm/trident/integration_test.clj */ diff --git a/storm-server/src/test/java/org/apache/storm/utils/EquivalenceUtilsTest.java b/storm-server/src/test/java/org/apache/storm/utils/EquivalenceUtilsTest.java index 6bcf85e3a2b..2b24fff91f9 100644 --- a/storm-server/src/test/java/org/apache/storm/utils/EquivalenceUtilsTest.java +++ b/storm-server/src/test/java/org/apache/storm/utils/EquivalenceUtilsTest.java @@ -18,8 +18,10 @@ package org.apache.storm.utils; -import com.google.common.collect.Maps; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import com.google.common.collect.Maps; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -28,8 +30,6 @@ import org.apache.storm.generated.LocalAssignment; import org.apache.storm.generated.WorkerResources; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; public class EquivalenceUtilsTest { diff --git a/storm-server/src/test/java/org/apache/storm/utils/ZookeeperServerCnxnFactoryTest.java b/storm-server/src/test/java/org/apache/storm/utils/ZookeeperServerCnxnFactoryTest.java index d41145f26c8..4274430a69d 100644 --- a/storm-server/src/test/java/org/apache/storm/utils/ZookeeperServerCnxnFactoryTest.java +++ b/storm-server/src/test/java/org/apache/storm/utils/ZookeeperServerCnxnFactoryTest.java @@ -12,11 +12,11 @@ package org.apache.storm.utils; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; + public class ZookeeperServerCnxnFactoryTest { @Test