You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by da...@apache.org on 2018/03/21 18:11:28 UTC
[1/5] storm git commit: avoiding rawtypes in configuration and
metadata Maps in order to allow usage without @SuppressWarnings("rawtypes")
and early detection of design flaws
Repository: storm
Updated Branches:
refs/heads/master 8c8c0c31c -> 0fdad2c0f
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-core/test/jvm/org/apache/storm/serialization/SerializationTest.java
----------------------------------------------------------------------
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 9ed57af..5fbf472 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 class SerializationTest {
isRoundtrip(Lists.newArrayList(mkString(1024 * 1024 * 2)));
}
- private Map mkConf(Map extra) {
+ private Map<String, Object> mkConf(Map<String, Object> extra) {
Map<String, Object> config = Utils.readDefaultConfig();
config.putAll(extra);
return config;
}
- private byte[] serialize(List vals, Map<String, Object> conf) throws IOException {
+ private byte[] serialize(List<Object> vals, Map<String, Object> conf) throws IOException {
KryoValuesSerializer serializer = new KryoValuesSerializer(mkConf(conf));
return serializer.serialize(vals);
}
- private List deserialize(byte[] bytes, Map<String, Object> conf) throws IOException {
+ private List<Object> deserialize(byte[] bytes, Map<String, Object> 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<Object> roundtrip(List<Object> vals) throws IOException {
+ return roundtrip(vals, new HashMap<>());
}
- private List roundtrip(List vals, Map<String, Object> conf) throws IOException {
+ private List<Object> roundtrip(List<Object> vals, Map<String, Object> conf) throws IOException {
return deserialize(serialize(vals, conf), conf);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
----------------------------------------------------------------------
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 a1dedcd..9f4336e 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 class Nimbus implements Iface, Shutdownable, DaemonCommon {
//heartbeats "stats"
Map<String, Object> hb = (Map<String, Object>)heartbeat.get("heartbeat");
if (hb != null) {
- Map ex = (Map) hb.get("stats");
+ Map<String, Object> ex = (Map<String, Object>) hb.get("stats");
if (ex != null) {
ExecutorStats stats = StatsUtil.thriftifyExecutorStats(ex);
summ.set_stats(stats);
@@ -4101,7 +4101,7 @@ public class Nimbus implements Iface, Shutdownable, DaemonCommon {
IStormClusterState state = stormClusterState;
Map<String, Assignment> topoIdToAssignments = state.topologyAssignments();
Map<String, StormBase> topoIdToBases = state.topologyBases();
- Map<String, Object> clusterSchedulerConfig = scheduler.config();
+ Map<String, Number> 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
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-server/src/main/java/org/apache/storm/metricstore/MetricStore.java
----------------------------------------------------------------------
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 166333b..d43e11b 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<String, Object> config) throws MetricException;
/**
* Stores a metric in the store.
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-server/src/main/java/org/apache/storm/metricstore/MetricStoreConfig.java
----------------------------------------------------------------------
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 ac52bd5..d66529a 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<String, Object> conf) throws MetricException {
try {
String storeClass = (String)conf.get(DaemonConfig.STORM_METRIC_STORE_CLASS);
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-server/src/main/java/org/apache/storm/metricstore/NimbusMetricProcessor.java
----------------------------------------------------------------------
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 64688c9..0c98208 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 class NimbusMetricProcessor implements WorkerMetricsProcessor {
}
@Override
- public void prepare(Map config) throws MetricException {}
+ public void prepare(Map<String, Object> config) throws MetricException {}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-server/src/main/java/org/apache/storm/metricstore/WorkerMetricsProcessor.java
----------------------------------------------------------------------
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 dc1ec4a..98c1163 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<String, Object> config) throws MetricException;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-server/src/main/java/org/apache/storm/metricstore/rocksdb/RocksDbStore.java
----------------------------------------------------------------------
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 2f44aff..2e7ed02 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 @@ public class RocksDbStore implements MetricStore, AutoCloseable {
* @param config Storm config map
* @throws MetricException on preparation error
*/
- public void prepare(Map config) throws MetricException {
+ public void prepare(Map<String, Object> config) throws MetricException {
validateConfig(config);
this.failureMeter = StormMetricsRegistry.registerMeter("RocksDB:metric-failures");
@@ -125,7 +125,7 @@ public class RocksDbStore implements MetricStore, AutoCloseable {
* @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<String, Object> 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 @@ public class RocksDbStore implements MetricStore, AutoCloseable {
}
}
- private String getRocksDbAbsoluteDir(Map conf) throws MetricException {
+ private String getRocksDbAbsoluteDir(Map<String, Object> 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);
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-server/src/main/java/org/apache/storm/nimbus/DefaultTopologyValidator.java
----------------------------------------------------------------------
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 40fd109..55a86cf 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 org.apache.storm.generated.StormTopology;
import java.util.Map;
public class DefaultTopologyValidator implements ITopologyValidator {
+
@Override
- public void prepare(Map StormConf){
+ public void prepare(Map<String, Object> StormConf){
}
+
@Override
public void validate(String topologyName, Map<String, Object> topologyConf, StormTopology topology) throws InvalidTopologyException {
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-server/src/main/java/org/apache/storm/nimbus/ITopologyActionNotifierPlugin.java
----------------------------------------------------------------------
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 8d641bf..f36a4a8 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<String, Object> StormConf);
/**
* When a new actions is executed for a topology, this method will be called.
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-server/src/main/java/org/apache/storm/nimbus/ITopologyValidator.java
----------------------------------------------------------------------
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 7d44a8e..46c4073 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 org.apache.storm.generated.StormTopology;
import java.util.Map;
public interface ITopologyValidator {
- void prepare(Map StormConf);
+
+ void prepare(Map<String, Object> StormConf);
+
void validate(String topologyName, Map<String, Object> topologyConf, StormTopology topology)
throws InvalidTopologyException;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-server/src/main/java/org/apache/storm/scheduler/DefaultScheduler.java
----------------------------------------------------------------------
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 5ef2ce5..82630ca 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 class DefaultScheduler implements IScheduler {
}
@Override
- public Map<String, Object> config() {
+ public Map<String, Map<String, Double>> config() {
return new HashMap<>();
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-server/src/main/java/org/apache/storm/scheduler/EvenScheduler.java
----------------------------------------------------------------------
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 d4dfd94..9cbce18 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 class EvenScheduler implements IScheduler {
}
@Override
- public Map<String, Object> config() {
+ public Map<String, Map<String, Double>> config() {
return new HashMap<>();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-server/src/main/java/org/apache/storm/scheduler/IScheduler.java
----------------------------------------------------------------------
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 2f1de1c..5b79f11 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<String, Object> config();
+ Map config();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-server/src/main/java/org/apache/storm/scheduler/IsolationScheduler.java
----------------------------------------------------------------------
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 e10b8e8..3201a40 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 class IsolationScheduler implements IScheduler {
}
@Override
- public Map<String, Object> config() {
+ public Map<String, Map<String, Double>> config() {
return new HashMap<>();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-server/src/main/java/org/apache/storm/scheduler/blacklist/BlacklistScheduler.java
----------------------------------------------------------------------
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 35c039e..c401474 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<String, Object> conf;
protected int toleranceTime;
protected int toleranceCount;
@@ -76,7 +75,7 @@ public class BlacklistScheduler implements IScheduler {
}
@Override
- public void prepare(Map conf) {
+ public void prepare(Map<String, Object> conf) {
LOG.info("Preparing black list scheduler");
underlyingScheduler.prepare(conf);
this.conf = conf;
@@ -132,7 +131,7 @@ public class BlacklistScheduler implements IScheduler {
}
@Override
- public Map<String, Object> config() {
+ public Map<String, Map<String, Double>> config() {
return underlyingScheduler.config();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-server/src/main/java/org/apache/storm/scheduler/blacklist/strategies/DefaultBlacklistStrategy.java
----------------------------------------------------------------------
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 00cf25a..f6ca6ad 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<String, Integer> blacklist;
@Override
- public void prepare(Map conf) {
+ public void prepare(Map<String, Object> 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);
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-server/src/main/java/org/apache/storm/scheduler/blacklist/strategies/IBlacklistStrategy.java
----------------------------------------------------------------------
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 f050006..8543659 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 @@ import org.apache.storm.scheduler.Topologies;
public interface IBlacklistStrategy {
- void prepare(Map conf);
+ void prepare(Map<String, Object> conf);
/**
* Get blacklist by blacklist strategy.
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-server/src/main/java/org/apache/storm/scheduler/multitenant/MultitenantScheduler.java
----------------------------------------------------------------------
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 8bd9035..d4d240c 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 @@ import org.slf4j.LoggerFactory;
public class MultitenantScheduler implements IScheduler {
private static final Logger LOG = LoggerFactory.getLogger(MultitenantScheduler.class);
@SuppressWarnings("rawtypes")
- private Map conf;
+ private Map<String, Object> conf;
protected IConfigLoader configLoader;
@Override
@@ -82,8 +82,8 @@ public class MultitenantScheduler implements IScheduler {
}
@Override
- public Map<String, Object> config() {
- return (Map) getUserConf();
+ public Map config() {
+ return getUserConf();
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-server/src/main/java/org/apache/storm/scheduler/resource/ResourceAwareScheduler.java
----------------------------------------------------------------------
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 e730705..541e1a5 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 class ResourceAwareScheduler implements IScheduler {
}
@Override
- public Map<String, Object> config() {
+ public Map<String, Map<String, Double>> config() {
return (Map) getUserResourcePools();
}
@@ -282,7 +282,7 @@ public class ResourceAwareScheduler implements IScheduler {
}
// if no configs from loader, try to read from user-resource-pools.yaml
- Map fromFile = Utils.findAndReadConfigFile("user-resource-pools.yaml", false);
+ Map<String, Object> fromFile = Utils.findAndReadConfigFile("user-resource-pools.yaml", false);
raw = (Map<String, Map<String, Number>>) fromFile.get(DaemonConfig.RESOURCE_AWARE_SCHEDULER_USER_POOLS);
if (raw != null) {
return convertToDouble(raw);
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-server/src/main/java/org/apache/storm/scheduler/utils/ArtifactoryConfigLoader.java
----------------------------------------------------------------------
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 87f39cd..5d3dfbe 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<String, Object> lastReturnedValue;
private URI targetURI = null;
private JSONParser jsonParser;
private String scheme;
@@ -110,7 +110,7 @@ public class ArtifactoryConfigLoader implements IConfigLoader {
* @return The scheduler configuration if exists; null otherwise.
*/
@Override
- public Map load(String configKey) {
+ public Map<String, Object> load(String configKey) {
if (targetURI == null) {
return null;
}
@@ -120,13 +120,13 @@ public class ArtifactoryConfigLoader implements IConfigLoader {
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<String, Object>) lastReturnedValue.get(configKey);
}
try {
- Map raw = loadFromURI(targetURI);
+ Map<String, Object> raw = loadFromURI(targetURI);
if (raw != null) {
- return (Map) raw.get(configKey);
+ return (Map<String, Object>) raw.get(configKey);
}
} catch (Exception e) {
LOG.error("Failed to load from uri {}", targetURI);
@@ -284,11 +284,11 @@ public class ArtifactoryConfigLoader implements IConfigLoader {
lastReturnedValue = ret;
}
- private Map loadFromFile(File file) {
- Map ret = null;
+ private Map<String, Object> loadFromFile(File file) {
+ Map<String, Object> ret = null;
try {
- ret = (Map) Utils.readYamlFile(file.getCanonicalPath());
+ ret = (Map<String, Object>) Utils.readYamlFile(file.getCanonicalPath());
} catch (IOException e) {
LOG.error("Filed to load from file. Exception: {}", e.getMessage());
}
@@ -305,7 +305,7 @@ public class ArtifactoryConfigLoader implements IConfigLoader {
return null;
}
- private Map getLatestFromCache() {
+ private Map<String, Object> getLatestFromCache() {
String localFileName = localCacheDir + File.separator + cacheFilename;
return loadFromFile(new File(localFileName));
}
@@ -348,7 +348,7 @@ public class ArtifactoryConfigLoader implements IConfigLoader {
cacheInitialized = true;
}
- private Map loadFromURI(URI uri) throws IOException {
+ private Map<String, Object> loadFromURI(URI uri) throws IOException {
String host = uri.getHost();
Integer port = uri.getPort();
String location = uri.getPath();
@@ -365,7 +365,7 @@ public class ArtifactoryConfigLoader implements IConfigLoader {
// If we failed to get anything from Artifactory try to get it from our local cache
if (yamlConfig == null) {
- Map ret = getLatestFromCache();
+ Map<String, Object> ret = getLatestFromCache();
updateLastReturned(ret);
return ret;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-server/src/main/java/org/apache/storm/scheduler/utils/FileConfigLoader.java
----------------------------------------------------------------------
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 e785e5c..a75e92b 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 class FileConfigLoader implements IConfigLoader {
* @return The scheduler configuration if exists; null otherwise.
*/
@Override
- public Map load(String configKey) {
+ public Map<String, Object> load(String configKey) {
if (targetFilePath != null) {
try {
- Map raw = (Map) Utils.readYamlFile(targetFilePath);
+ Map<String, Object> raw = (Map<String, Object>) Utils.readYamlFile(targetFilePath);
if (raw != null) {
- return (Map) raw.get(configKey);
+ return (Map<String, Object>) raw.get(configKey);
}
} catch (Exception e) {
LOG.error("Failed to load from file {}", targetFilePath);
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-server/src/main/java/org/apache/storm/utils/ServerUtils.java
----------------------------------------------------------------------
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 cd16259..96ad939 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 class ServerUtils {
type = LocalFsBlobStore.class.getName();
}
BlobStore store = (BlobStore) ReflectionUtils.newInstance(type);
- HashMap nconf = new HashMap(conf);
+ Map<String, Object> nconf = new HashMap<>(conf);
// only enable cleanup of blobstore on nimbus
nconf.put(Config.BLOBSTORE_CLEANUP_ENABLE, Boolean.TRUE);
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-server/src/test/java/org/apache/storm/scheduler/blacklist/FaultGenerateUtils.java
----------------------------------------------------------------------
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 ece6357..daf8671 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 class FaultGenerateUtils {
return supervisorsList;
}
- public static Cluster nextCluster(Cluster cluster, Map<String, SupervisorDetails> supervisors, INimbus iNimbus, Map config,
+ public static Cluster nextCluster(Cluster cluster, Map<String, SupervisorDetails> supervisors, INimbus iNimbus, Map<String, Object> config,
Topologies topologies) {
Map<String, SchedulerAssignmentImpl> assignment;
if (cluster == null) {
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-server/src/test/java/org/apache/storm/scheduler/blacklist/TestUtilsForBlacklistScheduler.java
----------------------------------------------------------------------
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 71055b0..553032d 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 class TestUtilsForBlacklistScheduler {
}
public static Map<String, SupervisorDetails> genSupervisors(int numSup, int numPorts) {
- Map<String, SupervisorDetails> retList = new HashMap<String, SupervisorDetails>();
+ Map<String, SupervisorDetails> retList = new HashMap<>();
for (int i = 0; i < numSup; i++) {
- List<Number> ports = new LinkedList<Number>();
+ List<Number> ports = new LinkedList<>();
for (int j = 0; j < numPorts; j++) {
ports.add(j);
}
@@ -97,7 +97,7 @@ public class TestUtilsForBlacklistScheduler {
}
- public static TopologyDetails getTopology(String name, Map config, int numSpout, int numBolt,
+ public static TopologyDetails getTopology(String name, Map<String, Object> config, int numSpout, int numBolt,
int spoutParallelism, int boltParallelism, int launchTime, boolean blacklistEnable) {
Config conf = new Config();
@@ -110,7 +110,7 @@ public class TestUtilsForBlacklistScheduler {
}
public static Map<ExecutorDetails, String> genExecsAndComps(StormTopology topology, int spoutParallelism, int boltParallelism) {
- Map<ExecutorDetails, String> retMap = new HashMap<ExecutorDetails, String>();
+ Map<ExecutorDetails, String> retMap = new HashMap<>();
int startTask = 0;
int endTask = 1;
for (Map.Entry<String, SpoutSpec> entry : topology.get_spouts().entrySet()) {
@@ -166,7 +166,7 @@ public class TestUtilsForBlacklistScheduler {
_isDistributed = isDistributed;
}
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
_collector = collector;
}
@@ -194,7 +194,7 @@ public class TestUtilsForBlacklistScheduler {
@Override
public Map<String, Object> getComponentConfiguration() {
if (!_isDistributed) {
- Map<String, Object> ret = new HashMap<String, Object>();
+ Map<String, Object> ret = new HashMap<>();
ret.put(Config.TOPOLOGY_MAX_TASK_PARALLELISM, 1);
return ret;
} else {
@@ -207,7 +207,7 @@ public class TestUtilsForBlacklistScheduler {
OutputCollector _collector;
@Override
- public void prepare(Map conf, TopologyContext context,
+ public void prepare(Map<String, Object> conf, TopologyContext context,
OutputCollector collector) {
_collector = collector;
}
@@ -225,7 +225,7 @@ public class TestUtilsForBlacklistScheduler {
public static class INimbusTest implements INimbus {
@Override
- public void prepare(Map stormConf, String schedulerLocalDir) {
+ public void prepare(Map<String, Object> stormConf, String schedulerLocalDir) {
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-server/src/test/java/org/apache/storm/scheduler/utils/ArtifactoryConfigLoaderTest.java
----------------------------------------------------------------------
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 f026f1d..60f8701 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<String, String> getDataMap = new HashMap<String, String>();
+ HashMap<String, String> getDataMap = new HashMap<>();
- public ArtifactoryConfigLoaderMock(Map conf) {
+ public ArtifactoryConfigLoaderMock(Map<String, Object> conf) {
super(conf);
}
@@ -84,7 +84,7 @@ public class ArtifactoryConfigLoaderTest {
public void testInvalidConfig() {
Config conf = new Config();
ArtifactoryConfigLoaderMock loaderMock = new ArtifactoryConfigLoaderMock(conf);
- Map ret = loaderMock.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS);
+ Map<String, Object> ret = loaderMock.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS);
Assert.assertNull("Unexpectedly returned not null", ret);
}
@@ -101,7 +101,7 @@ public class ArtifactoryConfigLoaderTest {
"{\"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<String, Object> 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 class ArtifactoryConfigLoaderTest {
// 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<String, Object> 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 class ArtifactoryConfigLoaderTest {
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<String, Object> 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 class ArtifactoryConfigLoaderTest {
// 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<String, Object> 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 class ArtifactoryConfigLoaderTest {
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<String, Object> 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 class ArtifactoryConfigLoaderTest {
// 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<String, Object> 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 class ArtifactoryConfigLoaderTest {
loaderMock.setData("Anything", "/location/of/this/artifact", "{ \"downloadUri\": \"anything\"}");
loaderMock.setData(null, null, "ThisIsNotValidYaml");
- Map ret = loaderMock.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS);
+ Map<String, Object> ret = loaderMock.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS);
Assert.assertNull("Unexpectedly returned a map", ret);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-server/src/test/java/org/apache/storm/scheduler/utils/FileConfigLoaderTest.java
----------------------------------------------------------------------
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 33df1a1..2c711dc 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 class FileConfigLoaderTest {
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<String, Object> result = testLoader.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS);
Assert.assertNull("Unexpectedly returned a map", result);
}
@@ -50,7 +50,7 @@ public class FileConfigLoaderTest {
public void testInvalidConfig() throws Exception {
Config conf = new Config();
FileConfigLoader testLoader = new FileConfigLoader(conf);
- Map result = testLoader.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS);
+ Map<String, Object> result = testLoader.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS);
Assert.assertNull("Unexpectedly returned a map", result);
}
@@ -70,7 +70,7 @@ public class FileConfigLoaderTest {
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<String, Object> result = testLoader.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS);
Assert.assertNull("Unexpectedly returned a map", result);
}
@@ -80,7 +80,7 @@ public class FileConfigLoaderTest {
File temp = File.createTempFile("FileLoader", ".yaml");
temp.deleteOnExit();
- Map<String, Integer> testMap = new HashMap<String, Integer>();
+ Map<String, Integer> testMap = new HashMap<>();
testMap.put("a", 1);
testMap.put("b", 2);
testMap.put("c", 3);
@@ -100,7 +100,7 @@ public class FileConfigLoaderTest {
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<String, Object> result = loader.load(DaemonConfig.MULTITENANT_SCHEDULER_USER_POOLS);
Assert.assertNotNull("Unexpectedly returned null", result);
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/webapp/LogviewerResource.java
----------------------------------------------------------------------
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 2e63013..b46c6a9 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 class LogviewerResource {
startFileOffset, startByteOffset, BooleanUtils.toBooleanObject(searchArchived), callback, origin);
}
- private int parseIntegerFromMap(Map map, String parameterKey) throws InvalidRequestException {
+ private int parseIntegerFromMap(Map<String, String[]> 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);
[4/5] storm git commit: removed unnecessary
@SuppressWarnings(rawtypes) annotations after adding generics to static types
of method parameters and variables
Posted by da...@apache.org.
removed unnecessary @SuppressWarnings(rawtypes) annotations after adding generics to static types of method parameters and variables
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1582024e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1582024e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1582024e
Branch: refs/heads/master
Commit: 1582024efc88a2d0b7da189774c380c01ac59683
Parents: c7394d1
Author: Karl-Philipp Richter <kr...@aol.de>
Authored: Mon Mar 19 21:16:50 2018 +0100
Committer: Karl-Philipp Richter <kr...@aol.de>
Committed: Mon Mar 19 21:25:35 2018 +0100
----------------------------------------------------------------------
.../java/org/apache/storm/hbase/topology/TotalWordCounter.java | 1 -
.../main/java/org/apache/storm/hbase/topology/WordCounter.java | 1 -
.../main/java/org/apache/storm/hbase/topology/WordSpout.java | 1 -
.../src/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 -
.../main/java/org/apache/storm/mongodb/topology/WordSpout.java | 1 -
.../main/java/org/apache/storm/redis/topology/WordCounter.java | 1 -
.../main/java/org/apache/storm/redis/topology/WordSpout.java | 1 -
.../jvm/org/apache/storm/starter/bolt/RollingCountAggBolt.java | 1 -
.../jvm/org/apache/storm/starter/bolt/RollingCountBolt.java | 1 -
.../main/java/org/apache/storm/hbase/bolt/HBaseLookupBolt.java | 1 -
.../java/org/apache/storm/jms/trident/TridentJmsSpout.java | 6 +++---
.../apache/storm/redis/trident/state/RedisClusterMapState.java | 2 +-
.../apache/storm/redis/trident/state/RedisClusterState.java | 2 +-
.../org/apache/storm/redis/trident/state/RedisMapState.java | 2 +-
.../java/org/apache/storm/redis/trident/state/RedisState.java | 2 +-
.../org/apache/storm/flux/examples/StatefulWordCounter.java | 1 -
.../main/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 --
storm-client/src/jvm/org/apache/storm/metric/SystemBolt.java | 2 +-
storm-server/src/main/java/org/apache/storm/Testing.java | 1 -
.../src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java | 2 +-
.../storm/scheduler/multitenant/MultitenantScheduler.java | 1 -
27 files changed, 9 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/1582024e/examples/storm-hbase-examples/src/main/java/org/apache/storm/hbase/topology/TotalWordCounter.java
----------------------------------------------------------------------
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 aa28a52..c107282 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<String, Object> topoConf, TopologyContext context) {
}
http://git-wip-us.apache.org/repos/asf/storm/blob/1582024e/examples/storm-hbase-examples/src/main/java/org/apache/storm/hbase/topology/WordCounter.java
----------------------------------------------------------------------
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 6054699..5c71ade 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 @@ import static org.apache.storm.utils.Utils.tuple;
public class WordCounter implements IBasicBolt {
- @SuppressWarnings("rawtypes")
public void prepare(Map<String, Object> topoConf, TopologyContext context) {
}
http://git-wip-us.apache.org/repos/asf/storm/blob/1582024e/examples/storm-hbase-examples/src/main/java/org/apache/storm/hbase/topology/WordSpout.java
----------------------------------------------------------------------
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 00ac67d..bcc9642 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 class WordSpout implements IRichSpout {
return this.isDistributed;
}
- @SuppressWarnings("rawtypes")
public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/1582024e/examples/storm-jdbc-examples/src/main/java/org/apache/storm/jdbc/spout/UserSpout.java
----------------------------------------------------------------------
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 f05f79a..9641599 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 class UserSpout implements IRichSpout {
return this.isDistributed;
}
- @SuppressWarnings("rawtypes")
public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/1582024e/examples/storm-jms-examples/src/main/java/org/apache/storm/jms/example/GenericBolt.java
----------------------------------------------------------------------
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 be6afb0..0b077c0 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 class GenericBolt extends BaseRichBolt {
this(name, autoAck, autoAnchor, null);
}
- @SuppressWarnings("rawtypes")
public void prepare(Map<String, Object> topoConf, TopologyContext context,
OutputCollector collector) {
this.collector = collector;
http://git-wip-us.apache.org/repos/asf/storm/blob/1582024e/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/TotalWordCounter.java
----------------------------------------------------------------------
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 3827e77..4dee7a0 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<String, Object> topoConf, TopologyContext context) {
}
http://git-wip-us.apache.org/repos/asf/storm/blob/1582024e/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/WordSpout.java
----------------------------------------------------------------------
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 086ac2f..f0bdde2 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 class WordSpout implements IRichSpout {
return this.isDistributed;
}
- @SuppressWarnings("rawtypes")
public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/1582024e/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WordCounter.java
----------------------------------------------------------------------
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 6c6e67a..c321b83 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 @@ import java.util.Map;
public class WordCounter implements IBasicBolt {
private Map<String, Integer> wordCounter = Maps.newHashMap();
- @SuppressWarnings("rawtypes")
public void prepare(Map<String, Object> topoConf, TopologyContext context) {
}
http://git-wip-us.apache.org/repos/asf/storm/blob/1582024e/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WordSpout.java
----------------------------------------------------------------------
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 76b2887..ef45cd2 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 class WordSpout implements IRichSpout {
return this.isDistributed;
}
- @SuppressWarnings("rawtypes")
public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/1582024e/examples/storm-starter/src/jvm/org/apache/storm/starter/bolt/RollingCountAggBolt.java
----------------------------------------------------------------------
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 e292308..fafdbcc 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<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
this.collector = collector;
http://git-wip-us.apache.org/repos/asf/storm/blob/1582024e/examples/storm-starter/src/jvm/org/apache/storm/starter/bolt/RollingCountBolt.java
----------------------------------------------------------------------
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 e7e72b1..b7ea55e 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 @@ public class RollingCountBolt extends BaseRichBolt {
return windowLengthInSeconds / windowUpdateFrequencyInSeconds;
}
- @SuppressWarnings("rawtypes")
@Override
public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
this.collector = collector;
http://git-wip-us.apache.org/repos/asf/storm/blob/1582024e/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseLookupBolt.java
----------------------------------------------------------------------
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 0212646..d20aab3 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 class HBaseLookupBolt extends AbstractHBaseBolt {
return this;
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void prepare(Map<String, Object> config, TopologyContext topologyContext, OutputCollector collector) {
super.prepare(config, topologyContext, collector);
http://git-wip-us.apache.org/repos/asf/storm/blob/1582024e/external/storm-jms/src/main/java/org/apache/storm/jms/trident/TridentJmsSpout.java
----------------------------------------------------------------------
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 31f4d0d..afdc0b2 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 @@ public class TridentJmsSpout implements ITridentSpout<JmsBatch> {
@Override
public ITridentSpout.BatchCoordinator<JmsBatch> getCoordinator(
- String txStateId, @SuppressWarnings("rawtypes") Map<String, Object> conf, TopologyContext context) {
+ String txStateId, Map<String, Object> conf, TopologyContext context) {
return new JmsBatchCoordinator(name);
}
@Override
- public Emitter<JmsBatch> getEmitter(String txStateId, @SuppressWarnings("rawtypes") Map<String, Object> conf, TopologyContext context) {
+ public Emitter<JmsBatch> getEmitter(String txStateId, Map<String, Object> conf, TopologyContext context) {
return new JmsEmitter(name, jmsProvider, tupleProducer, jmsAcknowledgeMode, conf);
}
@@ -210,7 +210,7 @@ public class TridentJmsSpout implements ITridentSpout<JmsBatch> {
private final Logger LOG = LoggerFactory.getLogger(JmsEmitter.class);
- public JmsEmitter(String name, JmsProvider jmsProvider, JmsTupleProducer tupleProducer, int jmsAcknowledgeMode, @SuppressWarnings("rawtypes") Map<String, Object> conf) {
+ public JmsEmitter(String name, JmsProvider jmsProvider, JmsTupleProducer tupleProducer, int jmsAcknowledgeMode, Map<String, Object> conf) {
if (jmsProvider == null) {
throw new IllegalStateException("JMS provider has not been set.");
}
http://git-wip-us.apache.org/repos/asf/storm/blob/1582024e/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterMapState.java
----------------------------------------------------------------------
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 3744bd5..ecae18d 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 class RedisClusterMapState<T> extends AbstractRedisMapState<T> {
* {@inheritDoc}
*/
@Override
- public State makeState(@SuppressWarnings("rawtypes") Map<String, Object> conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
+ public State makeState(Map<String, Object> conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
JedisCluster jedisCluster = new JedisCluster(jedisClusterConfig.getNodes(),
jedisClusterConfig.getTimeout(),
jedisClusterConfig.getTimeout(),
http://git-wip-us.apache.org/repos/asf/storm/blob/1582024e/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterState.java
----------------------------------------------------------------------
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 6d0ed3e..11d8907 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 class RedisClusterState implements State {
* {@inheritDoc}
*/
@Override
- public State makeState(@SuppressWarnings("rawtypes") Map<String, Object> conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
+ public State makeState(Map<String, Object> conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
JedisCluster jedisCluster = new JedisCluster(jedisClusterConfig.getNodes(),
jedisClusterConfig.getTimeout(),
jedisClusterConfig.getTimeout(),
http://git-wip-us.apache.org/repos/asf/storm/blob/1582024e/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisMapState.java
----------------------------------------------------------------------
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 21a40bd..f68b5ef 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 class RedisMapState<T> extends AbstractRedisMapState<T> {
* {@inheritDoc}
*/
@Override
- public State makeState(@SuppressWarnings("rawtypes") Map<String, Object> conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
+ public State makeState(Map<String, Object> conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
JedisPool jedisPool = new JedisPool(DEFAULT_POOL_CONFIG,
jedisPoolConfig.getHost(),
jedisPoolConfig.getPort(),
http://git-wip-us.apache.org/repos/asf/storm/blob/1582024e/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisState.java
----------------------------------------------------------------------
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 c6a6da3..ec0b679 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 class RedisState implements State {
* {@inheritDoc}
*/
@Override
- public State makeState(@SuppressWarnings("rawtypes") Map<String, Object> conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
+ public State makeState(Map<String, Object> conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
JedisPool jedisPool = new JedisPool(DEFAULT_POOL_CONFIG,
jedisPoolConfig.getHost(),
jedisPoolConfig.getPort(),
http://git-wip-us.apache.org/repos/asf/storm/blob/1582024e/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/StatefulWordCounter.java
----------------------------------------------------------------------
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 f1f4a6c..aa36af9 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<KeyValueState<String,
private KeyValueState<String, Long> wordCounts;
private OutputCollector collector;
- @SuppressWarnings("rawtypes")
@Override
public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
this.collector = collector;
http://git-wip-us.apache.org/repos/asf/storm/blob/1582024e/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/WordCounter.java
----------------------------------------------------------------------
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 f15af95..709c254 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<String, Object> topoConf, TopologyContext context) {
}
http://git-wip-us.apache.org/repos/asf/storm/blob/1582024e/storm-client/src/jvm/org/apache/storm/messaging/local/Context.java
----------------------------------------------------------------------
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 0babd5f..75fc899 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 @@ public class Context implements IContext {
return ret;
}
- @SuppressWarnings("rawtypes")
@Override
public void prepare(Map<String, Object> topoConf) {
//NOOP
@@ -249,7 +248,6 @@ public class Context implements IContext {
return new LocalClient(getLocalServer(storm_id, port));
}
- @SuppressWarnings("rawtypes")
@Override
public void term() {
//NOOP
http://git-wip-us.apache.org/repos/asf/storm/blob/1582024e/storm-client/src/jvm/org/apache/storm/messaging/netty/Client.java
----------------------------------------------------------------------
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 e0736b5..bbcfb43 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<String, Object> topoConf, AtomicBoolean[] remoteBpStatus, ChannelFactory factory, HashedWheelTimer scheduler, String host, int port, Context context) {
this.topoConf = topoConf;
closing = false;
http://git-wip-us.apache.org/repos/asf/storm/blob/1582024e/storm-client/src/jvm/org/apache/storm/messaging/netty/Context.java
----------------------------------------------------------------------
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 5a169de..82ebc26 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.IConnection;
import org.apache.storm.messaging.IContext;
public class Context implements IContext {
- @SuppressWarnings("rawtypes")
private Map<String, Object> topoConf;
private Map<String, IConnection> connections;
private NioClientSocketChannelFactory clientChannelFactory;
@@ -40,7 +39,6 @@ public class Context implements IContext {
/**
* initialization per Storm configuration
*/
- @SuppressWarnings("rawtypes")
public void prepare(Map<String, Object> topoConf) {
this.topoConf = topoConf;
connections = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/storm/blob/1582024e/storm-client/src/jvm/org/apache/storm/messaging/netty/Server.java
----------------------------------------------------------------------
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 0901cc3..9f16b8d 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 @@ import org.slf4j.LoggerFactory;
class Server extends ConnectionWithStatus implements IStatefulObject, ISaslServer {
private static final Logger LOG = LoggerFactory.getLogger(Server.class);
- @SuppressWarnings("rawtypes")
Map<String, Object> topoConf;
int port;
private final ConcurrentHashMap<String, AtomicInteger> messagesEnqueued = new ConcurrentHashMap<>();
@@ -70,7 +69,6 @@ class Server extends ConnectionWithStatus implements IStatefulObject, ISaslServe
private Supplier<Object> newConnectionResponse;
private final int boundPort;
- @SuppressWarnings("rawtypes")
Server(Map<String, Object> topoConf, int port) {
this.topoConf = topoConf;
this.port = port;
http://git-wip-us.apache.org/repos/asf/storm/blob/1582024e/storm-client/src/jvm/org/apache/storm/metric/SystemBolt.java
----------------------------------------------------------------------
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 67be2c9..629a60e 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 class SystemBolt implements IBolt {
}
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
+ @SuppressWarnings({ "unchecked" })
@Override
public void prepare(final Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
if(_prepareWasCalled && !"local".equals(topoConf.get(Config.STORM_CLUSTER_MODE))) {
http://git-wip-us.apache.org/repos/asf/storm/blob/1582024e/storm-server/src/main/java/org/apache/storm/Testing.java
----------------------------------------------------------------------
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 1d3758f..c391926 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 class Testing {
return ret;
}
- @SuppressWarnings("rawtypes")
private static void printRec(Object o, String prefix) {
if (o instanceof Collection) {
LOG.info("{} {} ({}) [",prefix,o, o.getClass());
http://git-wip-us.apache.org/repos/asf/storm/blob/1582024e/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
----------------------------------------------------------------------
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 9f4336e..f5d08ec 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 class Nimbus implements Iface, Shutdownable, DaemonCommon {
public static class StandaloneINimbus implements INimbus {
@Override
- public void prepare(@SuppressWarnings("rawtypes") Map<String, Object> topoConf, String schedulerLocalDir) {
+ public void prepare(Map<String, Object> topoConf, String schedulerLocalDir) {
//NOOP
}
http://git-wip-us.apache.org/repos/asf/storm/blob/1582024e/storm-server/src/main/java/org/apache/storm/scheduler/multitenant/MultitenantScheduler.java
----------------------------------------------------------------------
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 d4d240c..65c657e 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 @@ import org.slf4j.LoggerFactory;
public class MultitenantScheduler implements IScheduler {
private static final Logger LOG = LoggerFactory.getLogger(MultitenantScheduler.class);
- @SuppressWarnings("rawtypes")
private Map<String, Object> conf;
protected IConfigLoader configLoader;
[3/5] storm git commit: avoiding rawtypes in configuration and
metadata Maps in order to allow usage without @SuppressWarnings("rawtypes")
and early detection of design flaws
Posted by da...@apache.org.
avoiding rawtypes in configuration and metadata Maps in order to allow usage without @SuppressWarnings("rawtypes") and early detection of design flaws
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c7394d12
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c7394d12
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c7394d12
Branch: refs/heads/master
Commit: c7394d12ba9c705d8004396ab67cb3ae47d4aeee
Parents: ffa607e
Author: Karl-Philipp Richter <kr...@aol.de>
Authored: Tue Mar 13 13:52:09 2018 +0100
Committer: Karl-Philipp Richter <kr...@aol.de>
Committed: Mon Mar 19 18:13:53 2018 +0100
----------------------------------------------------------------------
.../storm/hdfs/spout/HdfsSpoutTopology.java | 2 +-
.../storm/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 +++----
.../apache/storm/hbase/security/AutoHBase.java | 2 +-
.../storm/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 +-
.../trident/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 +-
.../eventhubs/spout/BinaryEventDataScheme.java | 4 +--
.../storm/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 +-
.../eventhubs/spout/SimplePartitionManager.java | 2 +-
.../TransactionalTridentEventHubEmitter.java | 10 +++---
.../TransactionalTridentEventHubSpout.java | 4 +--
.../eventhubs/samples/bolt/GlobalCountBolt.java | 2 +-
.../eventhubs/spout/EventHubReceiverMock.java | 2 +-
.../TestTransactionalTridentEmitter.java | 6 ++--
.../org/apache/storm/hbase/bolt/HBaseBolt.java | 2 +-
.../hbase/state/HBaseKeyValueStateProvider.java | 4 +--
.../hbase/trident/state/HBaseMapState.java | 2 +-
.../storm/hbase/trident/state/HBaseState.java | 4 +--
.../hbase/trident/state/HBaseStateFactory.java | 2 +-
.../apache/storm/hdfs/spout/TestHdfsSpout.java | 4 +--
.../storm/jdbc/bolt/AbstractJdbcBolt.java | 2 +-
.../apache/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 +-
.../jvm/org/apache/storm/kafka/KafkaSpout.java | 2 +-
.../apache/storm/kafka/PartitionManager.java | 2 +-
.../src/jvm/org/apache/storm/kafka/ZkState.java | 7 ++--
.../kafka/trident/OpaqueTridentKafkaSpout.java | 15 ++++++--
.../kafka/trident/TridentKafkaEmitter.java | 37 ++++++++++++--------
.../apache/storm/kafka/ZkCoordinatorTest.java | 4 +--
.../mongodb/trident/state/MongoMapState.java | 4 +--
.../storm/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 +-
.../org/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 +--
.../org/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 +++++-----
.../apache/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 ++--
.../jvm/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 +--
.../storm/security/auth/FixedGroupsMapping.java | 2 +-
.../auth/authorizer/DRPCAuthorizerBase.java | 6 ++--
.../authorizer/DRPCSimpleACLAuthorizer.java | 6 ++--
.../serialization/types/HashMapSerializer.java | 4 +--
.../jvm/org/apache/storm/stats/CommonStats.java | 4 +--
.../storm/task/GeneralTopologyContext.java | 2 +-
.../storm/testing/NonRichBoltTracker.java | 2 +-
.../org/apache/storm/testing/SpoutTracker.java | 6 ++--
.../apache/storm/topology/TopologyBuilder.java | 4 +--
.../state/TestTransactionalState.java | 2 +-
.../transactional/state/TransactionalState.java | 8 ++---
.../apache/storm/trident/TridentTopology.java | 12 +++----
.../trident/drpc/ReturnResultsReducer.java | 4 +--
.../topology/state/TransactionalState.java | 8 +++--
.../jvm/org/apache/storm/utils/ConfigUtils.java | 4 +--
.../src/jvm/org/apache/storm/utils/JCQueue.java | 3 +-
.../org/apache/storm/utils/NimbusClient.java | 2 +-
.../src/jvm/org/apache/storm/utils/Utils.java | 11 +++---
.../apache/storm/zookeeper/ClientZookeeper.java | 8 ++---
.../DeserializingConnectionCallbackTest.java | 4 +--
.../apache/storm/security/auth/AutoSSLTest.java | 10 +++---
.../apache/storm/streams/ProcessorBoltTest.java | 3 +-
.../jvm/org/apache/storm/utils/UtilsTest.java | 12 +++----
.../apache/storm/command/UploadCredentials.java | 9 +++--
.../apache/storm/ui/FilterConfiguration.java | 10 +++---
.../src/jvm/org/apache/storm/ui/UIHelpers.java | 6 ++--
.../nimbus/InMemoryTopologyActionNotifier.java | 2 +-
.../storm/serialization/SerializationTest.java | 12 +++----
.../org/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 +-
.../storm/metricstore/rocksdb/RocksDbStore.java | 6 ++--
.../storm/nimbus/DefaultTopologyValidator.java | 4 ++-
.../nimbus/ITopologyActionNotifierPlugin.java | 2 +-
.../apache/storm/nimbus/ITopologyValidator.java | 4 ++-
.../storm/scheduler/DefaultScheduler.java | 2 +-
.../apache/storm/scheduler/EvenScheduler.java | 2 +-
.../org/apache/storm/scheduler/IScheduler.java | 2 +-
.../storm/scheduler/IsolationScheduler.java | 2 +-
.../scheduler/blacklist/BlacklistScheduler.java | 7 ++--
.../strategies/DefaultBlacklistStrategy.java | 2 +-
.../strategies/IBlacklistStrategy.java | 2 +-
.../multitenant/MultitenantScheduler.java | 6 ++--
.../resource/ResourceAwareScheduler.java | 4 +--
.../utils/ArtifactoryConfigLoader.java | 22 ++++++------
.../storm/scheduler/utils/FileConfigLoader.java | 6 ++--
.../org/apache/storm/utils/ServerUtils.java | 2 +-
.../scheduler/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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/spout/HdfsSpoutTopology.java
----------------------------------------------------------------------
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 a5d283e..943ca60 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 class HdfsSpoutTopology {
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<String, Object> clusterConf = Utils.readStormConfig();
StormSubmitter.submitTopologyWithProgressBar(topologyName, conf, builder.createTopology());
Nimbus.Iface client = NimbusClient.getConfiguredClient(clusterConf).getClient();
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/trident/TridentHiveTopology.java
----------------------------------------------------------------------
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 09bb331..f2e578e 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 class TridentHiveTopology {
}
@Override
- public Map getComponentConfiguration() {
+ public Map<String, Object> getComponentConfiguration() {
Config conf = new Config();
conf.setMaxTaskParallelism(1);
return conf;
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/examples/storm-jdbc-examples/src/main/java/org/apache/storm/jdbc/topology/AbstractUserTopology.java
----------------------------------------------------------------------
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 79ca987..492f7f0 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 abstract class AbstractUserTopology {
+ "<user> <password> [topology name]");
System.exit(-1);
}
- Map map = Maps.newHashMap();
+ Map<String, Object> 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
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/CaptureLoad.java
----------------------------------------------------------------------
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 5c1ef4e..68459e2 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 @@ public class CaptureLoad {
* @param topologyConf topology configuration
* @throws Exception on any error
*/
- public static void checkInitialization(Map<String, Double> topologyResources, String componentId, Map topologyConf) {
+ public static void checkInitialization(Map<String, Double> topologyResources, String componentId, Map<String, Object> topologyConf) {
StringBuilder msgBuilder = new StringBuilder();
for (String resourceName : topologyResources.keySet()) {
@@ -450,7 +450,7 @@ public class CaptureLoad {
}
}
- private static String checkInitResource(Map<String, Double> topologyResources, Map topologyConf, String resourceName) {
+ private static String checkInitResource(Map<String, Double> topologyResources, Map<String, Object> topologyConf, String resourceName) {
StringBuilder msgBuilder = new StringBuilder();
if (topologyResources.containsKey(resourceName)) {
Double resourceValue = (Double) topologyConf.getOrDefault(resourceName, null);
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/HttpForwardingMetricsServer.java
----------------------------------------------------------------------
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 247d017..ca8c501 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 @@ import org.eclipse.jetty.servlet.ServletHolder;
* A server that can listen for metrics from the HttpForwardingMetricsConsumer.
*/
public abstract class HttpForwardingMetricsServer {
- private Map conf;
+ private Map<String, Object> conf;
private Server server = null;
private int port = -1;
private String url = null;
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/ThroughputVsLatency.java
----------------------------------------------------------------------
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 3af5803..0cc5f41 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 class ThroughputVsLatency {
}
@Override
- public void prepare(Map stormConf, TopologyContext context) {
+ public void prepare(Map<String, Object> stormConf,
+ TopologyContext context) {
executorIndex = context.getThisTaskIndex();
sleep.prepare();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/examples/storm-perf/src/main/java/org/apache/storm/perf/LowThroughputTopo.java
----------------------------------------------------------------------
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 13488aa..5560780 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 class LowThroughputTopo {
}
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context,
+ SpoutOutputCollector collector) {
this.collector = collector;
}
@@ -133,7 +134,9 @@ public class LowThroughputTopo {
private OutputCollector collector;
@Override
- public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf,
+ TopologyContext context,
+ OutputCollector collector) {
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/examples/storm-perf/src/main/java/org/apache/storm/perf/SimplifiedWordCountTopo.java
----------------------------------------------------------------------
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 6d368a0..ea5be88 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<String, Object> config) {
final int spoutNum = Helper.getInt(config, SPOUT_NUM, DEFAULT_SPOUT_NUM);
final int cntBoltNum = Helper.getInt(config, BOLT_NUM, DEFAULT_COUNT_BOLT_NUM);
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/WordGenSpout.java
----------------------------------------------------------------------
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 92a2f53..b3195c1 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 class WordGenSpout extends BaseRichSpout {
}
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> 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 class WordGenSpout extends BaseRichSpout {
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<String> readWords(String file) {
ArrayList<String> lines = new ArrayList<>();
try {
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/Helper.java
----------------------------------------------------------------------
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 73bfdda..4429f4c 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 class Helper {
/** Kill topo on Ctrl-C */
public static void setupShutdownHook(final String topoName) {
- Map clusterConf = Utils.readStormConfig();
+ Map<String, Object> clusterConf = Utils.readStormConfig();
final Nimbus.Iface client = NimbusClient.getConfiguredClient(clusterConf).getClient();
Runtime.getRuntime().addShutdownHook(new Thread() {
public void run() {
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/examples/storm-starter/src/jvm/org/apache/storm/starter/FastWordCountTopology.java
----------------------------------------------------------------------
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 7c1cffd..e171557 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 class FastWordCountTopology {
conf.setNumWorkers(1);
StormSubmitter.submitTopologyWithProgressBar(name, conf, builder.createTopology());
- Map clusterConf = Utils.readStormConfig();
+ Map<String, Object> clusterConf = Utils.readStormConfig();
clusterConf.putAll(Utils.readCommandLineOpts());
Nimbus.Iface client = NimbusClient.getConfiguredClient(clusterConf).getClient();
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/examples/storm-starter/src/jvm/org/apache/storm/starter/InOrderDeliveryTest.java
----------------------------------------------------------------------
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 f725d14..e4a41e2 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 class InOrderDeliveryTest {
conf.setNumWorkers(1);
StormSubmitter.submitTopologyWithProgressBar(name, conf, builder.createTopology());
- Map clusterConf = Utils.readStormConfig();
+ Map<String, Object> clusterConf = Utils.readStormConfig();
clusterConf.putAll(Utils.readCommandLineOpts());
Nimbus.Iface client = NimbusClient.getConfiguredClient(clusterConf).getClient();
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/examples/storm-starter/src/jvm/org/apache/storm/starter/ResourceAwareExampleTopology.java
----------------------------------------------------------------------
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 861f4f5..07149e8 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 @@ public class ResourceAwareExampleTopology {
}
@Override
- public void prepare(Map conf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> conf, TopologyContext context, OutputCollector collector) {
_collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopAutoCreds.java
----------------------------------------------------------------------
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 2f62ee5..569f5af 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<String> configKeys = new HashSet<>();
@Override
- public void prepare(Map topoConf) {
+ public void prepare(Map<String, Object> topoConf) {
doPrepare(topoConf);
loadConfigKeys(topoConf);
}
@@ -83,7 +83,7 @@ public abstract class AbstractHadoopAutoCreds implements IAutoCredentials, Crede
*
* @param topoConf the topology conf
*/
- protected abstract void doPrepare(Map topoConf);
+ protected abstract void doPrepare(Map<String, Object> topoConf);
/**
* The lookup key for the config key string
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopNimbusPluginAutoCreds.java
----------------------------------------------------------------------
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 83e6d9b..dee337e 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<String, Object> conf) {
doPrepare(conf);
}
@@ -105,7 +105,7 @@ public abstract class AbstractHadoopNimbusPluginAutoCreds
*
* @param conf the storm cluster conf set via storm.yaml
*/
- protected abstract void doPrepare(Map conf);
+ protected abstract void doPrepare(Map<String, Object> conf);
/**
* The lookup key for the config key string
@@ -114,13 +114,13 @@ public abstract class AbstractHadoopNimbusPluginAutoCreds
*/
protected abstract String getConfigKeyString();
- protected abstract byte[] getHadoopCredentials(Map topologyConf, String configKey, final String topologyOwnerPrincipal);
+ protected abstract byte[] getHadoopCredentials(Map<String, Object> topologyConf, String configKey, final String topologyOwnerPrincipal);
- protected abstract byte[] getHadoopCredentials(Map topologyConf, final String topologyOwnerPrincipal);
+ protected abstract byte[] getHadoopCredentials(Map<String, Object> topologyConf, final String topologyOwnerPrincipal);
- protected abstract void doRenew(Map<String, String> credentials, Map topologyConf, final String topologyOwnerPrincipal);
+ protected abstract void doRenew(Map<String, String> credentials, Map<String, Object> topologyConf, final String topologyOwnerPrincipal);
- protected List<String> getConfigKeys(Map conf) {
+ protected List<String> getConfigKeys(Map<String, Object> conf) {
String configKeyString = getConfigKeyString();
List<String> configKeys = (List<String>) conf.get(configKeyString);
return configKeys != null ? configKeys : Collections.emptyList();
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBase.java
----------------------------------------------------------------------
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 5c3d0ce..e38a54a 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 @@ import static org.apache.storm.hbase.security.HBaseSecurityUtil.HBASE_CREDENTIAL
*/
public class AutoHBase extends AbstractHadoopAutoCreds {
@Override
- public void doPrepare(Map conf) {
+ public void doPrepare(Map<String, Object> conf) {
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBaseCommand.java
----------------------------------------------------------------------
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 e9e2a83..bd03ad9 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 @@ public final class AutoHBaseCommand {
@SuppressWarnings("unchecked")
public static void main(String[] args) throws Exception {
- Map conf = new HashMap();
+ Map<String, Object> 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
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/AutoHBaseNimbus.java
----------------------------------------------------------------------
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 bd1e03a..c9361b1 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<String, Object> conf) {
// we don't allow any cluster wide configuration
}
@@ -66,24 +66,24 @@ public class AutoHBaseNimbus extends AbstractHadoopNimbusPluginAutoCreds {
}
@Override
- protected byte[] getHadoopCredentials(Map conf, String configKey, final String topologyOwnerPrincipal) {
+ protected byte[] getHadoopCredentials(Map<String, Object> 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<String, Object> conf, final String topologyOwnerPrincipal) {
return getHadoopCredentials(conf, HBaseConfiguration.create(), topologyOwnerPrincipal);
}
- private Configuration getHadoopConfiguration(Map topoConf, String configKey) {
+ private Configuration getHadoopConfiguration(Map<String, Object> 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<String, Object> conf, Configuration hbaseConf, final String topologySubmitterUser) {
try {
if(UserGroupInformation.isSecurityEnabled()) {
UserProvider provider = UserProvider.instantiate(hbaseConf);
@@ -128,7 +128,7 @@ public class AutoHBaseNimbus extends AbstractHadoopNimbusPluginAutoCreds {
}
@Override
- public void doRenew(Map<String, String> credentials, Map topologyConf, final String topologySubmitterUser) {
+ public void doRenew(Map<String, String> credentials, Map<String, Object> topologyConf, final String topologySubmitterUser) {
//HBASE tokens are not renewable so we always have to get new ones.
populateCredentials(credentials, topologyConf, topologySubmitterUser);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/AutoHDFS.java
----------------------------------------------------------------------
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 1af47d8..6797db4 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 @@ import static org.apache.storm.hdfs.security.HdfsSecurityUtil.HDFS_CREDENTIALS;
*/
public class AutoHDFS extends AbstractHadoopAutoCreds {
@Override
- public void doPrepare(Map conf) {
+ public void doPrepare(Map<String, Object> conf) {
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/AutoHDFSCommand.java
----------------------------------------------------------------------
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 5f56d61..4a6a9a4 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 @@ public final class AutoHDFSCommand {
@SuppressWarnings("unchecked")
public static void main(String[] args) throws Exception {
- Map conf = new HashMap();
+ Map<String, Object> 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
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/AutoHDFSNimbus.java
----------------------------------------------------------------------
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 99b4ba8..aab16a9 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<String, Object> 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 class AutoHDFSNimbus extends AbstractHadoopNimbusPluginAutoCreds {
}
@Override
- protected byte[] getHadoopCredentials(Map conf, String configKey, final String topologyOwnerPrincipal) {
+ protected byte[] getHadoopCredentials(Map<String, Object> 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<String, Object> conf, final String topologyOwnerPrincipal) {
return getHadoopCredentials(conf, new Configuration(), topologyOwnerPrincipal);
}
- private Configuration getHadoopConfiguration(Map topoConf, String configKey) {
+ private Configuration getHadoopConfiguration(Map<String, Object> 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<String, Object> conf, final Configuration configuration, final String topologySubmitterUser) {
try {
if(UserGroupInformation.isSecurityEnabled()) {
login(configuration);
@@ -144,8 +144,7 @@ public class AutoHDFSNimbus extends AbstractHadoopNimbusPluginAutoCreds {
* {@inheritDoc}
*/
@Override
- @SuppressWarnings("unchecked")
- public void doRenew(Map<String, String> credentials, Map topologyConf, final String topologyOwnerPrincipal) {
+ public void doRenew(Map<String, String> credentials, Map<String, Object> topologyConf, final String topologyOwnerPrincipal) {
List<String> confKeys = getConfigKeys(topologyConf);
for (Pair<String, Credentials> cred : getCredentials(credentials, confKeys)) {
try {
@@ -153,7 +152,7 @@ public class AutoHDFSNimbus extends AbstractHadoopNimbusPluginAutoCreds {
Collection<Token<? extends TokenIdentifier>> tokens = cred.getSecond().getAllTokens();
if (tokens != null && !tokens.isEmpty()) {
- for (Token token : tokens) {
+ for (Token<? extends TokenIdentifier> 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);
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/HdfsSecurityUtil.java
----------------------------------------------------------------------
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 10c377e..c5a3f0f 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<String, Object> 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())) &&
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-autocreds/src/main/java/org/apache/storm/hive/security/AutoHive.java
----------------------------------------------------------------------
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 6010dd1..2160753 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 @@ import static org.apache.storm.hive.security.HiveSecurityUtil.HIVE_CREDENTIALS_C
*/
public class AutoHive extends AbstractHadoopAutoCreds {
@Override
- public void doPrepare(Map conf) {
+ public void doPrepare(Map<String, Object> conf) {
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-autocreds/src/main/java/org/apache/storm/hive/security/AutoHiveCommand.java
----------------------------------------------------------------------
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 9009a53..dcd99ae 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 @@ public final class AutoHiveCommand {
@SuppressWarnings("unchecked")
public static void main(String[] args) throws Exception {
- Map conf = new HashMap();
+ Map<String, Object> 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"
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-autocreds/src/main/java/org/apache/storm/hive/security/AutoHiveNimbus.java
----------------------------------------------------------------------
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 b60e15a..9854b69 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<String, Object> 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 class AutoHiveNimbus extends AbstractHadoopNimbusPluginAutoCreds {
}
@Override
- protected byte[] getHadoopCredentials(Map conf, String configKey, final String topologyOwnerPrincipal) {
+ protected byte[] getHadoopCredentials(Map<String, Object> 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<String, Object> conf, final String topologyOwnerPrincipal) {
Configuration configuration = new Configuration();
return getHadoopCredentials(conf, configuration, topologyOwnerPrincipal);
}
- private Configuration getHadoopConfiguration(Map topoConf, String configKey) {
+ private Configuration getHadoopConfiguration(Map<String, Object> topoConf, String configKey) {
Configuration configuration = new Configuration();
fillHadoopConfiguration(topoConf, configKey, configuration);
return configuration;
@@ -107,7 +107,7 @@ public class AutoHiveNimbus extends AbstractHadoopNimbusPluginAutoCreds {
}
@SuppressWarnings("unchecked")
- protected byte[] getHadoopCredentials(Map conf, final Configuration configuration, final String topologySubmitterUser) {
+ protected byte[] getHadoopCredentials(Map<String, Object> conf, final Configuration configuration, final String topologySubmitterUser) {
try {
if (UserGroupInformation.isSecurityEnabled()) {
String hiveMetaStoreURI = getMetaStoreURI(configuration);
@@ -192,7 +192,7 @@ public class AutoHiveNimbus extends AbstractHadoopNimbusPluginAutoCreds {
}
@Override
- public void doRenew(Map<String, String> credentials, Map topologyConf, final String topologyOwnerPrincipal) {
+ public void doRenew(Map<String, String> credentials, Map<String, Object> topologyConf, final String topologyOwnerPrincipal) {
List<String> configKeys = getConfigKeys(topologyConf);
for (Pair<String, Credentials> cred : getCredentials(credentials, configKeys)) {
try {
@@ -204,7 +204,7 @@ public class AutoHiveNimbus extends AbstractHadoopNimbusPluginAutoCreds {
login(configuration);
if (tokens != null && !tokens.isEmpty()) {
- for (Token token : tokens) {
+ for (Token<? extends TokenIdentifier> token : tokens) {
long expiration = renewToken(token, hiveMetaStoreURI, hiveMetaStorePrincipal);
LOG.info("Hive delegation token renewed, new expiration time {}", expiration);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/ObjectMapperCqlStatementMapper.java
----------------------------------------------------------------------
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 d3841fb..fa9a348 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 class ObjectMapperCqlStatementMapper implements CQLStatementTupleMapper {
}
@Override
- public List<Statement> map(Map map, Session session, ITuple tuple) {
+ public List<Statement> map(Map<String, Object> map, Session session, ITuple tuple) {
final ObjectMapperOperation operation = (ObjectMapperOperation)tuple.getValueByField(operationField);
Preconditions.checkNotNull(operation, "Operation must not be null");
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraMapStateFactory.java
----------------------------------------------------------------------
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 ad05060..75f0d4f 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<String, Object> cassandraConfig;
- private CassandraMapStateFactory(StateType stateType, CassandraBackingMap.Options options, Map cassandraConfig) {
+ private CassandraMapStateFactory(StateType stateType, CassandraBackingMap.Options options, Map<String, Object> 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<String, Object> 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<String, Object> 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<String, Object> cassandraConfig) {
return new CassandraMapStateFactory(StateType.NON_TRANSACTIONAL, options, cassandraConfig);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/MapStateFactoryBuilder.java
----------------------------------------------------------------------
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 c371fdb..e36b7ef 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<T> {
private Integer maxParallelism;
private StateType stateType;
private StateMapper<T> stateMapper;
- private Map cassandraConfig;
+ private Map<String, Object> cassandraConfig;
private int cacheSize;
- public static <U> MapStateFactoryBuilder<OpaqueValue<U>> opaque(Map cassandraConf) {
+ public static <U> MapStateFactoryBuilder<OpaqueValue<U>> opaque(Map<String, Object> cassandraConf) {
return new MapStateFactoryBuilder<OpaqueValue<U>>()
.withStateType(StateType.OPAQUE)
.withCassandraConfig(cassandraConf);
}
- public static <U> MapStateFactoryBuilder<TransactionalValue<U>> transactional(Map cassandraConf) {
+ public static <U> MapStateFactoryBuilder<TransactionalValue<U>> transactional(Map<String, Object> cassandraConf) {
return new MapStateFactoryBuilder<TransactionalValue<U>>()
.withStateType(StateType.TRANSACTIONAL)
.withCassandraConfig(cassandraConf);
}
- public static <U> MapStateFactoryBuilder<U> nontransactional(Map cassandraConf) {
+ public static <U> MapStateFactoryBuilder<U> nontransactional(Map<String, Object> cassandraConf) {
return new MapStateFactoryBuilder<U>()
.withStateType(StateType.NON_TRANSACTIONAL)
.withCassandraConfig(cassandraConf);
@@ -145,7 +145,7 @@ public class MapStateFactoryBuilder<T> {
return this;
}
- protected MapStateFactoryBuilder<T> withCassandraConfig(Map cassandraConf) {
+ protected MapStateFactoryBuilder<T> withCassandraConfig(Map<String, Object> cassandraConf) {
this.cassandraConfig = cassandraConf;
return this;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/WeatherSpout.java
----------------------------------------------------------------------
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 6dc6c06..caf19ee 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 class WeatherSpout extends BaseRichSpout {
}
@Override
- public void open(Map map, TopologyContext topologyContext, SpoutOutputCollector spoutOutputCollector) {
+ public void open(Map<String, Object> map, TopologyContext topologyContext, SpoutOutputCollector spoutOutputCollector) {
this.spoutOutputCollector = spoutOutputCollector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/AbstractEsBolt.java
----------------------------------------------------------------------
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 42f20e6..a819f65 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 abstract class AbstractEsBolt extends BaseTickTupleAwareRichBolt {
}
@Override
- public void prepare(Map map, TopologyContext topologyContext, OutputCollector outputCollector) {
+ public void prepare(Map<String, Object> map, TopologyContext topologyContext, OutputCollector outputCollector) {
try {
this.collector = outputCollector;
synchronized (AbstractEsBolt.class) {
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexBolt.java
----------------------------------------------------------------------
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 1f3122b..9145a1b 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 class EsIndexBolt extends AbstractEsBolt {
}
@Override
- public void prepare(Map map, TopologyContext topologyContext, OutputCollector outputCollector) {
+ public void prepare(Map<String, Object> map, TopologyContext topologyContext, OutputCollector outputCollector) {
super.prepare(map, topologyContext, outputCollector);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsPercolateBolt.java
----------------------------------------------------------------------
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 4d969d5..ac9e07a 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 class EsPercolateBolt extends AbstractEsBolt {
}
@Override
- public void prepare(Map map, TopologyContext topologyContext, OutputCollector outputCollector) {
+ public void prepare(Map<String, Object> map, TopologyContext topologyContext, OutputCollector outputCollector) {
super.prepare(map, topologyContext, outputCollector);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/BinaryEventDataScheme.java
----------------------------------------------------------------------
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 5c767e8..bbd46ea 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 @@ public class BinaryEventDataScheme implements IEventDataScheme {
throw new RuntimeException(e);
}
}
- Map metaDataMap = eventData.getProperties();
- Map systemMetaDataMap = eventData.getSystemProperties();
+ Map<String, Object> metaDataMap = eventData.getProperties();
+ Map<String, Object> systemMetaDataMap = eventData.getSystemProperties();
fieldContents.add(messageData);
fieldContents.add(metaDataMap);
fieldContents.add(systemMetaDataMap);
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventDataScheme.java
----------------------------------------------------------------------
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 96bd6d0..f82ffe6 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 @@ public class EventDataScheme implements IEventDataScheme {
throw e;
}
}
- Map metaDataMap = eventData.getProperties();
- fieldContents.add(messageData);
+ Map<String, Object> metaDataMap = eventData.getProperties();
+ fieldContents.add(messageData);
fieldContents.add(metaDataMap);
return fieldContents;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubReceiverImpl.java
----------------------------------------------------------------------
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 4949024..459b9bc 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 class EventHubReceiverImpl implements IEventHubReceiver {
}
@Override
- public Map getMetricsData() {
- Map ret = new HashMap();
+ public Map<String, Object> getMetricsData() {
+ Map<String, Object> ret = new HashMap<>();
ret.put(partitionId + "/receiveApiLatencyMean", receiveApiLatencyMean.getValueAndReset());
ret.put(partitionId + "/receiveApiCallCount", receiveApiCallCount.getValueAndReset());
ret.put(partitionId + "/receiveMessageCount", receiveMessageCount.getValueAndReset());
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubSpout.java
----------------------------------------------------------------------
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 a7013ad..d8c3d09 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 class EventHubSpout extends BaseRichSpout {
context.registerMetric("EventHubReceiver", new IMetric() {
@Override
public Object getValueAndReset() {
- Map concatMetricsDataMaps = new HashMap();
+ Map<String, Object> concatMetricsDataMaps = new HashMap<>();
for (IPartitionManager partitionManager :
partitionCoordinator.getMyPartitionManagers()) {
concatMetricsDataMaps.putAll(partitionManager.getMetricsData());
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/IEventHubReceiver.java
----------------------------------------------------------------------
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 4ae78c5..c8de8bc 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<String, Object> getMetricsData();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/IPartitionManager.java
----------------------------------------------------------------------
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 845f508..123d1c1 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<String, Object> getMetricsData();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/SimplePartitionManager.java
----------------------------------------------------------------------
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 b76b342..25c4261 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 @@ public class SimplePartitionManager implements IPartitionManager {
}
@Override
- public Map getMetricsData() {
+ public Map<String, Object> getMetricsData() {
return receiver.getMetricsData();
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/TransactionalTridentEventHubEmitter.java
----------------------------------------------------------------------
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 b78fcd3..d3456e0 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 @@ import java.util.Map;
public class TransactionalTridentEventHubEmitter
- implements IPartitionedTridentSpout.Emitter<Partitions, Partition, Map> {
+ implements IPartitionedTridentSpout.Emitter<Partitions, Partition, Map<String, Object>> {
private static final Logger logger = LoggerFactory.getLogger(TransactionalTridentEventHubEmitter.class);
private final int batchSize;
private final EventHubSpoutConfig spoutConfig;
@@ -98,7 +98,7 @@ public class TransactionalTridentEventHubEmitter
@Override
public void emitPartitionBatch(TransactionAttempt attempt,
- TridentCollector collector, Partition partition, Map meta) {
+ TridentCollector collector, Partition partition, Map<String, Object> 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 class TransactionalTridentEventHubEmitter
}
@Override
- public Map emitPartitionBatchNew(TransactionAttempt attempt,
- TridentCollector collector, Partition partition, Map meta) {
+ public Map<String, Object> emitPartitionBatchNew(TransactionAttempt attempt,
+ TridentCollector collector, Partition partition, Map<String, Object> meta) {
ITridentPartitionManager pm = getOrCreatePartitionManager(partition);
String offset = FieldConstants.DefaultStartingOffset;
if(meta != null && meta.containsKey("nextOffset")) {
@@ -138,7 +138,7 @@ public class TransactionalTridentEventHubEmitter
}
//logger.info("emitted new batches: " + listEvents.size());
- Map newMeta = new HashMap();
+ Map<String, Object> newMeta = new HashMap<>();
newMeta.put("offset", offset);
newMeta.put("nextOffset", nextOffset);
newMeta.put("count", ""+listEvents.size());
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/TransactionalTridentEventHubSpout.java
----------------------------------------------------------------------
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 450fb3f..4d4de16 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 @@ import org.apache.storm.eventhubs.trident.Partition;
* Transactional Trident EventHub Spout
*/
public class TransactionalTridentEventHubSpout implements
- IPartitionedTridentSpout<Partitions, Partition, Map> {
+ IPartitionedTridentSpout<Partitions, Partition, Map<String, Object>> {
private static final long serialVersionUID = 1L;
private final IEventDataScheme scheme;
private final EventHubSpoutConfig spoutConfig;
@@ -53,7 +53,7 @@ public class TransactionalTridentEventHubSpout implements
}
@Override
- public IPartitionedTridentSpout.Emitter<Partitions, Partition, Map> getEmitter(
+ public IPartitionedTridentSpout.Emitter<Partitions, Partition, Map<String, Object>> getEmitter(
Map<String, Object> conf, TopologyContext context) {
return new TransactionalTridentEventHubEmitter(spoutConfig);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/samples/bolt/GlobalCountBolt.java
----------------------------------------------------------------------
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 285736e..4bed2e3 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 class GlobalCountBolt extends BaseBasicBolt {
long now = System.nanoTime();
long millis = (now - lastMetricsTime) / 1000000;
throughput = globalCountDiff / millis * 1000;
- Map values = new HashMap();
+ Map<String, Object> values = new HashMap<>();
values.put("global_count", globalCount);
values.put("throughput", throughput);
lastMetricsTime = now;
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/spout/EventHubReceiverMock.java
----------------------------------------------------------------------
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 7538d4b..09fb60f 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 class EventHubReceiverMock implements IEventHubReceiver {
}
@Override
- public Map getMetricsData() {
+ public Map<String, Object> getMetricsData() {
return null;
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/trident/TestTransactionalTridentEmitter.java
----------------------------------------------------------------------
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 03696a2..b6ce76a 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 class TestTransactionalTridentEmitter {
@Test
public void testEmitInSequence() {
//test the happy path, emit batches in sequence
- Map meta = emitter.emitPartitionBatchNew(null, collectorMock, partition, null);
+ Map<String, Object> 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 class TestTransactionalTridentEmitter {
@Test
public void testReEmit() {
//test we can re-emit the second batch
- Map meta = emitter.emitPartitionBatchNew(null, collectorMock, partition, null);
+ Map<String, Object> meta = emitter.emitPartitionBatchNew(null, collectorMock, partition, null);
collectorMock.clear();
//emit second batch
- Map meta1 = emitter.emitPartitionBatchNew(null, collectorMock, partition, meta);
+ Map<String, Object> meta1 = emitter.emitPartitionBatchNew(null, collectorMock, partition, meta);
String collected0 = collectorMock.getBuffer();
collectorMock.clear();
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java
----------------------------------------------------------------------
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 9263d18..bae7aeb 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 class HBaseBolt extends AbstractHBaseBolt {
}
@Override
- public void prepare(Map map, TopologyContext topologyContext, OutputCollector collector) {
+ public void prepare(Map<String, Object> map, TopologyContext topologyContext, OutputCollector collector) {
super.prepare(map, topologyContext, collector);
this.batchHelper = new BatchHelper(batchSize, collector);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-hbase/src/main/java/org/apache/storm/hbase/state/HBaseKeyValueStateProvider.java
----------------------------------------------------------------------
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 ce91086..763c387 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<String, Object> stormConf, TopologyContext context) {
try {
return getHBaseKeyValueState(namespace, stormConf, context, getStateConfig(stormConf));
} catch (Exception ex) {
@@ -81,7 +81,7 @@ public class HBaseKeyValueStateProvider implements StateProvider {
//heck for backward compatibility, we need to pass TOPOLOGY_AUTO_CREDENTIALS to hbase conf
//the conf instance is instance of persistentMap so making a copy.
- Map<String, Object> hbaseConfMap = new HashMap<String, Object>(conf);
+ Map<String, Object> hbaseConfMap = new HashMap<>(conf);
hbaseConfMap.put(Config.TOPOLOGY_AUTO_CREDENTIALS, stormConf.get(Config.TOPOLOGY_AUTO_CREDENTIALS));
HBaseClient hbaseClient = new HBaseClient(hbaseConfMap, hbConfig, config.tableName);
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseMapState.java
----------------------------------------------------------------------
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 36077fc..9dbcd80 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<T> implements IBackingMap<T> {
* @param map topology config map.
* @param partitionNum the number of partition.
*/
- public HBaseMapState(final Options<T> options, Map map, int partitionNum) {
+ public HBaseMapState(final Options<T> options, Map<String, Object> map, int partitionNum) {
this.options = options;
this.serializer = options.serializer;
this.partitionNum = partitionNum;
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseState.java
----------------------------------------------------------------------
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 b199514..7b32eae 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<String, Object> map;
private int numPartitions;
private int partitionIndex;
- protected HBaseState(Map map, int partitionIndex, int numPartitions, Options options) {
+ protected HBaseState(Map<String, Object> map, int partitionIndex, int numPartitions, Options options) {
this.options = options;
this.map = map;
this.partitionIndex = partitionIndex;
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseStateFactory.java
----------------------------------------------------------------------
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 e208ef3..08e9dc3 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 class HBaseStateFactory implements StateFactory {
}
@Override
- public State makeState(Map map, IMetricsContext iMetricsContext, int partitionIndex, int numPartitions) {
+ public State makeState(Map<String, Object> map, IMetricsContext iMetricsContext, int partitionIndex, int numPartitions) {
HBaseState state = new HBaseState(map , partitionIndex, numPartitions, options);
state.prepare();
return state;
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/spout/TestHdfsSpout.java
----------------------------------------------------------------------
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 b3909f3..67ccde6 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 @@ public class TestHdfsSpout {
return result;
}
- private Map getCommonConfigs() {
- Map<String, Object> topoConf = new HashMap();
+ private Map<String, Object> getCommonConfigs() {
+ Map<String, Object> topoConf = new HashMap<>();
topoConf.put(Config.TOPOLOGY_ACKER_EXECUTORS, "0");
return topoConf;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/AbstractJdbcBolt.java
----------------------------------------------------------------------
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 6258a97..9ae455c 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<String, Object> map, final TopologyContext topologyContext,
final OutputCollector outputCollector) {
this.collector = outputCollector;
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/JdbcInsertBolt.java
----------------------------------------------------------------------
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 dafef21..897ece0 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 class JdbcInsertBolt extends AbstractJdbcBolt {
}
@Override
- public void prepare(Map map, TopologyContext topologyContext, OutputCollector collector) {
+ public void prepare(Map<String, Object> 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.");
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcState.java
----------------------------------------------------------------------
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 814b20b..eabf011 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<String, Object> map, int partitionIndex, int numPartitions, Options options) {
this.options = options;
this.map = map;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcStateFactory.java
----------------------------------------------------------------------
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 0295748..abc169f 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 class JdbcStateFactory implements StateFactory {
}
@Override
- public State makeState(Map map, IMetricsContext iMetricsContext, int partitionIndex, int numPartitions) {
+ public State makeState(Map<String, Object> map, IMetricsContext iMetricsContext, int partitionIndex, int numPartitions) {
JdbcState state = new JdbcState(map , partitionIndex, numPartitions, options);
state.prepare();
return state;
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/common/JdbcClientTest.java
----------------------------------------------------------------------
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 e55700c..05f4f31 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<String, Object> 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
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-jms/src/main/java/org/apache/storm/jms/trident/JmsStateFactory.java
----------------------------------------------------------------------
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 9a02ba9..4123752 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 class JmsStateFactory implements StateFactory {
}
@Override
- public State makeState(Map map, IMetricsContext iMetricsContext, int partitionIndex, int numPartitions) {
+ public State makeState(Map<String, Object> map, IMetricsContext iMetricsContext, int partitionIndex, int numPartitions) {
JmsState state = new JmsState(options);
state.prepare();
return state;
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutBatchMetadataTest.java
----------------------------------------------------------------------
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 a15e415..e348ad3 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 class KafkaTridentSpoutBatchMetadataTest {
KafkaTridentSpoutBatchMetadata metadata = new KafkaTridentSpoutBatchMetadata(startOffset, endOffset);
Map<String, Object> map = metadata.toMap();
- Map deserializedMap = (Map)JSONValue.parseWithException(JSONValue.toJSONString(map));
+ Map<String, Object> deserializedMap = (Map)JSONValue.parseWithException(JSONValue.toJSONString(map));
KafkaTridentSpoutBatchMetadata deserializedMetadata = KafkaTridentSpoutBatchMetadata.fromMap(deserializedMap);
assertThat(deserializedMetadata.getFirstOffset(), is(metadata.getFirstOffset()));
assertThat(deserializedMetadata.getLastOffset(), is(metadata.getLastOffset()));
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaSpout.java
----------------------------------------------------------------------
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 79cde56..7b1243c 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 class KafkaSpout extends BaseRichSpout {
@Override
public Object getValueAndReset() {
List<PartitionManager> pms = _coordinator.getMyManagedPartitions();
- Map concatMetricsDataMaps = new HashMap();
+ Map<String, Object> concatMetricsDataMaps = new HashMap<>();
for (PartitionManager pm : pms) {
concatMetricsDataMaps.putAll(pm.getMetricsDataMap());
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java
----------------------------------------------------------------------
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 4b5f456..a9a18fd 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 class PartitionManager {
_messageIneligibleForRetryCount = new CountMetric();
}
- public Map getMetricsDataMap() {
+ public Map<String, Object> getMetricsDataMap() {
String metricPrefix = _partition.getId();
Map<String, Object> ret = new HashMap<>();
[2/5] storm git commit: avoiding rawtypes in configuration and
metadata Maps in order to allow usage without @SuppressWarnings("rawtypes")
and early detection of design flaws
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkState.java
----------------------------------------------------------------------
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 9f26479..7241c60 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<String, Object> stateConf)
+ throws Exception {
Integer port = (Integer) stateConf.get(Config.TRANSACTIONAL_ZOOKEEPER_PORT);
String serverPorts = "";
for (String server : (List<String>) stateConf.get(Config.TRANSACTIONAL_ZOOKEEPER_SERVERS)) {
@@ -54,8 +55,8 @@ public class ZkState {
return _curator;
}
- public ZkState(Map stateConf) {
- stateConf = new HashMap(stateConf);
+ public ZkState(Map<String, Object> stateConf) {
+ stateConf = new HashMap<>(stateConf);
try {
_curator = newCurator(stateConf);
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/OpaqueTridentKafkaSpout.java
----------------------------------------------------------------------
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 8a47ddc..c17c912 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.List;
import java.util.Map;
-public class OpaqueTridentKafkaSpout implements IOpaquePartitionedTridentSpout<List<GlobalPartitionInformation>, Partition, Map> {
+public class OpaqueTridentKafkaSpout
+ implements IOpaquePartitionedTridentSpout<
+ List<GlobalPartitionInformation>,
+ Partition,
+ Map<String, Object>> {
TridentKafkaConfig _config;
@@ -36,13 +40,18 @@ public class OpaqueTridentKafkaSpout implements IOpaquePartitionedTridentSpout<L
}
@Override
- public IOpaquePartitionedTridentSpout.Emitter<List<GlobalPartitionInformation>, Partition, Map> getEmitter(Map<String, Object> conf, TopologyContext context) {
+ public Emitter<List<GlobalPartitionInformation>,
+ Partition,
+ Map<String, Object>> getEmitter(Map<String, Object> conf,
+ TopologyContext context) {
return new TridentKafkaEmitter(conf, context, _config, context
.getStormId()).asOpaqueEmitter();
}
@Override
- public IOpaquePartitionedTridentSpout.Coordinator getCoordinator(Map<String, Object> conf, TopologyContext tc) {
+ public IOpaquePartitionedTridentSpout.Coordinator getCoordinator(
+ Map<String, Object> conf,
+ TopologyContext tc) {
return new org.apache.storm.kafka.trident.Coordinator(conf, _config);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/TridentKafkaEmitter.java
----------------------------------------------------------------------
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 1339387..3333c2c 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 class TridentKafkaEmitter {
}
- private Map failFastEmitNewPartitionBatch(TransactionAttempt attempt, TridentCollector collector, Partition partition, Map lastMeta) {
+ private Map<String, Object> failFastEmitNewPartitionBatch(
+ final TransactionAttempt attempt,
+ TridentCollector collector,
+ Partition partition,
+ Map<String, Object> lastMeta) {
SimpleConsumer consumer = _connections.register(partition);
- Map ret = doEmitNewPartitionBatch(consumer, partition, collector, lastMeta, attempt);
+ Map<String, Object> 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<String, Object> emitNewPartitionBatch(TransactionAttempt attempt, TridentCollector collector, Partition partition, Map<String, Object> lastMeta) {
try {
return failFastEmitNewPartitionBatch(attempt, collector, partition, lastMeta);
} catch (FailedFetchException e) {
@@ -90,7 +94,7 @@ public class TridentKafkaEmitter {
if (lastMeta == null) {
return null;
} else {
- Map ret = new HashMap();
+ Map<String, Object> ret = new HashMap<>();
ret.put("offset", lastMeta.get("nextOffset"));
ret.put("nextOffset", lastMeta.get("nextOffset"));
ret.put("partition", partition.partition);
@@ -102,12 +106,17 @@ public class TridentKafkaEmitter {
}
}
- private Map doEmitNewPartitionBatch(SimpleConsumer consumer, Partition partition, TridentCollector collector, Map lastMeta, TransactionAttempt attempt) {
+ private Map<String, Object> doEmitNewPartitionBatch(SimpleConsumer consumer,
+ Partition partition,
+ TridentCollector collector,
+ Map<String, Object> 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<String, Object> lastTopoMeta = (Map<String, Object>)
+ lastMeta.get("topology");
if (lastTopoMeta != null) {
lastInstanceId = (String) lastTopoMeta.get("id");
}
@@ -136,7 +145,7 @@ public class TridentKafkaEmitter {
emit(collector, msg.message(), partition, msg.offset(), attempt);
endoffset = msg.nextOffset();
}
- Map newMeta = new HashMap();
+ Map<String, Object> newMeta = new HashMap<>();
newMeta.put("offset", offset);
newMeta.put("nextOffset", endoffset);
newMeta.put("instanceId", _topologyInstanceId);
@@ -161,7 +170,7 @@ public class TridentKafkaEmitter {
/**
* 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<String, Object> meta) {
LOG.info("re-emitting batch, attempt " + attempt);
String instanceId = (String) meta.get("instanceId");
if (!_config.ignoreZkOffsets || instanceId.equals(_topologyInstanceId)) {
@@ -221,9 +230,9 @@ public class TridentKafkaEmitter {
}
- public IOpaquePartitionedTridentSpout.Emitter<List<GlobalPartitionInformation>, Partition, Map> asOpaqueEmitter() {
+ public IOpaquePartitionedTridentSpout.Emitter<List<GlobalPartitionInformation>, Partition, Map<String, Object>> asOpaqueEmitter() {
- return new IOpaquePartitionedTridentSpout.Emitter<List<GlobalPartitionInformation>, Partition, Map>() {
+ return new IOpaquePartitionedTridentSpout.Emitter<List<GlobalPartitionInformation>, Partition, Map<String, Object>>() {
/**
* Emit a batch of tuples for a partition/transaction.
@@ -232,7 +241,7 @@ public class TridentKafkaEmitter {
* for defining the parameters of the next batch.
*/
@Override
- public Map emitPartitionBatch(TransactionAttempt transactionAttempt, TridentCollector tridentCollector, Partition partition, Map map) {
+ public Map<String, Object> emitPartitionBatch(TransactionAttempt transactionAttempt, TridentCollector tridentCollector, Partition partition, Map<String, Object> map) {
return emitNewPartitionBatch(transactionAttempt, tridentCollector, partition, map);
}
@@ -254,14 +263,14 @@ public class TridentKafkaEmitter {
}
public IPartitionedTridentSpout.Emitter asTransactionalEmitter() {
- return new IPartitionedTridentSpout.Emitter<List<GlobalPartitionInformation>, Partition, Map>() {
+ return new IPartitionedTridentSpout.Emitter<List<GlobalPartitionInformation>, Partition, Map<String, Object>>() {
/**
* 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<String, Object> emitPartitionBatchNew(TransactionAttempt transactionAttempt, TridentCollector tridentCollector, Partition partition, Map<String, Object> map) {
return failFastEmitNewPartitionBatch(transactionAttempt, tridentCollector, partition, map);
}
@@ -270,7 +279,7 @@ public class TridentKafkaEmitter {
* 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<String, Object> map) {
reEmitPartitionBatch(transactionAttempt, tridentCollector, partition, map);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-kafka/src/test/org/apache/storm/kafka/ZkCoordinatorTest.java
----------------------------------------------------------------------
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 8d8746f..31dfffe 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 class ZkCoordinatorTest {
when(dynamicPartitionConnections.register(any(Broker.class), any(String.class) ,anyInt())).thenReturn(simpleConsumer);
}
- private Map buildZookeeperConfig(TestingServer server) {
- Map<String, Object> conf = new HashMap();
+ private Map<String, Object> buildZookeeperConfig(TestingServer server) {
+ Map<String, Object> 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);
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-mongodb/src/main/java/org/apache/storm/mongodb/trident/state/MongoMapState.java
----------------------------------------------------------------------
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 56fd33a..b06d35d 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<T> implements IBackingMap<T> {
private Options<T> options;
private Serializer<T> serializer;
private MongoDbClient mongoClient;
- private Map map;
+ private Map<String, Object> map;
- protected MongoMapState(Map map, Options options) {
+ protected MongoMapState(Map<String, Object> map, Options options) {
this.options = options;
this.map = map;
this.serializer = options.serializer;
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-mongodb/src/main/java/org/apache/storm/mongodb/trident/state/MongoState.java
----------------------------------------------------------------------
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 c4e8cca..77c394c 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<String, Object> map;
- protected MongoState(Map map, Options options) {
+ protected MongoState(Map<String, Object> map, Options options) {
this.options = options;
this.map = map;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-redis/src/main/java/org/apache/storm/redis/bolt/AbstractRedisBolt.java
----------------------------------------------------------------------
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 471d6cd..f0f3fa3 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 abstract class AbstractRedisBolt extends BaseTickTupleAwareRichBolt {
* {@inheritDoc}
*/
@Override
- public void prepare(Map map, TopologyContext topologyContext, OutputCollector collector) {
+ public void prepare(Map<String, Object> map, TopologyContext topologyContext, OutputCollector collector) {
// FIXME: stores map (topoConf), topologyContext and expose these to derived classes
this.collector = collector;
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-rocketmq/src/main/java/org/apache/storm/rocketmq/trident/state/RocketMqState.java
----------------------------------------------------------------------
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 9a8a46e..daaa93c 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<String, Object> map, Options options) {
this.options = options;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/external/storm-solr/src/main/java/org/apache/storm/solr/trident/SolrStateFactory.java
----------------------------------------------------------------------
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 7d3e69d..2e8997c 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 class SolrStateFactory implements StateFactory {
}
@Override
- public State makeState(Map map, IMetricsContext iMetricsContext, int partitionIndex, int numPartitions) {
+ public State makeState(Map<String, Object> map, IMetricsContext iMetricsContext, int partitionIndex, int numPartitions) {
SolrState state = new SolrState(solrConfig, solrMapper);
state.prepare();
return state;
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/flux/flux-core/src/main/java/org/apache/storm/flux/model/ConfigMethodDef.java
----------------------------------------------------------------------
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 d100598..8d32c06 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 class ConfigMethodDef {
List<Object> newVal = new ArrayList<Object>();
for (Object obj : args) {
if (obj instanceof LinkedHashMap) {
- Map map = (Map)obj;
+ Map<String, Object> map = (Map<String, Object>)obj;
if (map.containsKey("ref") && map.size() == 1) {
newVal.add(new BeanReference((String)map.get("ref")));
this.hasReferences = true;
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/flux/flux-core/src/main/java/org/apache/storm/flux/model/ObjectDef.java
----------------------------------------------------------------------
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 170ee4f..1df9f9f 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 class ObjectDef {
List<Object> newVal = new ArrayList<Object>();
for (Object obj : constructorArgs) {
if (obj instanceof LinkedHashMap) {
- Map map = (Map)obj;
+ Map<String, Object> map = (Map<String, Object>)obj;
if (map.containsKey("ref") && map.size() == 1) {
newVal.add(new BeanReference((String) map.get("ref")));
this.hasReferences = true;
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/integration-test/src/test/java/org/apache/storm/st/wrapper/StormCluster.java
----------------------------------------------------------------------
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 4521b36..f8e59f5 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 class StormCluster {
this.client = NimbusClient.getConfiguredClient(conf).getClient();
}
- public static Map getConfig() {
+ public static Map<String, Object> getConfig() {
return Utils.readStormConfig();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/Config.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/Config.java b/storm-client/src/jvm/org/apache/storm/Config.java
index 7a286d5..ed6068c 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 class Config extends HashMap<String, Object> {
setClasspath(this, cp);
}
- public static void setEnvironment(Map<String, Object> conf, Map env) {
+ public static void setEnvironment(Map<String, Object> conf, Map<String, Object> env) {
conf.put(Config.TOPOLOGY_ENVIRONMENT, env);
}
- public void setEnvironment(Map env) {
+ public void setEnvironment(Map<String, Object> env) {
setEnvironment(this, env);
}
@@ -1955,7 +1955,7 @@ public class Config extends HashMap<String, Object> {
}
public static void registerMetricsConsumer(Map<String, Object> conf, Class klass, Object argument, long parallelismHint) {
- HashMap m = new HashMap();
+ HashMap<String, Object> m = new HashMap<>();
m.put("class", klass.getCanonicalName());
m.put("parallelism.hint", parallelismHint);
m.put("argument", argument);
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/StormSubmitter.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/StormSubmitter.java b/storm-client/src/jvm/org/apache/storm/StormSubmitter.java
index 0f6baf2..5ce0d44 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 class StormSubmitter {
return false;
}
- @SuppressWarnings("unchecked")
- public static Map prepareZookeeperAuthentication(Map<String, Object> conf) {
- Map toRet = new HashMap();
+ public static Map<String, Object> prepareZookeeperAuthentication(Map<String, Object> conf) {
+ Map<String, Object> 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) ||
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/Thrift.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/Thrift.java b/storm-client/src/jvm/org/apache/storm/Thrift.java
index bffd04f..e00b0ee 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 class Thrift {
return parallelism;
}
- public Map getConf() {
+ public Map<String, Object> getConf() {
return conf;
}
}
@@ -117,7 +117,7 @@ public class Thrift {
return bolt;
}
- public Map getConf() {
+ public Map<String, Object> getConf() {
return conf;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/cluster/ClusterUtils.java
----------------------------------------------------------------------
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 362d4dd..4bd5ded 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 class ClusterUtils {
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<String, Object>) stateStorage, (Map<String, Object>) stateStorage, context);
return new StormClusterStateImpl(Storage, context, true);
}
}
- public IStateStorage mkStateStorageImpl(Map<String, Object> config, Map auth_conf, ClusterStateContext context) throws Exception {
+ public IStateStorage mkStateStorageImpl(Map<String, Object> config, Map<String, Object> 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 class ClusterUtils {
return stateStorage;
}
- public static IStateStorage mkStateStorage(Map<String, Object> config, Map auth_conf, ClusterStateContext context) throws Exception {
+ public static IStateStorage mkStateStorage(Map<String, Object> config, Map<String, Object> auth_conf, ClusterStateContext context) throws Exception {
return _instance.mkStateStorageImpl(config, auth_conf, context);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/cluster/PaceMakerStateStorageFactory.java
----------------------------------------------------------------------
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 065e0df..5e0cdd7 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 @@ import org.apache.storm.utils.Utils;
public class PaceMakerStateStorageFactory implements StateStorageFactory {
@Override
- public IStateStorage mkStore(Map<String, Object> config, Map auth_conf, ClusterStateContext context) {
+ public IStateStorage mkStore(Map<String, Object> config, Map<String, Object> auth_conf, ClusterStateContext context) {
try {
ZKStateStorageFactory zkfact = new ZKStateStorageFactory();
IStateStorage zkState = zkfact.mkStore(config, auth_conf, context);
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/cluster/StateStorageFactory.java
----------------------------------------------------------------------
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 584a2d8..7b58855 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 @@ import java.util.Map;
public interface StateStorageFactory {
- IStateStorage mkStore(Map<String, Object> config, Map auth_conf, ClusterStateContext context);
+ IStateStorage mkStore(Map<String, Object> config, Map<String, Object> auth_conf, ClusterStateContext context);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/cluster/ZKStateStorage.java
----------------------------------------------------------------------
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 c68011e..d5c29f9 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<String, Object> authConf;
private Map<String, Object> conf;
private class ZkWatcherCallBack implements WatcherCallBack{
@@ -73,7 +73,7 @@ public class ZKStateStorage implements IStateStorage {
}
}
- public ZKStateStorage(Map<String, Object> conf, Map authConf, ClusterStateContext context) throws Exception {
+ public ZKStateStorage(Map<String, Object> conf, Map<String, Object> authConf, ClusterStateContext context) throws Exception {
this.conf = conf;
this.authConf = authConf;
if (context.getDaemonType().equals(DaemonType.NIMBUS))
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/cluster/ZKStateStorageFactory.java
----------------------------------------------------------------------
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 987c2fd..0ae745f 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 @@ import java.util.Map;
public class ZKStateStorageFactory implements StateStorageFactory {
@Override
- public IStateStorage mkStore(Map<String, Object> config, Map auth_conf, ClusterStateContext context) {
+ public IStateStorage mkStore(Map<String, Object> config, Map<String, Object> auth_conf, ClusterStateContext context) {
try {
return new ZKStateStorage(config, auth_conf, context);
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/daemon/StormCommon.java
----------------------------------------------------------------------
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 f2ebd5f..9a21679 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 class StormCommon {
for (SpoutSpec spout : topology.get_spouts().values()) {
ComponentCommon common = spout.get_common();
- Map spoutConf = componentConf(spout);
+ Map<String, Object> 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));
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/daemon/metrics/BuiltinMetricsUtil.java
----------------------------------------------------------------------
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 8237ad1..0fdcb9f 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 org.apache.storm.task.TopologyContext;
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<String, Object> topoConf, TopologyContext context) {
@@ -33,15 +36,14 @@ public class BuiltinMetricsUtil {
}
}
- public static void registerIconnectionClientMetrics(final Map nodePortToSocket, Map<String, Object> topoConf, TopologyContext context) {
+ public static void registerIconnectionClientMetrics(final Map<NodeInfo, IConnection> nodePortToSocket, Map<String, Object> topoConf, TopologyContext context) {
IMetric metric = new IMetric() {
@Override
public Object getValueAndReset() {
Map<Object, Object> 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<NodeInfo, IConnection> 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 class BuiltinMetricsUtil {
registerMetric("__send-iconnection", metric, topoConf, context);
}
- public static void registerQueueMetrics(Map queues, Map<String, Object> topoConf, TopologyContext context) {
- for (Object o : queues.entrySet()) {
- Map.Entry entry = (Map.Entry) o;
+ public static void registerQueueMetrics(Map<String, JCQueue> queues, Map<String, Object> topoConf, TopologyContext context) {
+ for (Map.Entry<String, JCQueue> 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);
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/daemon/worker/WorkerState.java
----------------------------------------------------------------------
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 9c7cf9e..d080471 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<String, Object> getConf() {
return conf;
}
@@ -140,7 +140,7 @@ public class WorkerState {
return localReceiveQueues;
}
- public Map getTopologyConf() {
+ public Map<String, Object> getTopologyConf() {
return topologyConf;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/drpc/DRPCSpout.java
----------------------------------------------------------------------
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 00ae469..80e4ea3 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 class DRPCSpout extends BaseRichSpout {
try {
DRPCRequest req = client.fetchRequest(_function);
if(req.get_request_id().length() > 0) {
- Map returnInfo = new HashMap();
+ Map<String, Object> 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 class DRPCSpout extends BaseRichSpout {
try {
DRPCRequest req = drpc.fetchRequest(_function);
if(req.get_request_id().length() > 0) {
- Map returnInfo = new HashMap();
+ Map<String, Object> returnInfo = new HashMap<>();
returnInfo.put("id", req.get_request_id());
returnInfo.put("host", _local_drpc_id);
returnInfo.put("port", 0);
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/drpc/JoinResult.java
----------------------------------------------------------------------
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 f57bbb1..be668fe 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 class JoinResult extends BaseRichBolt {
this.returnComponent = returnComponent;
}
- public void prepare(Map map, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> map, TopologyContext context, OutputCollector collector) {
_collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/drpc/PrepareRequest.java
----------------------------------------------------------------------
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 06e576c..6cfb898 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<String, Object> map, TopologyContext context) {
rand = new Random();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/drpc/ReturnResults.java
----------------------------------------------------------------------
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 04ddf25..6146890 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<String, Object> _conf;
Map<List, DRPCInvocationsClient> _clients = new HashMap<List, DRPCInvocationsClient>();
@Override
@@ -62,9 +62,9 @@ public class ReturnResults extends BaseRichBolt {
String result = (String) input.getValue(0);
String returnInfo = (String) input.getValue(1);
if (returnInfo!=null) {
- Map retMap = null;
+ Map<String, Object> retMap;
try {
- retMap = (Map) JSONValue.parseWithException(returnInfo);
+ retMap = (Map<String, Object>) JSONValue.parseWithException(returnInfo);
} catch (ParseException e) {
LOG.error("Parseing returnInfo failed", e);
_collector.fail(input);
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/executor/Executor.java
----------------------------------------------------------------------
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 267fe74..f811b82 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 @@ public abstract class Executor implements Callable, JCQueue.Consumer {
}
}
- private static List<Object> All_CONFIGS() {
- List<Object> ret = new ArrayList<Object>();
- 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<String> retrieveAllConfigKeys() {
+ List<String> 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 @@ public abstract class Executor implements Callable, JCQueue.Consumer {
// ============================ getter methods =================================
// =============================================================================
- private Map normalizedComponentConf(Map<String, Object> topoConf, WorkerTopologyContext topologyContext, String componentId) {
- List<Object> keysToRemove = All_CONFIGS();
+ private Map<String, Object> normalizedComponentConf(Map<String, Object> topoConf, WorkerTopologyContext topologyContext, String componentId) {
+ List<String> 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 @@ public abstract class Executor implements Callable, JCQueue.Consumer {
keysToRemove.remove(Config.TOPOLOGY_STATE_PROVIDER_CONFIG);
keysToRemove.remove(Config.TOPOLOGY_BOLTS_LATE_TUPLE_STREAM);
- Map<Object, Object> componentConf;
+ Map<String, Object> componentConf;
String specJsonConf = topologyContext.getComponentCommon(componentId).get_json_conf();
if (specJsonConf != null) {
try {
- componentConf = (Map<Object, Object>) JSONValue.parseWithException(specJsonConf);
+ componentConf = (Map<String, Object>) JSONValue.parseWithException(specJsonConf);
} catch (ParseException e) {
throw new RuntimeException(e);
}
@@ -466,7 +472,7 @@ public abstract class Executor implements Callable, JCQueue.Consumer {
componentConf = new HashMap<>();
}
- Map<Object, Object> ret = new HashMap<>();
+ Map<String, Object> ret = new HashMap<>();
ret.putAll(topoConf);
ret.putAll(componentConf);
@@ -489,7 +495,7 @@ public abstract class Executor implements Callable, JCQueue.Consumer {
return openOrPrepareWasCalled;
}
- public Map getTopoConf() {
+ public Map<String, Object> getTopoConf() {
return topoConf;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/executor/bolt/BoltExecutor.java
----------------------------------------------------------------------
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 61e6488..91bbcad 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.Task;
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 class BoltExecutor extends Executor {
private static IWaitStrategy makeSystemBoltWaitStrategy() {
WaitStrategyPark ws = new WaitStrategyPark();
- HashMap conf = new HashMap<String, Object>();
+ Map<String, Object> 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 class BoltExecutor extends Executor {
Map<String, JCQueue> map = ImmutableMap.of("receive", receiveQueue, "transfer", workerData.getTransferQueue());
BuiltinMetricsUtil.registerQueueMetrics(map, topoConf, userContext);
- Map cachedNodePortToSocket = workerData.getCachedNodeToPortSocket().get();
+ Map<NodeInfo, IConnection> cachedNodePortToSocket = workerData.getCachedNodeToPortSocket().get();
BuiltinMetricsUtil.registerIconnectionClientMetrics(cachedNodePortToSocket, topoConf, userContext);
BuiltinMetricsUtil.registerIconnectionServerMetric(workerData.getReceiver(), topoConf, userContext);
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/messaging/DeserializingConnectionCallback.java
----------------------------------------------------------------------
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 b80f7c0..7dbc5d6 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 @@ import java.util.concurrent.atomic.AtomicLong;
*/
public class DeserializingConnectionCallback implements IConnectionCallback, IMetric {
private final WorkerState.ILocalTransferCallback cb;
- private final Map conf;
+ private final Map<String, Object> conf;
private final GeneralTopologyContext context;
private final ThreadLocal<KryoTupleDeserializer> _des =
@@ -55,7 +55,7 @@ public class DeserializingConnectionCallback implements IConnectionCallback, IMe
private final ConcurrentHashMap<String, AtomicLong> byteCounts = new ConcurrentHashMap<>();
- public DeserializingConnectionCallback(final Map conf, final GeneralTopologyContext context, WorkerState.ILocalTransferCallback callback) {
+ public DeserializingConnectionCallback(final Map<String, Object> conf, final GeneralTopologyContext context, WorkerState.ILocalTransferCallback callback) {
this.conf = conf;
this.context = context;
cb = callback;
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/messaging/netty/Client.java
----------------------------------------------------------------------
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 ac92c6b..e0736b5 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 class Client extends ConnectionWithStatus implements IStatefulObject, ISa
return ret;
}
- public Map getConfig() {
+ public Map<String, Object> getConfig() {
return topoConf;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/metric/api/MultiCountMetric.java
----------------------------------------------------------------------
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 5c0caf5..343a3d7 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 class MultiCountMetric implements IMetric {
return val;
}
- public Object getValueAndReset() {
- Map ret = new HashMap();
+ public Map<String, Object> getValueAndReset() {
+ Map<String, Object> ret = new HashMap<>();
for(Map.Entry<String, CountMetric> e : _value.entrySet()) {
ret.put(e.getKey(), e.getValue().getValueAndReset());
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/metric/api/MultiReducedMetric.java
----------------------------------------------------------------------
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 9bd9113..a6cb49a 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 class MultiReducedMetric implements IMetric {
return val;
}
- public Object getValueAndReset() {
- Map ret = new HashMap();
+ public Map<String, Object> getValueAndReset() {
+ Map<String, Object> ret = new HashMap<>();
for(Map.Entry<String, ReducedMetric> e : _value.entrySet()) {
Object val = e.getValue().getValueAndReset();
if(val != null) {
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/security/auth/FixedGroupsMapping.java
----------------------------------------------------------------------
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 62f1d9b..b55dec2 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<String, Object> storm_conf) {
Map<?, ?> params = (Map<?, ?>) storm_conf.get(Config.STORM_GROUP_MAPPING_SERVICE_PARAMS);
Map<String, Set<String>> mapping = (Map<String, Set<String>>) params.get(STORM_FIXED_GROUP_MAPPING);
if (mapping != null) {
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/DRPCAuthorizerBase.java
----------------------------------------------------------------------
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 fdcd31e..f29e882 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<String, Object> conf);
- abstract protected boolean permitClientRequest(ReqContext context, String operation, Map params);
+ abstract protected boolean permitClientRequest(ReqContext context, String operation, Map<String, Object> params);
- abstract protected boolean permitInvocationRequest(ReqContext context, String operation, Map params);
+ abstract protected boolean permitInvocationRequest(ReqContext context, String operation, Map<String, Object> 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<String, Object> params) {
if ("execute".equals(operation)) {
return permitClientRequest(context, operation, params);
} else if ("failRequest".equals(operation) ||
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/DRPCSimpleACLAuthorizer.java
----------------------------------------------------------------------
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 dc4d911..ca8646f 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 @@ public class DRPCSimpleACLAuthorizer extends DRPCAuthorizerBase {
return null;
}
- protected boolean permitClientOrInvocationRequest(ReqContext context, Map params,
+ protected boolean permitClientOrInvocationRequest(ReqContext context, Map<String, Object> params,
String fieldName) {
Map<String,AclFunctionEntry> acl = readAclFromConfig();
String function = (String) params.get(FUNCTION_KEY);
@@ -165,13 +165,13 @@ public class DRPCSimpleACLAuthorizer extends DRPCAuthorizerBase {
@Override
protected boolean permitClientRequest(ReqContext context, String operation,
- Map params) {
+ Map<String, Object> params) {
return permitClientOrInvocationRequest(context, params, "clientUsers");
}
@Override
protected boolean permitInvocationRequest(ReqContext context, String operation,
- Map params) {
+ Map<String, Object> params) {
return permitClientOrInvocationRequest(context, params, "invocationUser");
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/serialization/types/HashMapSerializer.java
----------------------------------------------------------------------
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 a1e917a..73b1273 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 @@ import java.util.Map;
public class HashMapSerializer extends MapSerializer {
@Override
- public Map create(Kryo kryo, Input input, Class<Map> type) {
- return new HashMap();
+ public Map<String, Object> create(Kryo kryo, Input input, Class<Map> type) {
+ return new HashMap<>();
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/stats/CommonStats.java
----------------------------------------------------------------------
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 f115d12..b6461c5 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 abstract class CommonStats {
transferredStats.close();
}
- protected Map valueStat(MultiCountStatAndMetric metric) {
+ protected Map<String,Map<String,Long>> valueStat(MultiCountStatAndMetric metric) {
return metric.getTimeCounts();
}
- protected Map valueStat(MultiLatencyStatAndMetric metric) {
+ protected Map<String, Map<String, Double>> valueStat(MultiLatencyStatAndMetric metric) {
return metric.getTimeLatAvg();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/task/GeneralTopologyContext.java
----------------------------------------------------------------------
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 d59c9cf..4ea979e 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 class GeneralTopologyContext implements JSONAware {
@Override
public String toJSONString() {
- Map obj = new HashMap();
+ Map<String, Object> obj = new HashMap<>();
obj.put("task->component", _taskToComponent);
// TODO: jsonify StormTopology
// at the minimum should send source info
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/testing/NonRichBoltTracker.java
----------------------------------------------------------------------
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 4c04d84..8193f9a 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 class NonRichBoltTracker implements IBolt {
public void execute(Tuple input) {
_delegate.execute(input);
- Map stats = (Map) RegisteredGlobalState.getState(_trackId);
+ Map<String, Object> stats = (Map<String, Object>) RegisteredGlobalState.getState(_trackId);
((AtomicInteger) stats.get("processed")).incrementAndGet();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/testing/SpoutTracker.java
----------------------------------------------------------------------
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 5f75eae..d2af80f 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 class SpoutTracker extends BaseRichSpout {
}
private void recordSpoutEmit() {
- Map stats = (Map) RegisteredGlobalState.getState(_trackId);
+ Map<String, Object> stats = (Map<String, Object>) RegisteredGlobalState.getState(_trackId);
((AtomicInteger) stats.get("spout-emitted")).incrementAndGet();
}
@@ -99,13 +99,13 @@ public class SpoutTracker extends BaseRichSpout {
public void ack(Object msgId) {
_delegate.ack(msgId);
- Map stats = (Map) RegisteredGlobalState.getState(_trackId);
+ Map<String, Object> stats = (Map<String, Object>) RegisteredGlobalState.getState(_trackId);
((AtomicInteger) stats.get("processed")).incrementAndGet();
}
public void fail(Object msgId) {
_delegate.fail(msgId);
- Map stats = (Map) RegisteredGlobalState.getState(_trackId);
+ Map<String, Object> stats = (Map<String, Object>) RegisteredGlobalState.getState(_trackId);
((AtomicInteger) stats.get("processed")).incrementAndGet();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/topology/TopologyBuilder.java
----------------------------------------------------------------------
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 60a7eb3..e10bc44 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 class TopologyBuilder {
}
}
- private static String mergeIntoJson(Map into, Map newMap) {
- Map res = new HashMap<>(into);
+ private static String mergeIntoJson(Map<String, Object> into, Map<String, Object> newMap) {
+ Map<String, Object> res = new HashMap<>(into);
res.putAll(newMap);
return JSONValue.toJSONString(res);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/transactional/state/TestTransactionalState.java
----------------------------------------------------------------------
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 bf6b181..b83c849 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<String, Object> conf, String id, Map componentConf, String subroot) {
+ protected TestTransactionalState(Map<String, Object> conf, String id, Map<String, Object> componentConf, String subroot) {
super(conf, id, componentConf, subroot);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/transactional/state/TransactionalState.java
----------------------------------------------------------------------
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 d7079f3..c940b3f 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<ACL> _zkAcls = null;
- public static TransactionalState newUserState(Map<String, Object> conf, String id, Map componentConf) {
+ public static TransactionalState newUserState(Map<String, Object> conf, String id, Map<String, Object> componentConf) {
return new TransactionalState(conf, id, componentConf, "user");
}
- public static TransactionalState newCoordinatorState(Map<String, Object> conf, String id, Map componentConf) {
+ public static TransactionalState newCoordinatorState(Map<String, Object> conf, String id, Map<String, Object> componentConf) {
return new TransactionalState(conf, id, componentConf, "coordinator");
}
- protected TransactionalState(Map<String, Object> conf, String id, Map componentConf, String subroot) {
+ protected TransactionalState(Map<String, Object> conf, String id, Map<String, Object> 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,
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/trident/TridentTopology.java
----------------------------------------------------------------------
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 d51b883..7b18187 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 class TridentTopology {
}
}
}
- HashMap<String, Number> combinedMasterCoordResources = new HashMap<String, Number>(_resourceDefaults);
+ HashMap<String, Number> combinedMasterCoordResources = new HashMap<>(_resourceDefaults);
combinedMasterCoordResources.putAll(_masterCoordResources);
return builder.buildTopology(combinedMasterCoordResources);
}
- private static Map<String, Number> mergeDefaultResources(Map<String, Number> res, Map defaultConfig) {
- Map<String, Number> ret = new HashMap<String, Number>();
+ private static Map<String, Number> mergeDefaultResources(Map<String, Number> res, Map<String, Number> defaultConfig) {
+ Map<String, Number> 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);
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/trident/drpc/ReturnResultsReducer.java
----------------------------------------------------------------------
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 617a42f..6d6648a 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 class ReturnResultsReducer implements MultiReducer<ReturnResultsState> {
// only one of the multireducers will receive the tuples
if (state.returnInfo!=null) {
String result = JSONValue.toJSONString(state.results);
- Map retMap = null;
+ Map<String, Object> retMap;
try {
- retMap = (Map) JSONValue.parseWithException(state.returnInfo);
+ retMap = (Map<String, Object>) JSONValue.parseWithException(state.returnInfo);
} catch (ParseException e) {
collector.reportError(e);
return;
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/trident/topology/state/TransactionalState.java
----------------------------------------------------------------------
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 bb05450..61d50f8 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 class TransactionalState {
protected TransactionalState(Map<String, Object> 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<String> servers = (List<String>) getWithBackup(conf, Config.TRANSACTIONAL_ZOOKEEPER_SERVERS, Config.STORM_ZOOKEEPER_SERVERS);
@@ -193,9 +193,11 @@ public class TransactionalState {
_curator.close();
}
- private Object getWithBackup(Map amap, Object primary, Object backup) {
+ private Object getWithBackup(Map<String, Object> 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;
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/utils/ConfigUtils.java
----------------------------------------------------------------------
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 0d5bab8..eb4557f 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 class ConfigUtils {
return ret;
}
- public static Map overrideLoginConfigWithSystemProperty(Map<String, Object> conf) { // note that we delete the return value
+ public static Map<String, Object> overrideLoginConfigWithSystemProperty(Map<String, Object> 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 class ConfigUtils {
return conf;
}
- public static Map readYamlConfig(String name) {
+ public static Map<String, Object> readYamlConfig(String name) {
return readYamlConfig(name, true);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/utils/JCQueue.java
----------------------------------------------------------------------
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 26b0ac4..7a64812 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 org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Map;
import java.util.concurrent.atomic.AtomicLong;
@@ -189,7 +190,7 @@ public class JCQueue implements IStatefulObject {
}
public Object getState() {
- HashMap state = new HashMap<String, Object>();
+ Map<String, Object> state = new HashMap<>();
final double arrivalRateInSecs = arrivalsTracker.reportRate();
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/utils/NimbusClient.java
----------------------------------------------------------------------
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 e27304a..bbd47a9 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 @@ public class NimbusClient extends ThriftClient {
return true;
}
- public static NimbusClient getConfiguredClientAs(Map conf, String asUser) {
+ public static NimbusClient getConfiguredClientAs(Map<String, Object> conf, String asUser) {
return getConfiguredClientAs(conf, asUser, null);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/utils/Utils.java
----------------------------------------------------------------------
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 af03787..ba2ed74 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 class Utils {
* @param listSeq to reverse
* @return a reversed map
*/
- public static HashMap reverseMap(List listSeq) {
- HashMap<Object, List<Object>> rtn = new HashMap();
+ public static Map<Object, List<Object>> reverseMap(List<List<Object>> listSeq) {
+ Map<Object, List<Object>> rtn = new HashMap<>();
if (listSeq == null) {
return rtn;
}
- for (Object entry : listSeq) {
- List listEntry = (List) entry;
+ for (List<Object> listEntry : listSeq) {
Object key = listEntry.get(0);
Object val = listEntry.get(1);
- List list = rtn.get(val);
+ List<Object> list = rtn.get(val);
if (list == null) {
- list = new ArrayList<Object>();
+ list = new ArrayList<>();
rtn.put(val, list);
}
list.add(key);
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/src/jvm/org/apache/storm/zookeeper/ClientZookeeper.java
----------------------------------------------------------------------
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 d2d862b..42d4417 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 class ClientZookeeper {
_instance.mkdirsImpl(zk, path, acls);
}
- public static CuratorFramework mkClient(Map<String, Object> conf, List<String> servers, Object port, String root, final WatcherCallBack watcher, Map authConf) {
+ public static CuratorFramework mkClient(Map<String, Object> conf, List<String> servers, Object port, String root, final WatcherCallBack watcher, Map<String, Object> authConf) {
return _instance.mkClientImpl(conf, servers, port, root, watcher, authConf);
}
@@ -313,15 +313,15 @@ public class ClientZookeeper {
return mkClientImpl(conf, servers, port, root, new DefaultWatcherCallBack());
}
- public CuratorFramework mkClientImpl(Map<String, Object> conf, List<String> servers, Object port, Map authConf) {
+ public CuratorFramework mkClientImpl(Map<String, Object> conf, List<String> servers, Object port, Map<String, Object> authConf) {
return mkClientImpl(conf, servers, port, "", new DefaultWatcherCallBack(), authConf);
}
- public CuratorFramework mkClientImpl(Map<String, Object> conf, List<String> servers, Object port, String root, Map authConf) {
+ public CuratorFramework mkClientImpl(Map<String, Object> conf, List<String> servers, Object port, String root, Map<String, Object> authConf) {
return mkClientImpl(conf, servers, port, root, new DefaultWatcherCallBack(), authConf);
}
- public CuratorFramework mkClientImpl(Map<String, Object> conf, List<String> servers, Object port, String root, final WatcherCallBack watcher, Map authConf) {
+ public CuratorFramework mkClientImpl(Map<String, Object> conf, List<String> servers, Object port, String root, final WatcherCallBack watcher, Map<String, Object> authConf) {
CuratorFramework fk;
if (authConf != null) {
fk = CuratorUtils.newCurator(conf, servers, port, root, new ZookeeperAuthInfo(authConf));
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/test/jvm/org/apache/storm/messaging/DeserializingConnectionCallbackTest.java
----------------------------------------------------------------------
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 9f0e1d1..985aa1c 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 class DeserializingConnectionCallbackTest {
@Test
public void testUpdateMetricsConfigOff() {
- Map config = new HashMap();
+ Map<String, Object> 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 class DeserializingConnectionCallbackTest {
@Test
public void testUpdateMetricsConfigOn() {
- Map config = new HashMap();
+ Map<String, Object> config = new HashMap<>();
config.put(Config.TOPOLOGY_SERIALIZED_MESSAGE_SIZE_METRICS, Boolean.TRUE);
DeserializingConnectionCallback withMetrics =
new DeserializingConnectionCallback(config, mock(GeneralTopologyContext.class), mock(
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/test/jvm/org/apache/storm/security/auth/AutoSSLTest.java
----------------------------------------------------------------------
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 272ca60..9283132 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 @@ public class AutoSSLTest {
@Test
public void testgetSSLFilesFromConf() throws Exception {
AutoSSL assl = new AutoSSL();
- Map<String, Object> conf = new HashMap();
+ Map<String, Object> conf = new HashMap<>();
assertNull(assl.getSSLFilesFromConf(conf));
conf.put(AutoSSL.SSL_FILES_CONF, "sslfile1.txt");
assl.prepare(conf);
@@ -74,14 +74,14 @@ public class AutoSSLTest {
@Test
public void testgetSSLFilesFromConfMultipleComma() throws Exception {
AutoSSL assl = new AutoSSL();
- Map<String, Object> conf = new HashMap();
+ Map<String, Object> conf = new HashMap<>();
assertNull(assl.getSSLFilesFromConf(conf));
conf.put(AutoSSL.SSL_FILES_CONF, "sslfile1.txt,sslfile2.txt,sslfile3.txt");
assl.prepare(conf);
Collection<String> sslFiles = assl.getSSLFilesFromConf(conf);
assertNotNull(sslFiles);
assertEquals(3, sslFiles.size());
- ArrayList valid = new ArrayList<String>();
+ List<String> 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 class AutoSSLTest {
AutoSSL assl = new TestAutoSSL(baseDir.getPath());
LOG.debug("base dir is; " + baseDir);
- Map sslconf = new HashMap();
+ Map<String, Object> sslconf = new HashMap<>();
sslconf.put(AutoSSL.SSL_FILES_CONF, temp.getPath());
assl.prepare(sslconf);
Collection<String> sslFiles = assl.getSSLFilesFromConf(sslconf);
- Map<String, String> creds = new HashMap();
+ Map<String, String> creds = new HashMap<>();
assl.populateCredentials(creds);
assertTrue(creds.containsKey(temp.getName()));
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/test/jvm/org/apache/storm/streams/ProcessorBoltTest.java
----------------------------------------------------------------------
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 9380714..ba0747c 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.Collections;
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 @@ public class ProcessorBoltTest {
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<GlobalStreamId, Grouping> 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));
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java
----------------------------------------------------------------------
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 c8499e9..30cdae9 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 class UtilsTest {
Utils.isZkAuthenticationConfiguredTopology(topologyMockMap("foobar")));
}
- private Map topologyMockMap(String value) {
+ private Map<String, Object> topologyMockMap(String value) {
return mockMap(Config.STORM_ZOOKEEPER_TOPOLOGY_AUTH_SCHEME, value);
}
- private Map mockMap(String key, String value) {
- Map<String, Object> map = new HashMap<String, Object>();
+ private Map<String, Object> mockMap(String key, String value) {
+ Map<String, Object> map = new HashMap<>();
map.put(key, value);
return map;
}
- private Map serverMockMap(String value) {
+ private Map<String, Object> serverMockMap(String value) {
return mockMap(Config.STORM_ZOOKEEPER_AUTH_SCHEME, value);
}
- private Map emptyMockMap() {
- return new HashMap<String, Object>();
+ private Map<String, Object> emptyMockMap() {
+ return new HashMap<>();
}
private void doParseJvmHeapMemByChildOptsTest(String message, String opt, double expected) {
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-core/src/jvm/org/apache/storm/command/UploadCredentials.java
----------------------------------------------------------------------
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 6023409..a72039b 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 class UploadCredentials {
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<String,String> credentialsMap = new HashMap<>();
if (null != credentialFile) {
Properties credentialProps = new Properties();
credentialProps.load(new FileReader(credentialFile));
- credentialsMap.putAll(credentialProps);
+ for(Map.Entry<Object, Object> 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);
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-core/src/jvm/org/apache/storm/ui/FilterConfiguration.java
----------------------------------------------------------------------
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 db5952e..e671264 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 @@ import java.util.Map;
public class FilterConfiguration {
private String filterClass;
private String filterName;
- private Map filterParams;
+ private Map<String, String> filterParams;
- public FilterConfiguration(String filterClass, Map filterParams) {
+ public FilterConfiguration(String filterClass, Map<String, String> 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<String, String> filterParams) {
this.filterClass = filterClass;
this.filterName = filterName;
this.filterParams = filterParams;
@@ -53,11 +53,11 @@ public class FilterConfiguration {
this.filterClass = filterClass;
}
- public Map getFilterParams() {
+ public Map<String, String> getFilterParams() {
return filterParams;
}
- public void setFilterParams(Map filterParams) {
+ public void setFilterParams(Map<String, String> filterParams) {
this.filterParams = filterParams;
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-core/src/jvm/org/apache/storm/ui/UIHelpers.java
----------------------------------------------------------------------
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 f29c1f6..be4a4c0 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 class UIHelpers {
return "[" + e.get_task_start() + "-" + e.get_task_end() + "]";
}
- public static Map unauthorizedUserJson(String user) {
+ public static Map<String, Object> unauthorizedUserJson(String user) {
return ImmutableMap.of(
"error", "No Authorization",
"errorMessage", String.format("User %s is not authorized.", user));
@@ -203,7 +203,7 @@ public class UIHelpers {
for (FilterConfiguration filterConf : filtersConfs) {
String filterName = filterConf.getFilterName();
String filterClass = filterConf.getFilterClass();
- Map filterParams = filterConf.getFilterParams();
+ Map<String, String> filterParams = filterConf.getFilterParams();
if (filterClass != null) {
FilterHolder filterHolder = new FilterHolder();
filterHolder.setClassName(filterClass);
@@ -215,7 +215,7 @@ public class UIHelpers {
if (filterParams != null) {
filterHolder.setInitParameters(filterParams);
} else {
- filterHolder.setInitParameters(new HashMap<String, String>());
+ filterHolder.setInitParameters(new HashMap<>());
}
context.addFilter(filterHolder, "/*", EnumSet.allOf(DispatcherType.class));
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c7394d12/storm-core/test/jvm/org/apache/storm/nimbus/InMemoryTopologyActionNotifier.java
----------------------------------------------------------------------
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 6205468..c1f082c 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<String, Object> StormConf) {
//no-op
}
[5/5] storm git commit: [STORM-2999] Add generics to static type of
method parameters and variables where applicable
Posted by da...@apache.org.
[STORM-2999] Add generics to static type of method parameters and variables where applicable
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0fdad2c0
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0fdad2c0
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0fdad2c0
Branch: refs/heads/master
Commit: 0fdad2c0ff357c431454128dd937edf2876a5fb5
Parents: 8c8c0c3 1582024
Author: Derek Dagit <de...@oath.com>
Authored: Wed Mar 21 11:05:32 2018 -0500
Committer: Derek Dagit <de...@oath.com>
Committed: Wed Mar 21 11:05:32 2018 -0500
----------------------------------------------------------------------
.../storm/hbase/topology/TotalWordCounter.java | 1 -
.../storm/hbase/topology/WordCounter.java | 1 -
.../apache/storm/hbase/topology/WordSpout.java | 1 -
.../storm/hdfs/spout/HdfsSpoutTopology.java | 2 +-
.../storm/hive/trident/TridentHiveTopology.java | 2 +-
.../org/apache/storm/jdbc/spout/UserSpout.java | 1 -
.../jdbc/topology/AbstractUserTopology.java | 2 +-
.../apache/storm/jms/example/GenericBolt.java | 1 -
.../org/apache/storm/loadgen/CaptureLoad.java | 4 +--
.../loadgen/HttpForwardingMetricsServer.java | 2 +-
.../storm/loadgen/ThroughputVsLatency.java | 3 +-
.../mongodb/topology/TotalWordCounter.java | 1 -
.../storm/mongodb/topology/WordSpout.java | 1 -
.../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/redis/topology/WordCounter.java | 1 -
.../apache/storm/redis/topology/WordSpout.java | 1 -
.../storm/starter/FastWordCountTopology.java | 2 +-
.../storm/starter/InOrderDeliveryTest.java | 2 +-
.../starter/ResourceAwareExampleTopology.java | 2 +-
.../storm/starter/bolt/RollingCountAggBolt.java | 1 -
.../storm/starter/bolt/RollingCountBolt.java | 1 -
.../storm/common/AbstractHadoopAutoCreds.java | 4 +--
.../AbstractHadoopNimbusPluginAutoCreds.java | 12 +++----
.../apache/storm/hbase/security/AutoHBase.java | 2 +-
.../storm/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 +-
.../trident/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 +-
.../eventhubs/spout/BinaryEventDataScheme.java | 4 +--
.../storm/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 +-
.../eventhubs/spout/SimplePartitionManager.java | 2 +-
.../TransactionalTridentEventHubEmitter.java | 10 +++---
.../TransactionalTridentEventHubSpout.java | 4 +--
.../eventhubs/samples/bolt/GlobalCountBolt.java | 2 +-
.../eventhubs/spout/EventHubReceiverMock.java | 2 +-
.../TestTransactionalTridentEmitter.java | 6 ++--
.../org/apache/storm/hbase/bolt/HBaseBolt.java | 2 +-
.../storm/hbase/bolt/HBaseLookupBolt.java | 1 -
.../hbase/state/HBaseKeyValueStateProvider.java | 4 +--
.../hbase/trident/state/HBaseMapState.java | 2 +-
.../storm/hbase/trident/state/HBaseState.java | 4 +--
.../hbase/trident/state/HBaseStateFactory.java | 2 +-
.../apache/storm/hdfs/spout/TestHdfsSpout.java | 4 +--
.../storm/jdbc/bolt/AbstractJdbcBolt.java | 2 +-
.../apache/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 +-
.../storm/jms/trident/TridentJmsSpout.java | 6 ++--
.../KafkaTridentSpoutBatchMetadataTest.java | 2 +-
.../jvm/org/apache/storm/kafka/KafkaSpout.java | 2 +-
.../apache/storm/kafka/PartitionManager.java | 2 +-
.../src/jvm/org/apache/storm/kafka/ZkState.java | 7 ++--
.../kafka/trident/OpaqueTridentKafkaSpout.java | 15 ++++++--
.../kafka/trident/TridentKafkaEmitter.java | 37 ++++++++++++--------
.../apache/storm/kafka/ZkCoordinatorTest.java | 4 +--
.../mongodb/trident/state/MongoMapState.java | 4 +--
.../storm/mongodb/trident/state/MongoState.java | 4 +--
.../storm/redis/bolt/AbstractRedisBolt.java | 2 +-
.../trident/state/RedisClusterMapState.java | 2 +-
.../redis/trident/state/RedisClusterState.java | 2 +-
.../redis/trident/state/RedisMapState.java | 2 +-
.../storm/redis/trident/state/RedisState.java | 2 +-
.../rocketmq/trident/state/RocketMqState.java | 2 +-
.../storm/solr/trident/SolrStateFactory.java | 2 +-
.../storm/flux/model/ConfigMethodDef.java | 2 +-
.../org/apache/storm/flux/model/ObjectDef.java | 2 +-
.../flux/examples/StatefulWordCounter.java | 1 -
.../apache/storm/flux/examples/WordCounter.java | 1 -
.../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 +--
.../org/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 +++++-----
.../apache/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 ++--
.../jvm/org/apache/storm/executor/Executor.java | 32 ++++++++++-------
.../storm/executor/bolt/BoltExecutor.java | 6 ++--
.../DeserializingConnectionCallback.java | 4 +--
.../apache/storm/messaging/local/Context.java | 2 --
.../apache/storm/messaging/netty/Client.java | 3 +-
.../apache/storm/messaging/netty/Context.java | 2 --
.../apache/storm/messaging/netty/Server.java | 2 --
.../jvm/org/apache/storm/metric/SystemBolt.java | 2 +-
.../storm/metric/api/MultiCountMetric.java | 4 +--
.../storm/metric/api/MultiReducedMetric.java | 4 +--
.../storm/security/auth/FixedGroupsMapping.java | 2 +-
.../auth/authorizer/DRPCAuthorizerBase.java | 6 ++--
.../authorizer/DRPCSimpleACLAuthorizer.java | 6 ++--
.../serialization/types/HashMapSerializer.java | 4 +--
.../jvm/org/apache/storm/stats/CommonStats.java | 4 +--
.../storm/task/GeneralTopologyContext.java | 2 +-
.../storm/testing/NonRichBoltTracker.java | 2 +-
.../org/apache/storm/testing/SpoutTracker.java | 6 ++--
.../apache/storm/topology/TopologyBuilder.java | 4 +--
.../state/TestTransactionalState.java | 2 +-
.../transactional/state/TransactionalState.java | 8 ++---
.../apache/storm/trident/TridentTopology.java | 12 +++----
.../trident/drpc/ReturnResultsReducer.java | 4 +--
.../topology/state/TransactionalState.java | 8 +++--
.../jvm/org/apache/storm/utils/ConfigUtils.java | 4 +--
.../src/jvm/org/apache/storm/utils/JCQueue.java | 3 +-
.../org/apache/storm/utils/NimbusClient.java | 2 +-
.../src/jvm/org/apache/storm/utils/Utils.java | 11 +++---
.../apache/storm/zookeeper/ClientZookeeper.java | 8 ++---
.../DeserializingConnectionCallbackTest.java | 4 +--
.../apache/storm/security/auth/AutoSSLTest.java | 10 +++---
.../apache/storm/streams/ProcessorBoltTest.java | 3 +-
.../jvm/org/apache/storm/utils/UtilsTest.java | 12 +++----
.../apache/storm/command/UploadCredentials.java | 9 +++--
.../apache/storm/ui/FilterConfiguration.java | 10 +++---
.../src/jvm/org/apache/storm/ui/UIHelpers.java | 6 ++--
.../nimbus/InMemoryTopologyActionNotifier.java | 2 +-
.../storm/serialization/SerializationTest.java | 12 +++----
.../src/main/java/org/apache/storm/Testing.java | 1 -
.../org/apache/storm/daemon/nimbus/Nimbus.java | 6 ++--
.../apache/storm/metricstore/MetricStore.java | 2 +-
.../storm/metricstore/MetricStoreConfig.java | 2 +-
.../metricstore/NimbusMetricProcessor.java | 2 +-
.../metricstore/WorkerMetricsProcessor.java | 2 +-
.../storm/metricstore/rocksdb/RocksDbStore.java | 6 ++--
.../storm/nimbus/DefaultTopologyValidator.java | 4 ++-
.../nimbus/ITopologyActionNotifierPlugin.java | 2 +-
.../apache/storm/nimbus/ITopologyValidator.java | 4 ++-
.../storm/scheduler/DefaultScheduler.java | 2 +-
.../apache/storm/scheduler/EvenScheduler.java | 2 +-
.../org/apache/storm/scheduler/IScheduler.java | 2 +-
.../storm/scheduler/IsolationScheduler.java | 2 +-
.../scheduler/blacklist/BlacklistScheduler.java | 7 ++--
.../strategies/DefaultBlacklistStrategy.java | 2 +-
.../strategies/IBlacklistStrategy.java | 2 +-
.../multitenant/MultitenantScheduler.java | 7 ++--
.../resource/ResourceAwareScheduler.java | 4 +--
.../utils/ArtifactoryConfigLoader.java | 22 ++++++------
.../storm/scheduler/utils/FileConfigLoader.java | 6 ++--
.../org/apache/storm/utils/ServerUtils.java | 2 +-
.../scheduler/blacklist/FaultGenerateUtils.java | 2 +-
.../TestUtilsForBlacklistScheduler.java | 16 ++++-----
.../utils/ArtifactoryConfigLoaderTest.java | 20 +++++------
.../scheduler/utils/FileConfigLoaderTest.java | 10 +++---
.../logviewer/webapp/LogviewerResource.java | 4 +--
170 files changed, 397 insertions(+), 376 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/0fdad2c0/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/ThroughputVsLatency.java
----------------------------------------------------------------------