From f7598f5e9069c6b7e0d0825f7e82861c8011ec12 Mon Sep 17 00:00:00 2001 From: Karl-Philipp Richter Date: Mon, 9 Mar 2015 02:26:30 +0100 Subject: [PATCH] Add missing @Override annotations (help to detect inheritance issues when generics are used more intensively) --- .../hbase/topology/TotalWordCounter.java | 4 +++ .../storm/hbase/topology/WordCounter.java | 4 +++ .../storm/hbase/topology/WordSpout.java | 6 ++++ .../storm/hdfs/bolt/HdfsFileTopology.java | 8 ++++++ .../storm/hdfs/bolt/SequenceFileTopology.java | 8 ++++++ .../hive/bolt/BucketTestHiveTopology.java | 5 ++++ .../apache/storm/hive/bolt/HiveTopology.java | 5 ++++ .../hive/bolt/HiveTopologyPartitioned.java | 5 ++++ .../apache/storm/jdbc/spout/UserSpout.java | 6 ++++ .../apache/storm/jms/example/GenericBolt.java | 4 +++ .../storm/jms/example/JsonTupleProducer.java | 2 ++ .../storm/jms/example/SpringJmsProvider.java | 2 ++ ...aSpoutTopologyMainWildcardTopicsLocal.java | 1 + .../loadgen/HttpForwardingMetricsServer.java | 1 + .../mongodb/topology/TotalWordCounter.java | 4 +++ .../storm/mongodb/topology/WordCounter.java | 4 +++ .../storm/mongodb/topology/WordSpout.java | 6 ++++ .../storm/perf/StrGenSpoutHdfsBoltTopo.java | 1 + .../org/apache/storm/perf/utils/Helper.java | 1 + .../storm/redis/topology/WordCounter.java | 4 +++ .../storm/redis/topology/WordSpout.java | 6 ++++ .../solr/topology/SolrFieldsTopology.java | 2 ++ .../storm/solr/topology/SolrJsonTopology.java | 1 + .../trident/SolrFieldsTridentTopology.java | 1 + .../solr/trident/SolrJsonTridentTopology.java | 1 + .../apache/storm/starter/RollingTopWords.java | 1 + .../storm/starter/SkewedRollingTopWords.java | 1 + .../storm/starter/WordCountTopology.java | 1 + .../starter/spout/RandomSentenceSpout.java | 1 + .../tools/RankableObjectWithFields.java | 3 ++ .../apache/storm/starter/tools/Rankings.java | 1 + .../starter/trident/DebugMemoryMapState.java | 1 + .../storm/starter/tools/RankingsTest.java | 1 + .../impl/BatchAsyncResultHandler.java | 2 ++ .../impl/SingleAsyncResultHandler.java | 2 ++ ...ObjectMapperCqlStatementMapperBuilder.java | 1 + .../hbase/trident/state/HBaseMapState.java | 1 + .../windowing/HBaseWindowsStoreFactory.java | 1 + .../hdfs/blobstore/HdfsBlobStoreImplTest.java | 1 + .../storm/hdfs/bolt/AbstractHdfsBolt.java | 1 + .../bolt/format/DefaultFileNameFormat.java | 1 + .../storm/hdfs/common/AbstractHDFSWriter.java | 5 ++++ .../org/apache/storm/hdfs/spout/FileLock.java | 1 + .../apache/storm/hdfs/spout/HdfsSpout.java | 2 ++ .../storm/hdfs/spout/SequenceFileReader.java | 2 ++ .../storm/hdfs/spout/TextFileReader.java | 2 ++ .../trident/format/DefaultFileNameFormat.java | 1 + .../storm/hdfs/spout/TestHdfsSpout.java | 1 + .../org/apache/storm/jms/spout/JmsSpout.java | 2 ++ .../storm/jms/spout/MockJmsProvider.java | 2 ++ .../storm/kafka/spout/KafkaSpoutConfig.java | 1 + .../storm/kafka/spout/RecordTranslator.java | 1 + .../mapper/SimpleMongoUpdateMapper.java | 1 + .../mongodb/trident/state/MongoMapState.java | 1 + .../mqtt/mappers/ByteArrayMessageMapper.java | 2 ++ .../mqtt/mappers/StringMessageMapper.java | 2 ++ .../apache/storm/mqtt/spout/MqttSpout.java | 19 +++++++++++++ .../bolt/TupleOpenTsdbDatapointMapper.java | 1 + .../storm/flux/examples/WordCounter.java | 4 +++ pom.xml | 26 +++++++++++++++++ .../compiler/RexNodeToJavaCodeCompiler.java | 1 + .../datasource/socket/spout/SocketSpout.java | 1 + .../src/main/resources/storm/pmd-ruleset.xml | 28 +++++++++++++++++++ .../src/jvm/org/apache/storm/ILocalDRPC.java | 1 + .../src/jvm/org/apache/storm/LogWriter.java | 1 + .../assignments/ILocalAssignmentsBackend.java | 1 + .../storm/blobstore/ClientBlobStore.java | 1 + .../storm/coordination/CoordinatedBolt.java | 11 ++++++++ .../daemon/supervisor/AdvancedFSOps.java | 19 +++++++++++++ .../supervisor/ClientSupervisorUtils.java | 1 + .../storm/drpc/DRPCInvocationsClient.java | 3 ++ .../jvm/org/apache/storm/drpc/JoinResult.java | 3 ++ .../org/apache/storm/drpc/KeyedFairBolt.java | 7 ++++- .../org/apache/storm/drpc/PrepareRequest.java | 1 + .../org/apache/storm/drpc/ReturnResults.java | 1 + .../storm/executor/ExecutorShutdown.java | 1 + .../bolt/BoltOutputCollectorImpl.java | 1 + .../storm/generated/NumErrorsChoice.java | 1 + .../generated/TopologyInitialStatus.java | 1 + .../jvm/org/apache/storm/grouping/Load.java | 1 + .../storm/grouping/PartialKeyGrouping.java | 2 ++ .../apache/storm/messaging/netty/Client.java | 1 + .../netty/KerberosSaslNettyClient.java | 3 ++ .../netty/KerberosSaslNettyServer.java | 2 ++ .../apache/storm/messaging/netty/Login.java | 1 + .../messaging/netty/SaslNettyClient.java | 1 + .../storm/metric/api/AssignableMetric.java | 1 + .../storm/metric/api/CombinedMetric.java | 1 + .../apache/storm/metric/api/CountMetric.java | 1 + .../apache/storm/metric/api/MeanReducer.java | 3 ++ .../storm/metric/api/MultiCountMetric.java | 1 + .../storm/metric/api/MultiReducedMetric.java | 1 + .../storm/metric/api/ReducedMetric.java | 1 + .../metric/api/rpc/AssignableShellMetric.java | 1 + .../metric/api/rpc/CombinedShellMetric.java | 1 + .../metric/api/rpc/CountShellMetric.java | 1 + .../metric/api/rpc/ReducedShellMetric.java | 1 + .../metric/internal/CountStatAndMetric.java | 1 + .../metric/internal/LatencyStatAndMetric.java | 1 + .../storm/metric/internal/RateTracker.java | 1 + .../storm/multilang/JsonSerializer.java | 6 ++++ .../storm/pacemaker/PacemakerClient.java | 3 ++ .../apache/storm/security/auth/AutoSSL.java | 1 + .../auth/DefaultPrincipalToLocal.java | 1 + .../auth/KerberosPrincipalToLocal.java | 1 + .../security/auth/SimpleTransportPlugin.java | 3 ++ .../auth/authorizer/DenyAuthorizer.java | 2 ++ .../auth/authorizer/NoopAuthorizer.java | 2 ++ .../digest/DigestSaslTransportPlugin.java | 1 + .../auth/kerberos/AutoTGTKrb5LoginModule.java | 5 ++++ .../auth/kerberos/ClientCallbackHandler.java | 1 + .../kerberos/KerberosSaslTransportPlugin.java | 1 + .../auth/kerberos/ServerCallbackHandler.java | 1 + .../auth/sasl/SaslTransportPlugin.java | 2 ++ .../serialization/DefaultKryoFactory.java | 1 + .../serialization/KryoTupleSerializer.java | 1 + .../jvm/org/apache/storm/spout/RawScheme.java | 2 ++ .../org/apache/storm/spout/ShellSpout.java | 5 ++++ .../storm/spout/SpoutOutputCollector.java | 2 ++ .../storm/state/BaseBinaryStateIterator.java | 5 ++++ .../storm/state/DefaultStateEncoder.java | 4 +++ .../storm/streams/operations/Reducer.java | 1 + .../jvm/org/apache/storm/task/ShellBolt.java | 5 ++++ .../apache/storm/task/TopologyContext.java | 3 ++ .../org/apache/storm/testing/BoltTracker.java | 1 + .../org/apache/storm/testing/FeederSpout.java | 6 ++++ .../apache/storm/testing/FixedTupleSpout.java | 5 ++++ .../storm/testing/NonRichBoltTracker.java | 3 ++ .../storm/testing/PythonShellMetricsBolt.java | 3 ++ .../testing/PythonShellMetricsSpout.java | 2 ++ .../testing/SingleUserSimpleTransport.java | 2 ++ .../apache/storm/testing/SpoutTracker.java | 8 ++++++ .../storm/testing/TestAggregatesCounter.java | 4 +++ .../storm/testing/TestEventLogSpout.java | 6 ++++ .../testing/TestEventOrderCheckBolt.java | 4 +++ .../apache/storm/testing/TestGlobalCount.java | 4 +++ .../storm/testing/TestKryoDecorator.java | 1 + .../apache/storm/testing/TestPlannerBolt.java | 3 ++ .../storm/testing/TestPlannerSpout.java | 6 ++++ .../apache/storm/testing/TestWordCounter.java | 4 +++ .../apache/storm/testing/TestWordSpout.java | 6 ++++ .../storm/testing/TupleCaptureBolt.java | 3 ++ .../storm/topology/BasicBoltExecutor.java | 5 ++++ .../storm/topology/BasicOutputCollector.java | 4 +++ .../topology/CheckpointTupleForwarder.java | 2 ++ .../storm/topology/OutputFieldsGetter.java | 4 +++ .../fluent/ChainedAggregatorDeclarer.java | 13 +++++++++ .../operation/TridentOperationContext.java | 3 ++ .../operation/impl/ChainedAggregatorImpl.java | 5 ++++ .../impl/CombinerAggregatorCombineImpl.java | 5 ++++ .../operation/impl/ReducerAggregatorImpl.java | 5 ++++ .../trident/testing/FeederBatchSpout.java | 1 + .../trident/testing/LRUMemoryMapState.java | 12 ++++++++ .../storm/trident/testing/MemoryMapState.java | 12 ++++++++ .../trident/topology/TransactionAttempt.java | 2 ++ .../trident/topology/TridentBoltExecutor.java | 6 ++++ .../AbstractTridentWindowManager.java | 2 ++ .../InMemoryTridentWindowManager.java | 1 + .../StoreBasedTridentWindowManager.java | 4 +++ .../windowing/config/BaseWindowConfig.java | 1 + .../jvm/org/apache/storm/tuple/Fields.java | 1 + .../org/apache/storm/utils/DRPCClient.java | 1 + .../storm/utils/DefaultShellLogHandler.java | 2 ++ .../org/apache/storm/utils/TimeCacheMap.java | 1 + .../WatermarkCountEvictionPolicy.java | 1 + .../PaceMakerStateStorageFactoryTest.java | 2 ++ .../org/apache/storm/bolt/TestJoinBolt.java | 2 ++ .../dependency/DependencyUploaderTest.java | 2 ++ .../apache/storm/clojure/ClojureTuple.java | 4 +++ .../storm/clojure/IndifferentAccessMap.java | 22 +++++++++++++++ .../LocalizedResourceRetentionSet.java | 1 + .../logging/filters/AccessLoggingFilter.java | 3 ++ .../org/apache/storm/metricstore/Metric.java | 1 + .../apache/storm/metricstore/MetricStore.java | 1 + .../metricstore/rocksdb/RocksDbStore.java | 2 ++ .../rocksdb/StringMetadataCache.java | 6 ++++ .../apache/storm/scheduler/resource/User.java | 1 + .../TestUtilsForBlacklistScheduler.java | 6 ++++ .../TestUtilsForResourceAwareScheduler.java | 6 ++++ .../daemon/drpc/webapp/ReqContextFilter.java | 5 +++- .../NotAliveExceptionMapper.java | 1 + 181 files changed, 585 insertions(+), 2 deletions(-) create mode 100644 storm-checkstyle/src/main/resources/storm/pmd-ruleset.xml diff --git a/examples/storm-hbase-examples/src/main/java/org/apache/storm/hbase/topology/TotalWordCounter.java b/examples/storm-hbase-examples/src/main/java/org/apache/storm/hbase/topology/TotalWordCounter.java index 313340a847f..a1017df7128 100644 --- a/examples/storm-hbase-examples/src/main/java/org/apache/storm/hbase/topology/TotalWordCounter.java +++ b/examples/storm-hbase-examples/src/main/java/org/apache/storm/hbase/topology/TotalWordCounter.java @@ -32,6 +32,7 @@ public class TotalWordCounter implements IBasicBolt { private static final Random RANDOM = new Random(); private BigInteger total = BigInteger.ZERO; + @Override public void prepare(Map topoConf, TopologyContext context) { } @@ -39,6 +40,7 @@ public void prepare(Map topoConf, TopologyContext context) { * Just output the word value with a count of 1. * The HBaseBolt will handle incrementing the counter. */ + @Override public void execute(Tuple input, BasicOutputCollector collector) { total = total.add(new BigInteger(input.getValues().get(1).toString())); collector.emit(tuple(total.toString())); @@ -48,10 +50,12 @@ public void execute(Tuple input, BasicOutputCollector collector) { } } + @Override public void cleanup() { LOG.info("Final total = " + total); } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declare(new Fields("total")); } diff --git a/examples/storm-hbase-examples/src/main/java/org/apache/storm/hbase/topology/WordCounter.java b/examples/storm-hbase-examples/src/main/java/org/apache/storm/hbase/topology/WordCounter.java index 933cc49c2b4..699b2ca8296 100644 --- a/examples/storm-hbase-examples/src/main/java/org/apache/storm/hbase/topology/WordCounter.java +++ b/examples/storm-hbase-examples/src/main/java/org/apache/storm/hbase/topology/WordCounter.java @@ -25,6 +25,7 @@ public class WordCounter implements IBasicBolt { + @Override public void prepare(Map topoConf, TopologyContext context) { } @@ -32,14 +33,17 @@ public void prepare(Map topoConf, TopologyContext context) { * Just output the word value with a count of 1. * The HBaseBolt will handle incrementing the counter. */ + @Override public void execute(Tuple input, BasicOutputCollector collector) { collector.emit(tuple(input.getValues().get(0), 1)); } + @Override public void cleanup() { } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declare(new Fields("word", "count")); } diff --git a/examples/storm-hbase-examples/src/main/java/org/apache/storm/hbase/topology/WordSpout.java b/examples/storm-hbase-examples/src/main/java/org/apache/storm/hbase/topology/WordSpout.java index 3e407d65149..a80e80af0ae 100644 --- a/examples/storm-hbase-examples/src/main/java/org/apache/storm/hbase/topology/WordSpout.java +++ b/examples/storm-hbase-examples/src/main/java/org/apache/storm/hbase/topology/WordSpout.java @@ -39,14 +39,17 @@ public boolean isDistributed() { return this.isDistributed; } + @Override public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) { this.collector = collector; } + @Override public void close() { } + @Override public void nextTuple() { final Random rand = new Random(); final String word = words[rand.nextInt(words.length)]; @@ -54,14 +57,17 @@ public void nextTuple() { Thread.yield(); } + @Override public void ack(Object msgId) { } + @Override public void fail(Object msgId) { } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declare(new Fields("word")); } 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 e3599d571f0..e0e3057f742 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 @@ -118,16 +118,19 @@ public static class SentenceSpout extends BaseRichSpout { private int count = 0; private long total = 0L; + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declare(new Fields("sentence", "timestamp")); } + @Override public void open(Map config, TopologyContext context, SpoutOutputCollector collector) { this.collector = collector; this.pending = new ConcurrentHashMap(); } + @Override public void nextTuple() { Values values = new Values(sentences[index], System.currentTimeMillis()); UUID msgId = UUID.randomUUID(); @@ -146,10 +149,12 @@ public void nextTuple() { Thread.yield(); } + @Override public void ack(Object msgId) { this.pending.remove(msgId); } + @Override public void fail(Object msgId) { System.out.println("**** RESENDING FAILED TUPLE"); this.collector.emit(this.pending.get(msgId), msgId); @@ -161,15 +166,18 @@ public static class MyBolt extends BaseRichBolt { private HashMap counts = null; private OutputCollector collector; + @Override public void prepare(Map config, TopologyContext context, OutputCollector collector) { this.counts = new HashMap(); this.collector = collector; } + @Override public void execute(Tuple tuple) { collector.ack(tuple); } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { // this bolt does not emit anything } 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 8ddd045510c..2a58249bce0 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 @@ -124,16 +124,19 @@ public static class SentenceSpout extends BaseRichSpout { private int count = 0; private long total = 0L; + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declare(new Fields("sentence", "timestamp")); } + @Override public void open(Map config, TopologyContext context, SpoutOutputCollector collector) { this.collector = collector; this.pending = new ConcurrentHashMap(); } + @Override public void nextTuple() { Values values = new Values(sentences[index], System.currentTimeMillis()); UUID msgId = UUID.randomUUID(); @@ -152,11 +155,13 @@ public void nextTuple() { Thread.yield(); } + @Override public void ack(Object msgId) { // System.out.println("ACK"); this.pending.remove(msgId); } + @Override public void fail(Object msgId) { System.out.println("**** RESENDING FAILED TUPLE"); this.collector.emit(this.pending.get(msgId), msgId); @@ -169,16 +174,19 @@ public static class MyBolt extends BaseRichBolt { private HashMap counts = null; private OutputCollector collector; + @Override public void prepare(Map config, TopologyContext context, OutputCollector collector) { this.counts = new HashMap(); this.collector = collector; } + @Override public void execute(Tuple tuple) { collector.ack(tuple); } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { // this bolt does not emit anything } diff --git a/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/BucketTestHiveTopology.java b/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/BucketTestHiveTopology.java index 19bf4d4193e..85bbde7a53e 100644 --- a/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/BucketTestHiveTopology.java +++ b/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/BucketTestHiveTopology.java @@ -119,10 +119,12 @@ public UserDataSpout withDataFile (String filePath) { return this; } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declare(new Fields(this.outputFields)); } + @Override public void open(Map config, TopologyContext context, SpoutOutputCollector collector) { this.collector = collector; @@ -135,6 +137,7 @@ public void open(Map config, TopologyContext context, } } + @Override public void nextTuple() { String line; try { @@ -161,10 +164,12 @@ public void nextTuple() { } } + @Override public void ack(Object msgId) { this.pending.remove(msgId); } + @Override public void fail(Object msgId) { System.out.println("**** RESENDING FAILED TUPLE"); this.collector.emit(this.pending.get(msgId), msgId); diff --git a/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/HiveTopology.java b/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/HiveTopology.java index d9d4ea9dbc8..5dbb036c136 100644 --- a/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/HiveTopology.java +++ b/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/HiveTopology.java @@ -100,16 +100,19 @@ public static class UserDataSpout extends BaseRichSpout { private int count = 0; private long total = 0L; + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declare(new Fields("id","name","phone","street","city","state")); } + @Override public void open(Map config, TopologyContext context, SpoutOutputCollector collector) { this.collector = collector; this.pending = new ConcurrentHashMap(); } + @Override public void nextTuple() { String[] user = sentences[index].split(","); Values values = new Values(Integer.parseInt(user[0]),user[1],user[2],user[3],user[4],user[5]); @@ -129,10 +132,12 @@ public void nextTuple() { Thread.yield(); } + @Override public void ack(Object msgId) { this.pending.remove(msgId); } + @Override public void fail(Object msgId) { System.out.println("**** RESENDING FAILED TUPLE"); this.collector.emit(this.pending.get(msgId), msgId); diff --git a/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/HiveTopologyPartitioned.java b/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/HiveTopologyPartitioned.java index 4d8089d660c..6af50de4da1 100644 --- a/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/HiveTopologyPartitioned.java +++ b/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/HiveTopologyPartitioned.java @@ -101,16 +101,19 @@ public static class UserDataSpout extends BaseRichSpout { private int count = 0; private long total = 0L; + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declare(new Fields("id","name","phone","street","city","state")); } + @Override public void open(Map config, TopologyContext context, SpoutOutputCollector collector) { this.collector = collector; this.pending = new ConcurrentHashMap(); } + @Override public void nextTuple() { String[] user = sentences[index].split(","); Values values = new Values(Integer.parseInt(user[0]),user[1],user[2],user[3],user[4],user[5]); @@ -130,10 +133,12 @@ public void nextTuple() { } } + @Override public void ack(Object msgId) { this.pending.remove(msgId); } + @Override public void fail(Object msgId) { System.out.println("**** RESENDING FAILED TUPLE"); this.collector.emit(this.pending.get(msgId), msgId); 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 96415991a8d..06f107cfc6a 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 @@ -47,14 +47,17 @@ public boolean isDistributed() { return this.isDistributed; } + @Override public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) { this.collector = collector; } + @Override public void close() { } + @Override public void nextTuple() { final Random rand = new Random(); final Values row = rows.get(rand.nextInt(rows.size() - 1)); @@ -62,14 +65,17 @@ public void nextTuple() { Thread.yield(); } + @Override public void ack(Object msgId) { } + @Override public void fail(Object msgId) { } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declare(new Fields("user_id","user_name","create_date")); } diff --git a/examples/storm-jms-examples/src/main/java/org/apache/storm/jms/example/GenericBolt.java b/examples/storm-jms-examples/src/main/java/org/apache/storm/jms/example/GenericBolt.java index 0b077c07f7a..341a4dc9973 100644 --- a/examples/storm-jms-examples/src/main/java/org/apache/storm/jms/example/GenericBolt.java +++ b/examples/storm-jms-examples/src/main/java/org/apache/storm/jms/example/GenericBolt.java @@ -67,12 +67,14 @@ public GenericBolt(String name, boolean autoAck, boolean autoAnchor) { this(name, autoAck, autoAnchor, null); } + @Override public void prepare(Map topoConf, TopologyContext context, OutputCollector collector) { this.collector = collector; } + @Override public void execute(Tuple input) { LOG.debug("[" + this.name + "] Received message: " + input); @@ -94,10 +96,12 @@ public void execute(Tuple input) { } + @Override public void cleanup() { } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { if (this.declaredFields != null) { declarer.declare(this.declaredFields); diff --git a/examples/storm-jms-examples/src/main/java/org/apache/storm/jms/example/JsonTupleProducer.java b/examples/storm-jms-examples/src/main/java/org/apache/storm/jms/example/JsonTupleProducer.java index 9ee175e307b..9f88570310d 100644 --- a/examples/storm-jms-examples/src/main/java/org/apache/storm/jms/example/JsonTupleProducer.java +++ b/examples/storm-jms-examples/src/main/java/org/apache/storm/jms/example/JsonTupleProducer.java @@ -42,6 +42,7 @@ @SuppressWarnings("serial") public class JsonTupleProducer implements JmsTupleProducer { + @Override public Values toTuple(Message msg) throws JMSException { if(msg instanceof TextMessage){ String json = ((TextMessage) msg).getText(); @@ -51,6 +52,7 @@ public Values toTuple(Message msg) throws JMSException { } } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declare(new Fields("json")); } diff --git a/examples/storm-jms-examples/src/main/java/org/apache/storm/jms/example/SpringJmsProvider.java b/examples/storm-jms-examples/src/main/java/org/apache/storm/jms/example/SpringJmsProvider.java index 306fc25e25f..747b4151584 100644 --- a/examples/storm-jms-examples/src/main/java/org/apache/storm/jms/example/SpringJmsProvider.java +++ b/examples/storm-jms-examples/src/main/java/org/apache/storm/jms/example/SpringJmsProvider.java @@ -63,10 +63,12 @@ public SpringJmsProvider(String appContextClasspathResource, String connectionFa this.destination = (Destination)context.getBean(destinationBean); } + @Override public ConnectionFactory connectionFactory() throws Exception { return this.connectionFactory; } + @Override public Destination destination() throws Exception { return this.destination; } diff --git a/examples/storm-kafka-client-examples/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutTopologyMainWildcardTopicsLocal.java b/examples/storm-kafka-client-examples/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutTopologyMainWildcardTopicsLocal.java index d7b8cd97f8c..cf70bb34743 100644 --- a/examples/storm-kafka-client-examples/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutTopologyMainWildcardTopicsLocal.java +++ b/examples/storm-kafka-client-examples/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutTopologyMainWildcardTopicsLocal.java @@ -22,6 +22,7 @@ public static void main(String[] args) throws Exception { new KafkaSpoutTopologyMainWildcardTopicsLocal().runExample(); } + @Override protected KafkaSpoutTopologyMainNamedTopics getTopology() { return new KafkaSpoutTopologyMainWildcardTopics(); } diff --git a/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/HttpForwardingMetricsServer.java b/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/HttpForwardingMetricsServer.java index ca8c501c28f..aa3e89f4299 100644 --- a/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/HttpForwardingMetricsServer.java +++ b/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/HttpForwardingMetricsServer.java @@ -54,6 +54,7 @@ protected KryoValuesDeserializer initialValue() { }; private class MetricsCollectionServlet extends HttpServlet { + @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { Input in = new Input(request.getInputStream()); List metrics = des.get().deserializeFrom(in); diff --git a/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/TotalWordCounter.java b/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/TotalWordCounter.java index 4dee7a0c370..b5d20cbfdac 100644 --- a/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/TotalWordCounter.java +++ b/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/TotalWordCounter.java @@ -37,12 +37,14 @@ public class TotalWordCounter implements IBasicBolt { private BigInteger total = BigInteger.ZERO; private static final Logger LOG = LoggerFactory.getLogger(TotalWordCounter.class); private static final Random RANDOM = new Random(); + @Override public void prepare(Map topoConf, TopologyContext context) { } /* * Just output the word value with a count of 1. */ + @Override public void execute(Tuple input, BasicOutputCollector collector) { total = total.add(new BigInteger(input.getValues().get(1).toString())); collector.emit(tuple(total.toString())); @@ -52,10 +54,12 @@ public void execute(Tuple input, BasicOutputCollector collector) { } } + @Override public void cleanup() { LOG.info("Final total = " + total); } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declare(new Fields("total")); } diff --git a/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/WordCounter.java b/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/WordCounter.java index 40542748723..ec96346e96c 100644 --- a/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/WordCounter.java +++ b/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/WordCounter.java @@ -31,10 +31,12 @@ public class WordCounter implements IBasicBolt { private Map wordCounter = Maps.newHashMap(); + @Override public void prepare(Map topoConf, TopologyContext context) { } + @Override public void execute(Tuple input, BasicOutputCollector collector) { String word = input.getStringByField("word"); int count; @@ -49,10 +51,12 @@ public void execute(Tuple input, BasicOutputCollector collector) { collector.emit(new Values(word, String.valueOf(count))); } + @Override public void cleanup() { } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declare(new Fields("word", "count")); } diff --git a/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/WordSpout.java b/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/WordSpout.java index f0bdde20fe2..aa143735874 100644 --- a/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/WordSpout.java +++ b/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/WordSpout.java @@ -45,14 +45,17 @@ public boolean isDistributed() { return this.isDistributed; } + @Override public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) { this.collector = collector; } + @Override public void close() { } + @Override public void nextTuple() { final Random rand = new Random(); final String word = words[rand.nextInt(words.length)]; @@ -60,14 +63,17 @@ public void nextTuple() { Thread.yield(); } + @Override public void ack(Object msgId) { } + @Override public void fail(Object msgId) { } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declare(new Fields("word")); } diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/StrGenSpoutHdfsBoltTopo.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/StrGenSpoutHdfsBoltTopo.java index 110bf796e06..fa0d90bcc1a 100755 --- a/examples/storm-perf/src/main/java/org/apache/storm/perf/StrGenSpoutHdfsBoltTopo.java +++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/StrGenSpoutHdfsBoltTopo.java @@ -153,6 +153,7 @@ public LineWriter withLineDelimiter(String delimiter) { return this; } + @Override public byte[] format(Tuple tuple) { return (tuple.getValueByField(fieldName).toString() + this.lineDelimiter).getBytes(); } diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/Helper.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/Helper.java index a0f838ead7a..b3a206c01d6 100755 --- a/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/Helper.java +++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/Helper.java @@ -74,6 +74,7 @@ public static void setupShutdownHook(final String topoName) { Map clusterConf = Utils.readStormConfig(); final Nimbus.Iface client = NimbusClient.getConfiguredClient(clusterConf).getClient(); Runtime.getRuntime().addShutdownHook(new Thread() { + @Override public void run() { try { System.out.println("Killing..."); 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 c321b83d472..8595d1ef16a 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 @@ -31,9 +31,11 @@ public class WordCounter implements IBasicBolt { private Map wordCounter = Maps.newHashMap(); + @Override public void prepare(Map topoConf, TopologyContext context) { } + @Override public void execute(Tuple input, BasicOutputCollector collector) { String word = input.getStringByField("word"); int count; @@ -48,10 +50,12 @@ public void execute(Tuple input, BasicOutputCollector collector) { collector.emit(new Values(word, String.valueOf(count))); } + @Override public void cleanup() { } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declare(new Fields("word", "count")); } 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 ef45cd2f63a..a3877625328 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 @@ -45,14 +45,17 @@ public boolean isDistributed() { return this.isDistributed; } + @Override public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) { this.collector = collector; } + @Override public void close() { } + @Override public void nextTuple() { final Random rand = new Random(); final String word = words[rand.nextInt(words.length)]; @@ -60,14 +63,17 @@ public void nextTuple() { Thread.yield(); } + @Override public void ack(Object msgId) { } + @Override public void fail(Object msgId) { } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declare(new Fields("word")); } diff --git a/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/topology/SolrFieldsTopology.java b/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/topology/SolrFieldsTopology.java index 030da1ae1f4..0157cfc9752 100644 --- a/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/topology/SolrFieldsTopology.java +++ b/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/topology/SolrFieldsTopology.java @@ -43,10 +43,12 @@ protected SolrMapper getSolrMapper(SolrConfig solrConfig) throws IOException { .setMultiValueFieldToken("%").build(); } + @Override protected SolrCommitStrategy getSolrCommitStgy() { return new CountBasedCommit(2); // To Commit to Solr and Ack according to the commit strategy } + @Override protected StormTopology getTopology() throws IOException { TopologyBuilder builder = new TopologyBuilder(); builder.setSpout("SolrFieldsSpout", new SolrFieldsSpout()); diff --git a/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/topology/SolrJsonTopology.java b/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/topology/SolrJsonTopology.java index 24e6b5e0cf3..d76ffb7d42b 100644 --- a/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/topology/SolrJsonTopology.java +++ b/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/topology/SolrJsonTopology.java @@ -38,6 +38,7 @@ protected SolrMapper getSolrMapper() throws IOException { return new SolrJsonMapper.Builder(COLLECTION, jsonTupleField).build(); } + @Override protected StormTopology getTopology() throws IOException { TopologyBuilder builder = new TopologyBuilder(); builder.setSpout("SolrJsonSpout", new SolrJsonSpout()); diff --git a/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/trident/SolrFieldsTridentTopology.java b/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/trident/SolrFieldsTridentTopology.java index ca64be0a22e..2a230f634a5 100644 --- a/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/trident/SolrFieldsTridentTopology.java +++ b/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/trident/SolrFieldsTridentTopology.java @@ -35,6 +35,7 @@ public static void main(String[] args) throws Exception { solrFieldsTridentTopology.run(args); } + @Override protected StormTopology getTopology() throws IOException { final TridentTopology tridentTopology = new TridentTopology(); final SolrFieldsSpout spout = new SolrFieldsSpout(); diff --git a/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/trident/SolrJsonTridentTopology.java b/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/trident/SolrJsonTridentTopology.java index 75131b858a1..ae3e08816e4 100644 --- a/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/trident/SolrJsonTridentTopology.java +++ b/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/trident/SolrJsonTridentTopology.java @@ -34,6 +34,7 @@ public static void main(String[] args) throws Exception { solrJsonTridentTopology.run(args); } + @Override protected StormTopology getTopology() throws IOException { final TridentTopology topology = new TridentTopology(); final SolrJsonSpout spout = new SolrJsonSpout(); diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/RollingTopWords.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/RollingTopWords.java index 23f56c28804..f8ad8c2bee3 100644 --- a/examples/storm-starter/src/jvm/org/apache/storm/starter/RollingTopWords.java +++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/RollingTopWords.java @@ -61,6 +61,7 @@ public static void main(String[] args) throws Exception { * locally ("-local") or remotely, i.e. on a real cluster. * @throws Exception */ + @Override protected int run(String[] args) { String topologyName = "slidingWindowCounts"; if (args.length >= 1) { diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/SkewedRollingTopWords.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/SkewedRollingTopWords.java index a3b82963356..a17385467cc 100644 --- a/examples/storm-starter/src/jvm/org/apache/storm/starter/SkewedRollingTopWords.java +++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/SkewedRollingTopWords.java @@ -64,6 +64,7 @@ public static void main(String[] args) throws Exception { * locally ("-local") or remotely, i.e. on a real cluster. * @throws Exception */ + @Override protected int run(String[] args) { String topologyName = "slidingWindowCounts"; if (args.length >= 1) { diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/WordCountTopology.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/WordCountTopology.java index 32ec82256c4..628aad742c0 100644 --- a/examples/storm-starter/src/jvm/org/apache/storm/starter/WordCountTopology.java +++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/WordCountTopology.java @@ -35,6 +35,7 @@ public static void main(String[] args) throws Exception { ConfigurableTopology.start(new WordCountTopology(), args); } + @Override protected int run(String[] args) throws Exception { TopologyBuilder builder = new TopologyBuilder(); diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/RandomSentenceSpout.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/RandomSentenceSpout.java index e3e0a68de17..f6067ae9324 100644 --- a/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/RandomSentenceSpout.java +++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/RandomSentenceSpout.java @@ -82,6 +82,7 @@ public TimeStamped(String prefix) { this.prefix = prefix; } + @Override protected String sentence(String input) { return prefix + currentDate() + " " + input; } diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/tools/RankableObjectWithFields.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/tools/RankableObjectWithFields.java index 0b3808e232e..48bc261d247 100644 --- a/examples/storm-starter/src/jvm/org/apache/storm/starter/tools/RankableObjectWithFields.java +++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/tools/RankableObjectWithFields.java @@ -63,10 +63,12 @@ public static RankableObjectWithFields from(Tuple tuple) { return new RankableObjectWithFields(obj, count, otherFields.toArray()); } + @Override public Object getObject() { return obj; } + @Override public long getCount() { return count; } @@ -111,6 +113,7 @@ public int hashCode() { return result; } + @Override public String toString() { StringBuffer buf = new StringBuffer(); buf.append("["); diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/tools/Rankings.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/tools/Rankings.java index eae6ccdac61..85a123b6dfe 100644 --- a/examples/storm-starter/src/jvm/org/apache/storm/starter/tools/Rankings.java +++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/tools/Rankings.java @@ -135,6 +135,7 @@ public void pruneZeroCounts() { } } + @Override public String toString() { return rankedItems.toString(); } diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/trident/DebugMemoryMapState.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/trident/DebugMemoryMapState.java index 4849f72068a..ceac936355a 100644 --- a/examples/storm-starter/src/jvm/org/apache/storm/starter/trident/DebugMemoryMapState.java +++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/trident/DebugMemoryMapState.java @@ -40,6 +40,7 @@ public DebugMemoryMapState(String id) { super(id); } + @Override public List multiUpdate(List> keys, List updaters) { print(keys, updaters); if ((updateCount++ % 5) == 0) { 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 8ee4f22c891..206d45c77d4 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 @@ -341,6 +341,7 @@ public void updatingWithNewRankablesShouldBeThreadSafe() throws InterruptedExcep // when blitzer.blitz(new Runnable() { + @Override public void run() { for (Rankable r : entries) { try { diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/impl/BatchAsyncResultHandler.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/impl/BatchAsyncResultHandler.java index 99a27ef0097..27139faee54 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/impl/BatchAsyncResultHandler.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/impl/BatchAsyncResultHandler.java @@ -41,6 +41,7 @@ public BatchAsyncResultHandler(ExecutionResultHandler handler) { * * The default method does no-operation. */ + @Override public void failure(Throwable t, List input) { completed.offer(new ExecutionResultCollector.FailedCollector(input, t)); } @@ -50,6 +51,7 @@ public void failure(Throwable t, List input) { * * The default method does no-operation. */ + @Override public void success(List input) { completed.offer(new ExecutionResultCollector.SucceedCollector(input)); } diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/impl/SingleAsyncResultHandler.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/impl/SingleAsyncResultHandler.java index d7cc19b1c39..127a06d5b82 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/impl/SingleAsyncResultHandler.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/impl/SingleAsyncResultHandler.java @@ -40,6 +40,7 @@ public SingleAsyncResultHandler(ExecutionResultHandler handler) { * * The default method does no-operation. */ + @Override public void failure(Throwable t, Tuple input) { completed.offer(new ExecutionResultCollector.FailedCollector(input, t)); } @@ -49,6 +50,7 @@ public void failure(Throwable t, Tuple input) { * * The default method does no-operation. */ + @Override public void success(Tuple input) { completed.offer(new ExecutionResultCollector.SucceedCollector(input)); } diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/builder/ObjectMapperCqlStatementMapperBuilder.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/builder/ObjectMapperCqlStatementMapperBuilder.java index 2044f2dbafd..d7961d85874 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/builder/ObjectMapperCqlStatementMapperBuilder.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/builder/ObjectMapperCqlStatementMapperBuilder.java @@ -47,6 +47,7 @@ public ObjectMapperCqlStatementMapperBuilder(String operationField, String value /** * Builds an ObjectMapperCqlStatementMapper. */ + @Override public ObjectMapperCqlStatementMapper build() { List> codecs = codecProducers.stream().map(codecProducer -> { try { diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseMapState.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseMapState.java index 63169fbd6eb..191d7cb7057 100644 --- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseMapState.java +++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseMapState.java @@ -234,6 +234,7 @@ public Factory(StateType stateType, Options options) { } @SuppressWarnings({ "rawtypes", "unchecked" }) + @Override public State makeState(Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions) { LOG.info("Preparing HBase State for partition {} of {}.", partitionIndex + 1, numPartitions); IBackingMap state = new HBaseMapState(options, conf, partitionIndex); diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/windowing/HBaseWindowsStoreFactory.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/windowing/HBaseWindowsStoreFactory.java index 99818118b92..c4030b204cb 100644 --- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/windowing/HBaseWindowsStoreFactory.java +++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/windowing/HBaseWindowsStoreFactory.java @@ -34,6 +34,7 @@ public HBaseWindowsStoreFactory(Map config, String tableName, by this.qualifier = qualifier; } + @Override public WindowsStore create(Map topoConf) { Configuration configuration = HBaseConfiguration.create(); for (Map.Entry entry : config.entrySet()) { 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 752e5637f20..0d44f05923a 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 @@ -64,6 +64,7 @@ public TestHdfsBlobStoreImpl(Path path, Map conf, super(path, conf, hconf); } + @Override protected Path getKeyDir(String key) { return new Path(new Path(blobDir, KEYDIR), key); } 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 bcff1044c2e..156e58a92c4 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 @@ -91,6 +91,7 @@ protected void rotateOutputFile(Writer writer) throws IOException { * @param topologyContext * @param collector */ + @Override public final void prepare(Map conf, TopologyContext topologyContext, OutputCollector collector) { this.writeLock = new Object(); if (this.syncPolicy == null) throw new IllegalStateException("SyncPolicy must be specified."); diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/DefaultFileNameFormat.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/DefaultFileNameFormat.java index 14b45136b23..42c1f5b67a5 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/DefaultFileNameFormat.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/DefaultFileNameFormat.java @@ -74,6 +74,7 @@ public String getName(long rotation, long timeStamp) { return this.prefix + this.componentId + "-" + this.taskId + "-" + rotation + "-" + timeStamp + this.extension; } + @Override public String getPath() { return this.path; } diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/common/AbstractHDFSWriter.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/common/AbstractHDFSWriter.java index d4a95eec215..6c2b0e06127 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/common/AbstractHDFSWriter.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/common/AbstractHDFSWriter.java @@ -31,6 +31,7 @@ public AbstractHDFSWriter(FileRotationPolicy policy, Path path) { this.filePath = path; } + @Override final public long write(Tuple tuple) throws IOException { doWrite(tuple); this.needsRotation = rotationPolicy.mark(tuple, offset); @@ -38,18 +39,22 @@ final public long write(Tuple tuple) throws IOException { return this.offset; } + @Override final public void sync() throws IOException { doSync(); } + @Override final public void close() throws IOException { doClose(); } + @Override public boolean needsRotation() { return needsRotation; } + @Override public Path getFilePath() { return this.filePath; } diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/FileLock.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/FileLock.java index c5a2f55f08c..c6529a9761c 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/FileLock.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/FileLock.java @@ -302,6 +302,7 @@ public static LogEntry deserialize(String line) { return new LogEntry(Long.parseLong(fields[0]), fields[1], fields[2]); } + @Override public String toString() { return eventTime + "," + componentID + "," + fileOffset; } diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/HdfsSpout.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/HdfsSpout.java index bdf9da379a9..18c469f0db7 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/HdfsSpout.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/HdfsSpout.java @@ -230,6 +230,7 @@ public SpoutOutputCollector getCollector() { return collector; } + @Override public void nextTuple() { LOG.trace("Next Tuple {}", spoutId); // 1) First re-emit any previously failed tuples (from retryList) @@ -387,6 +388,7 @@ protected void emitData(List tuple, MessageId id) { } @SuppressWarnings("deprecation") + @Override public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) { LOG.info("Opening HDFS Spout"); this.conf = conf; diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/SequenceFileReader.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/SequenceFileReader.java index ab61c2b5f95..39dccaeaf45 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/SequenceFileReader.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/SequenceFileReader.java @@ -69,6 +69,7 @@ private static void skipToOffset(SequenceFile.Reader reader, Offset offset, } } + @Override public List next() throws IOException, ParseException { if (reader.next(key, value)) { ArrayList result = new ArrayList(2); @@ -88,6 +89,7 @@ public void close() { } } + @Override public Offset getFileOffset() { return offset; } diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/TextFileReader.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/TextFileReader.java index cc5531eff12..94b40f38eb9 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/TextFileReader.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/TextFileReader.java @@ -59,10 +59,12 @@ private TextFileReader(FileSystem fs, Path file, Map conf, TextF } + @Override public Offset getFileOffset() { return offset.clone(); } + @Override public List next() throws IOException, ParseException { String line = readLineAndTrackOffset(reader); if (line != null) { diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/DefaultFileNameFormat.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/DefaultFileNameFormat.java index 825a0f097f4..e97bf1c62ce 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/DefaultFileNameFormat.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/DefaultFileNameFormat.java @@ -72,6 +72,7 @@ public String getName(long rotation, long timeStamp) { return this.prefix + "-" + this.partitionIndex + "-" + rotation + "-" + timeStamp + this.extension; } + @Override public String getPath() { return this.path; } 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 97ad8f2f211..c3e89dcdd8c 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 @@ -776,6 +776,7 @@ public MockTopologyContext(int componentId, Map topoConf) { this.componentId = componentId; } + @Override public String getThisComponentId() { return Integer.toString(componentId); } 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 96226d6dba8..1980a968d5e 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 @@ -255,6 +255,7 @@ public void open(final Map conf, *

When overridden, should always call {@code super} * to finalize the active connections. */ + @Override public void close() { try { LOG.debug("Closing JMS connection."); @@ -272,6 +273,7 @@ public void close() { *

This method polls the queue that's being filled asynchronously by the * jms connection, every {@link #POLL_INTERVAL_MS} seconds. */ + @Override public void nextTuple() { try { Message msg = consumer.receive(POLL_INTERVAL_MS); 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 ca9733d2d1d..c0a8790cb98 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 @@ -46,6 +46,7 @@ public MockJmsProvider() throws NamingException { * * @throws Exception */ + @Override public ConnectionFactory connectionFactory() throws Exception { return this.connectionFactory; } @@ -58,6 +59,7 @@ public ConnectionFactory connectionFactory() throws Exception { * * @throws Exception */ + @Override public Destination destination() throws Exception { return this.destination; } diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpoutConfig.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpoutConfig.java index a51e14cff21..18010378dbd 100644 --- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpoutConfig.java +++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpoutConfig.java @@ -293,6 +293,7 @@ private Builder setKafkaPropsForProcessingGuarantee() { return this; } + @Override public KafkaSpoutConfig build() { return new KafkaSpoutConfig<>(this); } diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/RecordTranslator.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/RecordTranslator.java index 6361c90278a..12263bd8916 100644 --- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/RecordTranslator.java +++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/RecordTranslator.java @@ -39,6 +39,7 @@ public interface RecordTranslator extends Serializable, Func apply(ConsumerRecord record); /** diff --git a/external/storm-mongodb/src/main/java/org/apache/storm/mongodb/common/mapper/SimpleMongoUpdateMapper.java b/external/storm-mongodb/src/main/java/org/apache/storm/mongodb/common/mapper/SimpleMongoUpdateMapper.java index 72328c97335..1c9cd41efbb 100644 --- a/external/storm-mongodb/src/main/java/org/apache/storm/mongodb/common/mapper/SimpleMongoUpdateMapper.java +++ b/external/storm-mongodb/src/main/java/org/apache/storm/mongodb/common/mapper/SimpleMongoUpdateMapper.java @@ -39,6 +39,7 @@ public Document toDocument(ITuple tuple) { return new Document("$set", document); } + @Override public SimpleMongoUpdateMapper withFields(String... fields) { this.fields = fields; return this; diff --git a/external/storm-mongodb/src/main/java/org/apache/storm/mongodb/trident/state/MongoMapState.java b/external/storm-mongodb/src/main/java/org/apache/storm/mongodb/trident/state/MongoMapState.java index b06d35dd9bb..0a3b100a4ee 100644 --- a/external/storm-mongodb/src/main/java/org/apache/storm/mongodb/trident/state/MongoMapState.java +++ b/external/storm-mongodb/src/main/java/org/apache/storm/mongodb/trident/state/MongoMapState.java @@ -147,6 +147,7 @@ public Factory(StateType stateType, Options options) { } @SuppressWarnings({"rawtypes", "unchecked"}) + @Override public State makeState(Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions) { IBackingMap state = new MongoMapState(conf, options); diff --git a/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/mappers/ByteArrayMessageMapper.java b/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/mappers/ByteArrayMessageMapper.java index 1dd943de10f..a943f86537f 100644 --- a/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/mappers/ByteArrayMessageMapper.java +++ b/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/mappers/ByteArrayMessageMapper.java @@ -19,10 +19,12 @@ public class ByteArrayMessageMapper implements MqttMessageMapper { + @Override public Values toValues(MqttMessage message) { return new Values(message.getTopic(), message.getMessage()); } + @Override public Fields outputFields() { return new Fields("topic", "message"); } diff --git a/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/mappers/StringMessageMapper.java b/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/mappers/StringMessageMapper.java index 341e52d4c2c..3f76b6177cf 100644 --- a/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/mappers/StringMessageMapper.java +++ b/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/mappers/StringMessageMapper.java @@ -22,10 +22,12 @@ * "topic" and "message", both of which are Strings. */ public class StringMessageMapper implements MqttMessageMapper { + @Override public Values toValues(MqttMessage message) { return new Values(message.getTopic(), new String(message.getMessage())); } + @Override public Fields outputFields() { return new Fields("topic", "message"); } diff --git a/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/spout/MqttSpout.java b/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/spout/MqttSpout.java index 268a6952c18..1e8cf468b8c 100644 --- a/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/spout/MqttSpout.java +++ b/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/spout/MqttSpout.java @@ -76,14 +76,17 @@ private Long nextId() { return this.sequence; } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declare(this.type.outputFields()); } + @Override public Map getComponentConfiguration() { return null; } + @Override public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) { this.topologyName = (String) conf.get(Config.TOPOLOGY_NAME); @@ -129,13 +132,16 @@ private void connectMqtt() throws Exception { } + @Override public void close() { this.connection.disconnect(new DisconnectCallback()); } + @Override public void activate() { } + @Override public void deactivate() { } @@ -147,6 +153,7 @@ public void deactivate() { * to have nextTuple sleep for a short amount of time (like a single millisecond) * so as not to waste too much CPU. */ + @Override public void nextTuple() { AckableMessage tm = this.incoming.poll(); if (tm != null) { @@ -166,6 +173,7 @@ public void nextTuple() { * * @param msgId */ + @Override public void ack(Object msgId) { AckableMessage msg = this.pending.remove(msgId); this.connection.getDispatchQueue().execute(msg.ack()); @@ -178,6 +186,7 @@ public void ack(Object msgId) { * * @param msgId */ + @Override public void fail(Object msgId) { try { this.incoming.put(this.pending.remove(msgId)); @@ -188,14 +197,17 @@ public void fail(Object msgId) { // ################# Listener Implementation ###################### + @Override public void onConnected() { // this gets called repeatedly for no apparent reason, don't do anything } + @Override public void onDisconnected() { // this gets called repeatedly for no apparent reason, don't do anything } + @Override public void onPublish(UTF8Buffer topic, Buffer payload, Runnable ack) { LOG.debug("Received message: topic={}, payload={}", topic.toString(), new String(payload.toByteArray())); try { @@ -205,6 +217,7 @@ public void onPublish(UTF8Buffer topic, Buffer payload, Runnable ack) { } } + @Override public void onFailure(Throwable throwable) { LOG.error("MQTT Connection Failure.", throwable); MqttSpout.this.connection.disconnect(new DisconnectCallback()); @@ -213,11 +226,13 @@ public void onFailure(Throwable throwable) { // ################# Connect Callback Implementation ###################### private class ConnectCallback implements Callback { + @Override public void onSuccess(Void v) { LOG.info("MQTT Connected. Subscribing to topic..."); MqttSpout.this.mqttConnected = true; } + @Override public void onFailure(Throwable throwable) { LOG.info("MQTT Connection failed."); MqttSpout.this.mqttConnectFailed = true; @@ -226,10 +241,12 @@ public void onFailure(Throwable throwable) { // ################# Subscribe Callback Implementation ###################### private class SubscribeCallback implements Callback { + @Override public void onSuccess(byte[] qos) { LOG.info("Subscripton sucessful."); } + @Override public void onFailure(Throwable throwable) { LOG.error("MQTT Subscripton failed.", throwable); throw new RuntimeException("MQTT Subscribe failed.", throwable); @@ -238,10 +255,12 @@ public void onFailure(Throwable throwable) { // ################# Subscribe Callback Implementation ###################### private class DisconnectCallback implements Callback { + @Override public void onSuccess(Void aVoid) { LOG.info("MQTT Disconnect successful."); } + @Override public void onFailure(Throwable throwable) { // Disconnects don't fail. } diff --git a/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/bolt/TupleOpenTsdbDatapointMapper.java b/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/bolt/TupleOpenTsdbDatapointMapper.java index 89535356cb1..53a49a95bf1 100644 --- a/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/bolt/TupleOpenTsdbDatapointMapper.java +++ b/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/bolt/TupleOpenTsdbDatapointMapper.java @@ -86,6 +86,7 @@ public String getTagsField() { return tagsField; } + @Override public boolean equals(Object o) { if (this == o) return true; if (!(o instanceof TupleOpenTsdbDatapointMapper)) return false; 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 709c254b9cc..1604b791950 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 @@ -43,6 +43,7 @@ public class WordCounter extends BaseBasicBolt { + @Override public void prepare(Map topoConf, TopologyContext context) { } @@ -50,14 +51,17 @@ public void prepare(Map topoConf, TopologyContext context) { * Just output the word value with a count of 1. * The HBaseBolt will handle incrementing the counter. */ + @Override public void execute(Tuple input, BasicOutputCollector collector) { collector.emit(tuple(input.getValues().get(0), 1)); } + @Override public void cleanup() { } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declare(new Fields("word", "count")); } diff --git a/pom.xml b/pom.xml index 91a3293d37b..ab1a7fafe26 100644 --- a/pom.xml +++ b/pom.xml @@ -1254,6 +1254,32 @@ org.apache.maven.plugins maven-pmd-plugin 3.12.0 + + + storm/pmd-ruleset.xml + + true + true + + org/apache/storm/generated/** + org/apache/storm/sql/parser/impl/** + + + + + pmd-check + + check + + + + + + org.apache.storm + storm-checkstyle + ${project.version} + + maven-clean-plugin diff --git a/sql/storm-sql-core/src/jvm/org/apache/storm/sql/compiler/RexNodeToJavaCodeCompiler.java b/sql/storm-sql-core/src/jvm/org/apache/storm/sql/compiler/RexNodeToJavaCodeCompiler.java index 5c4cf6460f5..589154a2501 100644 --- a/sql/storm-sql-core/src/jvm/org/apache/storm/sql/compiler/RexNodeToJavaCodeCompiler.java +++ b/sql/storm-sql-core/src/jvm/org/apache/storm/sql/compiler/RexNodeToJavaCodeCompiler.java @@ -158,6 +158,7 @@ private BlockBuilder compileToBlock(final RexProgram program, ParameterExpressio JavaRowFormat.ARRAY, false)))); final Function1 correlates = new Function1() { + @Override public RexToLixTranslator.InputGetter apply(String a0) { throw new UnsupportedOperationException(); } diff --git a/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/datasource/socket/spout/SocketSpout.java b/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/datasource/socket/spout/SocketSpout.java index b8743b9e6dc..38cb8e7610d 100644 --- a/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/datasource/socket/spout/SocketSpout.java +++ b/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/datasource/socket/spout/SocketSpout.java @@ -157,6 +157,7 @@ public Map getComponentConfiguration() { } private class SocketReaderRunnable implements Runnable { + @Override public void run() { while (running) { try { diff --git a/storm-checkstyle/src/main/resources/storm/pmd-ruleset.xml b/storm-checkstyle/src/main/resources/storm/pmd-ruleset.xml new file mode 100644 index 00000000000..83c085829dd --- /dev/null +++ b/storm-checkstyle/src/main/resources/storm/pmd-ruleset.xml @@ -0,0 +1,28 @@ + + + + + + + The default ruleset for Apache Storm + + + \ No newline at end of file diff --git a/storm-client/src/jvm/org/apache/storm/ILocalDRPC.java b/storm-client/src/jvm/org/apache/storm/ILocalDRPC.java index 93d88b72441..1a8916d30f0 100644 --- a/storm-client/src/jvm/org/apache/storm/ILocalDRPC.java +++ b/storm-client/src/jvm/org/apache/storm/ILocalDRPC.java @@ -27,5 +27,6 @@ public interface ILocalDRPC extends DistributedRPC.Iface, DistributedRPCInvocati * @deprecated use {@link #close()} instead */ @Deprecated + @Override public void shutdown(); } diff --git a/storm-client/src/jvm/org/apache/storm/LogWriter.java b/storm-client/src/jvm/org/apache/storm/LogWriter.java index 4546f10fa98..0c032191c91 100644 --- a/storm-client/src/jvm/org/apache/storm/LogWriter.java +++ b/storm-client/src/jvm/org/apache/storm/LogWriter.java @@ -56,6 +56,7 @@ public static void main(String[] args) throws Exception { System.exit(ret); } + @Override public void run() { Logger logger = this.logger; BufferedReader in = this.in; diff --git a/storm-client/src/jvm/org/apache/storm/assignments/ILocalAssignmentsBackend.java b/storm-client/src/jvm/org/apache/storm/assignments/ILocalAssignmentsBackend.java index 5f901532fa5..762842ecc1e 100644 --- a/storm-client/src/jvm/org/apache/storm/assignments/ILocalAssignmentsBackend.java +++ b/storm-client/src/jvm/org/apache/storm/assignments/ILocalAssignmentsBackend.java @@ -116,5 +116,6 @@ public interface ILocalAssignmentsBackend extends AutoCloseable { /** * Function to release resource. */ + @Override void close(); } diff --git a/storm-client/src/jvm/org/apache/storm/blobstore/ClientBlobStore.java b/storm-client/src/jvm/org/apache/storm/blobstore/ClientBlobStore.java index f01c74e1038..b9290cf03d7 100644 --- a/storm-client/src/jvm/org/apache/storm/blobstore/ClientBlobStore.java +++ b/storm-client/src/jvm/org/apache/storm/blobstore/ClientBlobStore.java @@ -171,6 +171,7 @@ protected abstract AtomicOutputStream createBlobToExtend(String key, SettableBlo */ public abstract void createStateInZookeeper(String key); + @Override public abstract void close(); /** diff --git a/storm-client/src/jvm/org/apache/storm/coordination/CoordinatedBolt.java b/storm-client/src/jvm/org/apache/storm/coordination/CoordinatedBolt.java index 0b40f2f54c5..181e4ec87e1 100644 --- a/storm-client/src/jvm/org/apache/storm/coordination/CoordinatedBolt.java +++ b/storm-client/src/jvm/org/apache/storm/coordination/CoordinatedBolt.java @@ -74,6 +74,7 @@ private static Map singleSourceArgs(String sourceComponent, return ret; } + @Override public void prepare(Map config, TopologyContext context, OutputCollector collector) { TimeCacheMap.ExpiredCallback callback = null; if (_delegate instanceof TimeoutCallback) { @@ -167,6 +168,7 @@ private boolean checkFinishId(Tuple tup, TupleType type) { return failed; } + @Override public void execute(Tuple tuple) { Object id = tuple.getValue(0); TrackingInfo track; @@ -201,11 +203,13 @@ public void execute(Tuple tuple) { } } + @Override public void cleanup() { _delegate.cleanup(); _tracked.cleanup(); } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { _delegate.declareOutputFields(declarer); declarer.declareStream(Constants.COORDINATED_STREAM_ID, true, new Fields("id", "count")); @@ -306,17 +310,20 @@ public CoordinatedOutputCollector(IOutputCollector delegate) { _delegate = delegate; } + @Override public List emit(String stream, Collection anchors, List tuple) { List tasks = _delegate.emit(stream, anchors, tuple); updateTaskCounts(tuple.get(0), tasks); return tasks; } + @Override public void emitDirect(int task, String stream, Collection anchors, List tuple) { updateTaskCounts(tuple.get(0), Arrays.asList(task)); _delegate.emitDirect(task, stream, anchors, tuple); } + @Override public void ack(Tuple tuple) { Object id = tuple.getValue(0); synchronized (_tracked) { @@ -333,6 +340,7 @@ public void ack(Tuple tuple) { } } + @Override public void fail(Tuple tuple) { Object id = tuple.getValue(0); synchronized (_tracked) { @@ -345,14 +353,17 @@ public void fail(Tuple tuple) { _delegate.fail(tuple); } + @Override public void flush() { _delegate.flush(); } + @Override public void resetTimeout(Tuple tuple) { _delegate.resetTimeout(tuple); } + @Override public void reportError(Throwable error) { _delegate.reportError(error); } diff --git a/storm-client/src/jvm/org/apache/storm/daemon/supervisor/AdvancedFSOps.java b/storm-client/src/jvm/org/apache/storm/daemon/supervisor/AdvancedFSOps.java index 5cd04f7e32e..79b5af687e5 100644 --- a/storm-client/src/jvm/org/apache/storm/daemon/supervisor/AdvancedFSOps.java +++ b/storm-client/src/jvm/org/apache/storm/daemon/supervisor/AdvancedFSOps.java @@ -73,6 +73,7 @@ public static AdvancedFSOps make(Map conf) { * @param dir the directory to change permissions on * @throws IOException on any error */ + @Override public void restrictDirectoryPermissions(File dir) throws IOException { Set perms = new HashSet<>( Arrays.asList(PosixFilePermission.OWNER_READ, PosixFilePermission.OWNER_WRITE, @@ -88,6 +89,7 @@ public void restrictDirectoryPermissions(File dir) throws IOException { * @param toDir where to move it from * @throws IOException on any error */ + @Override public void moveDirectoryPreferAtomic(File fromDir, File toDir) throws IOException { FileUtils.forceMkdir(toDir); Files.move(fromDir.toPath(), toDir.toPath(), StandardCopyOption.ATOMIC_MOVE); @@ -96,6 +98,7 @@ public void moveDirectoryPreferAtomic(File fromDir, File toDir) throws IOExcepti /** * @return true if an atomic directory move works, else false. */ + @Override public boolean supportsAtomicDirectoryMove() { return true; } @@ -107,6 +110,7 @@ public boolean supportsAtomicDirectoryMove() { * @param toDir to where * @throws IOException on any error */ + @Override public void copyDirectory(File fromDir, File toDir) throws IOException { FileUtils.copyDirectory(fromDir, toDir); } @@ -118,6 +122,7 @@ public void copyDirectory(File fromDir, File toDir) throws IOException { * @param user the user to change the permissions for * @throws IOException on any error */ + @Override public void setupBlobPermissions(File path, String user) throws IOException { //Normally this is a NOOP } @@ -130,6 +135,7 @@ public void setupBlobPermissions(File path, String user) throws IOException { * @param logPrefix if an external process needs to be launched to delete the object what prefix to include in the logs * @throws IOException on any error. */ + @Override public void deleteIfExists(File path, String user, String logPrefix) throws IOException { //by default no need to do this as a different user deleteIfExists(path); @@ -141,6 +147,7 @@ public void deleteIfExists(File path, String user, String logPrefix) throws IOEx * @param path what to delete * @throws IOException on any error. */ + @Override public void deleteIfExists(File path) throws IOException { LOG.info("Deleting path {}", path); Path p = path.toPath(); @@ -159,6 +166,7 @@ public void deleteIfExists(File path) throws IOException { * @param path the directory to set the permissions on * @throws IOException on any error */ + @Override public void setupStormCodeDir(String user, File path) throws IOException { //By default this is a NOOP } @@ -170,6 +178,7 @@ public void setupStormCodeDir(String user, File path) throws IOException { * @param path the directory to set the permissions on * @throws IOException on any error */ + @Override public void setupWorkerArtifactsDir(String user, File path) throws IOException { //By default this is a NOOP } @@ -183,6 +192,7 @@ public void setupWorkerArtifactsDir(String user, File path) throws IOException { * * @throws IOException on any error */ + @Override public boolean doRequiredTopoFilesExist(Map conf, String topologyId) throws IOException { return ClientSupervisorUtils.doRequiredTopoFilesExist(conf, topologyId); } @@ -193,6 +203,7 @@ public boolean doRequiredTopoFilesExist(Map conf, String topolog * @param path the directory to create * @throws IOException on any error */ + @Override public void forceMkdir(File path) throws IOException { FileUtils.forceMkdir(path); } @@ -203,14 +214,17 @@ public void forceMkdir(File path) throws IOException { * @param path the directory to create * @throws IOException on any error */ + @Override public void forceMkdir(Path path) throws IOException { Files.createDirectories(path); } + @Override public DirectoryStream newDirectoryStream(Path dir, DirectoryStream.Filter filter) throws IOException { return Files.newDirectoryStream(dir, filter); } + @Override public DirectoryStream newDirectoryStream(Path dir) throws IOException { return Files.newDirectoryStream(dir); } @@ -223,6 +237,7 @@ public DirectoryStream newDirectoryStream(Path dir) throws IOException { * * @throws IOException on any error. */ + @Override public boolean fileExists(File path) throws IOException { return path.exists(); } @@ -235,6 +250,7 @@ public boolean fileExists(File path) throws IOException { * * @throws IOException on any error. */ + @Override public boolean fileExists(Path path) throws IOException { return Files.exists(path); } @@ -247,6 +263,7 @@ public boolean fileExists(Path path) throws IOException { * * @throws IOException on any error */ + @Override public Writer getWriter(File file) throws IOException { return new FileWriter(file); } @@ -259,6 +276,7 @@ public Writer getWriter(File file) throws IOException { * * @throws IOException on any error */ + @Override public OutputStream getOutputStream(File file) throws IOException { return new FileOutputStream(file); } @@ -270,6 +288,7 @@ public OutputStream getOutputStream(File file) throws IOException { * @param data the data to write * @throws IOException on any error */ + @Override public void dump(File location, String data) throws IOException { File parent = location.getParentFile(); if (!parent.exists()) { diff --git a/storm-client/src/jvm/org/apache/storm/daemon/supervisor/ClientSupervisorUtils.java b/storm-client/src/jvm/org/apache/storm/daemon/supervisor/ClientSupervisorUtils.java index 8ee8b630908..0aa57348bd5 100644 --- a/storm-client/src/jvm/org/apache/storm/daemon/supervisor/ClientSupervisorUtils.java +++ b/storm-client/src/jvm/org/apache/storm/daemon/supervisor/ClientSupervisorUtils.java @@ -139,6 +139,7 @@ public static Process launchProcess(List command, } if (logPrefix != null || exitCodeCallback != null) { Utils.asyncLoop(new Callable() { + @Override public Long call() { if (logPrefix != null) { Utils.readAndLogStream(logPrefix, diff --git a/storm-client/src/jvm/org/apache/storm/drpc/DRPCInvocationsClient.java b/storm-client/src/jvm/org/apache/storm/drpc/DRPCInvocationsClient.java index e30549b1cc5..e388de71cd7 100644 --- a/storm-client/src/jvm/org/apache/storm/drpc/DRPCInvocationsClient.java +++ b/storm-client/src/jvm/org/apache/storm/drpc/DRPCInvocationsClient.java @@ -57,6 +57,7 @@ public boolean isConnected() { return client.get() != null; } + @Override public void result(String id, String result) throws TException, AuthorizationException { DistributedRPCInvocations.Client c = client.get(); try { @@ -72,6 +73,7 @@ public void result(String id, String result) throws TException, AuthorizationExc } } + @Override public DRPCRequest fetchRequest(String func) throws TException, AuthorizationException { DistributedRPCInvocations.Client c = client.get(); try { @@ -87,6 +89,7 @@ public DRPCRequest fetchRequest(String func) throws TException, AuthorizationExc } } + @Override public void failRequest(String id) throws TException, AuthorizationException { DistributedRPCInvocations.Client c = client.get(); try { diff --git a/storm-client/src/jvm/org/apache/storm/drpc/JoinResult.java b/storm-client/src/jvm/org/apache/storm/drpc/JoinResult.java index d6d4201d4cd..543e22a7f90 100644 --- a/storm-client/src/jvm/org/apache/storm/drpc/JoinResult.java +++ b/storm-client/src/jvm/org/apache/storm/drpc/JoinResult.java @@ -39,10 +39,12 @@ public JoinResult(String returnComponent) { this.returnComponent = returnComponent; } + @Override public void prepare(Map map, TopologyContext context, OutputCollector collector) { _collector = collector; } + @Override public void execute(Tuple tuple) { Object requestId = tuple.getValue(0); if (tuple.getSourceComponent().equals(returnComponent)) { @@ -64,6 +66,7 @@ public void execute(Tuple tuple) { } } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declare(new Fields("result", "return-info")); } diff --git a/storm-client/src/jvm/org/apache/storm/drpc/KeyedFairBolt.java b/storm-client/src/jvm/org/apache/storm/drpc/KeyedFairBolt.java index 1ca564785c7..fc10f86fbc8 100644 --- a/storm-client/src/jvm/org/apache/storm/drpc/KeyedFairBolt.java +++ b/storm-client/src/jvm/org/apache/storm/drpc/KeyedFairBolt.java @@ -39,7 +39,7 @@ public KeyedFairBolt(IBasicBolt delegate) { this(new BasicBoltExecutor(delegate)); } - + @Override public void prepare(Map topoConf, TopologyContext context, OutputCollector collector) { if (_delegate instanceof FinishedCallback) { _callback = (FinishedCallback) _delegate; @@ -47,6 +47,7 @@ public void prepare(Map topoConf, TopologyContext context, Outpu _delegate.prepare(topoConf, context, collector); _rrQueue = new KeyedRoundRobinQueue(); _executor = new Thread(new Runnable() { + @Override public void run() { try { while (true) { @@ -61,20 +62,24 @@ public void run() { _executor.start(); } + @Override public void execute(Tuple input) { Object key = input.getValue(0); _rrQueue.add(key, input); } + @Override public void cleanup() { _executor.interrupt(); _delegate.cleanup(); } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { _delegate.declareOutputFields(declarer); } + @Override public void finishedId(Object id) { if (_callback != null) { _callback.finishedId(id); diff --git a/storm-client/src/jvm/org/apache/storm/drpc/PrepareRequest.java b/storm-client/src/jvm/org/apache/storm/drpc/PrepareRequest.java index d9895ad7799..a0a7cfbc457 100644 --- a/storm-client/src/jvm/org/apache/storm/drpc/PrepareRequest.java +++ b/storm-client/src/jvm/org/apache/storm/drpc/PrepareRequest.java @@ -46,6 +46,7 @@ public void execute(Tuple tuple, BasicOutputCollector collector) { collector.emit(ID_STREAM, new Values(requestId)); } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declareStream(ARGS_STREAM, new Fields("request", "args")); declarer.declareStream(RETURN_STREAM, new Fields("request", "return")); diff --git a/storm-client/src/jvm/org/apache/storm/drpc/ReturnResults.java b/storm-client/src/jvm/org/apache/storm/drpc/ReturnResults.java index cb0aaa87734..b120b512f96 100644 --- a/storm-client/src/jvm/org/apache/storm/drpc/ReturnResults.java +++ b/storm-client/src/jvm/org/apache/storm/drpc/ReturnResults.java @@ -126,6 +126,7 @@ public void cleanup() { } } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { } } diff --git a/storm-client/src/jvm/org/apache/storm/executor/ExecutorShutdown.java b/storm-client/src/jvm/org/apache/storm/executor/ExecutorShutdown.java index 37ea683e242..2a6d5610000 100644 --- a/storm-client/src/jvm/org/apache/storm/executor/ExecutorShutdown.java +++ b/storm-client/src/jvm/org/apache/storm/executor/ExecutorShutdown.java @@ -72,6 +72,7 @@ public void credentialsChanged(Credentials credentials) { } } + @Override public void loadChanged(LoadMapping loadMapping) { executor.reflectNewLoadMapping(loadMapping); } diff --git a/storm-client/src/jvm/org/apache/storm/executor/bolt/BoltOutputCollectorImpl.java b/storm-client/src/jvm/org/apache/storm/executor/bolt/BoltOutputCollectorImpl.java index b8a582ba01e..5ea78384db2 100644 --- a/storm-client/src/jvm/org/apache/storm/executor/bolt/BoltOutputCollectorImpl.java +++ b/storm-client/src/jvm/org/apache/storm/executor/bolt/BoltOutputCollectorImpl.java @@ -59,6 +59,7 @@ public BoltOutputCollectorImpl(BoltExecutor executor, Task taskData, Random rand this.xsfer = executor.getExecutorTransfer(); } + @Override public List emit(String streamId, Collection anchors, List tuple) { try { return boltEmit(streamId, anchors, tuple, null); diff --git a/storm-client/src/jvm/org/apache/storm/generated/NumErrorsChoice.java b/storm-client/src/jvm/org/apache/storm/generated/NumErrorsChoice.java index ace4920cf4d..b14da190d24 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/NumErrorsChoice.java +++ b/storm-client/src/jvm/org/apache/storm/generated/NumErrorsChoice.java @@ -39,6 +39,7 @@ private NumErrorsChoice(int value) { /** * Get the integer value of this enum value, as defined in the Thrift IDL. */ + @Override public int getValue() { return value; } diff --git a/storm-client/src/jvm/org/apache/storm/generated/TopologyInitialStatus.java b/storm-client/src/jvm/org/apache/storm/generated/TopologyInitialStatus.java index e55e7fa3236..7ccb6a03380 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/TopologyInitialStatus.java +++ b/storm-client/src/jvm/org/apache/storm/generated/TopologyInitialStatus.java @@ -38,6 +38,7 @@ private TopologyInitialStatus(int value) { /** * Get the integer value of this enum value, as defined in the Thrift IDL. */ + @Override public int getValue() { return value; } diff --git a/storm-client/src/jvm/org/apache/storm/grouping/Load.java b/storm-client/src/jvm/org/apache/storm/grouping/Load.java index db7f47e629d..2c6662d32b1 100644 --- a/storm-client/src/jvm/org/apache/storm/grouping/Load.java +++ b/storm-client/src/jvm/org/apache/storm/grouping/Load.java @@ -64,6 +64,7 @@ public double getLoad() { return connectionLoad > boltLoad ? connectionLoad : boltLoad; } + @Override public String toString() { return "[:load " + boltLoad + " " + connectionLoad + "]"; } diff --git a/storm-client/src/jvm/org/apache/storm/grouping/PartialKeyGrouping.java b/storm-client/src/jvm/org/apache/storm/grouping/PartialKeyGrouping.java index d42c1236f46..bba635e5b24 100644 --- a/storm-client/src/jvm/org/apache/storm/grouping/PartialKeyGrouping.java +++ b/storm-client/src/jvm/org/apache/storm/grouping/PartialKeyGrouping.java @@ -156,6 +156,7 @@ public static class RandomTwoTaskAssignmentCreator implements AssignmentCreator /** * Creates a two task assignment by selecting random tasks. */ + @Override public int[] createAssignment(List tasks, byte[] key) { // It is necessary that this produce a deterministic assignment based on the key, so seed the Random from the key final long seedForRandom = Arrays.hashCode(key); @@ -178,6 +179,7 @@ public static class BalancedTargetSelector implements TargetSelector { /** * Chooses one of the incoming tasks and selects the one that has been selected the fewest times so far. */ + @Override public Integer chooseTask(int[] assignedTasks) { Integer taskIdWithMinLoad = null; Long minTaskLoad = Long.MAX_VALUE; 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 61a9c9918ef..e76f9d5779b 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 @@ -177,6 +177,7 @@ private void launchChannelAliveThread() { // netty TimerTask is already defined and hence a fully // qualified name TIMER.schedule(new java.util.TimerTask() { + @Override public void run() { try { LOG.debug("running timer task, address {}", dstAddress); diff --git a/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyClient.java b/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyClient.java index 7f2adb5b0e9..352c5b390a8 100644 --- a/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyClient.java +++ b/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyClient.java @@ -107,6 +107,7 @@ public KerberosSaslNettyClient(Map topoConf, String jaas_section final CallbackHandler fch = ch; LOG.debug("Kerberos Client with principal: {}, host: {}", fPrincipalName, fHost); saslClient = Subject.doAs(subject, new PrivilegedExceptionAction() { + @Override public SaslClient run() { try { Map props = new TreeMap(); @@ -146,6 +147,7 @@ public byte[] saslResponse(SaslMessageToken saslTokenMessage) { try { final SaslMessageToken fSaslTokenMessage = saslTokenMessage; byte[] retval = Subject.doAs(subject, new PrivilegedExceptionAction() { + @Override public byte[] run() { try { byte[] retval = saslClient.evaluateChallenge(fSaslTokenMessage @@ -176,6 +178,7 @@ private static class SaslClientCallbackHandler implements CallbackHandler { * @param callbacks objects that indicate what credential information the server's SaslServer requires from the client. * @throws UnsupportedCallbackException */ + @Override public void handle(Callback[] callbacks) throws UnsupportedCallbackException { for (Callback callback : callbacks) { LOG.info("Kerberos Client Callback Handler got callback: {}", callback.getClass()); diff --git a/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyServer.java b/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyServer.java index 3321e8f146e..466ee6d02ca 100644 --- a/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyServer.java +++ b/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyServer.java @@ -97,6 +97,7 @@ class KerberosSaslNettyServer { LOG.debug("Server with host: {}", fHost); saslServer = Subject.doAs(subject, new PrivilegedExceptionAction() { + @Override public SaslServer run() { try { Map props = new TreeMap(); @@ -136,6 +137,7 @@ public String getUserName() { public byte[] response(final byte[] token) { try { byte[] retval = Subject.doAs(subject, new PrivilegedExceptionAction() { + @Override public byte[] run() { try { LOG.debug("response: Responding to input token of length: {}", diff --git a/storm-client/src/jvm/org/apache/storm/messaging/netty/Login.java b/storm-client/src/jvm/org/apache/storm/messaging/netty/Login.java index 1530d37b402..f9e42f0a3d6 100644 --- a/storm-client/src/jvm/org/apache/storm/messaging/netty/Login.java +++ b/storm-client/src/jvm/org/apache/storm/messaging/netty/Login.java @@ -111,6 +111,7 @@ public Login(final String loginContextName, CallbackHandler callbackHandler) // you can decrease the interval of expiration of tickets (for example, to 3 minutes) by running : // "modprinc -maxlife 3mins " in kadmin. t = new Thread(new Runnable() { + @Override public void run() { LOG.info("TGT refresh thread started."); while (true) { // renewal thread's main loop. if it exits from here, thread will exit. diff --git a/storm-client/src/jvm/org/apache/storm/messaging/netty/SaslNettyClient.java b/storm-client/src/jvm/org/apache/storm/messaging/netty/SaslNettyClient.java index c55f2a940c7..11f487dbfbf 100644 --- a/storm-client/src/jvm/org/apache/storm/messaging/netty/SaslNettyClient.java +++ b/storm-client/src/jvm/org/apache/storm/messaging/netty/SaslNettyClient.java @@ -108,6 +108,7 @@ public SaslClientCallbackHandler(String topologyToken, byte[] token) { * @param callbacks objects that indicate what credential information the server's SaslServer requires from the client. * @throws UnsupportedCallbackException */ + @Override public void handle(Callback[] callbacks) throws UnsupportedCallbackException { NameCallback nc = null; diff --git a/storm-client/src/jvm/org/apache/storm/metric/api/AssignableMetric.java b/storm-client/src/jvm/org/apache/storm/metric/api/AssignableMetric.java index f2494270613..8e980ad5626 100644 --- a/storm-client/src/jvm/org/apache/storm/metric/api/AssignableMetric.java +++ b/storm-client/src/jvm/org/apache/storm/metric/api/AssignableMetric.java @@ -23,6 +23,7 @@ public void setValue(Object value) { _value = value; } + @Override public Object getValueAndReset() { return _value; } diff --git a/storm-client/src/jvm/org/apache/storm/metric/api/CombinedMetric.java b/storm-client/src/jvm/org/apache/storm/metric/api/CombinedMetric.java index bf50480d3c8..944533f7119 100644 --- a/storm-client/src/jvm/org/apache/storm/metric/api/CombinedMetric.java +++ b/storm-client/src/jvm/org/apache/storm/metric/api/CombinedMetric.java @@ -25,6 +25,7 @@ public void update(Object value) { _value = _combiner.combine(_value, value); } + @Override public Object getValueAndReset() { Object ret = _value; _value = _combiner.identity(); diff --git a/storm-client/src/jvm/org/apache/storm/metric/api/CountMetric.java b/storm-client/src/jvm/org/apache/storm/metric/api/CountMetric.java index 10d216acb63..8284ed99db1 100644 --- a/storm-client/src/jvm/org/apache/storm/metric/api/CountMetric.java +++ b/storm-client/src/jvm/org/apache/storm/metric/api/CountMetric.java @@ -26,6 +26,7 @@ public void incrBy(long incrementBy) { _value += incrementBy; } + @Override public Object getValueAndReset() { long ret = _value; _value = 0; diff --git a/storm-client/src/jvm/org/apache/storm/metric/api/MeanReducer.java b/storm-client/src/jvm/org/apache/storm/metric/api/MeanReducer.java index 0af91f54c6c..e78ddb87e59 100644 --- a/storm-client/src/jvm/org/apache/storm/metric/api/MeanReducer.java +++ b/storm-client/src/jvm/org/apache/storm/metric/api/MeanReducer.java @@ -24,10 +24,12 @@ class MeanReducerState { } public class MeanReducer implements IReducer { + @Override public MeanReducerState init() { return new MeanReducerState(); } + @Override public MeanReducerState reduce(MeanReducerState acc, Object input) { acc.count++; if (input instanceof Double) { @@ -44,6 +46,7 @@ public MeanReducerState reduce(MeanReducerState acc, Object input) { return acc; } + @Override public Object extractResult(MeanReducerState acc) { if (acc.count > 0) { return acc.sum / (double) acc.count; diff --git a/storm-client/src/jvm/org/apache/storm/metric/api/MultiCountMetric.java b/storm-client/src/jvm/org/apache/storm/metric/api/MultiCountMetric.java index 65c9c322dfb..cc2dce276b7 100644 --- a/storm-client/src/jvm/org/apache/storm/metric/api/MultiCountMetric.java +++ b/storm-client/src/jvm/org/apache/storm/metric/api/MultiCountMetric.java @@ -29,6 +29,7 @@ public CountMetric scope(String key) { return val; } + @Override public Map getValueAndReset() { Map ret = new HashMap<>(); for (Map.Entry e : _value.entrySet()) { diff --git a/storm-client/src/jvm/org/apache/storm/metric/api/MultiReducedMetric.java b/storm-client/src/jvm/org/apache/storm/metric/api/MultiReducedMetric.java index d5d807abaf1..079b3209308 100644 --- a/storm-client/src/jvm/org/apache/storm/metric/api/MultiReducedMetric.java +++ b/storm-client/src/jvm/org/apache/storm/metric/api/MultiReducedMetric.java @@ -31,6 +31,7 @@ public ReducedMetric scope(String key) { return val; } + @Override public Map getValueAndReset() { Map ret = new HashMap<>(); for (Map.Entry e : _value.entrySet()) { diff --git a/storm-client/src/jvm/org/apache/storm/metric/api/ReducedMetric.java b/storm-client/src/jvm/org/apache/storm/metric/api/ReducedMetric.java index 6b0041e778d..92ee6ff594c 100644 --- a/storm-client/src/jvm/org/apache/storm/metric/api/ReducedMetric.java +++ b/storm-client/src/jvm/org/apache/storm/metric/api/ReducedMetric.java @@ -25,6 +25,7 @@ public void update(Object value) { _accumulator = _reducer.reduce(_accumulator, value); } + @Override public Object getValueAndReset() { Object ret = _reducer.extractResult(_accumulator); _accumulator = _reducer.init(); diff --git a/storm-client/src/jvm/org/apache/storm/metric/api/rpc/AssignableShellMetric.java b/storm-client/src/jvm/org/apache/storm/metric/api/rpc/AssignableShellMetric.java index 7e595163baa..ec74f719f68 100644 --- a/storm-client/src/jvm/org/apache/storm/metric/api/rpc/AssignableShellMetric.java +++ b/storm-client/src/jvm/org/apache/storm/metric/api/rpc/AssignableShellMetric.java @@ -19,6 +19,7 @@ public AssignableShellMetric(Object value) { super(value); } + @Override public void updateMetricFromRPC(Object value) { setValue(value); } diff --git a/storm-client/src/jvm/org/apache/storm/metric/api/rpc/CombinedShellMetric.java b/storm-client/src/jvm/org/apache/storm/metric/api/rpc/CombinedShellMetric.java index decf63ac2fa..bffd1e73cdb 100644 --- a/storm-client/src/jvm/org/apache/storm/metric/api/rpc/CombinedShellMetric.java +++ b/storm-client/src/jvm/org/apache/storm/metric/api/rpc/CombinedShellMetric.java @@ -20,6 +20,7 @@ public CombinedShellMetric(ICombiner combiner) { super(combiner); } + @Override public void updateMetricFromRPC(Object value) { update(value); } diff --git a/storm-client/src/jvm/org/apache/storm/metric/api/rpc/CountShellMetric.java b/storm-client/src/jvm/org/apache/storm/metric/api/rpc/CountShellMetric.java index 1924e9492c0..abc2074d8ce 100644 --- a/storm-client/src/jvm/org/apache/storm/metric/api/rpc/CountShellMetric.java +++ b/storm-client/src/jvm/org/apache/storm/metric/api/rpc/CountShellMetric.java @@ -20,6 +20,7 @@ public class CountShellMetric extends CountMetric implements IShellMetric { * if value is null, it will call incr() * if value is long, it will call incrBy((long)params) * */ + @Override public void updateMetricFromRPC(Object value) { if (value == null) { incr(); diff --git a/storm-client/src/jvm/org/apache/storm/metric/api/rpc/ReducedShellMetric.java b/storm-client/src/jvm/org/apache/storm/metric/api/rpc/ReducedShellMetric.java index be67280dd7d..f7abddbab1f 100644 --- a/storm-client/src/jvm/org/apache/storm/metric/api/rpc/ReducedShellMetric.java +++ b/storm-client/src/jvm/org/apache/storm/metric/api/rpc/ReducedShellMetric.java @@ -21,6 +21,7 @@ public ReducedShellMetric(IReducer reducer) { super(reducer); } + @Override public void updateMetricFromRPC(Object value) { update(value); } diff --git a/storm-client/src/jvm/org/apache/storm/metric/internal/CountStatAndMetric.java b/storm-client/src/jvm/org/apache/storm/metric/internal/CountStatAndMetric.java index abce34885b0..d8112dbec6b 100644 --- a/storm-client/src/jvm/org/apache/storm/metric/internal/CountStatAndMetric.java +++ b/storm-client/src/jvm/org/apache/storm/metric/internal/CountStatAndMetric.java @@ -187,6 +187,7 @@ public void close() { } private class Fresher extends TimerTask { + @Override public void run() { rotateSched(System.currentTimeMillis()); } diff --git a/storm-client/src/jvm/org/apache/storm/metric/internal/LatencyStatAndMetric.java b/storm-client/src/jvm/org/apache/storm/metric/internal/LatencyStatAndMetric.java index e7d4636535c..c66f2a18c3a 100644 --- a/storm-client/src/jvm/org/apache/storm/metric/internal/LatencyStatAndMetric.java +++ b/storm-client/src/jvm/org/apache/storm/metric/internal/LatencyStatAndMetric.java @@ -245,6 +245,7 @@ public void close() { } private class Fresher extends TimerTask { + @Override public void run() { rotateSched(System.currentTimeMillis()); } diff --git a/storm-client/src/jvm/org/apache/storm/metric/internal/RateTracker.java b/storm-client/src/jvm/org/apache/storm/metric/internal/RateTracker.java index 30a8d02ba5a..d0bbc743d96 100644 --- a/storm-client/src/jvm/org/apache/storm/metric/internal/RateTracker.java +++ b/storm-client/src/jvm/org/apache/storm/metric/internal/RateTracker.java @@ -130,6 +130,7 @@ private synchronized void rotateBuckets(long time) { } private class Fresher extends TimerTask { + @Override public void run() { rotateBuckets(System.currentTimeMillis()); } diff --git a/storm-client/src/jvm/org/apache/storm/multilang/JsonSerializer.java b/storm-client/src/jvm/org/apache/storm/multilang/JsonSerializer.java index b012252d1a0..6b44d19e9c9 100644 --- a/storm-client/src/jvm/org/apache/storm/multilang/JsonSerializer.java +++ b/storm-client/src/jvm/org/apache/storm/multilang/JsonSerializer.java @@ -39,6 +39,7 @@ public class JsonSerializer implements ISerializer { private transient BufferedWriter processIn; private transient BufferedReader processOut; + @Override public void initialize(OutputStream processIn, InputStream processOut) { try { this.processIn = new BufferedWriter(new OutputStreamWriter(processIn, DEFAULT_CHARSET)); @@ -48,6 +49,7 @@ public void initialize(OutputStream processIn, InputStream processOut) { } } + @Override public Number connect(Map conf, TopologyContext context) throws IOException, NoOutputException { JSONObject setupInfo = new JSONObject(); @@ -60,6 +62,7 @@ public Number connect(Map conf, TopologyContext context) return pid; } + @Override public void writeBoltMsg(BoltMsg boltMsg) throws IOException { JSONObject obj = new JSONObject(); obj.put("id", boltMsg.getId()); @@ -70,6 +73,7 @@ public void writeBoltMsg(BoltMsg boltMsg) throws IOException { writeMessage(obj); } + @Override public void writeSpoutMsg(SpoutMsg msg) throws IOException { JSONObject obj = new JSONObject(); obj.put("command", msg.getCommand()); @@ -77,6 +81,7 @@ public void writeSpoutMsg(SpoutMsg msg) throws IOException { writeMessage(obj); } + @Override public void writeTaskIds(List taskIds) throws IOException { writeMessage(taskIds); } @@ -91,6 +96,7 @@ private void writeString(String str) throws IOException { processIn.flush(); } + @Override public ShellMsg readShellMsg() throws IOException, NoOutputException { JSONObject msg = (JSONObject) readMessage(); ShellMsg shellMsg = new ShellMsg(); diff --git a/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java b/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java index e01c7c017b2..641e326dc6d 100644 --- a/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java +++ b/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java @@ -145,10 +145,12 @@ public synchronized void channelReady(Channel channel) { this.notifyAll(); } + @Override public String name() { return client_name; } + @Override public String secretKey() { return secret; } @@ -231,6 +233,7 @@ public void gotMessage(HBMessage m) { public void reconnect() { final PacemakerClient client = this; timer.schedule(new TimerTask() { + @Override public void run() { client.doReconnect(); } diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/AutoSSL.java b/storm-client/src/jvm/org/apache/storm/security/auth/AutoSSL.java index 480108d411b..73c4b3bf54b 100644 --- a/storm-client/src/jvm/org/apache/storm/security/auth/AutoSSL.java +++ b/storm-client/src/jvm/org/apache/storm/security/auth/AutoSSL.java @@ -83,6 +83,7 @@ public static void deserializeSSLFile(String credsKey, String directory, } } + @Override public void prepare(Map conf) { this.conf = conf; writeDir = getSSLWriteDirFromConf(this.conf); diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/DefaultPrincipalToLocal.java b/storm-client/src/jvm/org/apache/storm/security/auth/DefaultPrincipalToLocal.java index 37e3a6a88b1..3e95613daf6 100644 --- a/storm-client/src/jvm/org/apache/storm/security/auth/DefaultPrincipalToLocal.java +++ b/storm-client/src/jvm/org/apache/storm/security/auth/DefaultPrincipalToLocal.java @@ -21,6 +21,7 @@ public class DefaultPrincipalToLocal implements IPrincipalToLocal { /** * Invoked once immediately after construction */ + @Override public void prepare(Map topoConf) { } diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/KerberosPrincipalToLocal.java b/storm-client/src/jvm/org/apache/storm/security/auth/KerberosPrincipalToLocal.java index b46c8609ef3..ea341f05835 100644 --- a/storm-client/src/jvm/org/apache/storm/security/auth/KerberosPrincipalToLocal.java +++ b/storm-client/src/jvm/org/apache/storm/security/auth/KerberosPrincipalToLocal.java @@ -24,6 +24,7 @@ public class KerberosPrincipalToLocal implements IPrincipalToLocal { * * @param topoConf Storm configuration */ + @Override public void prepare(Map topoConf) { } diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/SimpleTransportPlugin.java b/storm-client/src/jvm/org/apache/storm/security/auth/SimpleTransportPlugin.java index 059ebda2c53..46617e08fbe 100644 --- a/storm-client/src/jvm/org/apache/storm/security/auth/SimpleTransportPlugin.java +++ b/storm-client/src/jvm/org/apache/storm/security/auth/SimpleTransportPlugin.java @@ -127,6 +127,7 @@ private class SimpleWrapProcessor implements TProcessor { this.wrapped = wrapped; } + @Override public boolean process(final TProtocol inProt, final TProtocol outProt) throws TException { //populating request context ReqContext req_context = ReqContext.context(); @@ -152,10 +153,12 @@ public boolean process(final TProtocol inProt, final TProtocol outProt) throws T if (user != null) { HashSet principals = new HashSet<>(); principals.add(new Principal() { + @Override public String getName() { return user; } + @Override public String toString() { return user; } diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/DenyAuthorizer.java b/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/DenyAuthorizer.java index de16e5b202c..e51a7b09e1f 100644 --- a/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/DenyAuthorizer.java +++ b/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/DenyAuthorizer.java @@ -26,6 +26,7 @@ public class DenyAuthorizer implements IAuthorizer { * * @param conf Storm configuration */ + @Override public void prepare(Map conf) { } @@ -37,6 +38,7 @@ public void prepare(Map conf) { * @param topoConf configuration of targeted topology * @return true if the request is authorized, false if reject */ + @Override public boolean permit(ReqContext context, String operation, Map topoConf) { return false; } diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/NoopAuthorizer.java b/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/NoopAuthorizer.java index a0d95daf87e..c984f3a947d 100644 --- a/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/NoopAuthorizer.java +++ b/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/NoopAuthorizer.java @@ -26,6 +26,7 @@ public class NoopAuthorizer implements IAuthorizer { * * @param conf Storm configuration */ + @Override public void prepare(Map conf) { } @@ -37,6 +38,7 @@ public void prepare(Map conf) { * @param topoConf configuration of targeted topology * @return true if the request is authorized, false if reject */ + @Override public boolean permit(ReqContext context, String operation, Map topoConf) { return true; } 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 463b8412823..e3e4497c057 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 @@ -36,6 +36,7 @@ public class DigestSaslTransportPlugin extends SaslTransportPlugin { private static final Logger LOG = LoggerFactory.getLogger(DigestSaslTransportPlugin.class); private WorkerTokenAuthorizer workerTokenAuthorizer; + @Override protected TTransportFactory getServerTransportFactory(boolean impersonationAllowed) throws IOException { if (workerTokenAuthorizer == null) { workerTokenAuthorizer = new WorkerTokenAuthorizer(conf, type); diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/AutoTGTKrb5LoginModule.java b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/AutoTGTKrb5LoginModule.java index 7dd8b7c84d2..e7b6eac8fd9 100644 --- a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/AutoTGTKrb5LoginModule.java +++ b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/AutoTGTKrb5LoginModule.java @@ -33,6 +33,7 @@ public class AutoTGTKrb5LoginModule implements LoginModule { // initial state private Subject subject; + @Override public void initialize(Subject subject, CallbackHandler callbackHandler, Map sharedState, @@ -41,6 +42,7 @@ public void initialize(Subject subject, this.subject = subject; } + @Override public boolean login() throws LoginException { LOG.debug("Acquire TGT from Cache"); getKerbTicketFromCache(); @@ -62,6 +64,7 @@ protected Principal getKerbTicketClient() { return null; } + @Override public boolean commit() throws LoginException { if (isSucceeded() == false) { return false; @@ -80,6 +83,7 @@ public boolean commit() throws LoginException { return true; } + @Override public boolean abort() throws LoginException { if (isSucceeded() == false) { return false; @@ -88,6 +92,7 @@ public boolean abort() throws LoginException { } } + @Override public boolean logout() throws LoginException { if (subject != null && !subject.isReadOnly() && kerbTicket != null) { subject.getPrincipals().remove(kerbTicket.getClient()); diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/ClientCallbackHandler.java b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/ClientCallbackHandler.java index a426840dd6b..bf06d3cfd31 100644 --- a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/ClientCallbackHandler.java +++ b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/ClientCallbackHandler.java @@ -57,6 +57,7 @@ public ClientCallbackHandler(Configuration configuration) throws IOException { * * @param callbacks a collection of challenge callbacks */ + @Override public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException { for (Callback c : callbacks) { if (c instanceof NameCallback) { diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java index 27ea878c686..7cf109b8375 100644 --- a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java +++ b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java @@ -205,6 +205,7 @@ private TTransport kerberosConnect(TTransport transport, String serverHost, Stri try { Subject.doAs(subject, new PrivilegedExceptionAction() { + @Override public Void run() { try { LOG.debug("do as:" + principal); 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 139ad5425c1..20595a92384 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 @@ -50,6 +50,7 @@ public ServerCallbackHandler(Configuration configuration, boolean impersonationA } } + @Override public void handle(Callback[] callbacks) throws UnsupportedCallbackException { NameCallback nc = null; PasswordCallback pc = null; diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/sasl/SaslTransportPlugin.java b/storm-client/src/jvm/org/apache/storm/security/auth/sasl/SaslTransportPlugin.java index 1694caa1f24..f7cf59689b2 100644 --- a/storm-client/src/jvm/org/apache/storm/security/auth/sasl/SaslTransportPlugin.java +++ b/storm-client/src/jvm/org/apache/storm/security/auth/sasl/SaslTransportPlugin.java @@ -124,6 +124,7 @@ private static class TUGIWrapProcessor implements TProcessor { this.wrapped = wrapped; } + @Override public boolean process(final TProtocol inProt, final TProtocol outProt) throws TException { //populating request context ReqContext reqContext = ReqContext.context(); @@ -163,6 +164,7 @@ public User(String name) { /** * Get the full name of the user. */ + @Override public String getName() { return name; } diff --git a/storm-client/src/jvm/org/apache/storm/serialization/DefaultKryoFactory.java b/storm-client/src/jvm/org/apache/storm/serialization/DefaultKryoFactory.java index 7ce07086073..336fa45f922 100644 --- a/storm-client/src/jvm/org/apache/storm/serialization/DefaultKryoFactory.java +++ b/storm-client/src/jvm/org/apache/storm/serialization/DefaultKryoFactory.java @@ -32,6 +32,7 @@ public Kryo getKryo(Map conf) { public void preRegister(Kryo k, Map conf) { } + @Override public void postRegister(Kryo k, Map conf) { ((KryoSerializableDefault) k).overrideDefault(true); } diff --git a/storm-client/src/jvm/org/apache/storm/serialization/KryoTupleSerializer.java b/storm-client/src/jvm/org/apache/storm/serialization/KryoTupleSerializer.java index 39a601ff597..ad89438b2da 100644 --- a/storm-client/src/jvm/org/apache/storm/serialization/KryoTupleSerializer.java +++ b/storm-client/src/jvm/org/apache/storm/serialization/KryoTupleSerializer.java @@ -29,6 +29,7 @@ public KryoTupleSerializer(final Map conf, final GeneralTopology _ids = new SerializationFactory.IdDictionary(context.getRawTopology()); } + @Override public byte[] serialize(Tuple tuple) { try { diff --git a/storm-client/src/jvm/org/apache/storm/spout/RawScheme.java b/storm-client/src/jvm/org/apache/storm/spout/RawScheme.java index 5b7df4e9072..732dbd40523 100644 --- a/storm-client/src/jvm/org/apache/storm/spout/RawScheme.java +++ b/storm-client/src/jvm/org/apache/storm/spout/RawScheme.java @@ -24,12 +24,14 @@ import org.apache.storm.utils.Utils; public class RawScheme implements Scheme { + @Override public List deserialize(ByteBuffer ser) { // Maintain backward compatibility for 0.10 byte[] b = Utils.toByteArray(ser); return Utils.tuple(new Object[]{ b }); } + @Override public Fields getOutputFields() { return new Fields("bytes"); } diff --git a/storm-client/src/jvm/org/apache/storm/spout/ShellSpout.java b/storm-client/src/jvm/org/apache/storm/spout/ShellSpout.java index 6409e5ca1ee..317aec18640 100644 --- a/storm-client/src/jvm/org/apache/storm/spout/ShellSpout.java +++ b/storm-client/src/jvm/org/apache/storm/spout/ShellSpout.java @@ -87,6 +87,7 @@ public void changeChildCWD(boolean changeDirectory) { this.changeDirectory = changeDirectory; } + @Override public void open(Map topoConf, TopologyContext context, SpoutOutputCollector collector) { _collector = collector; @@ -112,20 +113,24 @@ public void open(Map topoConf, TopologyContext context, heartBeatExecutorService = MoreExecutors.getExitingScheduledExecutorService(new ScheduledThreadPoolExecutor(1)); } + @Override public void close() { heartBeatExecutorService.shutdownNow(); _process.destroy(); _running = false; } + @Override public void nextTuple() { this.sendSyncCommand("next", ""); } + @Override public void ack(Object msgId) { this.sendSyncCommand("ack", msgId); } + @Override public void fail(Object msgId) { this.sendSyncCommand("fail", msgId); } diff --git a/storm-client/src/jvm/org/apache/storm/spout/SpoutOutputCollector.java b/storm-client/src/jvm/org/apache/storm/spout/SpoutOutputCollector.java index 72b1ade77e2..f8895e68204 100644 --- a/storm-client/src/jvm/org/apache/storm/spout/SpoutOutputCollector.java +++ b/storm-client/src/jvm/org/apache/storm/spout/SpoutOutputCollector.java @@ -38,6 +38,7 @@ public SpoutOutputCollector(ISpoutOutputCollector delegate) { * * @return the list of task ids that this tuple was sent to */ + @Override public List emit(String streamId, List tuple, Object messageId) { return _delegate.emit(streamId, tuple, messageId); } @@ -77,6 +78,7 @@ public List emit(String streamId, List tuple) { * functionality will only work if the messageId is serializable via Kryo or the Serializable interface. The emitted values must be * immutable. */ + @Override public void emitDirect(int taskId, String streamId, List tuple, Object messageId) { _delegate.emitDirect(taskId, streamId, tuple, messageId); } diff --git a/storm-client/src/jvm/org/apache/storm/state/BaseBinaryStateIterator.java b/storm-client/src/jvm/org/apache/storm/state/BaseBinaryStateIterator.java index b122635a8a7..ee32e6ae031 100644 --- a/storm-client/src/jvm/org/apache/storm/state/BaseBinaryStateIterator.java +++ b/storm-client/src/jvm/org/apache/storm/state/BaseBinaryStateIterator.java @@ -40,6 +40,7 @@ public BaseBinaryStateIterator(Iterator> pendingPrepar * * @return Iterator of loaded state KVs */ + @Override protected abstract Iterator> loadChunkFromStateStorage(); /** @@ -47,6 +48,7 @@ public BaseBinaryStateIterator(Iterator> pendingPrepar * * @return whether end of data is reached from storage state KVs */ + @Override protected abstract boolean isEndOfDataFromStorage(); /** @@ -55,6 +57,7 @@ public BaseBinaryStateIterator(Iterator> pendingPrepar * @param key byte array encoded key * @return Decoded value of key */ + @Override protected abstract K decodeKey(byte[] key); /** @@ -63,6 +66,7 @@ public BaseBinaryStateIterator(Iterator> pendingPrepar * @param value byte array encoded value * @return Decoded value of value */ + @Override protected abstract V decodeValue(byte[] value); /** @@ -71,6 +75,7 @@ public BaseBinaryStateIterator(Iterator> pendingPrepar * @param value the value to check * @return true if the value is tombstone, false otherwise */ + @Override protected abstract boolean isTombstoneValue(byte[] value); } diff --git a/storm-client/src/jvm/org/apache/storm/state/DefaultStateEncoder.java b/storm-client/src/jvm/org/apache/storm/state/DefaultStateEncoder.java index b84d54b3aa9..42a9a4d56ff 100644 --- a/storm-client/src/jvm/org/apache/storm/state/DefaultStateEncoder.java +++ b/storm-client/src/jvm/org/apache/storm/state/DefaultStateEncoder.java @@ -41,19 +41,23 @@ public Serializer getValueSerializer() { return valueSerializer; } + @Override public byte[] encodeKey(K key) { return keySerializer.serialize(key); } + @Override public byte[] encodeValue(V value) { return internalValueSerializer.serialize( Optional.of(valueSerializer.serialize(value))); } + @Override public K decodeKey(byte[] encodedKey) { return keySerializer.deserialize(encodedKey); } + @Override public V decodeValue(byte[] encodedValue) { Optional internalValue = internalValueSerializer.deserialize(encodedValue); if (internalValue.isPresent()) { diff --git a/storm-client/src/jvm/org/apache/storm/streams/operations/Reducer.java b/storm-client/src/jvm/org/apache/storm/streams/operations/Reducer.java index e4d12cbb852..8f2f4bbc48f 100644 --- a/storm-client/src/jvm/org/apache/storm/streams/operations/Reducer.java +++ b/storm-client/src/jvm/org/apache/storm/streams/operations/Reducer.java @@ -25,5 +25,6 @@ public interface Reducer extends BiFunction { * @param arg2 the second argument * @return the result */ + @Override T apply(T arg1, T arg2); } 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 6b2a11f6808..719b1a89866 100644 --- a/storm-client/src/jvm/org/apache/storm/task/ShellBolt.java +++ b/storm-client/src/jvm/org/apache/storm/task/ShellBolt.java @@ -122,6 +122,7 @@ public void changeChildCWD(boolean changeDirectory) { this.changeDirectory = changeDirectory; } + @Override public void prepare(Map topoConf, TopologyContext context, final OutputCollector collector) { if (ConfigUtils.isLocalMode(topoConf)) { @@ -169,6 +170,7 @@ public void prepare(Map topoConf, TopologyContext context, heartBeatExecutorService.scheduleAtFixedRate(new BoltHeartbeatTimerTask(this), 1, 1, TimeUnit.SECONDS); } + @Override public void execute(Tuple input) { if (_exception != null) { throw new RuntimeException(_exception); @@ -197,6 +199,7 @@ private BoltMsg createBoltMessage(Tuple input, String genId) { return boltMsg; } + @Override public void cleanup() { _running = false; heartBeatExecutorService.shutdownNow(); @@ -323,6 +326,7 @@ public void run() { } private class BoltReaderRunnable implements Runnable { + @Override public void run() { while (_running) { try { @@ -367,6 +371,7 @@ public void run() { } private class BoltWriterRunnable implements Runnable { + @Override public void run() { while (_running) { try { diff --git a/storm-client/src/jvm/org/apache/storm/task/TopologyContext.java b/storm-client/src/jvm/org/apache/storm/task/TopologyContext.java index d6461d4b679..c6a6371bbdc 100644 --- a/storm-client/src/jvm/org/apache/storm/task/TopologyContext.java +++ b/storm-client/src/jvm/org/apache/storm/task/TopologyContext.java @@ -316,6 +316,7 @@ public String toJSONString() { * @return The IMetric argument unchanged. */ @Deprecated + @Override public T registerMetric(String name, T metric, int timeBucketSizeInSecs) { if (_openOrPrepareWasCalled.get()) { throw new RuntimeException("TopologyContext.registerMetric can only be called from within overridden " + @@ -382,6 +383,7 @@ public IMetric getRegisteredMetricByName(String name) { * Convenience method for registering ReducedMetric. */ @Deprecated + @Override public ReducedMetric registerMetric(String name, IReducer reducer, int timeBucketSizeInSecs) { return registerMetric(name, new ReducedMetric(reducer), timeBucketSizeInSecs); } @@ -390,6 +392,7 @@ public ReducedMetric registerMetric(String name, IReducer reducer, int timeBucke * Convenience method for registering CombinedMetric. */ @Deprecated + @Override public CombinedMetric registerMetric(String name, ICombiner combiner, int timeBucketSizeInSecs) { return registerMetric(name, new CombinedMetric(combiner), timeBucketSizeInSecs); } diff --git a/storm-client/src/jvm/org/apache/storm/testing/BoltTracker.java b/storm-client/src/jvm/org/apache/storm/testing/BoltTracker.java index 0bb3bf3eaba..5a57536bf5a 100644 --- a/storm-client/src/jvm/org/apache/storm/testing/BoltTracker.java +++ b/storm-client/src/jvm/org/apache/storm/testing/BoltTracker.java @@ -26,6 +26,7 @@ public BoltTracker(IRichBolt delegate, String id) { _richDelegate = delegate; } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { _richDelegate.declareOutputFields(declarer); } diff --git a/storm-client/src/jvm/org/apache/storm/testing/FeederSpout.java b/storm-client/src/jvm/org/apache/storm/testing/FeederSpout.java index 7f0239ca9e4..5cce40cad0a 100644 --- a/storm-client/src/jvm/org/apache/storm/testing/FeederSpout.java +++ b/storm-client/src/jvm/org/apache/storm/testing/FeederSpout.java @@ -60,14 +60,17 @@ public void waitForReader() { InprocMessaging.waitForReader(_id); } + @Override public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) { _collector = collector; } + @Override public void close() { } + @Override public void nextTuple() { List toEmit = (List) InprocMessaging.pollMessage(_id); if (toEmit != null) { @@ -78,18 +81,21 @@ public void nextTuple() { } } + @Override public void ack(Object msgId) { if (_ackFailDelegate != null) { _ackFailDelegate.ack(msgId); } } + @Override public void fail(Object msgId) { if (_ackFailDelegate != null) { _ackFailDelegate.fail(msgId); } } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declare(_outFields); } diff --git a/storm-client/src/jvm/org/apache/storm/testing/FixedTupleSpout.java b/storm-client/src/jvm/org/apache/storm/testing/FixedTupleSpout.java index 9665ae370a9..8404f860c4b 100644 --- a/storm-client/src/jvm/org/apache/storm/testing/FixedTupleSpout.java +++ b/storm-client/src/jvm/org/apache/storm/testing/FixedTupleSpout.java @@ -104,6 +104,7 @@ public void cleanup() { } } + @Override public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) { _context = context; List tasks = context.getComponentTasks(context.getThisComponentId()); @@ -121,9 +122,11 @@ public void open(Map conf, TopologyContext context, SpoutOutputC } } + @Override public void close() { } + @Override public void nextTuple() { if (_serveTuples.size() > 0) { FixedTuple ft = _serveTuples.remove(0); @@ -133,6 +136,7 @@ public void nextTuple() { } } + @Override public void ack(Object msgId) { synchronized (acked) { int curr = get(acked, _id, 0); @@ -140,6 +144,7 @@ public void ack(Object msgId) { } } + @Override public void fail(Object msgId) { synchronized (failed) { int curr = get(failed, _id, 0); diff --git a/storm-client/src/jvm/org/apache/storm/testing/NonRichBoltTracker.java b/storm-client/src/jvm/org/apache/storm/testing/NonRichBoltTracker.java index 84bb3229cec..f5d03274d59 100644 --- a/storm-client/src/jvm/org/apache/storm/testing/NonRichBoltTracker.java +++ b/storm-client/src/jvm/org/apache/storm/testing/NonRichBoltTracker.java @@ -30,16 +30,19 @@ public NonRichBoltTracker(IBolt delegate, String id) { _trackId = id; } + @Override public void prepare(Map topoConf, TopologyContext context, OutputCollector collector) { _delegate.prepare(topoConf, context, collector); } + @Override public void execute(Tuple input) { _delegate.execute(input); Map stats = (Map) RegisteredGlobalState.getState(_trackId); ((AtomicInteger) stats.get("processed")).incrementAndGet(); } + @Override public void cleanup() { _delegate.cleanup(); } diff --git a/storm-client/src/jvm/org/apache/storm/testing/PythonShellMetricsBolt.java b/storm-client/src/jvm/org/apache/storm/testing/PythonShellMetricsBolt.java index 76be626c5b0..48e08f1f226 100644 --- a/storm-client/src/jvm/org/apache/storm/testing/PythonShellMetricsBolt.java +++ b/storm-client/src/jvm/org/apache/storm/testing/PythonShellMetricsBolt.java @@ -37,6 +37,7 @@ public PythonShellMetricsBolt(String command, String file) { super(command, file); } + @Override public void prepare(Map topoConf, TopologyContext context, OutputCollector collector) { super.prepare(topoConf, context, collector); @@ -44,9 +45,11 @@ public void prepare(Map topoConf, TopologyContext context, Outpu context.registerMetric("my-custom-shell-metric", cMetric, 5); } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { } + @Override public Map getComponentConfiguration() { return null; } diff --git a/storm-client/src/jvm/org/apache/storm/testing/PythonShellMetricsSpout.java b/storm-client/src/jvm/org/apache/storm/testing/PythonShellMetricsSpout.java index 9d2c58113b4..e0795cba969 100644 --- a/storm-client/src/jvm/org/apache/storm/testing/PythonShellMetricsSpout.java +++ b/storm-client/src/jvm/org/apache/storm/testing/PythonShellMetricsSpout.java @@ -46,10 +46,12 @@ public void open(Map conf, TopologyContext context, SpoutOutputC context.registerMetric("my-custom-shellspout-metric", cMetric, 5); } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declare(new Fields("field1")); } + @Override public Map getComponentConfiguration() { return null; } diff --git a/storm-client/src/jvm/org/apache/storm/testing/SingleUserSimpleTransport.java b/storm-client/src/jvm/org/apache/storm/testing/SingleUserSimpleTransport.java index 762f0f1591a..d385de53347 100644 --- a/storm-client/src/jvm/org/apache/storm/testing/SingleUserSimpleTransport.java +++ b/storm-client/src/jvm/org/apache/storm/testing/SingleUserSimpleTransport.java @@ -23,10 +23,12 @@ public class SingleUserSimpleTransport extends SimpleTransportPlugin { protected Subject getDefaultSubject() { HashSet principals = new HashSet(); principals.add(new Principal() { + @Override public String getName() { return "user"; } + @Override public String toString() { return "user"; } diff --git a/storm-client/src/jvm/org/apache/storm/testing/SpoutTracker.java b/storm-client/src/jvm/org/apache/storm/testing/SpoutTracker.java index 59833f2426f..88a48b6cf7d 100644 --- a/storm-client/src/jvm/org/apache/storm/testing/SpoutTracker.java +++ b/storm-client/src/jvm/org/apache/storm/testing/SpoutTracker.java @@ -35,31 +35,37 @@ public SpoutTracker(IRichSpout delegate, String trackId) { _trackId = trackId; } + @Override public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) { _tracker = new SpoutTrackOutputCollector(collector); _delegate.open(conf, context, new SpoutOutputCollector(_tracker)); } + @Override public void close() { _delegate.close(); } + @Override public void nextTuple() { _delegate.nextTuple(); } + @Override public void ack(Object msgId) { _delegate.ack(msgId); Map stats = (Map) RegisteredGlobalState.getState(_trackId); ((AtomicInteger) stats.get("processed")).incrementAndGet(); } + @Override public void fail(Object msgId) { _delegate.fail(msgId); Map stats = (Map) RegisteredGlobalState.getState(_trackId); ((AtomicInteger) stats.get("processed")).incrementAndGet(); } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { _delegate.declareOutputFields(declarer); } @@ -79,12 +85,14 @@ private void recordSpoutEmit() { } + @Override public List emit(String streamId, List tuple, Object messageId) { List ret = _collector.emit(streamId, tuple, messageId); recordSpoutEmit(); return ret; } + @Override public void emitDirect(int taskId, String streamId, List tuple, Object messageId) { _collector.emitDirect(taskId, streamId, tuple, messageId); recordSpoutEmit(); diff --git a/storm-client/src/jvm/org/apache/storm/testing/TestAggregatesCounter.java b/storm-client/src/jvm/org/apache/storm/testing/TestAggregatesCounter.java index 94cde438c25..8fff86d7b3c 100644 --- a/storm-client/src/jvm/org/apache/storm/testing/TestAggregatesCounter.java +++ b/storm-client/src/jvm/org/apache/storm/testing/TestAggregatesCounter.java @@ -32,11 +32,13 @@ public class TestAggregatesCounter extends BaseRichBolt { Map _counts; OutputCollector _collector; + @Override public void prepare(Map topoConf, TopologyContext context, OutputCollector collector) { _collector = collector; _counts = new HashMap(); } + @Override public void execute(Tuple input) { String word = (String) input.getValues().get(0); int count = (Integer) input.getValues().get(1); @@ -49,10 +51,12 @@ public void execute(Tuple input) { _collector.ack(input); } + @Override public void cleanup() { } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declare(new Fields("agg-global")); } diff --git a/storm-client/src/jvm/org/apache/storm/testing/TestEventLogSpout.java b/storm-client/src/jvm/org/apache/storm/testing/TestEventLogSpout.java index f0792216f15..9418fbb737a 100644 --- a/storm-client/src/jvm/org/apache/storm/testing/TestEventLogSpout.java +++ b/storm-client/src/jvm/org/apache/storm/testing/TestEventLogSpout.java @@ -62,6 +62,7 @@ public static int getNumFailed(String stormId) { } } + @Override public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) { _collector = collector; this.source = context.getThisTaskId(); @@ -69,6 +70,7 @@ public void open(Map conf, TopologyContext context, SpoutOutputC myCount = totalCount / taskCount; } + @Override public void close() { } @@ -101,6 +103,7 @@ public boolean completed() { return false; } + @Override public void nextTuple() { if (eventId < myCount) { eventId++; @@ -108,6 +111,7 @@ public void nextTuple() { } } + @Override public void ack(Object msgId) { synchronized (acked) { int curr = get(acked, uid, 0); @@ -115,6 +119,7 @@ public void ack(Object msgId) { } } + @Override public void fail(Object msgId) { synchronized (failed) { int curr = get(failed, uid, 0); @@ -122,6 +127,7 @@ public void fail(Object msgId) { } } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declare(new Fields("source", "eventId")); } diff --git a/storm-client/src/jvm/org/apache/storm/testing/TestEventOrderCheckBolt.java b/storm-client/src/jvm/org/apache/storm/testing/TestEventOrderCheckBolt.java index debd4d4090d..320620f20a9 100644 --- a/storm-client/src/jvm/org/apache/storm/testing/TestEventOrderCheckBolt.java +++ b/storm-client/src/jvm/org/apache/storm/testing/TestEventOrderCheckBolt.java @@ -30,11 +30,13 @@ public class TestEventOrderCheckBolt extends BaseRichBolt { Map recentEventId = new HashMap(); private int _count; + @Override public void prepare(Map topoConf, TopologyContext context, OutputCollector collector) { _collector = collector; _count = 0; } + @Override public void execute(Tuple input) { Integer sourceId = input.getInteger(0); Long eventId = input.getLong(1); @@ -51,6 +53,7 @@ public void execute(Tuple input) { _collector.ack(input); } + @Override public void cleanup() { } @@ -59,6 +62,7 @@ public Fields getOutputFields() { return new Fields("error"); } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declare(new Fields("error")); } diff --git a/storm-client/src/jvm/org/apache/storm/testing/TestGlobalCount.java b/storm-client/src/jvm/org/apache/storm/testing/TestGlobalCount.java index b42929803ba..245b82c51a2 100644 --- a/storm-client/src/jvm/org/apache/storm/testing/TestGlobalCount.java +++ b/storm-client/src/jvm/org/apache/storm/testing/TestGlobalCount.java @@ -29,17 +29,20 @@ public class TestGlobalCount extends BaseRichBolt { OutputCollector _collector; private int _count; + @Override public void prepare(Map topoConf, TopologyContext context, OutputCollector collector) { _collector = collector; _count = 0; } + @Override public void execute(Tuple input) { _count++; _collector.emit(input, new Values(_count)); _collector.ack(input); } + @Override public void cleanup() { } @@ -48,6 +51,7 @@ public Fields getOutputFields() { return new Fields("global-count"); } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declare(new Fields("global-count")); } diff --git a/storm-client/src/jvm/org/apache/storm/testing/TestKryoDecorator.java b/storm-client/src/jvm/org/apache/storm/testing/TestKryoDecorator.java index f2f03e95fac..7af7ebafaf9 100644 --- a/storm-client/src/jvm/org/apache/storm/testing/TestKryoDecorator.java +++ b/storm-client/src/jvm/org/apache/storm/testing/TestKryoDecorator.java @@ -17,6 +17,7 @@ public class TestKryoDecorator implements IKryoDecorator { + @Override public void decorate(Kryo k) { k.register(TestSerObject.class); } diff --git a/storm-client/src/jvm/org/apache/storm/testing/TestPlannerBolt.java b/storm-client/src/jvm/org/apache/storm/testing/TestPlannerBolt.java index 305197048b3..d99d405f822 100644 --- a/storm-client/src/jvm/org/apache/storm/testing/TestPlannerBolt.java +++ b/storm-client/src/jvm/org/apache/storm/testing/TestPlannerBolt.java @@ -22,10 +22,12 @@ public class TestPlannerBolt extends BaseRichBolt { + @Override public void prepare(Map topoConf, TopologyContext context, OutputCollector collector) { } + @Override public void execute(Tuple input) { } @@ -34,6 +36,7 @@ public Fields getOutputFields() { return new Fields("field1", "field2"); } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declare(getOutputFields()); } diff --git a/storm-client/src/jvm/org/apache/storm/testing/TestPlannerSpout.java b/storm-client/src/jvm/org/apache/storm/testing/TestPlannerSpout.java index 8f0368a29dd..999f0680a85 100644 --- a/storm-client/src/jvm/org/apache/storm/testing/TestPlannerSpout.java +++ b/storm-client/src/jvm/org/apache/storm/testing/TestPlannerSpout.java @@ -45,26 +45,32 @@ public Fields getOutputFields() { } + @Override public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) { } + @Override public void close() { } + @Override public void nextTuple() { Utils.sleep(100); } + @Override public void ack(Object msgId) { } + @Override public void fail(Object msgId) { } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declare(getOutputFields()); } diff --git a/storm-client/src/jvm/org/apache/storm/testing/TestWordCounter.java b/storm-client/src/jvm/org/apache/storm/testing/TestWordCounter.java index 4244ad30fef..e10e066e66c 100644 --- a/storm-client/src/jvm/org/apache/storm/testing/TestWordCounter.java +++ b/storm-client/src/jvm/org/apache/storm/testing/TestWordCounter.java @@ -31,6 +31,7 @@ public class TestWordCounter extends BaseBasicBolt { Map _counts; + @Override public void prepare(Map topoConf, TopologyContext context) { _counts = new HashMap(); } @@ -39,6 +40,7 @@ protected String getTupleValue(Tuple t, int idx) { return (String) t.getValues().get(idx); } + @Override public void execute(Tuple input, BasicOutputCollector collector) { String word = getTupleValue(input, 0); int count = 0; @@ -50,10 +52,12 @@ public void execute(Tuple input, BasicOutputCollector collector) { collector.emit(tuple(word, count)); } + @Override public void cleanup() { } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declare(new Fields("word", "count")); } diff --git a/storm-client/src/jvm/org/apache/storm/testing/TestWordSpout.java b/storm-client/src/jvm/org/apache/storm/testing/TestWordSpout.java index 02613de8f45..2c86c685687 100644 --- a/storm-client/src/jvm/org/apache/storm/testing/TestWordSpout.java +++ b/storm-client/src/jvm/org/apache/storm/testing/TestWordSpout.java @@ -40,14 +40,17 @@ public TestWordSpout(boolean isDistributed) { _isDistributed = isDistributed; } + @Override public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) { _collector = collector; } + @Override public void close() { } + @Override public void nextTuple() { Utils.sleep(100); final String[] words = new String[]{ "nathan", "mike", "jackson", "golda", "bertels" }; @@ -56,14 +59,17 @@ public void nextTuple() { _collector.emit(new Values(word)); } + @Override public void ack(Object msgId) { } + @Override public void fail(Object msgId) { } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declare(new Fields("word")); } diff --git a/storm-client/src/jvm/org/apache/storm/testing/TupleCaptureBolt.java b/storm-client/src/jvm/org/apache/storm/testing/TupleCaptureBolt.java index 1829f5ec598..13b5b4e6a99 100644 --- a/storm-client/src/jvm/org/apache/storm/testing/TupleCaptureBolt.java +++ b/storm-client/src/jvm/org/apache/storm/testing/TupleCaptureBolt.java @@ -35,10 +35,12 @@ public TupleCaptureBolt() { emitted_tuples.put(_name, new HashMap>()); } + @Override public void prepare(Map topoConf, TopologyContext context, OutputCollector collector) { _collector = collector; } + @Override public void execute(Tuple input) { String component = input.getSourceComponent(); Map> captured = emitted_tuples.get(_name); @@ -53,6 +55,7 @@ public Map> getResults() { return emitted_tuples.get(_name); } + @Override public void cleanup() { } diff --git a/storm-client/src/jvm/org/apache/storm/topology/BasicBoltExecutor.java b/storm-client/src/jvm/org/apache/storm/topology/BasicBoltExecutor.java index b423d08d71c..a7a3a9e7a03 100644 --- a/storm-client/src/jvm/org/apache/storm/topology/BasicBoltExecutor.java +++ b/storm-client/src/jvm/org/apache/storm/topology/BasicBoltExecutor.java @@ -29,16 +29,19 @@ public BasicBoltExecutor(IBasicBolt bolt) { _bolt = bolt; } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { _bolt.declareOutputFields(declarer); } + @Override public void prepare(Map topoConf, TopologyContext context, OutputCollector collector) { _bolt.prepare(topoConf, context); _collector = new BasicOutputCollector(collector); } + @Override public void execute(Tuple input) { _collector.setContext(input); try { @@ -52,10 +55,12 @@ public void execute(Tuple input) { } } + @Override public void cleanup() { _bolt.cleanup(); } + @Override public Map getComponentConfiguration() { return _bolt.getComponentConfiguration(); } diff --git a/storm-client/src/jvm/org/apache/storm/topology/BasicOutputCollector.java b/storm-client/src/jvm/org/apache/storm/topology/BasicOutputCollector.java index 2f5ba2d50fd..8ff4999449e 100644 --- a/storm-client/src/jvm/org/apache/storm/topology/BasicOutputCollector.java +++ b/storm-client/src/jvm/org/apache/storm/topology/BasicOutputCollector.java @@ -27,6 +27,7 @@ public BasicOutputCollector(OutputCollector out) { this.out = out; } + @Override public List emit(String streamId, List tuple) { return out.emit(streamId, inputTuple, tuple); } @@ -39,6 +40,7 @@ public void setContext(Tuple inputTuple) { this.inputTuple = inputTuple; } + @Override public void emitDirect(int taskId, String streamId, List tuple) { out.emitDirect(taskId, streamId, inputTuple, tuple); } @@ -53,6 +55,7 @@ public void emitDirect(int taskId, List tuple) { * * @param tuple the tuple to reset timeout for */ + @Override public void resetTimeout(Tuple tuple) { out.resetTimeout(tuple); } @@ -61,6 +64,7 @@ protected IOutputCollector getOutputter() { return out; } + @Override public void reportError(Throwable t) { out.reportError(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 ad56d507941..9ab5f83a06b 100644 --- a/storm-client/src/jvm/org/apache/storm/topology/CheckpointTupleForwarder.java +++ b/storm-client/src/jvm/org/apache/storm/topology/CheckpointTupleForwarder.java @@ -67,6 +67,7 @@ public Map getComponentConfiguration() { * @param action the action (prepare, commit, rollback or initstate) * @param txid the transaction id. */ + @Override protected void handleCheckpoint(Tuple checkpointTuple, Action action, long txid) { collector.emit(CHECKPOINT_STREAM_ID, checkpointTuple, new Values(txid, action)); collector.ack(checkpointTuple); @@ -82,6 +83,7 @@ protected void handleCheckpoint(Tuple checkpointTuple, Action action, long txid) * * @param input the input tuple */ + @Override protected void handleTuple(Tuple input) { bolt.execute(input); } diff --git a/storm-client/src/jvm/org/apache/storm/topology/OutputFieldsGetter.java b/storm-client/src/jvm/org/apache/storm/topology/OutputFieldsGetter.java index 8849175db0a..1cd268c2594 100644 --- a/storm-client/src/jvm/org/apache/storm/topology/OutputFieldsGetter.java +++ b/storm-client/src/jvm/org/apache/storm/topology/OutputFieldsGetter.java @@ -21,18 +21,22 @@ public class OutputFieldsGetter implements OutputFieldsDeclarer { private Map _fields = new HashMap<>(); + @Override public void declare(Fields fields) { declare(false, fields); } + @Override public void declare(boolean direct, Fields fields) { declareStream(Utils.DEFAULT_STREAM_ID, direct, fields); } + @Override public void declareStream(String streamId, Fields fields) { declareStream(streamId, false, fields); } + @Override public void declareStream(String streamId, boolean direct, Fields fields) { if (null == streamId) { throw new IllegalArgumentException("streamId can't be null"); 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 62c88a07975..51d8ab7ca92 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 @@ -41,6 +41,7 @@ public ChainedAggregatorDeclarer(IAggregatableStream stream, GlobalAggregationSc _globalScheme = globalScheme; } + @Override public Stream chainEnd() { Fields[] inputFields = new Fields[_aggs.size()]; Aggregator[] aggs = new Aggregator[_aggs.size()]; @@ -89,37 +90,45 @@ public Stream chainEnd() { return _stream.toStream(); } + @Override public ChainedPartitionAggregatorDeclarer partitionAggregate(Aggregator agg, Fields functionFields) { return partitionAggregate(null, agg, functionFields); } + @Override public ChainedPartitionAggregatorDeclarer partitionAggregate(Fields inputFields, Aggregator agg, Fields functionFields) { _type = AggType.PARTITION; _aggs.add(new AggSpec(inputFields, agg, functionFields)); return this; } + @Override public ChainedPartitionAggregatorDeclarer partitionAggregate(CombinerAggregator agg, Fields functionFields) { return partitionAggregate(null, agg, functionFields); } + @Override public ChainedPartitionAggregatorDeclarer partitionAggregate(Fields inputFields, CombinerAggregator agg, Fields functionFields) { initCombiner(inputFields, agg, functionFields); return partitionAggregate(functionFields, new CombinerAggregatorCombineImpl(agg), functionFields); } + @Override public ChainedPartitionAggregatorDeclarer partitionAggregate(ReducerAggregator agg, Fields functionFields) { return partitionAggregate(null, agg, functionFields); } + @Override public ChainedPartitionAggregatorDeclarer partitionAggregate(Fields inputFields, ReducerAggregator agg, Fields functionFields) { return partitionAggregate(inputFields, new ReducerAggregatorImpl(agg), functionFields); } + @Override public ChainedFullAggregatorDeclarer aggregate(Aggregator agg, Fields functionFields) { return aggregate(null, agg, functionFields); } + @Override public ChainedFullAggregatorDeclarer aggregate(Fields inputFields, Aggregator agg, Fields functionFields) { return aggregate(inputFields, agg, functionFields, false); } @@ -136,19 +145,23 @@ private ChainedFullAggregatorDeclarer aggregate(Fields inputFields, Aggregator a return this; } + @Override public ChainedFullAggregatorDeclarer aggregate(CombinerAggregator agg, Fields functionFields) { return aggregate(null, agg, functionFields); } + @Override public ChainedFullAggregatorDeclarer aggregate(Fields inputFields, CombinerAggregator agg, Fields functionFields) { initCombiner(inputFields, agg, functionFields); return aggregate(functionFields, new CombinerAggregatorCombineImpl(agg), functionFields, true); } + @Override public ChainedFullAggregatorDeclarer aggregate(ReducerAggregator agg, Fields functionFields) { return aggregate(null, agg, functionFields); } + @Override public ChainedFullAggregatorDeclarer aggregate(Fields inputFields, ReducerAggregator agg, Fields functionFields) { return aggregate(inputFields, new ReducerAggregatorImpl(agg), functionFields); } diff --git a/storm-client/src/jvm/org/apache/storm/trident/operation/TridentOperationContext.java b/storm-client/src/jvm/org/apache/storm/trident/operation/TridentOperationContext.java index e08d4f3bb33..473eda6c9b5 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/operation/TridentOperationContext.java +++ b/storm-client/src/jvm/org/apache/storm/trident/operation/TridentOperationContext.java @@ -53,14 +53,17 @@ public int getPartitionIndex() { return _topoContext.getThisTaskIndex(); } + @Override public T registerMetric(String name, T metric, int timeBucketSizeInSecs) { return _topoContext.registerMetric(name, metric, timeBucketSizeInSecs); } + @Override public ReducedMetric registerMetric(String name, IReducer reducer, int timeBucketSizeInSecs) { return _topoContext.registerMetric(name, new ReducedMetric(reducer), timeBucketSizeInSecs); } + @Override public CombinedMetric registerMetric(String name, ICombiner combiner, int timeBucketSizeInSecs) { return _topoContext.registerMetric(name, new CombinedMetric(combiner), timeBucketSizeInSecs); } 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 b2a7e293f0c..6a2ce194a07 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 @@ -39,6 +39,7 @@ public ChainedAggregatorImpl(Aggregator[] aggs, Fields[] inputFields, ComboList. } } + @Override public void prepare(Map conf, TridentOperationContext context) { _inputFactories = new ProjectionFactory[_inputFields.length]; for (int i = 0; i < _inputFields.length; i++) { @@ -47,6 +48,7 @@ public void prepare(Map conf, TridentOperationContext context) { } } + @Override public ChainedResult init(Object batchId, TridentCollector collector) { ChainedResult initted = new ChainedResult(collector, _aggs.length); for (int i = 0; i < _aggs.length; i++) { @@ -55,6 +57,7 @@ public ChainedResult init(Object batchId, TridentCollector collector) { return initted; } + @Override public void aggregate(ChainedResult val, TridentTuple tuple, TridentCollector collector) { val.setFollowThroughCollector(collector); for (int i = 0; i < _aggs.length; i++) { @@ -63,6 +66,7 @@ public void aggregate(ChainedResult val, TridentTuple tuple, TridentCollector co } } + @Override public void complete(ChainedResult val, TridentCollector collector) { val.setFollowThroughCollector(collector); for (int i = 0; i < _aggs.length; i++) { @@ -101,6 +105,7 @@ private boolean increment(TridentCollector[] lengths, int[] indices, int j) { return true; } + @Override public void cleanup() { for (Aggregator a : _aggs) { a.cleanup(); diff --git a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/CombinerAggregatorCombineImpl.java b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/CombinerAggregatorCombineImpl.java index 5813f328765..7525ea56c45 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/CombinerAggregatorCombineImpl.java +++ b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/CombinerAggregatorCombineImpl.java @@ -27,16 +27,19 @@ public CombinerAggregatorCombineImpl(CombinerAggregator agg) { _agg = agg; } + @Override public void prepare(Map conf, TridentOperationContext context) { } + @Override public Result init(Object batchId, TridentCollector collector) { Result ret = new Result(); ret.obj = _agg.zero(); return ret; } + @Override public void aggregate(Result val, TridentTuple tuple, TridentCollector collector) { Object v = tuple.getValue(0); if (val.obj == null) { @@ -46,10 +49,12 @@ public void aggregate(Result val, TridentTuple tuple, TridentCollector collector } } + @Override public void complete(Result val, TridentCollector collector) { collector.emit(new Values(val.obj)); } + @Override public void cleanup() { } diff --git a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/ReducerAggregatorImpl.java b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/ReducerAggregatorImpl.java index 5ea0482c350..0b6a507ba9a 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/ReducerAggregatorImpl.java +++ b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/ReducerAggregatorImpl.java @@ -27,24 +27,29 @@ public ReducerAggregatorImpl(ReducerAggregator agg) { _agg = agg; } + @Override public void prepare(Map conf, TridentOperationContext context) { } + @Override public Result init(Object batchId, TridentCollector collector) { Result ret = new Result(); ret.obj = _agg.init(); return ret; } + @Override public void aggregate(Result val, TridentTuple tuple, TridentCollector collector) { val.obj = _agg.reduce(val.obj, tuple); } + @Override public void complete(Result val, TridentCollector collector) { collector.emit(new Values(val.obj)); } + @Override public void cleanup() { } diff --git a/storm-client/src/jvm/org/apache/storm/trident/testing/FeederBatchSpout.java b/storm-client/src/jvm/org/apache/storm/trident/testing/FeederBatchSpout.java index e021e7ba9d0..236ef4888ac 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/testing/FeederBatchSpout.java +++ b/storm-client/src/jvm/org/apache/storm/trident/testing/FeederBatchSpout.java @@ -45,6 +45,7 @@ public void setWaitToEmit(boolean trueIfWait) { _waitToEmit = trueIfWait; } + @Override public void feed(Object tuples) { Semaphore sem = new Semaphore(0); ((List) RegisteredGlobalState.getState(_semaphoreId)).add(sem); diff --git a/storm-client/src/jvm/org/apache/storm/trident/testing/LRUMemoryMapState.java b/storm-client/src/jvm/org/apache/storm/trident/testing/LRUMemoryMapState.java index 104ebafe544..2b12a725b52 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/testing/LRUMemoryMapState.java +++ b/storm-client/src/jvm/org/apache/storm/trident/testing/LRUMemoryMapState.java @@ -43,38 +43,47 @@ public LRUMemoryMapState(int cacheSize, String id) { _delegate = new SnapshottableMap(OpaqueMap.build(_backing), new Values("$MEMORY-MAP-STATE-GLOBAL$")); } + @Override public T update(ValueUpdater updater) { return _delegate.update(updater); } + @Override public void set(T o) { _delegate.set(o); } + @Override public T get() { return _delegate.get(); } + @Override public void beginCommit(Long txid) { _delegate.beginCommit(txid); } + @Override public void commit(Long txid) { _delegate.commit(txid); } + @Override public Iterator> getTuples() { return _backing.getTuples(); } + @Override public List multiUpdate(List> keys, List updaters) { return _delegate.multiUpdate(keys, updaters); } + @Override public void multiPut(List> keys, List vals) { _delegate.multiPut(keys, vals); } + @Override public List multiGet(List> keys) { return _delegate.multiGet(keys); } @@ -135,10 +144,12 @@ public Iterator> getTuples() { private Iterator, T>> it = db.entrySet().iterator(); + @Override public boolean hasNext() { return it.hasNext(); } + @Override public List next() { Map.Entry, T> e = it.next(); List ret = new ArrayList(); @@ -147,6 +158,7 @@ public List next() { return ret; } + @Override public void remove() { throw new UnsupportedOperationException("Not supported yet."); } diff --git a/storm-client/src/jvm/org/apache/storm/trident/testing/MemoryMapState.java b/storm-client/src/jvm/org/apache/storm/trident/testing/MemoryMapState.java index cd6f0997dde..b3aed7ba21a 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/testing/MemoryMapState.java +++ b/storm-client/src/jvm/org/apache/storm/trident/testing/MemoryMapState.java @@ -46,18 +46,22 @@ public MemoryMapState(String id) { _delegate = new SnapshottableMap(OpaqueMap.build(_backing), new Values("$MEMORY-MAP-STATE-GLOBAL$")); } + @Override public T update(ValueUpdater updater) { return _delegate.update(updater); } + @Override public void set(T o) { _delegate.set(o); } + @Override public T get() { return _delegate.get(); } + @Override public void beginCommit(Long txid) { _delegate.beginCommit(txid); if (txid == null || !txid.equals(_currTx)) { @@ -67,22 +71,27 @@ public void beginCommit(Long txid) { _currTx = txid; } + @Override public void commit(Long txid) { _delegate.commit(txid); } + @Override public Iterator> getTuples() { return _backing.getTuples(); } + @Override public List multiUpdate(List> keys, List updaters) { return _delegate.multiUpdate(keys, updaters); } + @Override public void multiPut(List> keys, List vals) { _delegate.multiPut(keys, vals); } + @Override public List multiGet(List> keys) { return _delegate.multiGet(keys); } @@ -159,10 +168,12 @@ public Iterator> getTuples() { private Iterator, T>> it = db.entrySet().iterator(); + @Override public boolean hasNext() { return it.hasNext(); } + @Override public List next() { Map.Entry, T> e = it.next(); List ret = new ArrayList(); @@ -171,6 +182,7 @@ public List next() { return ret; } + @Override public void remove() { throw new UnsupportedOperationException("Not supported yet."); } diff --git a/storm-client/src/jvm/org/apache/storm/trident/topology/TransactionAttempt.java b/storm-client/src/jvm/org/apache/storm/trident/topology/TransactionAttempt.java index 0d30a68f24f..1f90b38c40d 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/topology/TransactionAttempt.java +++ b/storm-client/src/jvm/org/apache/storm/trident/topology/TransactionAttempt.java @@ -34,10 +34,12 @@ public Long getTransactionId() { return _txid; } + @Override public Object getId() { return _txid; } + @Override public int getAttemptId() { return _attemptId; } diff --git a/storm-client/src/jvm/org/apache/storm/trident/topology/TridentBoltExecutor.java b/storm-client/src/jvm/org/apache/storm/trident/topology/TridentBoltExecutor.java index 036bf7ff651..e3500b2d6e6 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/topology/TridentBoltExecutor.java +++ b/storm-client/src/jvm/org/apache/storm/trident/topology/TridentBoltExecutor.java @@ -400,25 +400,30 @@ public void setCurrBatch(TrackedBatch batch) { _currBatch = batch; } + @Override public List emit(String stream, Collection anchors, List tuple) { List tasks = _delegate.emit(stream, anchors, tuple); updateTaskCounts(tasks); return tasks; } + @Override public void emitDirect(int task, String stream, Collection anchors, List tuple) { updateTaskCounts(Arrays.asList(task)); _delegate.emitDirect(task, stream, anchors, tuple); } + @Override public void ack(Tuple tuple) { throw new IllegalStateException("Method should never be called"); } + @Override public void fail(Tuple tuple) { throw new IllegalStateException("Method should never be called"); } + @Override public void resetTimeout(Tuple tuple) { throw new IllegalStateException("Method should never be called"); } @@ -428,6 +433,7 @@ public void flush() { _delegate.flush(); } + @Override public void reportError(Throwable error) { _delegate.reportError(error); } 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 1f5d0f0590a..79d64a14f9f 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 @@ -138,10 +138,12 @@ private void execAggregatorAndStoreResult(int currentTriggerId, List tupleEve */ protected abstract List getTridentTuples(List tupleEvents); + @Override public Queue getPendingTriggers() { return pendingTriggers; } + @Override public void shutdown() { try { LOG.info("window manager [{}] is being shutdown", windowManager); diff --git a/storm-client/src/jvm/org/apache/storm/trident/windowing/InMemoryTridentWindowManager.java b/storm-client/src/jvm/org/apache/storm/trident/windowing/InMemoryTridentWindowManager.java index ff5d9bf8fce..6be4be4a10b 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/windowing/InMemoryTridentWindowManager.java +++ b/storm-client/src/jvm/org/apache/storm/trident/windowing/InMemoryTridentWindowManager.java @@ -47,6 +47,7 @@ public void onTuplesExpired(List expiredTuples) { LOG.debug("InMemoryTridentWindowManager.onTuplesExpired"); } + @Override public void addTuplesBatch(Object batchId, List tuples) { LOG.debug("Adding tuples to window-manager for batch: [{}]", batchId); for (TridentTuple tridentTuple : tuples) { diff --git a/storm-client/src/jvm/org/apache/storm/trident/windowing/StoreBasedTridentWindowManager.java b/storm-client/src/jvm/org/apache/storm/trident/windowing/StoreBasedTridentWindowManager.java index 98aba26440b..f07d3f171d8 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/windowing/StoreBasedTridentWindowManager.java +++ b/storm-client/src/jvm/org/apache/storm/trident/windowing/StoreBasedTridentWindowManager.java @@ -52,6 +52,7 @@ public StoreBasedTridentWindowManager(WindowConfig windowConfig, String windowTa windowTupleTaskId = TUPLE_PREFIX + windowTaskId; } + @Override protected void initialize() { // get existing tuples and pending/unsuccessful triggers for this operator-component/task and add them to WindowManager @@ -119,6 +120,7 @@ private String secondLastPart(String key) { return key.substring(secondLastSepIndex + 1, lastSepIndex); } + @Override public void addTuplesBatch(Object batchId, List tuples) { LOG.debug("Adding tuples to window-manager for batch: [{}]", batchId); List entries = new ArrayList<>(); @@ -159,6 +161,7 @@ public String keyOf(Object batchId) { return windowTupleTaskId + getBatchTxnId(batchId) + WindowsStore.KEY_SEPARATOR; } + @Override public List getTridentTuples(List tridentBatchTuples) { List resultTuples = new ArrayList<>(); List keys = new ArrayList<>(); @@ -188,6 +191,7 @@ public TridentTuple collectTridentTupleOrKey(TridentBatchTuple tridentBatchTuple return null; } + @Override public void onTuplesExpired(List expiredTuples) { if (maxCachedTuplesSize != null) { currentCachedTuplesSize.addAndGet(-expiredTuples.size()); diff --git a/storm-client/src/jvm/org/apache/storm/trident/windowing/config/BaseWindowConfig.java b/storm-client/src/jvm/org/apache/storm/trident/windowing/config/BaseWindowConfig.java index 95439343319..72794fd0d26 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/windowing/config/BaseWindowConfig.java +++ b/storm-client/src/jvm/org/apache/storm/trident/windowing/config/BaseWindowConfig.java @@ -34,6 +34,7 @@ public int getSlidingLength() { return slideLength; } + @Override public void validate() { if (slideLength > windowLength) { throw new IllegalArgumentException( diff --git a/storm-client/src/jvm/org/apache/storm/tuple/Fields.java b/storm-client/src/jvm/org/apache/storm/tuple/Fields.java index 5661516ff60..bdd80b79c48 100644 --- a/storm-client/src/jvm/org/apache/storm/tuple/Fields.java +++ b/storm-client/src/jvm/org/apache/storm/tuple/Fields.java @@ -81,6 +81,7 @@ public String get(int index) { return _fields.get(index); } + @Override public Iterator iterator() { return _fields.iterator(); } diff --git a/storm-client/src/jvm/org/apache/storm/utils/DRPCClient.java b/storm-client/src/jvm/org/apache/storm/utils/DRPCClient.java index d949f93ec0d..85a4c4b5a74 100644 --- a/storm-client/src/jvm/org/apache/storm/utils/DRPCClient.java +++ b/storm-client/src/jvm/org/apache/storm/utils/DRPCClient.java @@ -119,6 +119,7 @@ public int getPort() { return port; } + @Override public String execute(String func, String args) throws TException, DRPCExecutionException, AuthorizationException { if (func == null) { throw new IllegalArgumentException("DRPC Function cannot be null"); diff --git a/storm-client/src/jvm/org/apache/storm/utils/DefaultShellLogHandler.java b/storm-client/src/jvm/org/apache/storm/utils/DefaultShellLogHandler.java index fc196e5b8bf..f0f3c7a2659 100644 --- a/storm-client/src/jvm/org/apache/storm/utils/DefaultShellLogHandler.java +++ b/storm-client/src/jvm/org/apache/storm/utils/DefaultShellLogHandler.java @@ -47,6 +47,7 @@ private Logger getLogger(final Class ownerCls) { * @param context - the current {@link TopologyContext}. * @see {@link ShellLogHandler#setUpContext} */ + @Override public void setUpContext(final Class ownerCls, final ShellProcess process, final TopologyContext context) { this.log = getLogger(ownerCls); @@ -61,6 +62,7 @@ public void setUpContext(final Class ownerCls, final ShellProcess process, * @param shellMsg - the {@link ShellMsg} to log. * @see {@link ShellLogHandler#log} */ + @Override public void log(final ShellMsg shellMsg) { if (shellMsg == null) { throw new IllegalArgumentException("shellMsg is required"); 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 b5af6847c7d..429f3d288d9 100644 --- a/storm-client/src/jvm/org/apache/storm/utils/TimeCacheMap.java +++ b/storm-client/src/jvm/org/apache/storm/utils/TimeCacheMap.java @@ -42,6 +42,7 @@ public TimeCacheMap(int expirationSecs, int numBuckets, ExpiredCallback ca final long expirationMillis = expirationSecs * 1000L; final long sleepTime = expirationMillis / (numBuckets - 1); _cleaner = new Thread(new Runnable() { + @Override public void run() { try { while (true) { 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 b820e5917bc..b76f605f3ed 100644 --- a/storm-client/src/jvm/org/apache/storm/windowing/WatermarkCountEvictionPolicy.java +++ b/storm-client/src/jvm/org/apache/storm/windowing/WatermarkCountEvictionPolicy.java @@ -32,6 +32,7 @@ public WatermarkCountEvictionPolicy(int count) { currentCount = new AtomicLong(); } + @Override public Action evict(Event event) { if (getContext() == null) { //It is possible to get asked about eviction before we have a context, due to WindowManager.compactWindow. diff --git a/storm-client/test/jvm/org/apache/storm/PaceMakerStateStorageFactoryTest.java b/storm-client/test/jvm/org/apache/storm/PaceMakerStateStorageFactoryTest.java index 63d8cdcd80d..ce567bfe406 100644 --- a/storm-client/test/jvm/org/apache/storm/PaceMakerStateStorageFactoryTest.java +++ b/storm-client/test/jvm/org/apache/storm/PaceMakerStateStorageFactoryTest.java @@ -147,10 +147,12 @@ public PacemakerClient getWriteClient() { return clientMock; } + @Override public HBMessage send(HBMessage m) throws PacemakerConnectionException, InterruptedException { return clientMock.send(m); } + @Override public List sendAll(HBMessage m) throws PacemakerConnectionException, InterruptedException { List response = new ArrayList<>(); response.add(clientMock.send(m)); 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 840ccb1c394..837b98512ed 100644 --- a/storm-client/test/jvm/org/apache/storm/bolt/TestJoinBolt.java +++ b/storm-client/test/jvm/org/apache/storm/bolt/TestJoinBolt.java @@ -331,10 +331,12 @@ public MockContext(String[] fieldNames) { this.fields = new Fields(fieldNames); } + @Override public String getComponentId(int taskId) { return "component"; } + @Override public Fields getComponentOutputFields(String componentId, String streamId) { return fields; } 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 3183241cd24..21c9f632b09 100644 --- a/storm-client/test/jvm/org/apache/storm/dependency/DependencyUploaderTest.java +++ b/storm-client/test/jvm/org/apache/storm/dependency/DependencyUploaderTest.java @@ -152,6 +152,7 @@ public void uploadFiles() throws Exception { final AtomicInteger counter = new AtomicInteger(); final Answer incrementCounter = new Answer() { + @Override public Object answer(InvocationOnMock invocation) throws Throwable { counter.addAndGet(1); return null; @@ -271,6 +272,7 @@ public void uploadArtifacts() throws Exception { final AtomicInteger counter = new AtomicInteger(); final Answer incrementCounter = new Answer() { + @Override public Object answer(InvocationOnMock invocation) throws Throwable { counter.addAndGet(1); return null; diff --git a/storm-clojure/src/main/java/org/apache/storm/clojure/ClojureTuple.java b/storm-clojure/src/main/java/org/apache/storm/clojure/ClojureTuple.java index 8de15eb7ec5..7b41b67d94c 100644 --- a/storm-clojure/src/main/java/org/apache/storm/clojure/ClojureTuple.java +++ b/storm-clojure/src/main/java/org/apache/storm/clojure/ClojureTuple.java @@ -152,6 +152,7 @@ public Obj withMeta(IPersistentMap meta) { } /* Indexed */ + @Override public Object nth(int i) { if (i < size()) { return getValue(i); @@ -160,6 +161,7 @@ public Object nth(int i) { } } + @Override public Object nth(int i, Object notfound) { Object ret = nth(i); if (ret==null) ret = notfound; @@ -167,11 +169,13 @@ public Object nth(int i, Object notfound) { } /* Counted */ + @Override public int count() { return size(); } /* IMeta */ + @Override public IPersistentMap meta() { if(_meta==null) { _meta = new PersistentArrayMap( new Object[] { diff --git a/storm-clojure/src/main/java/org/apache/storm/clojure/IndifferentAccessMap.java b/storm-clojure/src/main/java/org/apache/storm/clojure/IndifferentAccessMap.java index 9bdefb89d11..55ba58bd2b0 100644 --- a/storm-clojure/src/main/java/org/apache/storm/clojure/IndifferentAccessMap.java +++ b/storm-clojure/src/main/java/org/apache/storm/clojure/IndifferentAccessMap.java @@ -48,14 +48,17 @@ public IPersistentMap setMap(IPersistentMap map) { return _map; } + @Override public int size() { return ((Map) getMap()).size(); } + @Override public int count() { return size(); } + @Override public ISeq seq() { return getMap().seq(); } @@ -77,86 +80,105 @@ public Object valAt(Object o, Object def) { /* IPersistentMap */ /* Naive implementation, but it might be good enough */ + @Override public IPersistentMap assoc(Object k, Object v) { if(k instanceof Keyword) return assoc(((Keyword) k).getName(), v); return new IndifferentAccessMap(getMap().assoc(k, v)); } + @Override public IPersistentMap assocEx(Object k, Object v) { if(k instanceof Keyword) return assocEx(((Keyword) k).getName(), v); return new IndifferentAccessMap(getMap().assocEx(k, v)); } + @Override public IPersistentMap without(Object k) { if(k instanceof Keyword) return without(((Keyword) k).getName()); return new IndifferentAccessMap(getMap().without(k)); } + @Override public boolean containsKey(Object k) { if(k instanceof Keyword) return containsKey(((Keyword) k).getName()); return getMap().containsKey(k); } + @Override public IMapEntry entryAt(Object k) { if(k instanceof Keyword) return entryAt(((Keyword) k).getName()); return getMap().entryAt(k); } + @Override public IPersistentCollection cons(Object o) { return getMap().cons(o); } + @Override public IPersistentCollection empty() { return new IndifferentAccessMap(PersistentArrayMap.EMPTY); } + @Override public boolean equiv(Object o) { return getMap().equiv(o); } + @Override public Iterator iterator() { return getMap().iterator(); } /* Map */ + @Override public boolean containsValue(Object v) { return ((Map) getMap()).containsValue(v); } + @Override public Set entrySet() { return ((Map) getMap()).entrySet(); } + @Override public Object get(Object k) { return valAt(k); } + @Override public boolean isEmpty() { return ((Map) getMap()).isEmpty(); } + @Override public Set keySet() { return ((Map) getMap()).keySet(); } + @Override public Collection values() { return ((Map) getMap()).values(); } /* Not implemented */ + @Override public void clear() { throw new UnsupportedOperationException(); } + @Override public Object put(Object k, Object v) { throw new UnsupportedOperationException(); } + @Override public void putAll(Map m) { throw new UnsupportedOperationException(); } + @Override public Object remove(Object k) { throw new UnsupportedOperationException(); } diff --git a/storm-server/src/main/java/org/apache/storm/localizer/LocalizedResourceRetentionSet.java b/storm-server/src/main/java/org/apache/storm/localizer/LocalizedResourceRetentionSet.java index 372334b302c..f96b481ed88 100644 --- a/storm-server/src/main/java/org/apache/storm/localizer/LocalizedResourceRetentionSet.java +++ b/storm-server/src/main/java/org/apache/storm/localizer/LocalizedResourceRetentionSet.java @@ -135,6 +135,7 @@ public String toString() { } static class LRUComparator implements Comparator { + @Override public int compare(LocallyCachedBlob r1, LocallyCachedBlob r2) { long ret = r1.getLastUsed() - r2.getLastUsed(); if (0 == ret) { 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 5d7df0cfb85..73997df01b3 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 @@ -28,10 +28,12 @@ public class AccessLoggingFilter implements Filter { private static final Logger LOG = LoggerFactory.getLogger(AccessLoggingFilter.class); + @Override public void init(FilterConfig config) throws ServletException { //NOOP } + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { handle((HttpServletRequest) request, (HttpServletResponse) response, chain); } @@ -44,6 +46,7 @@ public void handle(HttpServletRequest request, HttpServletResponse response, Fil chain.doFilter(request, response); } + @Override public void destroy() { //NOOP } diff --git a/storm-server/src/main/java/org/apache/storm/metricstore/Metric.java b/storm-server/src/main/java/org/apache/storm/metricstore/Metric.java index 19de7818396..5f8bee365fa 100644 --- a/storm-server/src/main/java/org/apache/storm/metricstore/Metric.java +++ b/storm-server/src/main/java/org/apache/storm/metricstore/Metric.java @@ -83,6 +83,7 @@ public Metric(Metric o) { /** * Check if a Metric matches another object. */ + @Override public boolean equals(Object other) { if (!(other instanceof Metric)) { diff --git a/storm-server/src/main/java/org/apache/storm/metricstore/MetricStore.java b/storm-server/src/main/java/org/apache/storm/metricstore/MetricStore.java index bf2b840f9ad..82e4e354d43 100644 --- a/storm-server/src/main/java/org/apache/storm/metricstore/MetricStore.java +++ b/storm-server/src/main/java/org/apache/storm/metricstore/MetricStore.java @@ -45,6 +45,7 @@ public interface MetricStore extends AutoCloseable { /** * Close the metric store. */ + @Override void close(); /** diff --git a/storm-server/src/main/java/org/apache/storm/metricstore/rocksdb/RocksDbStore.java b/storm-server/src/main/java/org/apache/storm/metricstore/rocksdb/RocksDbStore.java index 2ac1c2037eb..6b7617eceb2 100644 --- a/storm-server/src/main/java/org/apache/storm/metricstore/rocksdb/RocksDbStore.java +++ b/storm-server/src/main/java/org/apache/storm/metricstore/rocksdb/RocksDbStore.java @@ -170,6 +170,7 @@ private String getRocksDbAbsoluteDir(Map conf) throws MetricExce * @param metric Metric to store * @throws MetricException if database write fails */ + @Override public void insert(Metric metric) throws MetricException { try { // don't bother blocking on a full queue, just drop metrics in case we can't keep up @@ -341,6 +342,7 @@ public void close() { * @param scanCallback callback for each Metric found * @throws MetricException on error */ + @Override public void scan(FilterOptions filter, ScanCallback scanCallback) throws MetricException { scanInternal(filter, scanCallback, null); } diff --git a/storm-server/src/main/java/org/apache/storm/metricstore/rocksdb/StringMetadataCache.java b/storm-server/src/main/java/org/apache/storm/metricstore/rocksdb/StringMetadataCache.java index d70076f98ec..bf90c69aa36 100644 --- a/storm-server/src/main/java/org/apache/storm/metricstore/rocksdb/StringMetadataCache.java +++ b/storm-server/src/main/java/org/apache/storm/metricstore/rocksdb/StringMetadataCache.java @@ -101,6 +101,7 @@ static void cleanUp() { * @param s The string to look for * @return the metadata associated with the string or null if not found */ + @Override public StringMetadata get(String s) { return lruStringCache.get(s); } @@ -118,6 +119,7 @@ public StringMetadata get(String s) { * @param newEntry Indicates the metadata is being used for the first time and should be written to RocksDB immediately * @throws MetricException when evicted data fails to save to the database or when the database is shutdown */ + @Override public void put(String s, StringMetadata stringMetadata, boolean newEntry) throws MetricException { if (dbWriter.isShutdown()) { // another thread could be writing out the metadata cache to the database. @@ -142,6 +144,7 @@ public void put(String s, StringMetadata stringMetadata, boolean newEntry) throw * @param val The evicted string's metadata * @throws RuntimeException when evicted data fails to save to the database */ + @Override public void evictionCallback(String key, StringMetadata val) { writeMetadataToDisk(key, val); } @@ -168,6 +171,7 @@ private void writeMetadataToDisk(String key, StringMetadata val) { * @param stringId The string Id to check * @return true if the Id is in the cache, false otherwise */ + @Override public boolean contains(Integer stringId) { return hashToString.containsKey(stringId); } @@ -178,6 +182,7 @@ public boolean contains(Integer stringId) { * @param stringId The string Id to check * @return the associated string if the Id is in the cache, null otherwise */ + @Override public String getMetadataString(Integer stringId) { return hashToString.get(stringId); } @@ -187,6 +192,7 @@ public String getMetadataString(Integer stringId) { * * @return the string metadata map entrySet */ + @Override public Set> entrySet() { return lruStringCache.entrySet(); } 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 ee79d59eef2..94f24070025 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 @@ -207,6 +207,7 @@ public String toString() { */ static class PQsortByPriorityAndSubmittionTime implements Comparator { + @Override public int compare(TopologyDetails topo1, TopologyDetails topo2) { if (topo1.getTopologyPriority() > topo2.getTopologyPriority()) { return 1; 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 e2260976df3..7d2f3fea40b 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 @@ -182,13 +182,16 @@ public TestSpout(boolean isDistributed) { _isDistributed = isDistributed; } + @Override public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) { _collector = collector; } + @Override public void close() { } + @Override public void nextTuple() { Utils.sleep(100); final String[] words = new String[]{"nathan", "mike", "jackson", "golda", "bertels"}; @@ -197,12 +200,15 @@ public void nextTuple() { _collector.emit(new Values(word)); } + @Override public void ack(Object msgId) { } + @Override public void fail(Object msgId) { } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declare(new Fields("word")); } 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 366ee78eb61..e29830ed3bf 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 @@ -316,13 +316,16 @@ public TestSpout(boolean isDistributed) { _isDistributed = isDistributed; } + @Override public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) { _collector = collector; } + @Override public void close() { } + @Override public void nextTuple() { Utils.sleep(100); final String[] words = new String[]{ "nathan", "mike", "jackson", "golda", "bertels" }; @@ -331,12 +334,15 @@ public void nextTuple() { _collector.emit(new Values(word)); } + @Override public void ack(Object msgId) { } + @Override public void fail(Object msgId) { } + @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declare(new Fields("word")); } diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/webapp/ReqContextFilter.java b/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/webapp/ReqContextFilter.java index e16c6dbe3ef..f5dbc80f705 100644 --- a/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/webapp/ReqContextFilter.java +++ b/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/webapp/ReqContextFilter.java @@ -52,7 +52,8 @@ public void populateContext(HttpServletRequest request) { httpCredsHandler.populateContext(ReqContext.context(), request); } } - + + @Override public void init(FilterConfig config) throws ServletException { //NOOP //We could add in configs through the web.xml if we wanted something stand alone here... @@ -64,6 +65,7 @@ public void init(FilterConfig config) throws ServletException { * @param response the response to populate * @param chain the next chain of entities to pass the object to */ + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { handle((HttpServletRequest)request, (HttpServletResponse)response, chain); } @@ -81,6 +83,7 @@ public void handle(HttpServletRequest request, HttpServletResponse response, Fil chain.doFilter(request, response); } + @Override public void destroy() { //NOOP } diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/exceptionmappers/NotAliveExceptionMapper.java b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/exceptionmappers/NotAliveExceptionMapper.java index 0cff689d817..fc69511af92 100644 --- a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/exceptionmappers/NotAliveExceptionMapper.java +++ b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/exceptionmappers/NotAliveExceptionMapper.java @@ -34,6 +34,7 @@ public class NotAliveExceptionMapper implements ExceptionMapper request; + @Override public Response toResponse(NotAliveException ex) { return getResponse(ex, request); }