From c7394d12ba9c705d8004396ab67cb3ae47d4aeee Mon Sep 17 00:00:00 2001 From: Karl-Philipp Richter Date: Tue, 13 Mar 2018 13:52:09 +0100 Subject: [PATCH 1/2] avoiding rawtypes in configuration and metadata Maps in order to allow usage without @SuppressWarnings("rawtypes") and early detection of design flaws --- .../storm/hdfs/spout/HdfsSpoutTopology.java | 2 +- .../hive/trident/TridentHiveTopology.java | 2 +- .../jdbc/topology/AbstractUserTopology.java | 2 +- .../org/apache/storm/loadgen/CaptureLoad.java | 4 +- .../loadgen/HttpForwardingMetricsServer.java | 2 +- .../storm/loadgen/ThroughputVsLatency.java | 3 +- .../apache/storm/perf/LowThroughputTopo.java | 7 +++- .../storm/perf/SimplifiedWordCountTopo.java | 2 +- .../apache/storm/perf/spout/WordGenSpout.java | 9 ++++- .../org/apache/storm/perf/utils/Helper.java | 2 +- .../storm/starter/FastWordCountTopology.java | 2 +- .../storm/starter/InOrderDeliveryTest.java | 2 +- .../starter/ResourceAwareExampleTopology.java | 2 +- .../storm/common/AbstractHadoopAutoCreds.java | 4 +- .../AbstractHadoopNimbusPluginAutoCreds.java | 12 +++--- .../storm/hbase/security/AutoHBase.java | 2 +- .../hbase/security/AutoHBaseCommand.java | 2 +- .../storm/hbase/security/AutoHBaseNimbus.java | 12 +++--- .../apache/storm/hdfs/security/AutoHDFS.java | 2 +- .../storm/hdfs/security/AutoHDFSCommand.java | 2 +- .../storm/hdfs/security/AutoHDFSNimbus.java | 15 ++++---- .../storm/hdfs/security/HdfsSecurityUtil.java | 2 +- .../apache/storm/hive/security/AutoHive.java | 2 +- .../storm/hive/security/AutoHiveCommand.java | 2 +- .../storm/hive/security/AutoHiveNimbus.java | 14 +++---- .../impl/ObjectMapperCqlStatementMapper.java | 2 +- .../state/CassandraMapStateFactory.java | 10 ++--- .../trident/state/MapStateFactoryBuilder.java | 10 ++--- .../apache/storm/cassandra/WeatherSpout.java | 2 +- .../elasticsearch/bolt/AbstractEsBolt.java | 2 +- .../storm/elasticsearch/bolt/EsIndexBolt.java | 2 +- .../elasticsearch/bolt/EsPercolateBolt.java | 2 +- .../spout/BinaryEventDataScheme.java | 4 +- .../eventhubs/spout/EventDataScheme.java | 4 +- .../eventhubs/spout/EventHubReceiverImpl.java | 4 +- .../storm/eventhubs/spout/EventHubSpout.java | 2 +- .../eventhubs/spout/IEventHubReceiver.java | 2 +- .../eventhubs/spout/IPartitionManager.java | 2 +- .../spout/SimplePartitionManager.java | 2 +- .../TransactionalTridentEventHubEmitter.java | 10 ++--- .../TransactionalTridentEventHubSpout.java | 4 +- .../samples/bolt/GlobalCountBolt.java | 2 +- .../eventhubs/spout/EventHubReceiverMock.java | 2 +- .../TestTransactionalTridentEmitter.java | 6 +-- .../apache/storm/hbase/bolt/HBaseBolt.java | 2 +- .../state/HBaseKeyValueStateProvider.java | 4 +- .../hbase/trident/state/HBaseMapState.java | 2 +- .../storm/hbase/trident/state/HBaseState.java | 4 +- .../trident/state/HBaseStateFactory.java | 2 +- .../storm/hdfs/spout/TestHdfsSpout.java | 4 +- .../storm/jdbc/bolt/AbstractJdbcBolt.java | 2 +- .../storm/jdbc/bolt/JdbcInsertBolt.java | 2 +- .../storm/jdbc/trident/state/JdbcState.java | 2 +- .../jdbc/trident/state/JdbcStateFactory.java | 2 +- .../storm/jdbc/common/JdbcClientTest.java | 2 +- .../storm/jms/trident/JmsStateFactory.java | 2 +- .../KafkaTridentSpoutBatchMetadataTest.java | 2 +- .../org/apache/storm/kafka/KafkaSpout.java | 2 +- .../apache/storm/kafka/PartitionManager.java | 2 +- .../jvm/org/apache/storm/kafka/ZkState.java | 7 ++-- .../trident/OpaqueTridentKafkaSpout.java | 15 ++++++-- .../kafka/trident/TridentKafkaEmitter.java | 37 ++++++++++++------- .../apache/storm/kafka/ZkCoordinatorTest.java | 4 +- .../mongodb/trident/state/MongoMapState.java | 4 +- .../mongodb/trident/state/MongoState.java | 4 +- .../storm/redis/bolt/AbstractRedisBolt.java | 2 +- .../rocketmq/trident/state/RocketMqState.java | 2 +- .../storm/solr/trident/SolrStateFactory.java | 2 +- .../storm/flux/model/ConfigMethodDef.java | 2 +- .../apache/storm/flux/model/ObjectDef.java | 2 +- .../apache/storm/st/wrapper/StormCluster.java | 2 +- .../src/jvm/org/apache/storm/Config.java | 6 +-- .../jvm/org/apache/storm/StormSubmitter.java | 5 +-- .../src/jvm/org/apache/storm/Thrift.java | 4 +- .../apache/storm/cluster/ClusterUtils.java | 6 +-- .../cluster/PaceMakerStateStorageFactory.java | 2 +- .../storm/cluster/StateStorageFactory.java | 2 +- .../apache/storm/cluster/ZKStateStorage.java | 4 +- .../storm/cluster/ZKStateStorageFactory.java | 2 +- .../org/apache/storm/daemon/StormCommon.java | 2 +- .../daemon/metrics/BuiltinMetricsUtil.java | 19 +++++----- .../storm/daemon/worker/WorkerState.java | 4 +- .../jvm/org/apache/storm/drpc/DRPCSpout.java | 4 +- .../jvm/org/apache/storm/drpc/JoinResult.java | 2 +- .../org/apache/storm/drpc/PrepareRequest.java | 2 +- .../org/apache/storm/drpc/ReturnResults.java | 6 +-- .../org/apache/storm/executor/Executor.java | 32 +++++++++------- .../storm/executor/bolt/BoltExecutor.java | 6 ++- .../DeserializingConnectionCallback.java | 4 +- .../apache/storm/messaging/netty/Client.java | 2 +- .../storm/metric/api/MultiCountMetric.java | 4 +- .../storm/metric/api/MultiReducedMetric.java | 4 +- .../security/auth/FixedGroupsMapping.java | 2 +- .../auth/authorizer/DRPCAuthorizerBase.java | 6 +-- .../authorizer/DRPCSimpleACLAuthorizer.java | 6 +-- .../types/HashMapSerializer.java | 4 +- .../org/apache/storm/stats/CommonStats.java | 4 +- .../storm/task/GeneralTopologyContext.java | 2 +- .../storm/testing/NonRichBoltTracker.java | 2 +- .../apache/storm/testing/SpoutTracker.java | 6 +-- .../storm/topology/TopologyBuilder.java | 4 +- .../state/TestTransactionalState.java | 2 +- .../state/TransactionalState.java | 8 ++-- .../apache/storm/trident/TridentTopology.java | 12 +++--- .../trident/drpc/ReturnResultsReducer.java | 4 +- .../topology/state/TransactionalState.java | 8 ++-- .../org/apache/storm/utils/ConfigUtils.java | 4 +- .../jvm/org/apache/storm/utils/JCQueue.java | 3 +- .../org/apache/storm/utils/NimbusClient.java | 2 +- .../src/jvm/org/apache/storm/utils/Utils.java | 11 +++--- .../storm/zookeeper/ClientZookeeper.java | 8 ++-- .../DeserializingConnectionCallbackTest.java | 4 +- .../storm/security/auth/AutoSSLTest.java | 10 ++--- .../storm/streams/ProcessorBoltTest.java | 3 +- .../jvm/org/apache/storm/utils/UtilsTest.java | 12 +++--- .../storm/command/UploadCredentials.java | 9 +++-- .../apache/storm/ui/FilterConfiguration.java | 10 ++--- .../jvm/org/apache/storm/ui/UIHelpers.java | 6 +-- .../InMemoryTopologyActionNotifier.java | 2 +- .../serialization/SerializationTest.java | 12 +++--- .../apache/storm/daemon/nimbus/Nimbus.java | 4 +- .../apache/storm/metricstore/MetricStore.java | 2 +- .../storm/metricstore/MetricStoreConfig.java | 2 +- .../metricstore/NimbusMetricProcessor.java | 2 +- .../metricstore/WorkerMetricsProcessor.java | 2 +- .../metricstore/rocksdb/RocksDbStore.java | 6 +-- .../nimbus/DefaultTopologyValidator.java | 4 +- .../nimbus/ITopologyActionNotifierPlugin.java | 2 +- .../storm/nimbus/ITopologyValidator.java | 4 +- .../storm/scheduler/DefaultScheduler.java | 2 +- .../apache/storm/scheduler/EvenScheduler.java | 2 +- .../apache/storm/scheduler/IScheduler.java | 2 +- .../storm/scheduler/IsolationScheduler.java | 2 +- .../blacklist/BlacklistScheduler.java | 7 ++-- .../strategies/DefaultBlacklistStrategy.java | 2 +- .../strategies/IBlacklistStrategy.java | 2 +- .../multitenant/MultitenantScheduler.java | 6 +-- .../resource/ResourceAwareScheduler.java | 4 +- .../utils/ArtifactoryConfigLoader.java | 22 +++++------ .../scheduler/utils/FileConfigLoader.java | 6 +-- .../org/apache/storm/utils/ServerUtils.java | 2 +- .../blacklist/FaultGenerateUtils.java | 2 +- .../TestUtilsForBlacklistScheduler.java | 16 ++++---- .../utils/ArtifactoryConfigLoaderTest.java | 20 +++++----- .../scheduler/utils/FileConfigLoaderTest.java | 10 ++--- .../logviewer/webapp/LogviewerResource.java | 4 +- 146 files changed, 388 insertions(+), 344 deletions(-) diff --git a/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/spout/HdfsSpoutTopology.java b/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/spout/HdfsSpoutTopology.java index a5d283e0f54..943ca60135d 100644 --- a/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/spout/HdfsSpoutTopology.java +++ b/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/spout/HdfsSpoutTopology.java @@ -132,7 +132,7 @@ public static void main(String[] args) throws Exception { builder.setBolt(BOLT_ID, bolt, 1).shuffleGrouping(SPOUT_ID); // 4 - submit topology, wait for a few min and terminate it - Map clusterConf = Utils.readStormConfig(); + Map clusterConf = Utils.readStormConfig(); StormSubmitter.submitTopologyWithProgressBar(topologyName, conf, builder.createTopology()); Nimbus.Iface client = NimbusClient.getConfiguredClient(clusterConf).getClient(); diff --git a/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/trident/TridentHiveTopology.java b/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/trident/TridentHiveTopology.java index 09bb331016c..f2e578e239e 100644 --- a/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/trident/TridentHiveTopology.java +++ b/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/trident/TridentHiveTopology.java @@ -177,7 +177,7 @@ public void close() { } @Override - public Map getComponentConfiguration() { + public Map getComponentConfiguration() { Config conf = new Config(); conf.setMaxTaskParallelism(1); return conf; diff --git a/examples/storm-jdbc-examples/src/main/java/org/apache/storm/jdbc/topology/AbstractUserTopology.java b/examples/storm-jdbc-examples/src/main/java/org/apache/storm/jdbc/topology/AbstractUserTopology.java index 79ca987868a..492f7f036da 100644 --- a/examples/storm-jdbc-examples/src/main/java/org/apache/storm/jdbc/topology/AbstractUserTopology.java +++ b/examples/storm-jdbc-examples/src/main/java/org/apache/storm/jdbc/topology/AbstractUserTopology.java @@ -71,7 +71,7 @@ public void execute(String[] args) throws Exception { + " [topology name]"); System.exit(-1); } - Map map = Maps.newHashMap(); + Map map = Maps.newHashMap(); map.put("dataSourceClassName", args[0]);//com.mysql.jdbc.jdbc2.optional.MysqlDataSource map.put("dataSource.url", args[1]);//jdbc:mysql://localhost/test map.put("dataSource.user", args[2]);//root diff --git a/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/CaptureLoad.java b/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/CaptureLoad.java index 5c1ef4e8565..68459e2e6c4 100644 --- a/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/CaptureLoad.java +++ b/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/CaptureLoad.java @@ -435,7 +435,7 @@ static Map parseResources(String input) { * @param topologyConf topology configuration * @throws Exception on any error */ - public static void checkInitialization(Map topologyResources, String componentId, Map topologyConf) { + public static void checkInitialization(Map topologyResources, String componentId, Map topologyConf) { StringBuilder msgBuilder = new StringBuilder(); for (String resourceName : topologyResources.keySet()) { @@ -450,7 +450,7 @@ public static void checkInitialization(Map topologyResources, St } } - private static String checkInitResource(Map topologyResources, Map topologyConf, String resourceName) { + private static String checkInitResource(Map topologyResources, Map topologyConf, String resourceName) { StringBuilder msgBuilder = new StringBuilder(); if (topologyResources.containsKey(resourceName)) { Double resourceValue = (Double) topologyConf.getOrDefault(resourceName, null); 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 247d0174398..ca8c501c28f 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 @@ -41,7 +41,7 @@ * A server that can listen for metrics from the HttpForwardingMetricsConsumer. */ public abstract class HttpForwardingMetricsServer { - private Map conf; + private Map conf; private Server server = null; private int port = -1; private String url = null; diff --git a/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/ThroughputVsLatency.java b/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/ThroughputVsLatency.java index 3af58039ad9..0cc5f41c0e3 100644 --- a/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/ThroughputVsLatency.java +++ b/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/ThroughputVsLatency.java @@ -97,7 +97,8 @@ public SplitSentence(SlowExecutorPattern slowness) { } @Override - public void prepare(Map stormConf, TopologyContext context) { + public void prepare(Map stormConf, + TopologyContext context) { executorIndex = context.getThisTaskIndex(); sleep.prepare(); } diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/LowThroughputTopo.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/LowThroughputTopo.java index 13488aaf87d..5560780ae68 100644 --- a/examples/storm-perf/src/main/java/org/apache/storm/perf/LowThroughputTopo.java +++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/LowThroughputTopo.java @@ -110,7 +110,8 @@ public void declareOutputFields(OutputFieldsDeclarer declarer) { } @Override - public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) { + public void open(Map conf, TopologyContext context, + SpoutOutputCollector collector) { this.collector = collector; } @@ -133,7 +134,9 @@ private static class LatencyPrintBolt extends BaseRichBolt { private OutputCollector collector; @Override - public void prepare(Map topoConf, TopologyContext context, OutputCollector collector) { + public void prepare(Map topoConf, + TopologyContext context, + OutputCollector collector) { this.collector = collector; } diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/SimplifiedWordCountTopo.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/SimplifiedWordCountTopo.java index 6d368a06042..ea5be8801b6 100644 --- a/examples/storm-perf/src/main/java/org/apache/storm/perf/SimplifiedWordCountTopo.java +++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/SimplifiedWordCountTopo.java @@ -44,7 +44,7 @@ public class SimplifiedWordCountTopo { public static final int DEFAULT_COUNT_BOLT_NUM = 1; - static StormTopology getTopology(Map config) { + static StormTopology getTopology(Map config) { final int spoutNum = Helper.getInt(config, SPOUT_NUM, DEFAULT_SPOUT_NUM); final int cntBoltNum = Helper.getInt(config, BOLT_NUM, DEFAULT_COUNT_BOLT_NUM); diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/WordGenSpout.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/WordGenSpout.java index 92a2f534124..b3195c1ddee 100644 --- a/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/WordGenSpout.java +++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/WordGenSpout.java @@ -52,7 +52,9 @@ public WordGenSpout(String file) { } @Override - public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) { + public void open(Map conf, + TopologyContext context, + SpoutOutputCollector collector) { this.collector = collector; Integer ackers = Helper.getInt(conf, "topology.acker.executors", 0); if (ackers.equals(0)) { @@ -82,7 +84,10 @@ public void declareOutputFields(OutputFieldsDeclarer declarer) { declarer.declare(new Fields(FIELDS)); } - // reads text file and extracts words from each line. returns list of all (non-unique) words + /** + * Reads text file and extracts words from each line. + * @return a list of all (non-unique) words + */ public static ArrayList readWords(String file) { ArrayList lines = new ArrayList<>(); try { 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 73bfdda285a..4429f4ccc87 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 @@ -70,7 +70,7 @@ public static void collectMetricsAndKill(String topologyName, Integer pollInterv /** Kill topo on Ctrl-C */ public static void setupShutdownHook(final String topoName) { - Map clusterConf = Utils.readStormConfig(); + Map clusterConf = Utils.readStormConfig(); final Nimbus.Iface client = NimbusClient.getConfiguredClient(clusterConf).getClient(); Runtime.getRuntime().addShutdownHook(new Thread() { public void run() { diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/FastWordCountTopology.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/FastWordCountTopology.java index 7c1cffd9fb6..e171557b22b 100644 --- a/examples/storm-starter/src/jvm/org/apache/storm/starter/FastWordCountTopology.java +++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/FastWordCountTopology.java @@ -183,7 +183,7 @@ public static void main(String[] args) throws Exception { conf.setNumWorkers(1); StormSubmitter.submitTopologyWithProgressBar(name, conf, builder.createTopology()); - Map clusterConf = Utils.readStormConfig(); + Map clusterConf = Utils.readStormConfig(); clusterConf.putAll(Utils.readCommandLineOpts()); Nimbus.Iface client = NimbusClient.getConfiguredClient(clusterConf).getClient(); diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/InOrderDeliveryTest.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/InOrderDeliveryTest.java index f725d14892a..e4a41e2dbd6 100644 --- a/examples/storm-starter/src/jvm/org/apache/storm/starter/InOrderDeliveryTest.java +++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/InOrderDeliveryTest.java @@ -159,7 +159,7 @@ public static void main(String[] args) throws Exception { conf.setNumWorkers(1); StormSubmitter.submitTopologyWithProgressBar(name, conf, builder.createTopology()); - Map clusterConf = Utils.readStormConfig(); + Map clusterConf = Utils.readStormConfig(); clusterConf.putAll(Utils.readCommandLineOpts()); Nimbus.Iface client = NimbusClient.getConfiguredClient(clusterConf).getClient(); diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/ResourceAwareExampleTopology.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/ResourceAwareExampleTopology.java index 861f4f508f4..07149e8eab9 100644 --- a/examples/storm-starter/src/jvm/org/apache/storm/starter/ResourceAwareExampleTopology.java +++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/ResourceAwareExampleTopology.java @@ -64,7 +64,7 @@ protected static void addToCache(String key, String value) { } @Override - public void prepare(Map conf, TopologyContext context, OutputCollector collector) { + public void prepare(Map conf, TopologyContext context, OutputCollector collector) { _collector = collector; } diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopAutoCreds.java b/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopAutoCreds.java index 2f62ee5daff..569f5af98fa 100644 --- a/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopAutoCreds.java +++ b/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopAutoCreds.java @@ -45,7 +45,7 @@ public abstract class AbstractHadoopAutoCreds implements IAutoCredentials, Crede private Set configKeys = new HashSet<>(); @Override - public void prepare(Map topoConf) { + public void prepare(Map topoConf) { doPrepare(topoConf); loadConfigKeys(topoConf); } @@ -83,7 +83,7 @@ public Set> getCredentials(Map credent * * @param topoConf the topology conf */ - protected abstract void doPrepare(Map topoConf); + protected abstract void doPrepare(Map topoConf); /** * The lookup key for the config key string diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopNimbusPluginAutoCreds.java b/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopNimbusPluginAutoCreds.java index 83e6d9b8399..dee337ed66e 100644 --- a/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopNimbusPluginAutoCreds.java +++ b/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopNimbusPluginAutoCreds.java @@ -45,7 +45,7 @@ public abstract class AbstractHadoopNimbusPluginAutoCreds public static final String CONFIG_KEY_RESOURCES = "resources"; @Override - public void prepare(Map conf) { + public void prepare(Map conf) { doPrepare(conf); } @@ -105,7 +105,7 @@ protected void fillHadoopConfiguration(Map topologyConf, String configKey, Confi * * @param conf the storm cluster conf set via storm.yaml */ - protected abstract void doPrepare(Map conf); + protected abstract void doPrepare(Map conf); /** * The lookup key for the config key string @@ -114,13 +114,13 @@ protected void fillHadoopConfiguration(Map topologyConf, String configKey, Confi */ protected abstract String getConfigKeyString(); - protected abstract byte[] getHadoopCredentials(Map topologyConf, String configKey, final String topologyOwnerPrincipal); + protected abstract byte[] getHadoopCredentials(Map topologyConf, String configKey, final String topologyOwnerPrincipal); - protected abstract byte[] getHadoopCredentials(Map topologyConf, final String topologyOwnerPrincipal); + protected abstract byte[] getHadoopCredentials(Map topologyConf, final String topologyOwnerPrincipal); - protected abstract void doRenew(Map credentials, Map topologyConf, final String topologyOwnerPrincipal); + protected abstract void doRenew(Map credentials, Map topologyConf, final String topologyOwnerPrincipal); - protected List getConfigKeys(Map conf) { + protected List getConfigKeys(Map conf) { String configKeyString = getConfigKeyString(); List configKeys = (List) conf.get(configKeyString); return configKeys != null ? configKeys : Collections.emptyList(); diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBase.java b/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBase.java index 5c3d0ce7741..e38a54a077e 100644 --- a/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBase.java +++ b/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBase.java @@ -30,7 +30,7 @@ */ public class AutoHBase extends AbstractHadoopAutoCreds { @Override - public void doPrepare(Map conf) { + public void doPrepare(Map conf) { } @Override diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBaseCommand.java b/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBaseCommand.java index e9e2a832548..bd03ad9c97a 100644 --- a/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBaseCommand.java +++ b/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBaseCommand.java @@ -39,7 +39,7 @@ private AutoHBaseCommand() { @SuppressWarnings("unchecked") public static void main(String[] args) throws Exception { - Map conf = new HashMap(); + Map conf = new HashMap<>(); conf.put(HBASE_PRINCIPAL_KEY, args[1]); // hbase principal storm-hbase@WITZEN.COM conf.put(HBASE_KEYTAB_FILE_KEY, args[2]); // storm hbase keytab /etc/security/keytabs/storm-hbase.keytab diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBaseNimbus.java b/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBaseNimbus.java index bd1e03a08d9..c9361b15af2 100644 --- a/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBaseNimbus.java +++ b/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBaseNimbus.java @@ -51,7 +51,7 @@ public class AutoHBaseNimbus extends AbstractHadoopNimbusPluginAutoCreds { private static final Logger LOG = LoggerFactory.getLogger(AutoHBaseNimbus.class); @Override - public void doPrepare(Map conf) { + public void doPrepare(Map conf) { // we don't allow any cluster wide configuration } @@ -66,24 +66,24 @@ public void shutdown() { } @Override - protected byte[] getHadoopCredentials(Map conf, String configKey, final String topologyOwnerPrincipal) { + protected byte[] getHadoopCredentials(Map conf, String configKey, final String topologyOwnerPrincipal) { Configuration configuration = getHadoopConfiguration(conf, configKey); return getHadoopCredentials(conf, configuration, topologyOwnerPrincipal); } @Override - protected byte[] getHadoopCredentials(Map conf, final String topologyOwnerPrincipal) { + protected byte[] getHadoopCredentials(Map conf, final String topologyOwnerPrincipal) { return getHadoopCredentials(conf, HBaseConfiguration.create(), topologyOwnerPrincipal); } - private Configuration getHadoopConfiguration(Map topoConf, String configKey) { + private Configuration getHadoopConfiguration(Map topoConf, String configKey) { Configuration configuration = HBaseConfiguration.create(); fillHadoopConfiguration(topoConf, configKey, configuration); return configuration; } @SuppressWarnings("unchecked") - protected byte[] getHadoopCredentials(Map conf, Configuration hbaseConf, final String topologySubmitterUser) { + protected byte[] getHadoopCredentials(Map conf, Configuration hbaseConf, final String topologySubmitterUser) { try { if(UserGroupInformation.isSecurityEnabled()) { UserProvider provider = UserProvider.instantiate(hbaseConf); @@ -128,7 +128,7 @@ protected byte[] getHadoopCredentials(Map conf, Configuration hbaseConf, final S } @Override - public void doRenew(Map credentials, Map topologyConf, final String topologySubmitterUser) { + public void doRenew(Map credentials, Map topologyConf, final String topologySubmitterUser) { //HBASE tokens are not renewable so we always have to get new ones. populateCredentials(credentials, topologyConf, topologySubmitterUser); } diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/AutoHDFS.java b/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/AutoHDFS.java index 1af47d8ca4f..6797db4bff0 100644 --- a/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/AutoHDFS.java +++ b/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/AutoHDFS.java @@ -30,7 +30,7 @@ */ public class AutoHDFS extends AbstractHadoopAutoCreds { @Override - public void doPrepare(Map conf) { + public void doPrepare(Map conf) { } @Override diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/AutoHDFSCommand.java b/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/AutoHDFSCommand.java index 5f56d61d4ac..4a6a9a458b4 100644 --- a/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/AutoHDFSCommand.java +++ b/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/AutoHDFSCommand.java @@ -39,7 +39,7 @@ private AutoHDFSCommand() { @SuppressWarnings("unchecked") public static void main(String[] args) throws Exception { - Map conf = new HashMap(); + Map conf = new HashMap<>(); conf.put(STORM_USER_NAME_KEY, args[1]); //with realm e.g. hdfs@WITZEND.COM conf.put(STORM_KEYTAB_FILE_KEY, args[2]);// /etc/security/keytabs/storm.keytab diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/AutoHDFSNimbus.java b/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/AutoHDFSNimbus.java index 99b4ba8ea77..aab16a9b3ee 100644 --- a/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/AutoHDFSNimbus.java +++ b/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/AutoHDFSNimbus.java @@ -56,7 +56,7 @@ public class AutoHDFSNimbus extends AbstractHadoopNimbusPluginAutoCreds { private String hdfsPrincipal; @Override - public void doPrepare(Map conf) { + public void doPrepare(Map conf) { if(conf.containsKey(STORM_KEYTAB_FILE_KEY) && conf.containsKey(STORM_USER_NAME_KEY)) { hdfsKeyTab = (String) conf.get(STORM_KEYTAB_FILE_KEY); hdfsPrincipal = (String) conf.get(STORM_USER_NAME_KEY); @@ -74,24 +74,24 @@ public void shutdown() { } @Override - protected byte[] getHadoopCredentials(Map conf, String configKey, final String topologyOwnerPrincipal) { + protected byte[] getHadoopCredentials(Map conf, String configKey, final String topologyOwnerPrincipal) { Configuration configuration = getHadoopConfiguration(conf, configKey); return getHadoopCredentials(conf, configuration, topologyOwnerPrincipal); } @Override - protected byte[] getHadoopCredentials(Map conf, final String topologyOwnerPrincipal) { + protected byte[] getHadoopCredentials(Map conf, final String topologyOwnerPrincipal) { return getHadoopCredentials(conf, new Configuration(), topologyOwnerPrincipal); } - private Configuration getHadoopConfiguration(Map topoConf, String configKey) { + private Configuration getHadoopConfiguration(Map topoConf, String configKey) { Configuration configuration = new Configuration(); fillHadoopConfiguration(topoConf, configKey, configuration); return configuration; } @SuppressWarnings("unchecked") - private byte[] getHadoopCredentials(Map conf, final Configuration configuration, final String topologySubmitterUser) { + private byte[] getHadoopCredentials(Map conf, final Configuration configuration, final String topologySubmitterUser) { try { if(UserGroupInformation.isSecurityEnabled()) { login(configuration); @@ -144,8 +144,7 @@ public Object run() { * {@inheritDoc} */ @Override - @SuppressWarnings("unchecked") - public void doRenew(Map credentials, Map topologyConf, final String topologyOwnerPrincipal) { + public void doRenew(Map credentials, Map topologyConf, final String topologyOwnerPrincipal) { List confKeys = getConfigKeys(topologyConf); for (Pair cred : getCredentials(credentials, confKeys)) { try { @@ -153,7 +152,7 @@ public void doRenew(Map credentials, Map topologyConf, final Str Collection> tokens = cred.getSecond().getAllTokens(); if (tokens != null && !tokens.isEmpty()) { - for (Token token : tokens) { + for (Token token : tokens) { //We need to re-login some other thread might have logged into hadoop using // their credentials (e.g. AutoHBase might be also part of nimbu auto creds) login(configuration); diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/HdfsSecurityUtil.java b/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/HdfsSecurityUtil.java index 10c377e604d..c5a3f0fc58f 100644 --- a/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/HdfsSecurityUtil.java +++ b/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/HdfsSecurityUtil.java @@ -49,7 +49,7 @@ public final class HdfsSecurityUtil { private HdfsSecurityUtil() { } - public static void login(Map conf, Configuration hdfsConfig) throws IOException { + public static void login(Map conf, Configuration hdfsConfig) throws IOException { //If AutoHDFS is specified, do not attempt to login using keytabs, only kept for backward compatibility. if(conf.get(TOPOLOGY_AUTO_CREDENTIALS) == null || (!(((List)conf.get(TOPOLOGY_AUTO_CREDENTIALS)).contains(AutoHDFS.class.getName())) && diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/hive/security/AutoHive.java b/external/storm-autocreds/src/main/java/org/apache/storm/hive/security/AutoHive.java index 6010dd1f436..2160753ba10 100644 --- a/external/storm-autocreds/src/main/java/org/apache/storm/hive/security/AutoHive.java +++ b/external/storm-autocreds/src/main/java/org/apache/storm/hive/security/AutoHive.java @@ -31,7 +31,7 @@ */ public class AutoHive extends AbstractHadoopAutoCreds { @Override - public void doPrepare(Map conf) { + public void doPrepare(Map conf) { } @Override diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/hive/security/AutoHiveCommand.java b/external/storm-autocreds/src/main/java/org/apache/storm/hive/security/AutoHiveCommand.java index 9009a534257..dcd99ae9a48 100644 --- a/external/storm-autocreds/src/main/java/org/apache/storm/hive/security/AutoHiveCommand.java +++ b/external/storm-autocreds/src/main/java/org/apache/storm/hive/security/AutoHiveCommand.java @@ -40,7 +40,7 @@ private AutoHiveCommand() { @SuppressWarnings("unchecked") public static void main(String[] args) throws Exception { - Map conf = new HashMap(); + Map conf = new HashMap<>(); conf.put(HIVE_PRINCIPAL_KEY, args[1]); // hive principal storm-hive@WITZEN.COM conf.put(HIVE_KEYTAB_FILE_KEY, args[2]); // storm hive keytab /etc/security/keytabs/storm-hive.keytab conf.put(HiveConf.ConfVars.METASTOREURIS.varname, args[3]); // hive.metastore.uris : "thrift://pm-eng1-cluster1.field.hortonworks.com:9083" diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/hive/security/AutoHiveNimbus.java b/external/storm-autocreds/src/main/java/org/apache/storm/hive/security/AutoHiveNimbus.java index b60e15a35c8..9854b69557f 100644 --- a/external/storm-autocreds/src/main/java/org/apache/storm/hive/security/AutoHiveNimbus.java +++ b/external/storm-autocreds/src/main/java/org/apache/storm/hive/security/AutoHiveNimbus.java @@ -60,7 +60,7 @@ public class AutoHiveNimbus extends AbstractHadoopNimbusPluginAutoCreds { public String metaStoreURI; @Override - public void doPrepare(Map conf) { + public void doPrepare(Map conf) { if (conf.containsKey(HIVE_KEYTAB_FILE_KEY) && conf.containsKey(HIVE_PRINCIPAL_KEY)) { hiveKeytab = (String) conf.get(HIVE_KEYTAB_FILE_KEY); hivePrincipal = (String) conf.get(HIVE_PRINCIPAL_KEY); @@ -79,18 +79,18 @@ public void shutdown() { } @Override - protected byte[] getHadoopCredentials(Map conf, String configKey, final String topologyOwnerPrincipal) { + protected byte[] getHadoopCredentials(Map conf, String configKey, final String topologyOwnerPrincipal) { Configuration configuration = getHadoopConfiguration(conf, configKey); return getHadoopCredentials(conf, configuration, topologyOwnerPrincipal); } @Override - protected byte[] getHadoopCredentials(Map conf, final String topologyOwnerPrincipal) { + protected byte[] getHadoopCredentials(Map conf, final String topologyOwnerPrincipal) { Configuration configuration = new Configuration(); return getHadoopCredentials(conf, configuration, topologyOwnerPrincipal); } - private Configuration getHadoopConfiguration(Map topoConf, String configKey) { + private Configuration getHadoopConfiguration(Map topoConf, String configKey) { Configuration configuration = new Configuration(); fillHadoopConfiguration(topoConf, configKey, configuration); return configuration; @@ -107,7 +107,7 @@ public HiveConf createHiveConf(String metaStoreURI, String hiveMetaStorePrincipa } @SuppressWarnings("unchecked") - protected byte[] getHadoopCredentials(Map conf, final Configuration configuration, final String topologySubmitterUser) { + protected byte[] getHadoopCredentials(Map conf, final Configuration configuration, final String topologySubmitterUser) { try { if (UserGroupInformation.isSecurityEnabled()) { String hiveMetaStoreURI = getMetaStoreURI(configuration); @@ -192,7 +192,7 @@ private void login(Configuration configuration) throws IOException { } @Override - public void doRenew(Map credentials, Map topologyConf, final String topologyOwnerPrincipal) { + public void doRenew(Map credentials, Map topologyConf, final String topologyOwnerPrincipal) { List configKeys = getConfigKeys(topologyConf); for (Pair cred : getCredentials(credentials, configKeys)) { try { @@ -204,7 +204,7 @@ public void doRenew(Map credentials, Map topologyConf, final Str login(configuration); if (tokens != null && !tokens.isEmpty()) { - for (Token token : tokens) { + for (Token token : tokens) { long expiration = renewToken(token, hiveMetaStoreURI, hiveMetaStorePrincipal); LOG.info("Hive delegation token renewed, new expiration time {}", expiration); } diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/ObjectMapperCqlStatementMapper.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/ObjectMapperCqlStatementMapper.java index d3841fbd4b9..fa9a348d01a 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/ObjectMapperCqlStatementMapper.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/ObjectMapperCqlStatementMapper.java @@ -67,7 +67,7 @@ public ObjectMapperCqlStatementMapper(String operationField, String valueField, } @Override - public List map(Map map, Session session, ITuple tuple) { + public List map(Map map, Session session, ITuple tuple) { final ObjectMapperOperation operation = (ObjectMapperOperation)tuple.getValueByField(operationField); Preconditions.checkNotNull(operation, "Operation must not be null"); diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraMapStateFactory.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraMapStateFactory.java index ad050606b4a..75f0d4faeab 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraMapStateFactory.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraMapStateFactory.java @@ -45,23 +45,23 @@ public class CassandraMapStateFactory implements StateFactory { private final StateType stateType; private final CassandraBackingMap.Options options; private int cacheSize; - private Map cassandraConfig; + private Map cassandraConfig; - private CassandraMapStateFactory(StateType stateType, CassandraBackingMap.Options options, Map cassandraConfig) { + private CassandraMapStateFactory(StateType stateType, CassandraBackingMap.Options options, Map cassandraConfig) { this.stateType = stateType; this.options = options; this.cassandraConfig = cassandraConfig; } - public static CassandraMapStateFactory opaque(CassandraBackingMap.Options options, Map cassandraConfig) { + public static CassandraMapStateFactory opaque(CassandraBackingMap.Options options, Map cassandraConfig) { return new CassandraMapStateFactory(StateType.OPAQUE, options, cassandraConfig); } - public static CassandraMapStateFactory transactional(CassandraBackingMap.Options options, Map cassandraConfig) { + public static CassandraMapStateFactory transactional(CassandraBackingMap.Options options, Map cassandraConfig) { return new CassandraMapStateFactory(StateType.TRANSACTIONAL, options, cassandraConfig); } - public static CassandraMapStateFactory nonTransactional(CassandraBackingMap.Options options, Map cassandraConfig) { + public static CassandraMapStateFactory nonTransactional(CassandraBackingMap.Options options, Map cassandraConfig) { return new CassandraMapStateFactory(StateType.NON_TRANSACTIONAL, options, cassandraConfig); } diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/MapStateFactoryBuilder.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/MapStateFactoryBuilder.java index c371fdb6101..e36b7ef7b71 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/MapStateFactoryBuilder.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/MapStateFactoryBuilder.java @@ -80,22 +80,22 @@ public class MapStateFactoryBuilder { private Integer maxParallelism; private StateType stateType; private StateMapper stateMapper; - private Map cassandraConfig; + private Map cassandraConfig; private int cacheSize; - public static MapStateFactoryBuilder> opaque(Map cassandraConf) { + public static MapStateFactoryBuilder> opaque(Map cassandraConf) { return new MapStateFactoryBuilder>() .withStateType(StateType.OPAQUE) .withCassandraConfig(cassandraConf); } - public static MapStateFactoryBuilder> transactional(Map cassandraConf) { + public static MapStateFactoryBuilder> transactional(Map cassandraConf) { return new MapStateFactoryBuilder>() .withStateType(StateType.TRANSACTIONAL) .withCassandraConfig(cassandraConf); } - public static MapStateFactoryBuilder nontransactional(Map cassandraConf) { + public static MapStateFactoryBuilder nontransactional(Map cassandraConf) { return new MapStateFactoryBuilder() .withStateType(StateType.NON_TRANSACTIONAL) .withCassandraConfig(cassandraConf); @@ -145,7 +145,7 @@ protected MapStateFactoryBuilder withStateType(StateType stateType) { return this; } - protected MapStateFactoryBuilder withCassandraConfig(Map cassandraConf) { + protected MapStateFactoryBuilder withCassandraConfig(Map cassandraConf) { this.cassandraConfig = cassandraConf; return this; } diff --git a/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/WeatherSpout.java b/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/WeatherSpout.java index 6dc6c068de4..caf19ee0e6c 100644 --- a/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/WeatherSpout.java +++ b/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/WeatherSpout.java @@ -56,7 +56,7 @@ public void declareOutputFields(OutputFieldsDeclarer outputFieldsDeclarer) { } @Override - public void open(Map map, TopologyContext topologyContext, SpoutOutputCollector spoutOutputCollector) { + public void open(Map map, TopologyContext topologyContext, SpoutOutputCollector spoutOutputCollector) { this.spoutOutputCollector = spoutOutputCollector; } diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/AbstractEsBolt.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/AbstractEsBolt.java index 42f20e61002..a819f65230a 100644 --- a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/AbstractEsBolt.java +++ b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/AbstractEsBolt.java @@ -49,7 +49,7 @@ public AbstractEsBolt(EsConfig esConfig) { } @Override - public void prepare(Map map, TopologyContext topologyContext, OutputCollector outputCollector) { + public void prepare(Map map, TopologyContext topologyContext, OutputCollector outputCollector) { try { this.collector = outputCollector; synchronized (AbstractEsBolt.class) { diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexBolt.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexBolt.java index 1f3122bd33e..9145a1b097f 100644 --- a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexBolt.java +++ b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexBolt.java @@ -56,7 +56,7 @@ public EsIndexBolt(EsConfig esConfig, EsTupleMapper tupleMapper) { } @Override - public void prepare(Map map, TopologyContext topologyContext, OutputCollector outputCollector) { + public void prepare(Map map, TopologyContext topologyContext, OutputCollector outputCollector) { super.prepare(map, topologyContext, outputCollector); } diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsPercolateBolt.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsPercolateBolt.java index 4d969d5e2d0..ac9e07a1f34 100644 --- a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsPercolateBolt.java +++ b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsPercolateBolt.java @@ -61,7 +61,7 @@ public EsPercolateBolt(EsConfig esConfig, EsTupleMapper tupleMapper) { } @Override - public void prepare(Map map, TopologyContext topologyContext, OutputCollector outputCollector) { + public void prepare(Map map, TopologyContext topologyContext, OutputCollector outputCollector) { super.prepare(map, topologyContext, outputCollector); } diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/BinaryEventDataScheme.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/BinaryEventDataScheme.java index 5c767e8aa84..bbd46ea6a65 100644 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/BinaryEventDataScheme.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/BinaryEventDataScheme.java @@ -58,8 +58,8 @@ else if (eventData.getObject()!=null) { throw new RuntimeException(e); } } - Map metaDataMap = eventData.getProperties(); - Map systemMetaDataMap = eventData.getSystemProperties(); + Map metaDataMap = eventData.getProperties(); + Map systemMetaDataMap = eventData.getSystemProperties(); fieldContents.add(messageData); fieldContents.add(metaDataMap); fieldContents.add(systemMetaDataMap); diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventDataScheme.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventDataScheme.java index 96bd6d02a55..f82ffe6c16e 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventDataScheme.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventDataScheme.java @@ -65,8 +65,8 @@ else if (eventData.getObject()!=null) { throw e; } } - Map metaDataMap = eventData.getProperties(); - fieldContents.add(messageData); + Map metaDataMap = eventData.getProperties(); + fieldContents.add(messageData); fieldContents.add(metaDataMap); return fieldContents; } diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubReceiverImpl.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubReceiverImpl.java index 49490242c2a..459b9bcb8c3 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubReceiverImpl.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubReceiverImpl.java @@ -156,8 +156,8 @@ public EventDataWrap receive() { } @Override - public Map getMetricsData() { - Map ret = new HashMap(); + public Map getMetricsData() { + Map ret = new HashMap<>(); ret.put(partitionId + "/receiveApiLatencyMean", receiveApiLatencyMean.getValueAndReset()); ret.put(partitionId + "/receiveApiCallCount", receiveApiCallCount.getValueAndReset()); ret.put(partitionId + "/receiveMessageCount", receiveMessageCount.getValueAndReset()); diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubSpout.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubSpout.java index a7013ad5abc..d8c3d091afe 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubSpout.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubSpout.java @@ -159,7 +159,7 @@ public void open(Map config, TopologyContext context, SpoutOutpu context.registerMetric("EventHubReceiver", new IMetric() { @Override public Object getValueAndReset() { - Map concatMetricsDataMaps = new HashMap(); + Map concatMetricsDataMaps = new HashMap<>(); for (IPartitionManager partitionManager : partitionCoordinator.getMyPartitionManagers()) { concatMetricsDataMaps.putAll(partitionManager.getMetricsData()); diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/IEventHubReceiver.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/IEventHubReceiver.java index 4ae78c5c734..c8de8bcee29 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/IEventHubReceiver.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/IEventHubReceiver.java @@ -29,5 +29,5 @@ public interface IEventHubReceiver { EventDataWrap receive(); - Map getMetricsData(); + Map getMetricsData(); } diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/IPartitionManager.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/IPartitionManager.java index 845f50815bc..123d1c1af4e 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/IPartitionManager.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/IPartitionManager.java @@ -33,5 +33,5 @@ public interface IPartitionManager { void fail(String offset); - Map getMetricsData(); + Map getMetricsData(); } diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/SimplePartitionManager.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/SimplePartitionManager.java index b76b34206e5..25c4261e19a 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/SimplePartitionManager.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/SimplePartitionManager.java @@ -127,7 +127,7 @@ private String getPartitionStatePath() { } @Override - public Map getMetricsData() { + public Map getMetricsData() { return receiver.getMetricsData(); } } diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/TransactionalTridentEventHubEmitter.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/TransactionalTridentEventHubEmitter.java index b78fcd35f6f..d3456e05cf7 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/TransactionalTridentEventHubEmitter.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/TransactionalTridentEventHubEmitter.java @@ -30,7 +30,7 @@ public class TransactionalTridentEventHubEmitter - implements IPartitionedTridentSpout.Emitter { + implements IPartitionedTridentSpout.Emitter> { private static final Logger logger = LoggerFactory.getLogger(TransactionalTridentEventHubEmitter.class); private final int batchSize; private final EventHubSpoutConfig spoutConfig; @@ -98,7 +98,7 @@ private ITridentPartitionManager getOrCreatePartitionManager(Partition partition @Override public void emitPartitionBatch(TransactionAttempt attempt, - TridentCollector collector, Partition partition, Map meta) { + TridentCollector collector, Partition partition, Map meta) { String offset = (String)meta.get("offset"); int count = Integer.parseInt((String)meta.get("count")); logger.info("re-emit for partition " + partition.getId() + ", offset=" + offset + ", count=" + count); @@ -117,8 +117,8 @@ public void emitPartitionBatch(TransactionAttempt attempt, } @Override - public Map emitPartitionBatchNew(TransactionAttempt attempt, - TridentCollector collector, Partition partition, Map meta) { + public Map emitPartitionBatchNew(TransactionAttempt attempt, + TridentCollector collector, Partition partition, Map meta) { ITridentPartitionManager pm = getOrCreatePartitionManager(partition); String offset = FieldConstants.DefaultStartingOffset; if(meta != null && meta.containsKey("nextOffset")) { @@ -138,7 +138,7 @@ public Map emitPartitionBatchNew(TransactionAttempt attempt, } //logger.info("emitted new batches: " + listEvents.size()); - Map newMeta = new HashMap(); + Map newMeta = new HashMap<>(); newMeta.put("offset", offset); newMeta.put("nextOffset", nextOffset); newMeta.put("count", ""+listEvents.size()); diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/TransactionalTridentEventHubSpout.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/TransactionalTridentEventHubSpout.java index 450fb3fc5a0..4d4de16ae99 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/TransactionalTridentEventHubSpout.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/TransactionalTridentEventHubSpout.java @@ -31,7 +31,7 @@ * Transactional Trident EventHub Spout */ public class TransactionalTridentEventHubSpout implements - IPartitionedTridentSpout { + IPartitionedTridentSpout> { private static final long serialVersionUID = 1L; private final IEventDataScheme scheme; private final EventHubSpoutConfig spoutConfig; @@ -53,7 +53,7 @@ public IPartitionedTridentSpout.Coordinator getCoordinator( } @Override - public IPartitionedTridentSpout.Emitter getEmitter( + public IPartitionedTridentSpout.Emitter> getEmitter( Map conf, TopologyContext context) { return new TransactionalTridentEventHubEmitter(spoutConfig); } diff --git a/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/samples/bolt/GlobalCountBolt.java b/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/samples/bolt/GlobalCountBolt.java index 285736e0376..4bed2e3ae95 100755 --- a/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/samples/bolt/GlobalCountBolt.java +++ b/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/samples/bolt/GlobalCountBolt.java @@ -55,7 +55,7 @@ public Object getValueAndReset() { long now = System.nanoTime(); long millis = (now - lastMetricsTime) / 1000000; throughput = globalCountDiff / millis * 1000; - Map values = new HashMap(); + Map values = new HashMap<>(); values.put("global_count", globalCount); values.put("throughput", throughput); lastMetricsTime = now; diff --git a/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/spout/EventHubReceiverMock.java b/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/spout/EventHubReceiverMock.java index 7538d4b6523..09fb60f032e 100755 --- a/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/spout/EventHubReceiverMock.java +++ b/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/spout/EventHubReceiverMock.java @@ -79,7 +79,7 @@ public EventDataWrap receive() { } @Override - public Map getMetricsData() { + public Map getMetricsData() { return null; } } diff --git a/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/trident/TestTransactionalTridentEmitter.java b/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/trident/TestTransactionalTridentEmitter.java index 03696a2eb3d..b6ce76a13a6 100755 --- a/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/trident/TestTransactionalTridentEmitter.java +++ b/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/trident/TestTransactionalTridentEmitter.java @@ -62,7 +62,7 @@ public void tearDown() throws Exception { @Test public void testEmitInSequence() { //test the happy path, emit batches in sequence - Map meta = emitter.emitPartitionBatchNew(null, collectorMock, partition, null); + Map meta = emitter.emitPartitionBatchNew(null, collectorMock, partition, null); String collected = collectorMock.getBuffer(); assertTrue(collected.startsWith("message"+0)); //System.out.println("collected: " + collected); @@ -77,11 +77,11 @@ public void testEmitInSequence() { @Test public void testReEmit() { //test we can re-emit the second batch - Map meta = emitter.emitPartitionBatchNew(null, collectorMock, partition, null); + Map meta = emitter.emitPartitionBatchNew(null, collectorMock, partition, null); collectorMock.clear(); //emit second batch - Map meta1 = emitter.emitPartitionBatchNew(null, collectorMock, partition, meta); + Map meta1 = emitter.emitPartitionBatchNew(null, collectorMock, partition, meta); String collected0 = collectorMock.getBuffer(); collectorMock.clear(); diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java index 9263d18f781..bae7aebaf8f 100644 --- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java +++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java @@ -105,7 +105,7 @@ public void execute(Tuple tuple) { } @Override - public void prepare(Map map, TopologyContext topologyContext, OutputCollector collector) { + public void prepare(Map map, TopologyContext topologyContext, OutputCollector collector) { super.prepare(map, topologyContext, collector); this.batchHelper = new BatchHelper(batchSize, collector); } diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/state/HBaseKeyValueStateProvider.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/state/HBaseKeyValueStateProvider.java index ce91086cf94..763c3876246 100644 --- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/state/HBaseKeyValueStateProvider.java +++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/state/HBaseKeyValueStateProvider.java @@ -45,7 +45,7 @@ public class HBaseKeyValueStateProvider implements StateProvider { private static final Logger LOG = LoggerFactory.getLogger(HBaseKeyValueStateProvider.class); @Override - public State newState(String namespace, Map stormConf, TopologyContext context) { + public State newState(String namespace, Map stormConf, TopologyContext context) { try { return getHBaseKeyValueState(namespace, stormConf, context, getStateConfig(stormConf)); } catch (Exception ex) { @@ -81,7 +81,7 @@ private HBaseKeyValueState getHBaseKeyValueState(String namespace, Map hbaseConfMap = new HashMap(conf); + Map hbaseConfMap = new HashMap<>(conf); hbaseConfMap.put(Config.TOPOLOGY_AUTO_CREDENTIALS, stormConf.get(Config.TOPOLOGY_AUTO_CREDENTIALS)); HBaseClient hbaseClient = new HBaseClient(hbaseConfMap, hbConfig, config.tableName); 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 36077fca6b8..9dbcd8059e9 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 @@ -86,7 +86,7 @@ public class HBaseMapState implements IBackingMap { * @param map topology config map. * @param partitionNum the number of partition. */ - public HBaseMapState(final Options options, Map map, int partitionNum) { + public HBaseMapState(final Options options, Map map, int partitionNum) { this.options = options; this.serializer = options.serializer; this.partitionNum = partitionNum; diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseState.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseState.java index b199514562a..7b32eae527f 100644 --- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseState.java +++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseState.java @@ -46,11 +46,11 @@ public class HBaseState implements State { private Options options; private HBaseClient hBaseClient; - private Map map; + private Map map; private int numPartitions; private int partitionIndex; - protected HBaseState(Map map, int partitionIndex, int numPartitions, Options options) { + protected HBaseState(Map map, int partitionIndex, int numPartitions, Options options) { this.options = options; this.map = map; this.partitionIndex = partitionIndex; diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseStateFactory.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseStateFactory.java index e208ef3ed36..08e9dc38d39 100644 --- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseStateFactory.java +++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseStateFactory.java @@ -32,7 +32,7 @@ public HBaseStateFactory(HBaseState.Options options) { } @Override - public State makeState(Map map, IMetricsContext iMetricsContext, int partitionIndex, int numPartitions) { + public State makeState(Map map, IMetricsContext iMetricsContext, int partitionIndex, int numPartitions) { HBaseState state = new HBaseState(map , partitionIndex, numPartitions, options); state.prepare(); return state; 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 b3909f309ee..67ccde6ae53 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 @@ -588,8 +588,8 @@ private static List readTextFile(FileSystem fs, String f) throws IOExcep return result; } - private Map getCommonConfigs() { - Map topoConf = new HashMap(); + private Map getCommonConfigs() { + Map topoConf = new HashMap<>(); topoConf.put(Config.TOPOLOGY_ACKER_EXECUTORS, "0"); return topoConf; } diff --git a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/AbstractJdbcBolt.java b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/AbstractJdbcBolt.java index 6258a9758ed..9ae455ccec0 100644 --- a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/AbstractJdbcBolt.java +++ b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/AbstractJdbcBolt.java @@ -65,7 +65,7 @@ public abstract class AbstractJdbcBolt extends BaseTickTupleAwareRichBolt { * {@inheritDoc} */ @Override - public void prepare(final Map map, final TopologyContext topologyContext, + public void prepare(final Map map, final TopologyContext topologyContext, final OutputCollector outputCollector) { this.collector = outputCollector; diff --git a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/JdbcInsertBolt.java b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/JdbcInsertBolt.java index dafef218a34..897ece016d7 100644 --- a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/JdbcInsertBolt.java +++ b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/JdbcInsertBolt.java @@ -74,7 +74,7 @@ public JdbcInsertBolt withQueryTimeoutSecs(int queryTimeoutSecs) { } @Override - public void prepare(Map map, TopologyContext topologyContext, OutputCollector collector) { + public void prepare(Map map, TopologyContext topologyContext, OutputCollector collector) { super.prepare(map, topologyContext, collector); if(StringUtils.isBlank(tableName) && StringUtils.isBlank(insertQuery)) { throw new IllegalArgumentException("You must supply either a tableName or an insert Query."); diff --git a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcState.java b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcState.java index 814b20ba8d5..eabf011773e 100644 --- a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcState.java +++ b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcState.java @@ -46,7 +46,7 @@ public class JdbcState implements State { private JdbcClient jdbcClient; private Map map; - protected JdbcState(Map map, int partitionIndex, int numPartitions, Options options) { + protected JdbcState(Map map, int partitionIndex, int numPartitions, Options options) { this.options = options; this.map = map; } diff --git a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcStateFactory.java b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcStateFactory.java index 0295748a3c4..abc169f6aa9 100644 --- a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcStateFactory.java +++ b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcStateFactory.java @@ -32,7 +32,7 @@ public JdbcStateFactory(JdbcState.Options options) { } @Override - public State makeState(Map map, IMetricsContext iMetricsContext, int partitionIndex, int numPartitions) { + public State makeState(Map map, IMetricsContext iMetricsContext, int partitionIndex, int numPartitions) { JdbcState state = new JdbcState(map , partitionIndex, numPartitions, options); state.prepare(); return state; diff --git a/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/common/JdbcClientTest.java b/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/common/JdbcClientTest.java index e55700c7e75..05f4f31019c 100644 --- a/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/common/JdbcClientTest.java +++ b/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/common/JdbcClientTest.java @@ -42,7 +42,7 @@ public class JdbcClientTest { private static final String tableName = "user_details"; @Before public void setup() { - Map map = Maps.newHashMap(); + Map map = Maps.newHashMap(); map.put("dataSourceClassName","org.hsqldb.jdbc.JDBCDataSource");//com.mysql.jdbc.jdbc2.optional.MysqlDataSource map.put("dataSource.url", "jdbc:hsqldb:mem:test");//jdbc:mysql://localhost/test map.put("dataSource.user","SA");//root diff --git a/external/storm-jms/src/main/java/org/apache/storm/jms/trident/JmsStateFactory.java b/external/storm-jms/src/main/java/org/apache/storm/jms/trident/JmsStateFactory.java index 9a02ba92925..4123752c7b3 100644 --- a/external/storm-jms/src/main/java/org/apache/storm/jms/trident/JmsStateFactory.java +++ b/external/storm-jms/src/main/java/org/apache/storm/jms/trident/JmsStateFactory.java @@ -32,7 +32,7 @@ public JmsStateFactory(JmsState.Options options) { } @Override - public State makeState(Map map, IMetricsContext iMetricsContext, int partitionIndex, int numPartitions) { + public State makeState(Map map, IMetricsContext iMetricsContext, int partitionIndex, int numPartitions) { JmsState state = new JmsState(options); state.prepare(); return state; diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutBatchMetadataTest.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutBatchMetadataTest.java index a15e4158a2a..e348ad38c0f 100644 --- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutBatchMetadataTest.java +++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutBatchMetadataTest.java @@ -43,7 +43,7 @@ public void testMetadataIsRoundTripSerializableWithJsonSimple() throws Exception KafkaTridentSpoutBatchMetadata metadata = new KafkaTridentSpoutBatchMetadata(startOffset, endOffset); Map map = metadata.toMap(); - Map deserializedMap = (Map)JSONValue.parseWithException(JSONValue.toJSONString(map)); + Map deserializedMap = (Map)JSONValue.parseWithException(JSONValue.toJSONString(map)); KafkaTridentSpoutBatchMetadata deserializedMetadata = KafkaTridentSpoutBatchMetadata.fromMap(deserializedMap); assertThat(deserializedMetadata.getFirstOffset(), is(metadata.getFirstOffset())); assertThat(deserializedMetadata.getLastOffset(), is(metadata.getLastOffset())); diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaSpout.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaSpout.java index 79cde569d1c..7b1243c5ef0 100644 --- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaSpout.java +++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaSpout.java @@ -111,7 +111,7 @@ public Object getValueAndReset() { @Override public Object getValueAndReset() { List pms = _coordinator.getMyManagedPartitions(); - Map concatMetricsDataMaps = new HashMap(); + Map concatMetricsDataMaps = new HashMap<>(); for (PartitionManager pm : pms) { concatMetricsDataMaps.putAll(pm.getMetricsDataMap()); } diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java index 4b5f4563c00..a9a18fd2fce 100644 --- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java +++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java @@ -165,7 +165,7 @@ public PartitionManager( _messageIneligibleForRetryCount = new CountMetric(); } - public Map getMetricsDataMap() { + public Map getMetricsDataMap() { String metricPrefix = _partition.getId(); Map ret = new HashMap<>(); diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkState.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkState.java index 9f264791687..7241c60d65d 100644 --- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkState.java +++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkState.java @@ -36,7 +36,8 @@ public class ZkState { private static final Logger LOG = LoggerFactory.getLogger(ZkState.class); CuratorFramework _curator; - private CuratorFramework newCurator(Map stateConf) throws Exception { + private CuratorFramework newCurator(final Map stateConf) + throws Exception { Integer port = (Integer) stateConf.get(Config.TRANSACTIONAL_ZOOKEEPER_PORT); String serverPorts = ""; for (String server : (List) stateConf.get(Config.TRANSACTIONAL_ZOOKEEPER_SERVERS)) { @@ -54,8 +55,8 @@ public CuratorFramework getCurator() { return _curator; } - public ZkState(Map stateConf) { - stateConf = new HashMap(stateConf); + public ZkState(Map stateConf) { + stateConf = new HashMap<>(stateConf); try { _curator = newCurator(stateConf); diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/OpaqueTridentKafkaSpout.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/OpaqueTridentKafkaSpout.java index 8a47ddc496e..c17c912c6b9 100644 --- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/OpaqueTridentKafkaSpout.java +++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/OpaqueTridentKafkaSpout.java @@ -26,7 +26,11 @@ import java.util.Map; -public class OpaqueTridentKafkaSpout implements IOpaquePartitionedTridentSpout, Partition, Map> { +public class OpaqueTridentKafkaSpout + implements IOpaquePartitionedTridentSpout< + List, + Partition, + Map> { TridentKafkaConfig _config; @@ -36,13 +40,18 @@ public OpaqueTridentKafkaSpout(TridentKafkaConfig config) { } @Override - public IOpaquePartitionedTridentSpout.Emitter, Partition, Map> getEmitter(Map conf, TopologyContext context) { + public Emitter, + Partition, + Map> getEmitter(Map conf, + TopologyContext context) { return new TridentKafkaEmitter(conf, context, _config, context .getStormId()).asOpaqueEmitter(); } @Override - public IOpaquePartitionedTridentSpout.Coordinator getCoordinator(Map conf, TopologyContext tc) { + public IOpaquePartitionedTridentSpout.Coordinator getCoordinator( + Map conf, + TopologyContext tc) { return new org.apache.storm.kafka.trident.Coordinator(conf, _config); } diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/TridentKafkaEmitter.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/TridentKafkaEmitter.java index 1339387ccf3..3333c2c3d79 100644 --- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/TridentKafkaEmitter.java +++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/TridentKafkaEmitter.java @@ -73,16 +73,20 @@ public TridentKafkaEmitter(Map conf, TopologyContext context, Tr } - private Map failFastEmitNewPartitionBatch(TransactionAttempt attempt, TridentCollector collector, Partition partition, Map lastMeta) { + private Map failFastEmitNewPartitionBatch( + final TransactionAttempt attempt, + TridentCollector collector, + Partition partition, + Map lastMeta) { SimpleConsumer consumer = _connections.register(partition); - Map ret = doEmitNewPartitionBatch(consumer, partition, collector, lastMeta, attempt); + Map ret = doEmitNewPartitionBatch(consumer, partition, collector, lastMeta, attempt); Long offset = (Long) ret.get("offset"); Long endOffset = (Long) ret.get("nextOffset"); _kafkaOffsetMetric.setOffsetData(partition, new PartitionManager.OffsetData(endOffset, offset)); return ret; } - private Map emitNewPartitionBatch(TransactionAttempt attempt, TridentCollector collector, Partition partition, Map lastMeta) { + private Map emitNewPartitionBatch(TransactionAttempt attempt, TridentCollector collector, Partition partition, Map lastMeta) { try { return failFastEmitNewPartitionBatch(attempt, collector, partition, lastMeta); } catch (FailedFetchException e) { @@ -90,7 +94,7 @@ private Map emitNewPartitionBatch(TransactionAttempt attempt, TridentCollector c if (lastMeta == null) { return null; } else { - Map ret = new HashMap(); + Map ret = new HashMap<>(); ret.put("offset", lastMeta.get("nextOffset")); ret.put("nextOffset", lastMeta.get("nextOffset")); ret.put("partition", partition.partition); @@ -102,12 +106,17 @@ private Map emitNewPartitionBatch(TransactionAttempt attempt, TridentCollector c } } - private Map doEmitNewPartitionBatch(SimpleConsumer consumer, Partition partition, TridentCollector collector, Map lastMeta, TransactionAttempt attempt) { + private Map doEmitNewPartitionBatch(SimpleConsumer consumer, + Partition partition, + TridentCollector collector, + Map lastMeta, + TransactionAttempt attempt) { LOG.debug("Emitting new partition batch - [transaction = {}], [lastMeta = {}]", attempt, lastMeta); long offset; if (lastMeta != null) { String lastInstanceId = null; - Map lastTopoMeta = (Map) lastMeta.get("topology"); + Map lastTopoMeta = (Map) + lastMeta.get("topology"); if (lastTopoMeta != null) { lastInstanceId = (String) lastTopoMeta.get("id"); } @@ -136,7 +145,7 @@ private Map doEmitNewPartitionBatch(SimpleConsumer consumer, Partition partition emit(collector, msg.message(), partition, msg.offset(), attempt); endoffset = msg.nextOffset(); } - Map newMeta = new HashMap(); + Map newMeta = new HashMap<>(); newMeta.put("offset", offset); newMeta.put("nextOffset", endoffset); newMeta.put("instanceId", _topologyInstanceId); @@ -161,7 +170,7 @@ private ByteBufferMessageSet fetchMessages(SimpleConsumer consumer, Partition pa /** * re-emit the batch described by the meta data provided */ - private void reEmitPartitionBatch(TransactionAttempt attempt, TridentCollector collector, Partition partition, Map meta) { + private void reEmitPartitionBatch(TransactionAttempt attempt, TridentCollector collector, Partition partition, Map meta) { LOG.info("re-emitting batch, attempt " + attempt); String instanceId = (String) meta.get("instanceId"); if (!_config.ignoreZkOffsets || instanceId.equals(_topologyInstanceId)) { @@ -221,9 +230,9 @@ private void refresh(List list) { } - public IOpaquePartitionedTridentSpout.Emitter, Partition, Map> asOpaqueEmitter() { + public IOpaquePartitionedTridentSpout.Emitter, Partition, Map> asOpaqueEmitter() { - return new IOpaquePartitionedTridentSpout.Emitter, Partition, Map>() { + return new IOpaquePartitionedTridentSpout.Emitter, Partition, Map>() { /** * Emit a batch of tuples for a partition/transaction. @@ -232,7 +241,7 @@ public IOpaquePartitionedTridentSpout.Emitter, * for defining the parameters of the next batch. */ @Override - public Map emitPartitionBatch(TransactionAttempt transactionAttempt, TridentCollector tridentCollector, Partition partition, Map map) { + public Map emitPartitionBatch(TransactionAttempt transactionAttempt, TridentCollector tridentCollector, Partition partition, Map map) { return emitNewPartitionBatch(transactionAttempt, tridentCollector, partition, map); } @@ -254,14 +263,14 @@ public void close() { } public IPartitionedTridentSpout.Emitter asTransactionalEmitter() { - return new IPartitionedTridentSpout.Emitter, Partition, Map>() { + return new IPartitionedTridentSpout.Emitter, Partition, Map>() { /** * Emit a batch of tuples for a partition/transaction that's never been emitted before. * Return the metadata that can be used to reconstruct this partition/batch in the future. */ @Override - public Map emitPartitionBatchNew(TransactionAttempt transactionAttempt, TridentCollector tridentCollector, Partition partition, Map map) { + public Map emitPartitionBatchNew(TransactionAttempt transactionAttempt, TridentCollector tridentCollector, Partition partition, Map map) { return failFastEmitNewPartitionBatch(transactionAttempt, tridentCollector, partition, map); } @@ -270,7 +279,7 @@ public Map emitPartitionBatchNew(TransactionAttempt transactionAttempt, TridentC * the metadata created when it was first emitted. */ @Override - public void emitPartitionBatch(TransactionAttempt transactionAttempt, TridentCollector tridentCollector, Partition partition, Map map) { + public void emitPartitionBatch(TransactionAttempt transactionAttempt, TridentCollector tridentCollector, Partition partition, Map map) { reEmitPartitionBatch(transactionAttempt, tridentCollector, partition, map); } diff --git a/external/storm-kafka/src/test/org/apache/storm/kafka/ZkCoordinatorTest.java b/external/storm-kafka/src/test/org/apache/storm/kafka/ZkCoordinatorTest.java index 8d8746fb36e..31dfffe1f17 100644 --- a/external/storm-kafka/src/test/org/apache/storm/kafka/ZkCoordinatorTest.java +++ b/external/storm-kafka/src/test/org/apache/storm/kafka/ZkCoordinatorTest.java @@ -63,8 +63,8 @@ public void setUp() throws Exception { when(dynamicPartitionConnections.register(any(Broker.class), any(String.class) ,anyInt())).thenReturn(simpleConsumer); } - private Map buildZookeeperConfig(TestingServer server) { - Map conf = new HashMap(); + private Map buildZookeeperConfig(TestingServer server) { + Map conf = new HashMap<>(); conf.put(Config.TRANSACTIONAL_ZOOKEEPER_PORT, server.getPort()); conf.put(Config.TRANSACTIONAL_ZOOKEEPER_SERVERS, Arrays.asList("localhost")); conf.put(Config.STORM_ZOOKEEPER_SESSION_TIMEOUT, 20000); 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 56fd33a07ea..b06d35dd9bb 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 @@ -68,9 +68,9 @@ public class MongoMapState implements IBackingMap { private Options options; private Serializer serializer; private MongoDbClient mongoClient; - private Map map; + private Map map; - protected MongoMapState(Map map, Options options) { + protected MongoMapState(Map map, Options options) { this.options = options; this.map = map; this.serializer = options.serializer; diff --git a/external/storm-mongodb/src/main/java/org/apache/storm/mongodb/trident/state/MongoState.java b/external/storm-mongodb/src/main/java/org/apache/storm/mongodb/trident/state/MongoState.java index c4e8ccaf0ef..77c394c5d02 100644 --- a/external/storm-mongodb/src/main/java/org/apache/storm/mongodb/trident/state/MongoState.java +++ b/external/storm-mongodb/src/main/java/org/apache/storm/mongodb/trident/state/MongoState.java @@ -45,9 +45,9 @@ public class MongoState implements State { private Options options; private MongoDbClient mongoClient; - private Map map; + private Map map; - protected MongoState(Map map, Options options) { + protected MongoState(Map map, Options options) { this.options = options; this.map = map; } diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/bolt/AbstractRedisBolt.java b/external/storm-redis/src/main/java/org/apache/storm/redis/bolt/AbstractRedisBolt.java index 471d6cd578c..f0f3fa39531 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/bolt/AbstractRedisBolt.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/bolt/AbstractRedisBolt.java @@ -82,7 +82,7 @@ public AbstractRedisBolt(JedisClusterConfig config) { * {@inheritDoc} */ @Override - public void prepare(Map map, TopologyContext topologyContext, OutputCollector collector) { + public void prepare(Map map, TopologyContext topologyContext, OutputCollector collector) { // FIXME: stores map (topoConf), topologyContext and expose these to derived classes this.collector = collector; diff --git a/external/storm-rocketmq/src/main/java/org/apache/storm/rocketmq/trident/state/RocketMqState.java b/external/storm-rocketmq/src/main/java/org/apache/storm/rocketmq/trident/state/RocketMqState.java index 9a8a46e8681..daaa93cb055 100644 --- a/external/storm-rocketmq/src/main/java/org/apache/storm/rocketmq/trident/state/RocketMqState.java +++ b/external/storm-rocketmq/src/main/java/org/apache/storm/rocketmq/trident/state/RocketMqState.java @@ -45,7 +45,7 @@ public class RocketMqState implements State { private Options options; private MQProducer producer; - protected RocketMqState(Map map, Options options) { + protected RocketMqState(Map map, Options options) { this.options = options; } diff --git a/external/storm-solr/src/main/java/org/apache/storm/solr/trident/SolrStateFactory.java b/external/storm-solr/src/main/java/org/apache/storm/solr/trident/SolrStateFactory.java index 7d3e69de123..2e8997c7928 100644 --- a/external/storm-solr/src/main/java/org/apache/storm/solr/trident/SolrStateFactory.java +++ b/external/storm-solr/src/main/java/org/apache/storm/solr/trident/SolrStateFactory.java @@ -36,7 +36,7 @@ public SolrStateFactory(SolrConfig solrConfig, SolrMapper solrMapper) { } @Override - public State makeState(Map map, IMetricsContext iMetricsContext, int partitionIndex, int numPartitions) { + public State makeState(Map map, IMetricsContext iMetricsContext, int partitionIndex, int numPartitions) { SolrState state = new SolrState(solrConfig, solrMapper); state.prepare(); return state; diff --git a/flux/flux-core/src/main/java/org/apache/storm/flux/model/ConfigMethodDef.java b/flux/flux-core/src/main/java/org/apache/storm/flux/model/ConfigMethodDef.java index d10059849ca..8d32c06fd5e 100644 --- a/flux/flux-core/src/main/java/org/apache/storm/flux/model/ConfigMethodDef.java +++ b/flux/flux-core/src/main/java/org/apache/storm/flux/model/ConfigMethodDef.java @@ -49,7 +49,7 @@ public void setArgs(List args) { List newVal = new ArrayList(); for (Object obj : args) { if (obj instanceof LinkedHashMap) { - Map map = (Map)obj; + Map map = (Map)obj; if (map.containsKey("ref") && map.size() == 1) { newVal.add(new BeanReference((String)map.get("ref"))); this.hasReferences = true; diff --git a/flux/flux-core/src/main/java/org/apache/storm/flux/model/ObjectDef.java b/flux/flux-core/src/main/java/org/apache/storm/flux/model/ObjectDef.java index 170ee4f3d2b..1df9f9f2987 100644 --- a/flux/flux-core/src/main/java/org/apache/storm/flux/model/ObjectDef.java +++ b/flux/flux-core/src/main/java/org/apache/storm/flux/model/ObjectDef.java @@ -57,7 +57,7 @@ public void setConstructorArgs(List constructorArgs) { List newVal = new ArrayList(); for (Object obj : constructorArgs) { if (obj instanceof LinkedHashMap) { - Map map = (Map)obj; + Map map = (Map)obj; if (map.containsKey("ref") && map.size() == 1) { newVal.add(new BeanReference((String) map.get("ref"))); this.hasReferences = true; diff --git a/integration-test/src/test/java/org/apache/storm/st/wrapper/StormCluster.java b/integration-test/src/test/java/org/apache/storm/st/wrapper/StormCluster.java index 4521b36bd34..f8e59f5596c 100644 --- a/integration-test/src/test/java/org/apache/storm/st/wrapper/StormCluster.java +++ b/integration-test/src/test/java/org/apache/storm/st/wrapper/StormCluster.java @@ -49,7 +49,7 @@ public StormCluster() { this.client = NimbusClient.getConfiguredClient(conf).getClient(); } - public static Map getConfig() { + public static Map getConfig() { return Utils.readStormConfig(); } diff --git a/storm-client/src/jvm/org/apache/storm/Config.java b/storm-client/src/jvm/org/apache/storm/Config.java index 7a286d52071..ed6068c4b6c 100644 --- a/storm-client/src/jvm/org/apache/storm/Config.java +++ b/storm-client/src/jvm/org/apache/storm/Config.java @@ -1853,11 +1853,11 @@ public void setClasspath(String cp) { setClasspath(this, cp); } - public static void setEnvironment(Map conf, Map env) { + public static void setEnvironment(Map conf, Map env) { conf.put(Config.TOPOLOGY_ENVIRONMENT, env); } - public void setEnvironment(Map env) { + public void setEnvironment(Map env) { setEnvironment(this, env); } @@ -1955,7 +1955,7 @@ public static void registerEventLogger(Map conf, Class conf, Class klass, Object argument, long parallelismHint) { - HashMap m = new HashMap(); + HashMap m = new HashMap<>(); m.put("class", klass.getCanonicalName()); m.put("parallelism.hint", parallelismHint); m.put("argument", argument); diff --git a/storm-client/src/jvm/org/apache/storm/StormSubmitter.java b/storm-client/src/jvm/org/apache/storm/StormSubmitter.java index 0f6baf2ccd8..5ce0d440dba 100644 --- a/storm-client/src/jvm/org/apache/storm/StormSubmitter.java +++ b/storm-client/src/jvm/org/apache/storm/StormSubmitter.java @@ -80,9 +80,8 @@ public static boolean validateZKDigestPayload(String payload) { return false; } - @SuppressWarnings("unchecked") - public static Map prepareZookeeperAuthentication(Map conf) { - Map toRet = new HashMap(); + public static Map prepareZookeeperAuthentication(Map conf) { + Map toRet = new HashMap<>(); String secretPayload = (String) conf.get(Config.STORM_ZOOKEEPER_TOPOLOGY_AUTH_PAYLOAD); // Is the topology ZooKeeper authentication configuration unset? if (! conf.containsKey(Config.STORM_ZOOKEEPER_TOPOLOGY_AUTH_PAYLOAD) || diff --git a/storm-client/src/jvm/org/apache/storm/Thrift.java b/storm-client/src/jvm/org/apache/storm/Thrift.java index bffd04f6f4d..e00b0ee6be9 100644 --- a/storm-client/src/jvm/org/apache/storm/Thrift.java +++ b/storm-client/src/jvm/org/apache/storm/Thrift.java @@ -94,7 +94,7 @@ public Integer getParallelism() { return parallelism; } - public Map getConf() { + public Map getConf() { return conf; } } @@ -117,7 +117,7 @@ public Object getBolt() { return bolt; } - public Map getConf() { + public Map getConf() { return conf; } diff --git a/storm-client/src/jvm/org/apache/storm/cluster/ClusterUtils.java b/storm-client/src/jvm/org/apache/storm/cluster/ClusterUtils.java index 362d4dd248b..4bd5ded5a78 100644 --- a/storm-client/src/jvm/org/apache/storm/cluster/ClusterUtils.java +++ b/storm-client/src/jvm/org/apache/storm/cluster/ClusterUtils.java @@ -256,12 +256,12 @@ public IStormClusterState mkStormClusterStateImpl(Object stateStorage, ClusterSt if (stateStorage instanceof IStateStorage) { return new StormClusterStateImpl((IStateStorage) stateStorage, context, false); } else { - IStateStorage Storage = _instance.mkStateStorageImpl((Map) stateStorage, (Map) stateStorage, context); + IStateStorage Storage = _instance.mkStateStorageImpl((Map) stateStorage, (Map) stateStorage, context); return new StormClusterStateImpl(Storage, context, true); } } - public IStateStorage mkStateStorageImpl(Map config, Map auth_conf, ClusterStateContext context) throws Exception { + public IStateStorage mkStateStorageImpl(Map config, Map auth_conf, ClusterStateContext context) throws Exception { String className = null; IStateStorage stateStorage = null; if (config.get(Config.STORM_CLUSTER_STATE_STORE) != null) { @@ -275,7 +275,7 @@ public IStateStorage mkStateStorageImpl(Map config, Map auth_con return stateStorage; } - public static IStateStorage mkStateStorage(Map config, Map auth_conf, ClusterStateContext context) throws Exception { + public static IStateStorage mkStateStorage(Map config, Map auth_conf, ClusterStateContext context) throws Exception { return _instance.mkStateStorageImpl(config, auth_conf, context); } diff --git a/storm-client/src/jvm/org/apache/storm/cluster/PaceMakerStateStorageFactory.java b/storm-client/src/jvm/org/apache/storm/cluster/PaceMakerStateStorageFactory.java index 065e0df8a7a..5e0cdd77bfd 100644 --- a/storm-client/src/jvm/org/apache/storm/cluster/PaceMakerStateStorageFactory.java +++ b/storm-client/src/jvm/org/apache/storm/cluster/PaceMakerStateStorageFactory.java @@ -24,7 +24,7 @@ public class PaceMakerStateStorageFactory implements StateStorageFactory { @Override - public IStateStorage mkStore(Map config, Map auth_conf, ClusterStateContext context) { + public IStateStorage mkStore(Map config, Map auth_conf, ClusterStateContext context) { try { ZKStateStorageFactory zkfact = new ZKStateStorageFactory(); IStateStorage zkState = zkfact.mkStore(config, auth_conf, context); diff --git a/storm-client/src/jvm/org/apache/storm/cluster/StateStorageFactory.java b/storm-client/src/jvm/org/apache/storm/cluster/StateStorageFactory.java index 584a2d8784f..7b58855ceaa 100644 --- a/storm-client/src/jvm/org/apache/storm/cluster/StateStorageFactory.java +++ b/storm-client/src/jvm/org/apache/storm/cluster/StateStorageFactory.java @@ -22,5 +22,5 @@ public interface StateStorageFactory { - IStateStorage mkStore(Map config, Map auth_conf, ClusterStateContext context); + IStateStorage mkStore(Map config, Map auth_conf, ClusterStateContext context); } diff --git a/storm-client/src/jvm/org/apache/storm/cluster/ZKStateStorage.java b/storm-client/src/jvm/org/apache/storm/cluster/ZKStateStorage.java index c68011e0912..d5c29f9cc1d 100644 --- a/storm-client/src/jvm/org/apache/storm/cluster/ZKStateStorage.java +++ b/storm-client/src/jvm/org/apache/storm/cluster/ZKStateStorage.java @@ -50,7 +50,7 @@ public class ZKStateStorage implements IStateStorage { private AtomicBoolean active; private boolean isNimbus; - private Map authConf; + private Map authConf; private Map conf; private class ZkWatcherCallBack implements WatcherCallBack{ @@ -73,7 +73,7 @@ public void execute(Watcher.Event.KeeperState state, Watcher.Event.EventType typ } } - public ZKStateStorage(Map conf, Map authConf, ClusterStateContext context) throws Exception { + public ZKStateStorage(Map conf, Map authConf, ClusterStateContext context) throws Exception { this.conf = conf; this.authConf = authConf; if (context.getDaemonType().equals(DaemonType.NIMBUS)) diff --git a/storm-client/src/jvm/org/apache/storm/cluster/ZKStateStorageFactory.java b/storm-client/src/jvm/org/apache/storm/cluster/ZKStateStorageFactory.java index 987c2fd79ee..0ae745f02d5 100644 --- a/storm-client/src/jvm/org/apache/storm/cluster/ZKStateStorageFactory.java +++ b/storm-client/src/jvm/org/apache/storm/cluster/ZKStateStorageFactory.java @@ -26,7 +26,7 @@ public class ZKStateStorageFactory implements StateStorageFactory { @Override - public IStateStorage mkStore(Map config, Map auth_conf, ClusterStateContext context) { + public IStateStorage mkStore(Map config, Map auth_conf, ClusterStateContext context) { try { return new ZKStateStorage(config, auth_conf, context); } catch (Exception e) { diff --git a/storm-client/src/jvm/org/apache/storm/daemon/StormCommon.java b/storm-client/src/jvm/org/apache/storm/daemon/StormCommon.java index f2ebd5f465d..9a21679d192 100644 --- a/storm-client/src/jvm/org/apache/storm/daemon/StormCommon.java +++ b/storm-client/src/jvm/org/apache/storm/daemon/StormCommon.java @@ -296,7 +296,7 @@ public static void addAcker(Map conf, StormTopology topology) { for (SpoutSpec spout : topology.get_spouts().values()) { ComponentCommon common = spout.get_common(); - Map spoutConf = componentConf(spout); + Map spoutConf = componentConf(spout); spoutConf.put(Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS, ObjectReader.getInt(conf.get(Config.TOPOLOGY_MESSAGE_TIMEOUT_SECS))); common.set_json_conf(JSONValue.toJSONString(spoutConf)); diff --git a/storm-client/src/jvm/org/apache/storm/daemon/metrics/BuiltinMetricsUtil.java b/storm-client/src/jvm/org/apache/storm/daemon/metrics/BuiltinMetricsUtil.java index 8237ad1b05e..0fdcb9f03a2 100644 --- a/storm-client/src/jvm/org/apache/storm/daemon/metrics/BuiltinMetricsUtil.java +++ b/storm-client/src/jvm/org/apache/storm/daemon/metrics/BuiltinMetricsUtil.java @@ -25,6 +25,9 @@ import java.util.HashMap; import java.util.Map; +import org.apache.storm.generated.NodeInfo; +import org.apache.storm.messaging.IConnection; +import org.apache.storm.utils.JCQueue; public class BuiltinMetricsUtil { public static void registerIconnectionServerMetric(Object server, Map topoConf, TopologyContext context) { @@ -33,15 +36,14 @@ public static void registerIconnectionServerMetric(Object server, Map topoConf, TopologyContext context) { + public static void registerIconnectionClientMetrics(final Map nodePortToSocket, Map topoConf, TopologyContext context) { IMetric metric = new IMetric() { @Override public Object getValueAndReset() { Map ret = new HashMap<>(); - for (Object o : nodePortToSocket.entrySet()) { - Map.Entry entry = (Map.Entry) o; - Object nodePort = entry.getKey(); - Object connection = entry.getValue(); + for (Map.Entry entry : nodePortToSocket.entrySet()) { + NodeInfo nodePort = entry.getKey(); + IConnection connection = entry.getValue(); if (connection instanceof IStatefulObject) { ret.put(nodePort, ((IStatefulObject) connection).getState()); } @@ -52,11 +54,10 @@ public Object getValueAndReset() { registerMetric("__send-iconnection", metric, topoConf, context); } - public static void registerQueueMetrics(Map queues, Map topoConf, TopologyContext context) { - for (Object o : queues.entrySet()) { - Map.Entry entry = (Map.Entry) o; + public static void registerQueueMetrics(Map queues, Map topoConf, TopologyContext context) { + for (Map.Entry entry : queues.entrySet()) { String name = "__" + entry.getKey(); - IMetric metric = new StateMetric((IStatefulObject) entry.getValue()); + IMetric metric = new StateMetric(entry.getValue()); registerMetric(name, metric, topoConf, context); } } diff --git a/storm-client/src/jvm/org/apache/storm/daemon/worker/WorkerState.java b/storm-client/src/jvm/org/apache/storm/daemon/worker/WorkerState.java index 9c7cf9e15a5..d08047100f4 100644 --- a/storm-client/src/jvm/org/apache/storm/daemon/worker/WorkerState.java +++ b/storm-client/src/jvm/org/apache/storm/daemon/worker/WorkerState.java @@ -96,7 +96,7 @@ public class WorkerState { private final WorkerTransfer workerTransfer; private final BackPressureTracker bpTracker; - public Map getConf() { + public Map getConf() { return conf; } @@ -140,7 +140,7 @@ public Map getLocalReceiveQueues() { return localReceiveQueues; } - public Map getTopologyConf() { + public Map getTopologyConf() { return topologyConf; } diff --git a/storm-client/src/jvm/org/apache/storm/drpc/DRPCSpout.java b/storm-client/src/jvm/org/apache/storm/drpc/DRPCSpout.java index 00ae469b66a..80e4ea302f3 100644 --- a/storm-client/src/jvm/org/apache/storm/drpc/DRPCSpout.java +++ b/storm-client/src/jvm/org/apache/storm/drpc/DRPCSpout.java @@ -204,7 +204,7 @@ public void nextTuple() { try { DRPCRequest req = client.fetchRequest(_function); if(req.get_request_id().length() > 0) { - Map returnInfo = new HashMap(); + Map returnInfo = new HashMap<>(); returnInfo.put("id", req.get_request_id()); returnInfo.put("host", client.getHost()); returnInfo.put("port", client.getPort()); @@ -228,7 +228,7 @@ public void nextTuple() { try { DRPCRequest req = drpc.fetchRequest(_function); if(req.get_request_id().length() > 0) { - Map returnInfo = new HashMap(); + Map returnInfo = new HashMap<>(); returnInfo.put("id", req.get_request_id()); returnInfo.put("host", _local_drpc_id); returnInfo.put("port", 0); 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 f57bbb14bc8..be668fe9dff 100644 --- a/storm-client/src/jvm/org/apache/storm/drpc/JoinResult.java +++ b/storm-client/src/jvm/org/apache/storm/drpc/JoinResult.java @@ -44,7 +44,7 @@ public JoinResult(String returnComponent) { this.returnComponent = returnComponent; } - public void prepare(Map map, TopologyContext context, OutputCollector collector) { + public void prepare(Map map, TopologyContext context, OutputCollector collector) { _collector = collector; } 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 06e576cf76f..6cfb898fad6 100644 --- a/storm-client/src/jvm/org/apache/storm/drpc/PrepareRequest.java +++ b/storm-client/src/jvm/org/apache/storm/drpc/PrepareRequest.java @@ -38,7 +38,7 @@ public class PrepareRequest extends BaseBasicBolt { Random rand; @Override - public void prepare(Map map, TopologyContext context) { + public void prepare(Map map, TopologyContext context) { rand = new Random(); } 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 04ddf25511b..61468900232 100644 --- a/storm-client/src/jvm/org/apache/storm/drpc/ReturnResults.java +++ b/storm-client/src/jvm/org/apache/storm/drpc/ReturnResults.java @@ -47,7 +47,7 @@ public class ReturnResults extends BaseRichBolt { public static final Logger LOG = LoggerFactory.getLogger(ReturnResults.class); OutputCollector _collector; boolean local; - Map _conf; + Map _conf; Map _clients = new HashMap(); @Override @@ -62,9 +62,9 @@ public void execute(Tuple input) { String result = (String) input.getValue(0); String returnInfo = (String) input.getValue(1); if (returnInfo!=null) { - Map retMap = null; + Map retMap; try { - retMap = (Map) JSONValue.parseWithException(returnInfo); + retMap = (Map) JSONValue.parseWithException(returnInfo); } catch (ParseException e) { LOG.error("Parseing returnInfo failed", e); _collector.fail(input); diff --git a/storm-client/src/jvm/org/apache/storm/executor/Executor.java b/storm-client/src/jvm/org/apache/storm/executor/Executor.java index 267fe7414e6..f811b826f5e 100644 --- a/storm-client/src/jvm/org/apache/storm/executor/Executor.java +++ b/storm-client/src/jvm/org/apache/storm/executor/Executor.java @@ -225,15 +225,21 @@ private static String getExecutorType(WorkerTopologyContext workerTopologyContex } } - private static List All_CONFIGS() { - List ret = new ArrayList(); - Config config = new Config(); - Class ConfigClass = config.getClass(); - Field[] fields = ConfigClass.getFields(); + /** + * Retrieves all values of all static fields of {@link Config} which + * represent all available configuration keys through reflection. The method + * assumes that they are {@code String}s through reflection. + * @return the list of retrieved field values + * @throws ClassCastException if one of the fields is not of type + * {@code String} + */ + private static List retrieveAllConfigKeys() { + List ret = new ArrayList<>(); + Field[] fields = Config.class.getFields(); for (int i = 0; i < fields.length; i++) { try { - Object obj = fields[i].get(null); - ret.add(obj); + String fieldValue = (String)fields[i].get(null); + ret.add(fieldValue); } catch (IllegalArgumentException e) { LOG.error(e.getMessage(), e); } catch (IllegalAccessException e) { @@ -432,8 +438,8 @@ private Map> outboundComponen // ============================ getter methods ================================= // ============================================================================= - private Map normalizedComponentConf(Map topoConf, WorkerTopologyContext topologyContext, String componentId) { - List keysToRemove = All_CONFIGS(); + private Map normalizedComponentConf(Map topoConf, WorkerTopologyContext topologyContext, String componentId) { + List keysToRemove = retrieveAllConfigKeys(); keysToRemove.remove(Config.TOPOLOGY_DEBUG); keysToRemove.remove(Config.TOPOLOGY_MAX_SPOUT_PENDING); keysToRemove.remove(Config.TOPOLOGY_MAX_TASK_PARALLELISM); @@ -451,11 +457,11 @@ private Map normalizedComponentConf(Map topoConf, WorkerTopology keysToRemove.remove(Config.TOPOLOGY_STATE_PROVIDER_CONFIG); keysToRemove.remove(Config.TOPOLOGY_BOLTS_LATE_TUPLE_STREAM); - Map componentConf; + Map componentConf; String specJsonConf = topologyContext.getComponentCommon(componentId).get_json_conf(); if (specJsonConf != null) { try { - componentConf = (Map) JSONValue.parseWithException(specJsonConf); + componentConf = (Map) JSONValue.parseWithException(specJsonConf); } catch (ParseException e) { throw new RuntimeException(e); } @@ -466,7 +472,7 @@ private Map normalizedComponentConf(Map topoConf, WorkerTopology componentConf = new HashMap<>(); } - Map ret = new HashMap<>(); + Map ret = new HashMap<>(); ret.putAll(topoConf); ret.putAll(componentConf); @@ -489,7 +495,7 @@ public AtomicBoolean getOpenOrPrepareWasCalled() { return openOrPrepareWasCalled; } - public Map getTopoConf() { + public Map getTopoConf() { return topoConf; } diff --git a/storm-client/src/jvm/org/apache/storm/executor/bolt/BoltExecutor.java b/storm-client/src/jvm/org/apache/storm/executor/bolt/BoltExecutor.java index 61e64881f84..91bbcada90a 100644 --- a/storm-client/src/jvm/org/apache/storm/executor/bolt/BoltExecutor.java +++ b/storm-client/src/jvm/org/apache/storm/executor/bolt/BoltExecutor.java @@ -37,7 +37,9 @@ import org.apache.storm.daemon.metrics.BuiltinMetricsUtil; import org.apache.storm.daemon.worker.WorkerState; import org.apache.storm.executor.Executor; +import org.apache.storm.generated.NodeInfo; import org.apache.storm.hooks.info.BoltExecuteInfo; +import org.apache.storm.messaging.IConnection; import org.apache.storm.metric.api.IMetricsRegistrant; import org.apache.storm.security.auth.IAutoCredentials; import org.apache.storm.policy.IWaitStrategy.WAIT_SITUATION; @@ -95,7 +97,7 @@ public BoltExecutorStats getStats() { private static IWaitStrategy makeSystemBoltWaitStrategy() { WaitStrategyPark ws = new WaitStrategyPark(); - HashMap conf = new HashMap(); + Map conf = new HashMap<>(); conf.put(Config.TOPOLOGY_BOLT_WAIT_PARK_MICROSEC, 5000); ws.prepare(conf, WAIT_SITUATION.BOLT_WAIT); return ws; @@ -126,7 +128,7 @@ public void init(ArrayList idToTask, int idToTaskBase) { Map map = ImmutableMap.of("receive", receiveQueue, "transfer", workerData.getTransferQueue()); BuiltinMetricsUtil.registerQueueMetrics(map, topoConf, userContext); - Map cachedNodePortToSocket = workerData.getCachedNodeToPortSocket().get(); + Map cachedNodePortToSocket = workerData.getCachedNodeToPortSocket().get(); BuiltinMetricsUtil.registerIconnectionClientMetrics(cachedNodePortToSocket, topoConf, userContext); BuiltinMetricsUtil.registerIconnectionServerMetric(workerData.getReceiver(), topoConf, userContext); diff --git a/storm-client/src/jvm/org/apache/storm/messaging/DeserializingConnectionCallback.java b/storm-client/src/jvm/org/apache/storm/messaging/DeserializingConnectionCallback.java index b80f7c0db1b..7dbc5d6aef7 100644 --- a/storm-client/src/jvm/org/apache/storm/messaging/DeserializingConnectionCallback.java +++ b/storm-client/src/jvm/org/apache/storm/messaging/DeserializingConnectionCallback.java @@ -39,7 +39,7 @@ */ public class DeserializingConnectionCallback implements IConnectionCallback, IMetric { private final WorkerState.ILocalTransferCallback cb; - private final Map conf; + private final Map conf; private final GeneralTopologyContext context; private final ThreadLocal _des = @@ -55,7 +55,7 @@ protected KryoTupleDeserializer initialValue() { private final ConcurrentHashMap byteCounts = new ConcurrentHashMap<>(); - public DeserializingConnectionCallback(final Map conf, final GeneralTopologyContext context, WorkerState.ILocalTransferCallback callback) { + public DeserializingConnectionCallback(final Map conf, final GeneralTopologyContext context, WorkerState.ILocalTransferCallback callback) { this.conf = conf; this.context = context; cb = callback; 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 ac92c6ba0ab..e0736b59470 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 @@ -549,7 +549,7 @@ public Object getState() { return ret; } - public Map getConfig() { + public Map getConfig() { return topoConf; } 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 5c0caf567c8..343a3d760ff 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 @@ -35,8 +35,8 @@ public CountMetric scope(String key) { return val; } - public Object getValueAndReset() { - Map ret = new HashMap(); + public Map getValueAndReset() { + Map ret = new HashMap<>(); for(Map.Entry e : _value.entrySet()) { ret.put(e.getKey(), e.getValue().getValueAndReset()); } 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 9bd9113d349..a6cb49a9083 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 @@ -37,8 +37,8 @@ public ReducedMetric scope(String key) { return val; } - public Object getValueAndReset() { - Map ret = new HashMap(); + public Map getValueAndReset() { + Map ret = new HashMap<>(); for(Map.Entry e : _value.entrySet()) { Object val = e.getValue().getValueAndReset(); if(val != null) { diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/FixedGroupsMapping.java b/storm-client/src/jvm/org/apache/storm/security/auth/FixedGroupsMapping.java index 62f1d9bcbc2..b55dec2eef5 100644 --- a/storm-client/src/jvm/org/apache/storm/security/auth/FixedGroupsMapping.java +++ b/storm-client/src/jvm/org/apache/storm/security/auth/FixedGroupsMapping.java @@ -41,7 +41,7 @@ public class FixedGroupsMapping implements IGroupMappingServiceProvider { * @param storm_conf Storm configuration */ @Override - public void prepare(Map storm_conf) { + public void prepare(Map storm_conf) { Map params = (Map) storm_conf.get(Config.STORM_GROUP_MAPPING_SERVICE_PARAMS); Map> mapping = (Map>) params.get(STORM_FIXED_GROUP_MAPPING); if (mapping != null) { diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/DRPCAuthorizerBase.java b/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/DRPCAuthorizerBase.java index fdcd31e27de..f29e8825852 100644 --- a/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/DRPCAuthorizerBase.java +++ b/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/DRPCAuthorizerBase.java @@ -36,9 +36,9 @@ public abstract class DRPCAuthorizerBase implements IAuthorizer { @Override public abstract void prepare(Map conf); - abstract protected boolean permitClientRequest(ReqContext context, String operation, Map params); + abstract protected boolean permitClientRequest(ReqContext context, String operation, Map params); - abstract protected boolean permitInvocationRequest(ReqContext context, String operation, Map params); + abstract protected boolean permitInvocationRequest(ReqContext context, String operation, Map params); /** * Authorizes request from to the DRPC server. @@ -47,7 +47,7 @@ public abstract class DRPCAuthorizerBase implements IAuthorizer { * @param params a Map with any key-value entries of use to the authorization implementation */ @Override - public boolean permit(ReqContext context, String operation, Map params) { + public boolean permit(ReqContext context, String operation, Map params) { if ("execute".equals(operation)) { return permitClientRequest(context, operation, params); } else if ("failRequest".equals(operation) || diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/DRPCSimpleACLAuthorizer.java b/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/DRPCSimpleACLAuthorizer.java index dc4d9119e31..ca8646fb7f5 100644 --- a/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/DRPCSimpleACLAuthorizer.java +++ b/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/DRPCSimpleACLAuthorizer.java @@ -125,7 +125,7 @@ private String getLocalUserFromContext(ReqContext context) { return null; } - protected boolean permitClientOrInvocationRequest(ReqContext context, Map params, + protected boolean permitClientOrInvocationRequest(ReqContext context, Map params, String fieldName) { Map acl = readAclFromConfig(); String function = (String) params.get(FUNCTION_KEY); @@ -165,13 +165,13 @@ protected boolean permitClientOrInvocationRequest(ReqContext context, Map params @Override protected boolean permitClientRequest(ReqContext context, String operation, - Map params) { + Map params) { return permitClientOrInvocationRequest(context, params, "clientUsers"); } @Override protected boolean permitInvocationRequest(ReqContext context, String operation, - Map params) { + Map params) { return permitClientOrInvocationRequest(context, params, "invocationUser"); } } diff --git a/storm-client/src/jvm/org/apache/storm/serialization/types/HashMapSerializer.java b/storm-client/src/jvm/org/apache/storm/serialization/types/HashMapSerializer.java index a1e917acb79..73b1273646d 100644 --- a/storm-client/src/jvm/org/apache/storm/serialization/types/HashMapSerializer.java +++ b/storm-client/src/jvm/org/apache/storm/serialization/types/HashMapSerializer.java @@ -26,7 +26,7 @@ public class HashMapSerializer extends MapSerializer { @Override - public Map create(Kryo kryo, Input input, Class type) { - return new HashMap(); + public Map create(Kryo kryo, Input input, Class type) { + return new HashMap<>(); } } diff --git a/storm-client/src/jvm/org/apache/storm/stats/CommonStats.java b/storm-client/src/jvm/org/apache/storm/stats/CommonStats.java index f115d12bc3a..b6461c580fe 100644 --- a/storm-client/src/jvm/org/apache/storm/stats/CommonStats.java +++ b/storm-client/src/jvm/org/apache/storm/stats/CommonStats.java @@ -61,11 +61,11 @@ public void cleanupStats() { transferredStats.close(); } - protected Map valueStat(MultiCountStatAndMetric metric) { + protected Map> valueStat(MultiCountStatAndMetric metric) { return metric.getTimeCounts(); } - protected Map valueStat(MultiLatencyStatAndMetric metric) { + protected Map> valueStat(MultiLatencyStatAndMetric metric) { return metric.getTimeLatAvg(); } diff --git a/storm-client/src/jvm/org/apache/storm/task/GeneralTopologyContext.java b/storm-client/src/jvm/org/apache/storm/task/GeneralTopologyContext.java index d59c9cfe8fa..4ea979e3c65 100644 --- a/storm-client/src/jvm/org/apache/storm/task/GeneralTopologyContext.java +++ b/storm-client/src/jvm/org/apache/storm/task/GeneralTopologyContext.java @@ -160,7 +160,7 @@ public Map> getTargets(String componentId) { @Override public String toJSONString() { - Map obj = new HashMap(); + Map obj = new HashMap<>(); obj.put("task->component", _taskToComponent); // TODO: jsonify StormTopology // at the minimum should send source info 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 4c04d84939c..8193f9ac9d0 100644 --- a/storm-client/src/jvm/org/apache/storm/testing/NonRichBoltTracker.java +++ b/storm-client/src/jvm/org/apache/storm/testing/NonRichBoltTracker.java @@ -41,7 +41,7 @@ public void prepare(Map topoConf, TopologyContext context, Outpu public void execute(Tuple input) { _delegate.execute(input); - Map stats = (Map) RegisteredGlobalState.getState(_trackId); + Map stats = (Map) RegisteredGlobalState.getState(_trackId); ((AtomicInteger) stats.get("processed")).incrementAndGet(); } 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 5f75eae8ec6..d2af80fe05b 100644 --- a/storm-client/src/jvm/org/apache/storm/testing/SpoutTracker.java +++ b/storm-client/src/jvm/org/apache/storm/testing/SpoutTracker.java @@ -45,7 +45,7 @@ public SpoutTrackOutputCollector(SpoutOutputCollector collector) { } private void recordSpoutEmit() { - Map stats = (Map) RegisteredGlobalState.getState(_trackId); + Map stats = (Map) RegisteredGlobalState.getState(_trackId); ((AtomicInteger) stats.get("spout-emitted")).incrementAndGet(); } @@ -99,13 +99,13 @@ public void nextTuple() { public void ack(Object msgId) { _delegate.ack(msgId); - Map stats = (Map) RegisteredGlobalState.getState(_trackId); + Map stats = (Map) RegisteredGlobalState.getState(_trackId); ((AtomicInteger) stats.get("processed")).incrementAndGet(); } public void fail(Object msgId) { _delegate.fail(msgId); - Map stats = (Map) RegisteredGlobalState.getState(_trackId); + Map stats = (Map) RegisteredGlobalState.getState(_trackId); ((AtomicInteger) stats.get("processed")).incrementAndGet(); } diff --git a/storm-client/src/jvm/org/apache/storm/topology/TopologyBuilder.java b/storm-client/src/jvm/org/apache/storm/topology/TopologyBuilder.java index 60a7eb351a5..e10bc440bec 100644 --- a/storm-client/src/jvm/org/apache/storm/topology/TopologyBuilder.java +++ b/storm-client/src/jvm/org/apache/storm/topology/TopologyBuilder.java @@ -735,8 +735,8 @@ public BoltDeclarer grouping(GlobalStreamId id, Grouping grouping) { } } - private static String mergeIntoJson(Map into, Map newMap) { - Map res = new HashMap<>(into); + private static String mergeIntoJson(Map into, Map newMap) { + Map res = new HashMap<>(into); res.putAll(newMap); return JSONValue.toJSONString(res); } diff --git a/storm-client/src/jvm/org/apache/storm/transactional/state/TestTransactionalState.java b/storm-client/src/jvm/org/apache/storm/transactional/state/TestTransactionalState.java index bf6b181b12e..b83c849532e 100644 --- a/storm-client/src/jvm/org/apache/storm/transactional/state/TestTransactionalState.java +++ b/storm-client/src/jvm/org/apache/storm/transactional/state/TestTransactionalState.java @@ -35,7 +35,7 @@ public class TestTransactionalState extends TransactionalState { * Matching constructor in absence of a default constructor in the parent * class. */ - protected TestTransactionalState(Map conf, String id, Map componentConf, String subroot) { + protected TestTransactionalState(Map conf, String id, Map componentConf, String subroot) { super(conf, id, componentConf, subroot); } diff --git a/storm-client/src/jvm/org/apache/storm/transactional/state/TransactionalState.java b/storm-client/src/jvm/org/apache/storm/transactional/state/TransactionalState.java index d7079f3afd5..c940b3f4714 100644 --- a/storm-client/src/jvm/org/apache/storm/transactional/state/TransactionalState.java +++ b/storm-client/src/jvm/org/apache/storm/transactional/state/TransactionalState.java @@ -43,17 +43,17 @@ public class TransactionalState { KryoValuesDeserializer _des; List _zkAcls = null; - public static TransactionalState newUserState(Map conf, String id, Map componentConf) { + public static TransactionalState newUserState(Map conf, String id, Map componentConf) { return new TransactionalState(conf, id, componentConf, "user"); } - public static TransactionalState newCoordinatorState(Map conf, String id, Map componentConf) { + public static TransactionalState newCoordinatorState(Map conf, String id, Map componentConf) { return new TransactionalState(conf, id, componentConf, "coordinator"); } - protected TransactionalState(Map conf, String id, Map componentConf, String subroot) { + protected TransactionalState(Map conf, String id, Map componentConf, String subroot) { try { - conf = new HashMap(conf); + conf = new HashMap<>(conf); // ensure that the serialization registrations are consistent with the declarations in this spout if(componentConf!=null) { conf.put(Config.TOPOLOGY_KRYO_REGISTER, diff --git a/storm-client/src/jvm/org/apache/storm/trident/TridentTopology.java b/storm-client/src/jvm/org/apache/storm/trident/TridentTopology.java index d51b88337cf..7b1818710e2 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/TridentTopology.java +++ b/storm-client/src/jvm/org/apache/storm/trident/TridentTopology.java @@ -529,17 +529,17 @@ public StormTopology build() { } } } - HashMap combinedMasterCoordResources = new HashMap(_resourceDefaults); + HashMap combinedMasterCoordResources = new HashMap<>(_resourceDefaults); combinedMasterCoordResources.putAll(_masterCoordResources); return builder.buildTopology(combinedMasterCoordResources); } - private static Map mergeDefaultResources(Map res, Map defaultConfig) { - Map ret = new HashMap(); + private static Map mergeDefaultResources(Map res, Map defaultConfig) { + Map ret = new HashMap<>(); - Number onHeapDefault = (Number)defaultConfig.get(Config.TOPOLOGY_COMPONENT_RESOURCES_ONHEAP_MEMORY_MB); - Number offHeapDefault = (Number)defaultConfig.get(Config.TOPOLOGY_COMPONENT_RESOURCES_OFFHEAP_MEMORY_MB); - Number cpuLoadDefault = (Number)defaultConfig.get(Config.TOPOLOGY_COMPONENT_CPU_PCORE_PERCENT); + Number onHeapDefault = defaultConfig.get(Config.TOPOLOGY_COMPONENT_RESOURCES_ONHEAP_MEMORY_MB); + Number offHeapDefault = defaultConfig.get(Config.TOPOLOGY_COMPONENT_RESOURCES_OFFHEAP_MEMORY_MB); + Number cpuLoadDefault = defaultConfig.get(Config.TOPOLOGY_COMPONENT_CPU_PCORE_PERCENT); if(res == null) { ret.put(Config.TOPOLOGY_COMPONENT_RESOURCES_ONHEAP_MEMORY_MB, onHeapDefault); diff --git a/storm-client/src/jvm/org/apache/storm/trident/drpc/ReturnResultsReducer.java b/storm-client/src/jvm/org/apache/storm/trident/drpc/ReturnResultsReducer.java index 617a42fa661..6d6648a1a16 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/drpc/ReturnResultsReducer.java +++ b/storm-client/src/jvm/org/apache/storm/trident/drpc/ReturnResultsReducer.java @@ -80,9 +80,9 @@ public void complete(ReturnResultsState state, TridentCollector collector) { // only one of the multireducers will receive the tuples if (state.returnInfo!=null) { String result = JSONValue.toJSONString(state.results); - Map retMap = null; + Map retMap; try { - retMap = (Map) JSONValue.parseWithException(state.returnInfo); + retMap = (Map) JSONValue.parseWithException(state.returnInfo); } catch (ParseException e) { collector.reportError(e); return; diff --git a/storm-client/src/jvm/org/apache/storm/trident/topology/state/TransactionalState.java b/storm-client/src/jvm/org/apache/storm/trident/topology/state/TransactionalState.java index bb054500b5d..61d50f89e39 100644 --- a/storm-client/src/jvm/org/apache/storm/trident/topology/state/TransactionalState.java +++ b/storm-client/src/jvm/org/apache/storm/trident/topology/state/TransactionalState.java @@ -59,7 +59,7 @@ public static TransactionalState newCoordinatorState(Map conf, S protected TransactionalState(Map conf, String id, String subroot) { try { - conf = new HashMap(conf); + conf = new HashMap<>(conf); String transactionalRoot = (String)conf.get(Config.TRANSACTIONAL_ZOOKEEPER_ROOT); String rootDir = transactionalRoot + "/" + id + "/" + subroot; List servers = (List) getWithBackup(conf, Config.TRANSACTIONAL_ZOOKEEPER_SERVERS, Config.STORM_ZOOKEEPER_SERVERS); @@ -193,9 +193,11 @@ public void close() { _curator.close(); } - private Object getWithBackup(Map amap, Object primary, Object backup) { + private Object getWithBackup(Map amap, String primary, String backup) { Object ret = amap.get(primary); - if(ret==null) return amap.get(backup); + if(ret==null) { + return amap.get(backup); + } return ret; } } diff --git a/storm-client/src/jvm/org/apache/storm/utils/ConfigUtils.java b/storm-client/src/jvm/org/apache/storm/utils/ConfigUtils.java index 0d5bab84cf7..eb4557fd41b 100644 --- a/storm-client/src/jvm/org/apache/storm/utils/ConfigUtils.java +++ b/storm-client/src/jvm/org/apache/storm/utils/ConfigUtils.java @@ -271,7 +271,7 @@ public static Map readSupervisorStormConfGivenPath(Map conf) { // note that we delete the return value + public static Map overrideLoginConfigWithSystemProperty(Map conf) { // note that we delete the return value String loginConfFile = System.getProperty("java.security.auth.login.config"); if (loginConfFile != null) { conf.put("java.security.auth.login.config", loginConfFile); @@ -322,7 +322,7 @@ public static Map readYamlConfig(String name, boolean mustExist) return conf; } - public static Map readYamlConfig(String name) { + public static Map readYamlConfig(String name) { return readYamlConfig(name, true); } diff --git a/storm-client/src/jvm/org/apache/storm/utils/JCQueue.java b/storm-client/src/jvm/org/apache/storm/utils/JCQueue.java index 26b0ac49193..7a64812da03 100644 --- a/storm-client/src/jvm/org/apache/storm/utils/JCQueue.java +++ b/storm-client/src/jvm/org/apache/storm/utils/JCQueue.java @@ -29,6 +29,7 @@ import java.util.ArrayList; import java.util.HashMap; +import java.util.Map; import java.util.concurrent.atomic.AtomicLong; @@ -189,7 +190,7 @@ public long capacity() { } public Object getState() { - HashMap state = new HashMap(); + Map state = new HashMap<>(); final double arrivalRateInSecs = arrivalsTracker.reportRate(); diff --git a/storm-client/src/jvm/org/apache/storm/utils/NimbusClient.java b/storm-client/src/jvm/org/apache/storm/utils/NimbusClient.java index e27304a8a3c..bbd47a9d8db 100644 --- a/storm-client/src/jvm/org/apache/storm/utils/NimbusClient.java +++ b/storm-client/src/jvm/org/apache/storm/utils/NimbusClient.java @@ -111,7 +111,7 @@ private static synchronized boolean shouldLogLeader(String leader) { return true; } - public static NimbusClient getConfiguredClientAs(Map conf, String asUser) { + public static NimbusClient getConfiguredClientAs(Map conf, String asUser) { return getConfiguredClientAs(conf, asUser, null); } diff --git a/storm-client/src/jvm/org/apache/storm/utils/Utils.java b/storm-client/src/jvm/org/apache/storm/utils/Utils.java index af03787a68d..ba2ed74d095 100644 --- a/storm-client/src/jvm/org/apache/storm/utils/Utils.java +++ b/storm-client/src/jvm/org/apache/storm/utils/Utils.java @@ -934,18 +934,17 @@ public static Map findAndReadConfigFile(String name) { * @param listSeq to reverse * @return a reversed map */ - public static HashMap reverseMap(List listSeq) { - HashMap> rtn = new HashMap(); + public static Map> reverseMap(List> listSeq) { + Map> rtn = new HashMap<>(); if (listSeq == null) { return rtn; } - for (Object entry : listSeq) { - List listEntry = (List) entry; + for (List listEntry : listSeq) { Object key = listEntry.get(0); Object val = listEntry.get(1); - List list = rtn.get(val); + List list = rtn.get(val); if (list == null) { - list = new ArrayList(); + list = new ArrayList<>(); rtn.put(val, list); } list.add(key); diff --git a/storm-client/src/jvm/org/apache/storm/zookeeper/ClientZookeeper.java b/storm-client/src/jvm/org/apache/storm/zookeeper/ClientZookeeper.java index d2d862b89ac..42d441717cf 100644 --- a/storm-client/src/jvm/org/apache/storm/zookeeper/ClientZookeeper.java +++ b/storm-client/src/jvm/org/apache/storm/zookeeper/ClientZookeeper.java @@ -73,7 +73,7 @@ public static void mkdirs(CuratorFramework zk, String path, List acls) { _instance.mkdirsImpl(zk, path, acls); } - public static CuratorFramework mkClient(Map conf, List servers, Object port, String root, final WatcherCallBack watcher, Map authConf) { + public static CuratorFramework mkClient(Map conf, List servers, Object port, String root, final WatcherCallBack watcher, Map authConf) { return _instance.mkClientImpl(conf, servers, port, root, watcher, authConf); } @@ -313,15 +313,15 @@ public CuratorFramework mkClientImpl(Map conf, List ser return mkClientImpl(conf, servers, port, root, new DefaultWatcherCallBack()); } - public CuratorFramework mkClientImpl(Map conf, List servers, Object port, Map authConf) { + public CuratorFramework mkClientImpl(Map conf, List servers, Object port, Map authConf) { return mkClientImpl(conf, servers, port, "", new DefaultWatcherCallBack(), authConf); } - public CuratorFramework mkClientImpl(Map conf, List servers, Object port, String root, Map authConf) { + public CuratorFramework mkClientImpl(Map conf, List servers, Object port, String root, Map authConf) { return mkClientImpl(conf, servers, port, root, new DefaultWatcherCallBack(), authConf); } - public CuratorFramework mkClientImpl(Map conf, List servers, Object port, String root, final WatcherCallBack watcher, Map authConf) { + public CuratorFramework mkClientImpl(Map conf, List servers, Object port, String root, final WatcherCallBack watcher, Map authConf) { CuratorFramework fk; if (authConf != null) { fk = CuratorUtils.newCurator(conf, servers, port, root, new ZookeeperAuthInfo(authConf)); diff --git a/storm-client/test/jvm/org/apache/storm/messaging/DeserializingConnectionCallbackTest.java b/storm-client/test/jvm/org/apache/storm/messaging/DeserializingConnectionCallbackTest.java index 9f0e1d19890..985aa1c65da 100644 --- a/storm-client/test/jvm/org/apache/storm/messaging/DeserializingConnectionCallbackTest.java +++ b/storm-client/test/jvm/org/apache/storm/messaging/DeserializingConnectionCallbackTest.java @@ -48,7 +48,7 @@ public void setUp() throws Exception { @Test public void testUpdateMetricsConfigOff() { - Map config = new HashMap(); + Map config = new HashMap<>(); config.put(Config.TOPOLOGY_SERIALIZED_MESSAGE_SIZE_METRICS, Boolean.FALSE); DeserializingConnectionCallback withoutMetrics = new DeserializingConnectionCallback(config, mock(GeneralTopologyContext.class), mock( @@ -64,7 +64,7 @@ public void testUpdateMetricsConfigOff() { @Test public void testUpdateMetricsConfigOn() { - Map config = new HashMap(); + Map config = new HashMap<>(); config.put(Config.TOPOLOGY_SERIALIZED_MESSAGE_SIZE_METRICS, Boolean.TRUE); DeserializingConnectionCallback withMetrics = new DeserializingConnectionCallback(config, mock(GeneralTopologyContext.class), mock( diff --git a/storm-client/test/jvm/org/apache/storm/security/auth/AutoSSLTest.java b/storm-client/test/jvm/org/apache/storm/security/auth/AutoSSLTest.java index 272ca60bbd8..9283132b254 100644 --- a/storm-client/test/jvm/org/apache/storm/security/auth/AutoSSLTest.java +++ b/storm-client/test/jvm/org/apache/storm/security/auth/AutoSSLTest.java @@ -59,7 +59,7 @@ protected String getSSLWriteDirFromConf(Map conf) { @Test public void testgetSSLFilesFromConf() throws Exception { AutoSSL assl = new AutoSSL(); - Map conf = new HashMap(); + Map conf = new HashMap<>(); assertNull(assl.getSSLFilesFromConf(conf)); conf.put(AutoSSL.SSL_FILES_CONF, "sslfile1.txt"); assl.prepare(conf); @@ -74,14 +74,14 @@ public void testgetSSLFilesFromConf() throws Exception { @Test public void testgetSSLFilesFromConfMultipleComma() throws Exception { AutoSSL assl = new AutoSSL(); - Map conf = new HashMap(); + Map conf = new HashMap<>(); assertNull(assl.getSSLFilesFromConf(conf)); conf.put(AutoSSL.SSL_FILES_CONF, "sslfile1.txt,sslfile2.txt,sslfile3.txt"); assl.prepare(conf); Collection sslFiles = assl.getSSLFilesFromConf(conf); assertNotNull(sslFiles); assertEquals(3, sslFiles.size()); - ArrayList valid = new ArrayList(); + List valid = new ArrayList<>(); Collections.addAll(valid, "sslfile1.txt", "sslfile2.txt", "sslfile3.txt"); for(String file: sslFiles) { assertTrue("removing: " + file, valid.remove(file)); @@ -104,13 +104,13 @@ public void testpopulateCredentials() throws Exception { AutoSSL assl = new TestAutoSSL(baseDir.getPath()); LOG.debug("base dir is; " + baseDir); - Map sslconf = new HashMap(); + Map sslconf = new HashMap<>(); sslconf.put(AutoSSL.SSL_FILES_CONF, temp.getPath()); assl.prepare(sslconf); Collection sslFiles = assl.getSSLFilesFromConf(sslconf); - Map creds = new HashMap(); + Map creds = new HashMap<>(); assl.populateCredentials(creds); assertTrue(creds.containsKey(temp.getName())); diff --git a/storm-client/test/jvm/org/apache/storm/streams/ProcessorBoltTest.java b/storm-client/test/jvm/org/apache/storm/streams/ProcessorBoltTest.java index 93807142867..ba0747c4924 100644 --- a/storm-client/test/jvm/org/apache/storm/streams/ProcessorBoltTest.java +++ b/storm-client/test/jvm/org/apache/storm/streams/ProcessorBoltTest.java @@ -40,6 +40,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; +import org.apache.storm.generated.Grouping; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -140,7 +141,7 @@ private void setUpProcessorBolt(Processor processor, node.setWindowed(isWindowed); Mockito.when(mockStreamToProcessors.get(Mockito.anyString())).thenReturn(Collections.singletonList(node)); Mockito.when(mockStreamToProcessors.keySet()).thenReturn(Collections.singleton("inputstream")); - Map mockSources = Mockito.mock(Map.class); + Map mockSources = Mockito.mock(Map.class); GlobalStreamId mockGlobalStreamId = Mockito.mock(GlobalStreamId.class); Mockito.when(mockTopologyContext.getThisSources()).thenReturn(mockSources); Mockito.when(mockSources.keySet()).thenReturn(Collections.singleton(mockGlobalStreamId)); diff --git a/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java b/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java index c8499e91d95..30cdae93608 100644 --- a/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java +++ b/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java @@ -50,22 +50,22 @@ public void isZkAuthenticationConfiguredTopologyTest() { Utils.isZkAuthenticationConfiguredTopology(topologyMockMap("foobar"))); } - private Map topologyMockMap(String value) { + private Map topologyMockMap(String value) { return mockMap(Config.STORM_ZOOKEEPER_TOPOLOGY_AUTH_SCHEME, value); } - private Map mockMap(String key, String value) { - Map map = new HashMap(); + private Map mockMap(String key, String value) { + Map map = new HashMap<>(); map.put(key, value); return map; } - private Map serverMockMap(String value) { + private Map serverMockMap(String value) { return mockMap(Config.STORM_ZOOKEEPER_AUTH_SCHEME, value); } - private Map emptyMockMap() { - return new HashMap(); + private Map emptyMockMap() { + return new HashMap<>(); } private void doParseJvmHeapMemByChildOptsTest(String message, String opt, double expected) { diff --git a/storm-core/src/jvm/org/apache/storm/command/UploadCredentials.java b/storm-core/src/jvm/org/apache/storm/command/UploadCredentials.java index 6023409ed27..a72039b7c96 100644 --- a/storm-core/src/jvm/org/apache/storm/command/UploadCredentials.java +++ b/storm-core/src/jvm/org/apache/storm/command/UploadCredentials.java @@ -44,18 +44,21 @@ public static void main(String[] args) throws Exception { if (null != rawCredentials && ((rawCredentials.size() % 2) != 0)) { throw new RuntimeException("Need an even number of arguments to make a map"); } - Map credentialsMap = new HashMap<>(); + Map credentialsMap = new HashMap<>(); if (null != credentialFile) { Properties credentialProps = new Properties(); credentialProps.load(new FileReader(credentialFile)); - credentialsMap.putAll(credentialProps); + for(Map.Entry credentialProp : credentialProps.entrySet()) { + credentialsMap.put((String)credentialProp.getKey(), + (String)credentialProp.getValue()); + } } if (null != rawCredentials) { for (int i = 0; i < rawCredentials.size(); i += 2) { credentialsMap.put(rawCredentials.get(i), rawCredentials.get(i + 1)); } } - StormSubmitter.pushCredentials(topologyName, new HashMap(), credentialsMap); + StormSubmitter.pushCredentials(topologyName, new HashMap<>(), credentialsMap); LOG.info("Uploaded new creds to topology: {}", topologyName); } } diff --git a/storm-core/src/jvm/org/apache/storm/ui/FilterConfiguration.java b/storm-core/src/jvm/org/apache/storm/ui/FilterConfiguration.java index db5952e4305..e6712645eac 100644 --- a/storm-core/src/jvm/org/apache/storm/ui/FilterConfiguration.java +++ b/storm-core/src/jvm/org/apache/storm/ui/FilterConfiguration.java @@ -22,16 +22,16 @@ public class FilterConfiguration { private String filterClass; private String filterName; - private Map filterParams; + private Map filterParams; - public FilterConfiguration(String filterClass, Map filterParams) { + public FilterConfiguration(String filterClass, Map filterParams) { this.filterParams = filterParams; this.filterClass = filterClass; this.filterName = null; } - public FilterConfiguration(String filterClass, String filterName, Map filterParams) { + public FilterConfiguration(String filterClass, String filterName, Map filterParams) { this.filterClass = filterClass; this.filterName = filterName; this.filterParams = filterParams; @@ -53,11 +53,11 @@ public void setFilterClass(String filterClass) { this.filterClass = filterClass; } - public Map getFilterParams() { + public Map getFilterParams() { return filterParams; } - public void setFilterParams(Map filterParams) { + public void setFilterParams(Map filterParams) { this.filterParams = filterParams; } } diff --git a/storm-core/src/jvm/org/apache/storm/ui/UIHelpers.java b/storm-core/src/jvm/org/apache/storm/ui/UIHelpers.java index f29c1f6ff77..be4a4c056de 100644 --- a/storm-core/src/jvm/org/apache/storm/ui/UIHelpers.java +++ b/storm-core/src/jvm/org/apache/storm/ui/UIHelpers.java @@ -109,7 +109,7 @@ public static String prettyExecutorInfo(ExecutorInfo e) { return "[" + e.get_task_start() + "-" + e.get_task_end() + "]"; } - public static Map unauthorizedUserJson(String user) { + public static Map unauthorizedUserJson(String user) { return ImmutableMap.of( "error", "No Authorization", "errorMessage", String.format("User %s is not authorized.", user)); @@ -203,7 +203,7 @@ public static void configFilters(ServletContextHandler context, List filterParams = filterConf.getFilterParams(); if (filterClass != null) { FilterHolder filterHolder = new FilterHolder(); filterHolder.setClassName(filterClass); @@ -215,7 +215,7 @@ public static void configFilters(ServletContextHandler context, List()); + filterHolder.setInitParameters(new HashMap<>()); } context.addFilter(filterHolder, "/*", EnumSet.allOf(DispatcherType.class)); } diff --git a/storm-core/test/jvm/org/apache/storm/nimbus/InMemoryTopologyActionNotifier.java b/storm-core/test/jvm/org/apache/storm/nimbus/InMemoryTopologyActionNotifier.java index 6205468e9c1..c1f082c3d0e 100644 --- a/storm-core/test/jvm/org/apache/storm/nimbus/InMemoryTopologyActionNotifier.java +++ b/storm-core/test/jvm/org/apache/storm/nimbus/InMemoryTopologyActionNotifier.java @@ -30,7 +30,7 @@ public class InMemoryTopologyActionNotifier implements ITopologyActionNotifierP @Override - public void prepare(Map StormConf) { + public void prepare(Map StormConf) { //no-op } diff --git a/storm-core/test/jvm/org/apache/storm/serialization/SerializationTest.java b/storm-core/test/jvm/org/apache/storm/serialization/SerializationTest.java index 9ed57af2f18..5fbf4729242 100644 --- a/storm-core/test/jvm/org/apache/storm/serialization/SerializationTest.java +++ b/storm-core/test/jvm/org/apache/storm/serialization/SerializationTest.java @@ -78,27 +78,27 @@ public void testStringSerialization() throws IOException { isRoundtrip(Lists.newArrayList(mkString(1024 * 1024 * 2))); } - private Map mkConf(Map extra) { + private Map mkConf(Map extra) { Map config = Utils.readDefaultConfig(); config.putAll(extra); return config; } - private byte[] serialize(List vals, Map conf) throws IOException { + private byte[] serialize(List vals, Map conf) throws IOException { KryoValuesSerializer serializer = new KryoValuesSerializer(mkConf(conf)); return serializer.serialize(vals); } - private List deserialize(byte[] bytes, Map conf) throws IOException { + private List deserialize(byte[] bytes, Map conf) throws IOException { KryoValuesDeserializer deserializer = new KryoValuesDeserializer(mkConf(conf)); return deserializer.deserialize(bytes); } - private List roundtrip(List vals) throws IOException { - return roundtrip(vals, new HashMap()); + private List roundtrip(List vals) throws IOException { + return roundtrip(vals, new HashMap<>()); } - private List roundtrip(List vals, Map conf) throws IOException { + private List roundtrip(List vals, Map conf) throws IOException { return deserialize(serialize(vals, conf), conf); } diff --git a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java index a1dedcd88a6..9f4336ed583 100644 --- a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java +++ b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java @@ -3637,7 +3637,7 @@ public TopologyInfo getTopologyInfoWithOpts(String topoId, GetInfoOptions option //heartbeats "stats" Map hb = (Map)heartbeat.get("heartbeat"); if (hb != null) { - Map ex = (Map) hb.get("stats"); + Map ex = (Map) hb.get("stats"); if (ex != null) { ExecutorStats stats = StatsUtil.thriftifyExecutorStats(ex); summ.set_stats(stats); @@ -4101,7 +4101,7 @@ public List getOwnerResourceSummaries(String owner) throws IStormClusterState state = stormClusterState; Map topoIdToAssignments = state.topologyAssignments(); Map topoIdToBases = state.topologyBases(); - Map clusterSchedulerConfig = scheduler.config(); + Map clusterSchedulerConfig = scheduler.config(); //put [owner-> StormBase-list] mapping to ownerToBasesMap //if this owner (the input parameter) is null, add all the owners with stormbase and guarantees 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 166333bfbef..d43e11bd12f 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 @@ -28,7 +28,7 @@ public interface MetricStore extends AutoCloseable { * @param config Storm config map * @throws MetricException on preparation error */ - void prepare(Map config) throws MetricException; + void prepare(Map config) throws MetricException; /** * Stores a metric in the store. diff --git a/storm-server/src/main/java/org/apache/storm/metricstore/MetricStoreConfig.java b/storm-server/src/main/java/org/apache/storm/metricstore/MetricStoreConfig.java index ac52bd5e6cc..d66529ae740 100644 --- a/storm-server/src/main/java/org/apache/storm/metricstore/MetricStoreConfig.java +++ b/storm-server/src/main/java/org/apache/storm/metricstore/MetricStoreConfig.java @@ -30,7 +30,7 @@ public class MetricStoreConfig { * @return MetricStore prepared store * @throws MetricException on misconfiguration */ - public static MetricStore configure(Map conf) throws MetricException { + public static MetricStore configure(Map conf) throws MetricException { try { String storeClass = (String)conf.get(DaemonConfig.STORM_METRIC_STORE_CLASS); diff --git a/storm-server/src/main/java/org/apache/storm/metricstore/NimbusMetricProcessor.java b/storm-server/src/main/java/org/apache/storm/metricstore/NimbusMetricProcessor.java index 64688c9bae0..0c982089887 100644 --- a/storm-server/src/main/java/org/apache/storm/metricstore/NimbusMetricProcessor.java +++ b/storm-server/src/main/java/org/apache/storm/metricstore/NimbusMetricProcessor.java @@ -37,5 +37,5 @@ public void processWorkerMetrics(Map conf, WorkerMetrics metrics } @Override - public void prepare(Map config) throws MetricException {} + public void prepare(Map config) throws MetricException {} } diff --git a/storm-server/src/main/java/org/apache/storm/metricstore/WorkerMetricsProcessor.java b/storm-server/src/main/java/org/apache/storm/metricstore/WorkerMetricsProcessor.java index dc1ec4ac78a..98c11631ea3 100644 --- a/storm-server/src/main/java/org/apache/storm/metricstore/WorkerMetricsProcessor.java +++ b/storm-server/src/main/java/org/apache/storm/metricstore/WorkerMetricsProcessor.java @@ -36,5 +36,5 @@ public interface WorkerMetricsProcessor { * @param config Storm config map * @throws MetricException on error */ - void prepare(Map config) throws MetricException; + void prepare(Map config) throws MetricException; } 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 2f44aff9fd3..2e7ed02350e 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 @@ -68,7 +68,7 @@ interface RocksDbScanCallback { * @param config Storm config map * @throws MetricException on preparation error */ - public void prepare(Map config) throws MetricException { + public void prepare(Map config) throws MetricException { validateConfig(config); this.failureMeter = StormMetricsRegistry.registerMeter("RocksDB:metric-failures"); @@ -125,7 +125,7 @@ public void prepare(Map config) throws MetricException { * @throws MetricException if there is a missing required configuration or if the store does not exist but * the config specifies not to create the store */ - private void validateConfig(Map config) throws MetricException { + private void validateConfig(Map config) throws MetricException { if (!(config.containsKey(DaemonConfig.STORM_ROCKSDB_LOCATION))) { throw new MetricException("Not a vaild RocksDB configuration - Missing store location " + DaemonConfig.STORM_ROCKSDB_LOCATION); } @@ -156,7 +156,7 @@ private void validateConfig(Map config) throws MetricException { } } - private String getRocksDbAbsoluteDir(Map conf) throws MetricException { + private String getRocksDbAbsoluteDir(Map conf) throws MetricException { String storePath = (String)conf.get(DaemonConfig.STORM_ROCKSDB_LOCATION); if (storePath == null) { throw new MetricException("Not a vaild RocksDB configuration - Missing store location " + DaemonConfig.STORM_ROCKSDB_LOCATION); diff --git a/storm-server/src/main/java/org/apache/storm/nimbus/DefaultTopologyValidator.java b/storm-server/src/main/java/org/apache/storm/nimbus/DefaultTopologyValidator.java index 40fd1098581..55a86cfa744 100644 --- a/storm-server/src/main/java/org/apache/storm/nimbus/DefaultTopologyValidator.java +++ b/storm-server/src/main/java/org/apache/storm/nimbus/DefaultTopologyValidator.java @@ -22,9 +22,11 @@ import java.util.Map; public class DefaultTopologyValidator implements ITopologyValidator { + @Override - public void prepare(Map StormConf){ + public void prepare(Map StormConf){ } + @Override public void validate(String topologyName, Map topologyConf, StormTopology topology) throws InvalidTopologyException { } diff --git a/storm-server/src/main/java/org/apache/storm/nimbus/ITopologyActionNotifierPlugin.java b/storm-server/src/main/java/org/apache/storm/nimbus/ITopologyActionNotifierPlugin.java index 8d641bfcc44..f36a4a8e323 100644 --- a/storm-server/src/main/java/org/apache/storm/nimbus/ITopologyActionNotifierPlugin.java +++ b/storm-server/src/main/java/org/apache/storm/nimbus/ITopologyActionNotifierPlugin.java @@ -27,7 +27,7 @@ public interface ITopologyActionNotifierPlugin { * Called once during nimbus initialization. * @param StormConf */ - void prepare(Map StormConf); + void prepare(Map StormConf); /** * When a new actions is executed for a topology, this method will be called. diff --git a/storm-server/src/main/java/org/apache/storm/nimbus/ITopologyValidator.java b/storm-server/src/main/java/org/apache/storm/nimbus/ITopologyValidator.java index 7d44a8e87e4..46c4073aa13 100644 --- a/storm-server/src/main/java/org/apache/storm/nimbus/ITopologyValidator.java +++ b/storm-server/src/main/java/org/apache/storm/nimbus/ITopologyValidator.java @@ -22,7 +22,9 @@ import java.util.Map; public interface ITopologyValidator { - void prepare(Map StormConf); + + void prepare(Map StormConf); + void validate(String topologyName, Map topologyConf, StormTopology topology) throws InvalidTopologyException; } diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/DefaultScheduler.java b/storm-server/src/main/java/org/apache/storm/scheduler/DefaultScheduler.java index 5ef2ce52bb7..82630cab9a0 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/DefaultScheduler.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/DefaultScheduler.java @@ -106,7 +106,7 @@ public void schedule(Topologies topologies, Cluster cluster) { } @Override - public Map config() { + public Map> config() { return new HashMap<>(); } } diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/EvenScheduler.java b/storm-server/src/main/java/org/apache/storm/scheduler/EvenScheduler.java index d4dfd94d8d0..9cbce184af7 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/EvenScheduler.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/EvenScheduler.java @@ -173,7 +173,7 @@ public void schedule(Topologies topologies, Cluster cluster) { } @Override - public Map config() { + public Map> config() { return new HashMap<>(); } diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/IScheduler.java b/storm-server/src/main/java/org/apache/storm/scheduler/IScheduler.java index 2f1de1c6ec0..5b79f11071e 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/IScheduler.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/IScheduler.java @@ -43,5 +43,5 @@ public interface IScheduler { * * @return The scheduler's configuration. */ - Map config(); + Map config(); } diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/IsolationScheduler.java b/storm-server/src/main/java/org/apache/storm/scheduler/IsolationScheduler.java index e10b8e8e156..3201a405563 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/IsolationScheduler.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/IsolationScheduler.java @@ -57,7 +57,7 @@ public void prepare(Map conf) { } @Override - public Map config() { + public Map> config() { return new HashMap<>(); } diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/blacklist/BlacklistScheduler.java b/storm-server/src/main/java/org/apache/storm/scheduler/blacklist/BlacklistScheduler.java index 35c039ed559..c4014746239 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/blacklist/BlacklistScheduler.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/blacklist/BlacklistScheduler.java @@ -53,8 +53,7 @@ public class BlacklistScheduler implements IScheduler { public static final int DEFAULT_BLACKLIST_SCHEDULER_TOLERANCE_TIME = 300; private final IScheduler underlyingScheduler; - @SuppressWarnings("rawtypes") - private Map conf; + private Map conf; protected int toleranceTime; protected int toleranceCount; @@ -76,7 +75,7 @@ public BlacklistScheduler(IScheduler underlyingScheduler) { } @Override - public void prepare(Map conf) { + public void prepare(Map conf) { LOG.info("Preparing black list scheduler"); underlyingScheduler.prepare(conf); this.conf = conf; @@ -132,7 +131,7 @@ public void schedule(Topologies topologies, Cluster cluster) { } @Override - public Map config() { + public Map> config() { return underlyingScheduler.config(); } diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/blacklist/strategies/DefaultBlacklistStrategy.java b/storm-server/src/main/java/org/apache/storm/scheduler/blacklist/strategies/DefaultBlacklistStrategy.java index 00cf25ade29..f6ca6ade61d 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/blacklist/strategies/DefaultBlacklistStrategy.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/blacklist/strategies/DefaultBlacklistStrategy.java @@ -53,7 +53,7 @@ public class DefaultBlacklistStrategy implements IBlacklistStrategy { private TreeMap blacklist; @Override - public void prepare(Map conf) { + public void prepare(Map conf) { toleranceCount = ObjectReader.getInt(conf.get(DaemonConfig.BLACKLIST_SCHEDULER_TOLERANCE_COUNT), DEFAULT_BLACKLIST_SCHEDULER_TOLERANCE_COUNT); resumeTime = ObjectReader.getInt(conf.get(DaemonConfig.BLACKLIST_SCHEDULER_RESUME_TIME), DEFAULT_BLACKLIST_SCHEDULER_RESUME_TIME); diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/blacklist/strategies/IBlacklistStrategy.java b/storm-server/src/main/java/org/apache/storm/scheduler/blacklist/strategies/IBlacklistStrategy.java index f0500068621..8543659f83f 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/blacklist/strategies/IBlacklistStrategy.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/blacklist/strategies/IBlacklistStrategy.java @@ -27,7 +27,7 @@ public interface IBlacklistStrategy { - void prepare(Map conf); + void prepare(Map conf); /** * Get blacklist by blacklist strategy. diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/multitenant/MultitenantScheduler.java b/storm-server/src/main/java/org/apache/storm/scheduler/multitenant/MultitenantScheduler.java index 8bd9035650c..d4d240ccdf8 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/multitenant/MultitenantScheduler.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/multitenant/MultitenantScheduler.java @@ -34,7 +34,7 @@ public class MultitenantScheduler implements IScheduler { private static final Logger LOG = LoggerFactory.getLogger(MultitenantScheduler.class); @SuppressWarnings("rawtypes") - private Map conf; + private Map conf; protected IConfigLoader configLoader; @Override @@ -82,8 +82,8 @@ private Map getUserConf() { } @Override - public Map config() { - return (Map) getUserConf(); + public Map config() { + return getUserConf(); } @Override diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/resource/ResourceAwareScheduler.java b/storm-server/src/main/java/org/apache/storm/scheduler/resource/ResourceAwareScheduler.java index e73070578d3..541e1a5a007 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/resource/ResourceAwareScheduler.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/resource/ResourceAwareScheduler.java @@ -63,7 +63,7 @@ public void prepare(Map conf) { } @Override - public Map config() { + public Map> config() { return (Map) getUserResourcePools(); } @@ -282,7 +282,7 @@ private Map> getUserResourcePools() { } // if no configs from loader, try to read from user-resource-pools.yaml - Map fromFile = Utils.findAndReadConfigFile("user-resource-pools.yaml", false); + Map fromFile = Utils.findAndReadConfigFile("user-resource-pools.yaml", false); raw = (Map>) fromFile.get(DaemonConfig.RESOURCE_AWARE_SCHEDULER_USER_POOLS); if (raw != null) { return convertToDouble(raw); diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/utils/ArtifactoryConfigLoader.java b/storm-server/src/main/java/org/apache/storm/scheduler/utils/ArtifactoryConfigLoader.java index 87f39cdf013..5d3dfbe9cb3 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/utils/ArtifactoryConfigLoader.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/utils/ArtifactoryConfigLoader.java @@ -71,7 +71,7 @@ public class ArtifactoryConfigLoader implements IConfigLoader { private String baseDirectory = DEFAULT_ARTIFACTORY_BASE_DIRECTORY; private int lastReturnedTime = 0; private int timeoutSeconds = DEFAULT_TIMEOUT_SECS; - private Map lastReturnedValue; + private Map lastReturnedValue; private URI targetURI = null; private JSONParser jsonParser; private String scheme; @@ -110,7 +110,7 @@ public ArtifactoryConfigLoader(Map conf) { * @return The scheduler configuration if exists; null otherwise. */ @Override - public Map load(String configKey) { + public Map load(String configKey) { if (targetURI == null) { return null; } @@ -120,13 +120,13 @@ public Map load(String configKey) { if (lastReturnedValue != null && ((currentTimeSecs - lastReturnedTime) < artifactoryPollTimeSecs)) { LOG.debug("currentTimeSecs: {}; lastReturnedTime {}; artifactoryPollTimeSecs: {}. Returning our last map.", currentTimeSecs, lastReturnedTime, artifactoryPollTimeSecs); - return (Map) lastReturnedValue.get(configKey); + return (Map) lastReturnedValue.get(configKey); } try { - Map raw = loadFromURI(targetURI); + Map raw = loadFromURI(targetURI); if (raw != null) { - return (Map) raw.get(configKey); + return (Map) raw.get(configKey); } } catch (Exception e) { LOG.error("Failed to load from uri {}", targetURI); @@ -284,11 +284,11 @@ private void updateLastReturned(Map ret) { lastReturnedValue = ret; } - private Map loadFromFile(File file) { - Map ret = null; + private Map loadFromFile(File file) { + Map ret = null; try { - ret = (Map) Utils.readYamlFile(file.getCanonicalPath()); + ret = (Map) Utils.readYamlFile(file.getCanonicalPath()); } catch (IOException e) { LOG.error("Filed to load from file. Exception: {}", e.getMessage()); } @@ -305,7 +305,7 @@ private Map loadFromFile(File file) { return null; } - private Map getLatestFromCache() { + private Map getLatestFromCache() { String localFileName = localCacheDir + File.separator + cacheFilename; return loadFromFile(new File(localFileName)); } @@ -348,7 +348,7 @@ private void makeArtifactoryCache(String location) throws IOException { cacheInitialized = true; } - private Map loadFromURI(URI uri) throws IOException { + private Map loadFromURI(URI uri) throws IOException { String host = uri.getHost(); Integer port = uri.getPort(); String location = uri.getPath(); @@ -365,7 +365,7 @@ private Map loadFromURI(URI uri) throws IOException { // If we failed to get anything from Artifactory try to get it from our local cache if (yamlConfig == null) { - Map ret = getLatestFromCache(); + Map ret = getLatestFromCache(); updateLastReturned(ret); return ret; } diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/utils/FileConfigLoader.java b/storm-server/src/main/java/org/apache/storm/scheduler/utils/FileConfigLoader.java index e785e5cb16f..a75e92b5a23 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/utils/FileConfigLoader.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/utils/FileConfigLoader.java @@ -56,12 +56,12 @@ public FileConfigLoader(Map conf) { * @return The scheduler configuration if exists; null otherwise. */ @Override - public Map load(String configKey) { + public Map load(String configKey) { if (targetFilePath != null) { try { - Map raw = (Map) Utils.readYamlFile(targetFilePath); + Map raw = (Map) Utils.readYamlFile(targetFilePath); if (raw != null) { - return (Map) raw.get(configKey); + return (Map) raw.get(configKey); } } catch (Exception e) { LOG.error("Failed to load from file {}", targetFilePath); diff --git a/storm-server/src/main/java/org/apache/storm/utils/ServerUtils.java b/storm-server/src/main/java/org/apache/storm/utils/ServerUtils.java index cd16259b9e1..96ad9395c8a 100644 --- a/storm-server/src/main/java/org/apache/storm/utils/ServerUtils.java +++ b/storm-server/src/main/java/org/apache/storm/utils/ServerUtils.java @@ -132,7 +132,7 @@ public static BlobStore getNimbusBlobStore(Map conf, String base type = LocalFsBlobStore.class.getName(); } BlobStore store = (BlobStore) ReflectionUtils.newInstance(type); - HashMap nconf = new HashMap(conf); + Map nconf = new HashMap<>(conf); // only enable cleanup of blobstore on nimbus nconf.put(Config.BLOBSTORE_CLEANUP_ENABLE, Boolean.TRUE); diff --git a/storm-server/src/test/java/org/apache/storm/scheduler/blacklist/FaultGenerateUtils.java b/storm-server/src/test/java/org/apache/storm/scheduler/blacklist/FaultGenerateUtils.java index ece63577361..daf8671e6c3 100644 --- a/storm-server/src/test/java/org/apache/storm/scheduler/blacklist/FaultGenerateUtils.java +++ b/storm-server/src/test/java/org/apache/storm/scheduler/blacklist/FaultGenerateUtils.java @@ -50,7 +50,7 @@ public static List> getSupervisorsList(int superv return supervisorsList; } - public static Cluster nextCluster(Cluster cluster, Map supervisors, INimbus iNimbus, Map config, + public static Cluster nextCluster(Cluster cluster, Map supervisors, INimbus iNimbus, Map config, Topologies topologies) { Map assignment; if (cluster == null) { 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 71055b05d91..553032d45a3 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 @@ -84,9 +84,9 @@ public static Map removePortFromSupervisors(Map genSupervisors(int numSup, int numPorts) { - Map retList = new HashMap(); + Map retList = new HashMap<>(); for (int i = 0; i < numSup; i++) { - List ports = new LinkedList(); + List ports = new LinkedList<>(); for (int j = 0; j < numPorts; j++) { ports.add(j); } @@ -97,7 +97,7 @@ public static Map genSupervisors(int numSup, int numP } - public static TopologyDetails getTopology(String name, Map config, int numSpout, int numBolt, + public static TopologyDetails getTopology(String name, Map config, int numSpout, int numBolt, int spoutParallelism, int boltParallelism, int launchTime, boolean blacklistEnable) { Config conf = new Config(); @@ -110,7 +110,7 @@ public static TopologyDetails getTopology(String name, Map config, int numSpout, } public static Map genExecsAndComps(StormTopology topology, int spoutParallelism, int boltParallelism) { - Map retMap = new HashMap(); + Map retMap = new HashMap<>(); int startTask = 0; int endTask = 1; for (Map.Entry entry : topology.get_spouts().entrySet()) { @@ -166,7 +166,7 @@ public TestSpout(boolean isDistributed) { _isDistributed = isDistributed; } - public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) { + public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) { _collector = collector; } @@ -194,7 +194,7 @@ public void declareOutputFields(OutputFieldsDeclarer declarer) { @Override public Map getComponentConfiguration() { if (!_isDistributed) { - Map ret = new HashMap(); + Map ret = new HashMap<>(); ret.put(Config.TOPOLOGY_MAX_TASK_PARALLELISM, 1); return ret; } else { @@ -207,7 +207,7 @@ public static class TestBolt extends BaseRichBolt { OutputCollector _collector; @Override - public void prepare(Map conf, TopologyContext context, + public void prepare(Map conf, TopologyContext context, OutputCollector collector) { _collector = collector; } @@ -225,7 +225,7 @@ public void declareOutputFields(OutputFieldsDeclarer declarer) { public static class INimbusTest implements INimbus { @Override - public void prepare(Map stormConf, String schedulerLocalDir) { + public void prepare(Map stormConf, String schedulerLocalDir) { } diff --git a/storm-server/src/test/java/org/apache/storm/scheduler/utils/ArtifactoryConfigLoaderTest.java b/storm-server/src/test/java/org/apache/storm/scheduler/utils/ArtifactoryConfigLoaderTest.java index f026f1d6a76..60f8701e38e 100644 --- a/storm-server/src/test/java/org/apache/storm/scheduler/utils/ArtifactoryConfigLoaderTest.java +++ b/storm-server/src/test/java/org/apache/storm/scheduler/utils/ArtifactoryConfigLoaderTest.java @@ -43,9 +43,9 @@ public class ArtifactoryConfigLoaderTest { private class ArtifactoryConfigLoaderMock extends ArtifactoryConfigLoader { String getData; - HashMap getDataMap = new HashMap(); + HashMap getDataMap = new HashMap<>(); - public ArtifactoryConfigLoaderMock(Map conf) { + public ArtifactoryConfigLoaderMock(Map conf) { super(conf); } @@ -84,7 +84,7 @@ public void removeTempDir() throws Exception { public void testInvalidConfig() { Config conf = new Config(); ArtifactoryConfigLoaderMock loaderMock = new ArtifactoryConfigLoaderMock(conf); - Map ret = loaderMock.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS); + Map ret = loaderMock.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS); Assert.assertNull("Unexpectedly returned not null", ret); } @@ -101,7 +101,7 @@ public void testPointingAtDirectory() { "{\"children\" : [ { \"uri\" : \"/20160621204337.yaml\", \"folder\" : false }]}" ); loaderMock.setData(null, null, "{ \"" + DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS + "\": {one: 1, two: 2, three: 3, four : 4}}"); - Map ret = loaderMock.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS); + Map ret = loaderMock.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS); Assert.assertNotNull("Unexpectedly returned null", ret); Assert.assertEquals(1, ret.get("one")); Assert.assertEquals(2, ret.get("two")); @@ -111,7 +111,7 @@ public void testPointingAtDirectory() { // Now let's load w/o setting up gets and we should still get valid map back ArtifactoryConfigLoaderMock tc2 = new ArtifactoryConfigLoaderMock(conf); - Map ret2 = tc2.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS); + Map ret2 = tc2.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS); Assert.assertNotNull("Unexpectedly returned null", ret2); Assert.assertEquals(1, ret2.get("one")); Assert.assertEquals(2, ret2.get("two")); @@ -132,7 +132,7 @@ public void testArtifactUpdate() { loaderMock.setData("Anything", "/location/of/test/dir", "{\"children\" : [ { \"uri\" : \"/20160621204337.yaml\", \"folder\" : false }]}" ); loaderMock.setData(null, null, "{ \"" + DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS + "\": {one: 1, two: 2, three: 3}}"); - Map ret = loaderMock.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS); + Map ret = loaderMock.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS); Assert.assertNotNull("Unexpectedly returned null", ret); Assert.assertEquals(1, ret.get("one")); @@ -142,7 +142,7 @@ public void testArtifactUpdate() { // Now let's load w/o setting up gets and we should still get valid map back ArtifactoryConfigLoaderMock tc2 = new ArtifactoryConfigLoaderMock(conf); - Map ret2 = tc2.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS); + Map ret2 = tc2.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS); Assert.assertNotNull("Unexpectedly returned null", ret2); Assert.assertEquals(1, ret2.get("one")); Assert.assertEquals(2, ret2.get("two")); @@ -199,7 +199,7 @@ public void testPointingAtSpecificArtifact() { loaderMock.setData("Anything", "/location/of/this/artifact", "{ \"downloadUri\": \"anything\"}"); loaderMock.setData(null, null, "{ \"" + DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS + "\": {one: 1, two: 2, three: 3}}"); - Map ret = loaderMock.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS); + Map ret = loaderMock.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS); Assert.assertNotNull("Unexpectedly returned null", ret); Assert.assertEquals(1, ret.get("one")); @@ -208,7 +208,7 @@ public void testPointingAtSpecificArtifact() { // Now let's load w/o setting up gets and we should still get valid map back ArtifactoryConfigLoaderMock tc2 = new ArtifactoryConfigLoaderMock(conf); - Map ret2 = tc2.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS); + Map ret2 = tc2.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS); Assert.assertNotNull("Unexpectedly returned null", ret2); Assert.assertEquals(1, ret2.get("one")); Assert.assertEquals(2, ret2.get("two")); @@ -226,7 +226,7 @@ public void testMalformedYaml() throws Exception { loaderMock.setData("Anything", "/location/of/this/artifact", "{ \"downloadUri\": \"anything\"}"); loaderMock.setData(null, null, "ThisIsNotValidYaml"); - Map ret = loaderMock.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS); + Map ret = loaderMock.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS); Assert.assertNull("Unexpectedly returned a map", ret); } } \ No newline at end of file diff --git a/storm-server/src/test/java/org/apache/storm/scheduler/utils/FileConfigLoaderTest.java b/storm-server/src/test/java/org/apache/storm/scheduler/utils/FileConfigLoaderTest.java index 33df1a187f3..2c711dcc4e6 100644 --- a/storm-server/src/test/java/org/apache/storm/scheduler/utils/FileConfigLoaderTest.java +++ b/storm-server/src/test/java/org/apache/storm/scheduler/utils/FileConfigLoaderTest.java @@ -42,7 +42,7 @@ public void testFileNotThere() { Config conf = new Config(); conf.put(DaemonConfig.SCHEDULER_CONFIG_LOADER_URI, FILE_SCHEME_PREFIX + "/file/not/exist/"); FileConfigLoader testLoader = new FileConfigLoader(conf); - Map result = testLoader.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS); + Map result = testLoader.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS); Assert.assertNull("Unexpectedly returned a map", result); } @@ -50,7 +50,7 @@ public void testFileNotThere() { public void testInvalidConfig() throws Exception { Config conf = new Config(); FileConfigLoader testLoader = new FileConfigLoader(conf); - Map result = testLoader.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS); + Map result = testLoader.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS); Assert.assertNull("Unexpectedly returned a map", result); } @@ -70,7 +70,7 @@ public void testMalformedYaml() throws Exception { conf.put(DaemonConfig.SCHEDULER_CONFIG_LOADER_URI, FILE_SCHEME_PREFIX + temp.getCanonicalPath()); FileConfigLoader testLoader = new FileConfigLoader(conf); - Map result = testLoader.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS); + Map result = testLoader.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS); Assert.assertNull("Unexpectedly returned a map", result); } @@ -80,7 +80,7 @@ public void testValidFile() throws Exception { File temp = File.createTempFile("FileLoader", ".yaml"); temp.deleteOnExit(); - Map testMap = new HashMap(); + Map testMap = new HashMap<>(); testMap.put("a", 1); testMap.put("b", 2); testMap.put("c", 3); @@ -100,7 +100,7 @@ public void testValidFile() throws Exception { conf.put(DaemonConfig.SCHEDULER_CONFIG_LOADER_URI, FILE_SCHEME_PREFIX + temp.getCanonicalPath()); FileConfigLoader loader = new FileConfigLoader(conf); - Map result = loader.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS); + Map result = loader.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS); Assert.assertNotNull("Unexpectedly returned null", result); diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/webapp/LogviewerResource.java b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/webapp/LogviewerResource.java index 2e63013f62b..b46c6a92e43 100644 --- a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/webapp/LogviewerResource.java +++ b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/webapp/LogviewerResource.java @@ -258,9 +258,9 @@ public Response deepSearch(@PathParam("topoId") String topologyId, startFileOffset, startByteOffset, BooleanUtils.toBooleanObject(searchArchived), callback, origin); } - private int parseIntegerFromMap(Map map, String parameterKey) throws InvalidRequestException { + private int parseIntegerFromMap(Map map, String parameterKey) throws InvalidRequestException { try { - return Integer.parseInt(((String[]) map.get(parameterKey))[0]); + return Integer.parseInt(map.get(parameterKey)[0]); } catch (NumberFormatException ex) { throw new InvalidRequestException("Could not make an integer out of the query parameter '" + parameterKey + "'", ex); From 1582024efc88a2d0b7da189774c380c01ac59683 Mon Sep 17 00:00:00 2001 From: Karl-Philipp Richter Date: Mon, 19 Mar 2018 21:16:50 +0100 Subject: [PATCH 2/2] removed unnecessary @SuppressWarnings(rawtypes) annotations after adding generics to static types of method parameters and variables --- .../org/apache/storm/hbase/topology/TotalWordCounter.java | 1 - .../java/org/apache/storm/hbase/topology/WordCounter.java | 1 - .../java/org/apache/storm/hbase/topology/WordSpout.java | 1 - .../main/java/org/apache/storm/jdbc/spout/UserSpout.java | 1 - .../main/java/org/apache/storm/jms/example/GenericBolt.java | 1 - .../org/apache/storm/mongodb/topology/TotalWordCounter.java | 1 - .../java/org/apache/storm/mongodb/topology/WordSpout.java | 1 - .../java/org/apache/storm/redis/topology/WordCounter.java | 1 - .../java/org/apache/storm/redis/topology/WordSpout.java | 1 - .../org/apache/storm/starter/bolt/RollingCountAggBolt.java | 1 - .../jvm/org/apache/storm/starter/bolt/RollingCountBolt.java | 1 - .../java/org/apache/storm/hbase/bolt/HBaseLookupBolt.java | 1 - .../java/org/apache/storm/jms/trident/TridentJmsSpout.java | 6 +++--- .../storm/redis/trident/state/RedisClusterMapState.java | 2 +- .../apache/storm/redis/trident/state/RedisClusterState.java | 2 +- .../org/apache/storm/redis/trident/state/RedisMapState.java | 2 +- .../org/apache/storm/redis/trident/state/RedisState.java | 2 +- .../org/apache/storm/flux/examples/StatefulWordCounter.java | 1 - .../java/org/apache/storm/flux/examples/WordCounter.java | 1 - .../src/jvm/org/apache/storm/messaging/local/Context.java | 2 -- .../src/jvm/org/apache/storm/messaging/netty/Client.java | 1 - .../src/jvm/org/apache/storm/messaging/netty/Context.java | 2 -- .../src/jvm/org/apache/storm/messaging/netty/Server.java | 2 -- .../src/jvm/org/apache/storm/metric/SystemBolt.java | 2 +- storm-server/src/main/java/org/apache/storm/Testing.java | 1 - .../main/java/org/apache/storm/daemon/nimbus/Nimbus.java | 2 +- .../storm/scheduler/multitenant/MultitenantScheduler.java | 1 - 27 files changed, 9 insertions(+), 32 deletions(-) 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 aa28a52e4c3..c107282a078 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 @@ -37,7 +37,6 @@ 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(); - @SuppressWarnings("rawtypes") public void prepare(Map topoConf, TopologyContext context) { } 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 60546999600..5c71ade9995 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 @@ -31,7 +31,6 @@ public class WordCounter implements IBasicBolt { - @SuppressWarnings("rawtypes") public void prepare(Map topoConf, TopologyContext context) { } 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 00ac67dc702..bcc9642ef1b 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 @@ -45,7 +45,6 @@ public boolean isDistributed() { return this.isDistributed; } - @SuppressWarnings("rawtypes") public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) { this.collector = collector; } 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 f05f79a4202..96415991a8d 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,7 +47,6 @@ public boolean isDistributed() { return this.isDistributed; } - @SuppressWarnings("rawtypes") public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) { this.collector = collector; } 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 be6afb0e96b..0b077c07f7a 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,7 +67,6 @@ public GenericBolt(String name, boolean autoAck, boolean autoAnchor) { this(name, autoAck, autoAnchor, null); } - @SuppressWarnings("rawtypes") public void prepare(Map topoConf, TopologyContext context, OutputCollector collector) { this.collector = collector; 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 3827e777dcc..4dee7a0c370 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,7 +37,6 @@ 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(); - @SuppressWarnings("rawtypes") public void prepare(Map topoConf, TopologyContext context) { } 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 086ac2fc3d2..f0bdde20fe2 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,7 +45,6 @@ public boolean isDistributed() { return this.isDistributed; } - @SuppressWarnings("rawtypes") public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) { this.collector = collector; } 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 6c6e67a049b..c321b83d472 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,7 +31,6 @@ public class WordCounter implements IBasicBolt { private Map wordCounter = Maps.newHashMap(); - @SuppressWarnings("rawtypes") public void prepare(Map topoConf, TopologyContext context) { } 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 76b28874b65..ef45cd2f63a 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,7 +45,6 @@ public boolean isDistributed() { return this.isDistributed; } - @SuppressWarnings("rawtypes") public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) { this.collector = collector; } diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/bolt/RollingCountAggBolt.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/bolt/RollingCountAggBolt.java index e2923082a48..fafdbcc3f1a 100644 --- a/examples/storm-starter/src/jvm/org/apache/storm/starter/bolt/RollingCountAggBolt.java +++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/bolt/RollingCountAggBolt.java @@ -44,7 +44,6 @@ public class RollingCountAggBolt extends BaseRichBolt { private OutputCollector collector; - @SuppressWarnings("rawtypes") @Override public void prepare(Map topoConf, TopologyContext context, OutputCollector collector) { this.collector = collector; diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/bolt/RollingCountBolt.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/bolt/RollingCountBolt.java index e7e72b1a56e..b7ea55eed29 100644 --- a/examples/storm-starter/src/jvm/org/apache/storm/starter/bolt/RollingCountBolt.java +++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/bolt/RollingCountBolt.java @@ -85,7 +85,6 @@ private int deriveNumWindowChunksFrom(int windowLengthInSeconds, int windowUpdat return windowLengthInSeconds / windowUpdateFrequencyInSeconds; } - @SuppressWarnings("rawtypes") @Override public void prepare(Map topoConf, TopologyContext context, OutputCollector collector) { this.collector = collector; diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseLookupBolt.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseLookupBolt.java index 021264691d9..d20aab3aac7 100644 --- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseLookupBolt.java +++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseLookupBolt.java @@ -71,7 +71,6 @@ public HBaseLookupBolt withProjectionCriteria(HBaseProjectionCriteria projection return this; } - @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void prepare(Map config, TopologyContext topologyContext, OutputCollector collector) { super.prepare(config, topologyContext, collector); diff --git a/external/storm-jms/src/main/java/org/apache/storm/jms/trident/TridentJmsSpout.java b/external/storm-jms/src/main/java/org/apache/storm/jms/trident/TridentJmsSpout.java index 31f4d0d66a2..afdc0b2bf75 100644 --- a/external/storm-jms/src/main/java/org/apache/storm/jms/trident/TridentJmsSpout.java +++ b/external/storm-jms/src/main/java/org/apache/storm/jms/trident/TridentJmsSpout.java @@ -163,12 +163,12 @@ private static final String toDeliveryModeString(int acknowledgeMode) { @Override public ITridentSpout.BatchCoordinator getCoordinator( - String txStateId, @SuppressWarnings("rawtypes") Map conf, TopologyContext context) { + String txStateId, Map conf, TopologyContext context) { return new JmsBatchCoordinator(name); } @Override - public Emitter getEmitter(String txStateId, @SuppressWarnings("rawtypes") Map conf, TopologyContext context) { + public Emitter getEmitter(String txStateId, Map conf, TopologyContext context) { return new JmsEmitter(name, jmsProvider, tupleProducer, jmsAcknowledgeMode, conf); } @@ -210,7 +210,7 @@ private class JmsEmitter implements Emitter, MessageListener { private final Logger LOG = LoggerFactory.getLogger(JmsEmitter.class); - public JmsEmitter(String name, JmsProvider jmsProvider, JmsTupleProducer tupleProducer, int jmsAcknowledgeMode, @SuppressWarnings("rawtypes") Map conf) { + public JmsEmitter(String name, JmsProvider jmsProvider, JmsTupleProducer tupleProducer, int jmsAcknowledgeMode, Map conf) { if (jmsProvider == null) { throw new IllegalStateException("JMS provider has not been set."); } diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterMapState.java b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterMapState.java index 3744bd56287..ecae18d3a80 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterMapState.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterMapState.java @@ -230,7 +230,7 @@ public Factory(JedisClusterConfig jedisClusterConfig, StateType type, Options op * {@inheritDoc} */ @Override - public State makeState(@SuppressWarnings("rawtypes") Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions) { + public State makeState(Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions) { JedisCluster jedisCluster = new JedisCluster(jedisClusterConfig.getNodes(), jedisClusterConfig.getTimeout(), jedisClusterConfig.getTimeout(), diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterState.java b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterState.java index 6d0ed3e456c..11d89076446 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterState.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterState.java @@ -69,7 +69,7 @@ public Factory(JedisClusterConfig config) { * {@inheritDoc} */ @Override - public State makeState(@SuppressWarnings("rawtypes") Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions) { + public State makeState(Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions) { JedisCluster jedisCluster = new JedisCluster(jedisClusterConfig.getNodes(), jedisClusterConfig.getTimeout(), jedisClusterConfig.getTimeout(), diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisMapState.java b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisMapState.java index 21a40bd0c21..f68b5ef644d 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisMapState.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisMapState.java @@ -230,7 +230,7 @@ public Factory(JedisPoolConfig jedisPoolConfig, StateType type, Options options) * {@inheritDoc} */ @Override - public State makeState(@SuppressWarnings("rawtypes") Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions) { + public State makeState(Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions) { JedisPool jedisPool = new JedisPool(DEFAULT_POOL_CONFIG, jedisPoolConfig.getHost(), jedisPoolConfig.getPort(), diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisState.java b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisState.java index c6a6da38bad..ec0b6790391 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisState.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisState.java @@ -69,7 +69,7 @@ public Factory(JedisPoolConfig config) { * {@inheritDoc} */ @Override - public State makeState(@SuppressWarnings("rawtypes") Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions) { + public State makeState(Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions) { JedisPool jedisPool = new JedisPool(DEFAULT_POOL_CONFIG, jedisPoolConfig.getHost(), jedisPoolConfig.getPort(), diff --git a/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/StatefulWordCounter.java b/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/StatefulWordCounter.java index f1f4a6cd6e6..aa36af9d5f3 100644 --- a/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/StatefulWordCounter.java +++ b/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/StatefulWordCounter.java @@ -34,7 +34,6 @@ public class StatefulWordCounter extends BaseStatefulBolt wordCounts; private OutputCollector collector; - @SuppressWarnings("rawtypes") @Override public void prepare(Map topoConf, TopologyContext context, OutputCollector collector) { this.collector = collector; 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 f15af952662..709c254b9cc 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,7 +43,6 @@ public class WordCounter extends BaseBasicBolt { - @SuppressWarnings("rawtypes") public void prepare(Map topoConf, TopologyContext context) { } diff --git a/storm-client/src/jvm/org/apache/storm/messaging/local/Context.java b/storm-client/src/jvm/org/apache/storm/messaging/local/Context.java index 0babd5fd3bf..75fc8996fb9 100644 --- a/storm-client/src/jvm/org/apache/storm/messaging/local/Context.java +++ b/storm-client/src/jvm/org/apache/storm/messaging/local/Context.java @@ -233,7 +233,6 @@ private static LocalServer getLocalServer(String nodeId, int port) { return ret; } - @SuppressWarnings("rawtypes") @Override public void prepare(Map topoConf) { //NOOP @@ -249,7 +248,6 @@ public IConnection connect(String storm_id, String host, int port, AtomicBoolean return new LocalClient(getLocalServer(storm_id, port)); } - @SuppressWarnings("rawtypes") @Override public void term() { //NOOP diff --git a/storm-client/src/jvm/org/apache/storm/messaging/netty/Client.java b/storm-client/src/jvm/org/apache/storm/messaging/netty/Client.java index e0736b59470..bbcfb434626 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 @@ -151,7 +151,6 @@ public class Client extends ConnectionWithStatus implements IStatefulObject, ISa // wait strategy when the netty channel is not writable private final IWaitStrategy waitStrategy; - @SuppressWarnings("rawtypes") Client(Map topoConf, AtomicBoolean[] remoteBpStatus, ChannelFactory factory, HashedWheelTimer scheduler, String host, int port, Context context) { this.topoConf = topoConf; closing = false; diff --git a/storm-client/src/jvm/org/apache/storm/messaging/netty/Context.java b/storm-client/src/jvm/org/apache/storm/messaging/netty/Context.java index 5a169de90e4..82ebc26c54a 100644 --- a/storm-client/src/jvm/org/apache/storm/messaging/netty/Context.java +++ b/storm-client/src/jvm/org/apache/storm/messaging/netty/Context.java @@ -31,7 +31,6 @@ import org.apache.storm.messaging.IContext; public class Context implements IContext { - @SuppressWarnings("rawtypes") private Map topoConf; private Map connections; private NioClientSocketChannelFactory clientChannelFactory; @@ -40,7 +39,6 @@ public class Context implements IContext { /** * initialization per Storm configuration */ - @SuppressWarnings("rawtypes") public void prepare(Map topoConf) { this.topoConf = topoConf; connections = new HashMap<>(); diff --git a/storm-client/src/jvm/org/apache/storm/messaging/netty/Server.java b/storm-client/src/jvm/org/apache/storm/messaging/netty/Server.java index 0901cc3713b..9f16b8d410e 100644 --- a/storm-client/src/jvm/org/apache/storm/messaging/netty/Server.java +++ b/storm-client/src/jvm/org/apache/storm/messaging/netty/Server.java @@ -53,7 +53,6 @@ class Server extends ConnectionWithStatus implements IStatefulObject, ISaslServer { private static final Logger LOG = LoggerFactory.getLogger(Server.class); - @SuppressWarnings("rawtypes") Map topoConf; int port; private final ConcurrentHashMap messagesEnqueued = new ConcurrentHashMap<>(); @@ -70,7 +69,6 @@ class Server extends ConnectionWithStatus implements IStatefulObject, ISaslServe private Supplier newConnectionResponse; private final int boundPort; - @SuppressWarnings("rawtypes") Server(Map topoConf, int port) { this.topoConf = topoConf; this.port = port; diff --git a/storm-client/src/jvm/org/apache/storm/metric/SystemBolt.java b/storm-client/src/jvm/org/apache/storm/metric/SystemBolt.java index 67be2c969f3..629a60eed77 100644 --- a/storm-client/src/jvm/org/apache/storm/metric/SystemBolt.java +++ b/storm-client/src/jvm/org/apache/storm/metric/SystemBolt.java @@ -89,7 +89,7 @@ public Object getValueAndReset() { } } - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({ "unchecked" }) @Override public void prepare(final Map topoConf, TopologyContext context, OutputCollector collector) { if(_prepareWasCalled && !"local".equals(topoConf.get(Config.STORM_CLUSTER_MODE))) { diff --git a/storm-server/src/main/java/org/apache/storm/Testing.java b/storm-server/src/main/java/org/apache/storm/Testing.java index 1d3758fa0e6..c391926e7d5 100644 --- a/storm-server/src/main/java/org/apache/storm/Testing.java +++ b/storm-server/src/main/java/org/apache/storm/Testing.java @@ -622,7 +622,6 @@ public static Map multiset(Collection c) { return ret; } - @SuppressWarnings("rawtypes") private static void printRec(Object o, String prefix) { if (o instanceof Collection) { LOG.info("{} {} ({}) [",prefix,o, o.getClass()); diff --git a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java index 9f4336ed583..f5d08ec0ce8 100644 --- a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java +++ b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java @@ -406,7 +406,7 @@ public Map apply(Map t) { public static class StandaloneINimbus implements INimbus { @Override - public void prepare(@SuppressWarnings("rawtypes") Map topoConf, String schedulerLocalDir) { + public void prepare(Map topoConf, String schedulerLocalDir) { //NOOP } diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/multitenant/MultitenantScheduler.java b/storm-server/src/main/java/org/apache/storm/scheduler/multitenant/MultitenantScheduler.java index d4d240ccdf8..65c657ea472 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/multitenant/MultitenantScheduler.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/multitenant/MultitenantScheduler.java @@ -33,7 +33,6 @@ public class MultitenantScheduler implements IScheduler { private static final Logger LOG = LoggerFactory.getLogger(MultitenantScheduler.class); - @SuppressWarnings("rawtypes") private Map conf; protected IConfigLoader configLoader;