You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2017/05/18 14:08:28 UTC
[01/13] storm git commit: STORM-2477: Add generics to Config types
Repository: storm
Updated Branches:
refs/heads/master a1c1ecfb2 -> 64e29f365
STORM-2477: Add generics to Config types
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4e00e48d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4e00e48d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4e00e48d
Branch: refs/heads/master
Commit: 4e00e48d5c45a7698e6dc727287089f5b6fd314d
Parents: 7043dea
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Sat Apr 15 16:21:20 2017 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Mon May 15 11:59:23 2017 -0500
----------------------------------------------------------------------
.travis.yml | 1 +
.../org/apache/storm/starter/ReachTopology.java | 4 +-
.../storm/starter/TransactionalGlobalCount.java | 2 +-
external/storm-eventhubs/pom.xml | 2 +-
external/storm-hbase/pom.xml | 4 +-
.../storm/hbase/bolt/AbstractHBaseBolt.java | 6 +--
external/storm-hdfs/pom.xml | 2 +-
.../apache/storm/jms/spout/JmsSpoutTest.java | 2 +-
external/storm-kafka-client/pom.xml | 2 +-
.../trident/KafkaTridentSpoutTransactional.java | 7 ++--
external/storm-redis/pom.xml | 2 +-
.../kerberos/KerberosSaslTransportPlugin.java | 8 ++--
.../jvm/org/apache/storm/stats/StatsUtil.java | 4 +-
.../apache/storm/testing/BatchNumberList.java | 2 +-
.../apache/storm/testing/CountingBatchBolt.java | 2 +-
.../storm/testing/KeyedCountingBatchBolt.java | 2 +-
.../storm/testing/KeyedSummingBatchBolt.java | 2 +-
.../operation/impl/IdentityMultiReducer.java | 8 ++--
.../storm/trident/spout/BatchSpoutExecutor.java | 10 ++---
.../trident/spout/RichSpoutBatchExecutor.java | 8 ++--
.../storm/trident/testing/FeederBatchSpout.java | 6 +--
.../testing/FeederCommitterBatchSpout.java | 4 +-
.../src/jvm/org/apache/storm/utils/Utils.java | 41 ++++++++++++--------
.../org/apache/storm/TestConfigValidate.java | 2 +-
.../storm/security/auth/AuthUtilsTest.java | 25 ++++++------
.../storm/security/auth/AuthUtilsTestMock.java | 17 ++++++--
.../java/org/apache/storm/daemon/drpc/DRPC.java | 2 +-
transform.sh | 34 ++++++++++++++++
28 files changed, 131 insertions(+), 80 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/4e00e48d/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index f70d5e0..78506ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,7 @@ before_install:
- rvm use 2.1.5 --install
- nvm install 0.12.2
- nvm use 0.12.2
+ - ./transform.sh
install: /bin/bash ./dev-tools/travis/travis-install.sh `pwd`
script:
- /bin/bash ./dev-tools/travis/travis-script.sh `pwd` $MODULES
http://git-wip-us.apache.org/repos/asf/storm/blob/4e00e48d/examples/storm-starter/src/jvm/org/apache/storm/starter/ReachTopology.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/ReachTopology.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/ReachTopology.java
index e90fcb0..efac86a 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/ReachTopology.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/ReachTopology.java
@@ -109,7 +109,7 @@ public class ReachTopology {
}
}
- public static class PartialUniquer extends BaseBatchBolt {
+ public static class PartialUniquer extends BaseBatchBolt<Object> {
BatchOutputCollector _collector;
Object _id;
Set<String> _followers = new HashSet<String>();
@@ -136,7 +136,7 @@ public class ReachTopology {
}
}
- public static class CountAggregator extends BaseBatchBolt {
+ public static class CountAggregator extends BaseBatchBolt<Object> {
BatchOutputCollector _collector;
Object _id;
int _count = 0;
http://git-wip-us.apache.org/repos/asf/storm/blob/4e00e48d/examples/storm-starter/src/jvm/org/apache/storm/starter/TransactionalGlobalCount.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/TransactionalGlobalCount.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/TransactionalGlobalCount.java
index c1e9555..03e779b 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/TransactionalGlobalCount.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/TransactionalGlobalCount.java
@@ -83,7 +83,7 @@ public class TransactionalGlobalCount {
public static Map<String, Value> DATABASE = new HashMap<String, Value>();
public static final String GLOBAL_COUNT_KEY = "GLOBAL-COUNT";
- public static class BatchCount extends BaseBatchBolt {
+ public static class BatchCount extends BaseBatchBolt<Object> {
Object _id;
BatchOutputCollector _collector;
http://git-wip-us.apache.org/repos/asf/storm/blob/4e00e48d/external/storm-eventhubs/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-eventhubs/pom.xml b/external/storm-eventhubs/pom.xml
index 080c46b..e709b13 100755
--- a/external/storm-eventhubs/pom.xml
+++ b/external/storm-eventhubs/pom.xml
@@ -53,7 +53,7 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<!--Note - the version would be inherited-->
<configuration>
- <maxAllowedViolations>1764</maxAllowedViolations>
+ <maxAllowedViolations>1765</maxAllowedViolations>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/storm/blob/4e00e48d/external/storm-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-hbase/pom.xml b/external/storm-hbase/pom.xml
index 02d2e17..4fd0367 100644
--- a/external/storm-hbase/pom.xml
+++ b/external/storm-hbase/pom.xml
@@ -106,9 +106,9 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<!--Note - the version would be inherited-->
<configuration>
- <maxAllowedViolations>370</maxAllowedViolations>
+ <maxAllowedViolations>371</maxAllowedViolations>
</configuration>
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/storm/blob/4e00e48d/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/AbstractHBaseBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/AbstractHBaseBolt.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/AbstractHBaseBolt.java
index 86c9761..8bab550 100644
--- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/AbstractHBaseBolt.java
+++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/AbstractHBaseBolt.java
@@ -51,11 +51,11 @@ public abstract class AbstractHBaseBolt extends BaseRichBolt {
}
@Override
- public void prepare(Map map, TopologyContext topologyContext, OutputCollector collector) {
+ public void prepare(Map topoConf, TopologyContext topologyContext, OutputCollector collector) {
this.collector = collector;
final Configuration hbConfig = HBaseConfiguration.create();
- Map<String, Object> conf = (Map<String, Object>)map.get(this.configKey);
+ Map<String, Object> conf = (Map<String, Object>)topoConf.get(this.configKey);
if(conf == null) {
throw new IllegalArgumentException("HBase configuration not found using key '" + this.configKey + "'");
}
@@ -70,7 +70,7 @@ public abstract class AbstractHBaseBolt extends BaseRichBolt {
//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);
- hbaseConfMap.put(Config.TOPOLOGY_AUTO_CREDENTIALS, map.get(Config.TOPOLOGY_AUTO_CREDENTIALS));
+ hbaseConfMap.put(Config.TOPOLOGY_AUTO_CREDENTIALS, topoConf.get(Config.TOPOLOGY_AUTO_CREDENTIALS));
this.hBaseClient = new HBaseClient(hbaseConfMap, hbConfig, tableName);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/4e00e48d/external/storm-hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml
index 9a81fdf..de42057 100644
--- a/external/storm-hdfs/pom.xml
+++ b/external/storm-hdfs/pom.xml
@@ -256,7 +256,7 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<!--Note - the version would be inherited-->
<configuration>
- <maxAllowedViolations>2220</maxAllowedViolations>
+ <maxAllowedViolations>2221</maxAllowedViolations>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/storm/blob/4e00e48d/external/storm-jms/src/test/java/org/apache/storm/jms/spout/JmsSpoutTest.java
----------------------------------------------------------------------
diff --git a/external/storm-jms/src/test/java/org/apache/storm/jms/spout/JmsSpoutTest.java b/external/storm-jms/src/test/java/org/apache/storm/jms/spout/JmsSpoutTest.java
index e80f70a..9f89384 100644
--- a/external/storm-jms/src/test/java/org/apache/storm/jms/spout/JmsSpoutTest.java
+++ b/external/storm-jms/src/test/java/org/apache/storm/jms/spout/JmsSpoutTest.java
@@ -51,7 +51,7 @@ public class JmsSpoutTest {
spout.setJmsTupleProducer(new MockTupleProducer());
spout.setJmsAcknowledgeMode(Session.CLIENT_ACKNOWLEDGE);
spout.setRecoveryPeriod(10); // Rapid recovery for testing.
- spout.open(new HashMap<String,String>(), null, collector);
+ spout.open(new HashMap<>(), null, collector);
Message msg = this.sendMessage(mockProvider.connectionFactory(), mockProvider.destination());
Thread.sleep(100);
spout.nextTuple(); // Pretend to be storm.
http://git-wip-us.apache.org/repos/asf/storm/blob/4e00e48d/external/storm-kafka-client/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/pom.xml b/external/storm-kafka-client/pom.xml
index 8689596..a275428 100644
--- a/external/storm-kafka-client/pom.xml
+++ b/external/storm-kafka-client/pom.xml
@@ -152,7 +152,7 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<!--Note - the version would be inherited-->
<configuration>
- <maxAllowedViolations>341</maxAllowedViolations>
+ <maxAllowedViolations>342</maxAllowedViolations>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/storm/blob/4e00e48d/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutTransactional.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutTransactional.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutTransactional.java
index 6e1c587..49e3b07 100644
--- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutTransactional.java
+++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutTransactional.java
@@ -20,19 +20,20 @@ package org.apache.storm.kafka.spout.trident;
import org.apache.storm.task.TopologyContext;
import org.apache.storm.trident.spout.IPartitionedTridentSpout;
+import org.apache.storm.trident.spout.ISpoutPartition;
import org.apache.storm.tuple.Fields;
import java.util.Map;
// TODO
-public class KafkaTridentSpoutTransactional implements IPartitionedTridentSpout {
+public class KafkaTridentSpoutTransactional<Ps, P extends ISpoutPartition, T> implements IPartitionedTridentSpout<Ps, P, T> {
@Override
- public Coordinator getCoordinator(Map conf, TopologyContext context) {
+ public Coordinator<Ps> getCoordinator(Map conf, TopologyContext context) {
return null;
}
@Override
- public Emitter getEmitter(Map conf, TopologyContext context) {
+ public Emitter<Ps, P, T> getEmitter(Map conf, TopologyContext context) {
return null;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/4e00e48d/external/storm-redis/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-redis/pom.xml b/external/storm-redis/pom.xml
index b7c946f..61fa168 100644
--- a/external/storm-redis/pom.xml
+++ b/external/storm-redis/pom.xml
@@ -95,7 +95,7 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<!--Note - the version would be inherited-->
<configuration>
- <maxAllowedViolations>598</maxAllowedViolations>
+ <maxAllowedViolations>602</maxAllowedViolations>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/storm/blob/4e00e48d/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
index 81efe95..d2df9dd 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
@@ -61,11 +61,11 @@ public class KerberosSaslTransportPlugin extends SaslTransportPlugin {
if (conf == null) {
throw new IllegalArgumentException("Configuration should not be null");
}
- SortedMap<String, ?> configsMap = AuthUtils.pullConfig(conf, login_context);
- if (configsMap!=null) {
+ SortedMap<String, ?> authConf = AuthUtils.pullConfig(conf, login_context);
+ if (authConf!=null) {
StringBuilder stringBuilder = new StringBuilder();
- for (String configKey: configsMap.keySet()) {
- String configValue = (String) configsMap.get(configKey);
+ for (String configKey: authConf.keySet()) {
+ String configValue = (String) authConf.get(configKey);
stringBuilder.append(configKey);
stringBuilder.append(configValue);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/4e00e48d/storm-client/src/jvm/org/apache/storm/stats/StatsUtil.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/stats/StatsUtil.java b/storm-client/src/jvm/org/apache/storm/stats/StatsUtil.java
index 6420546..e712804 100644
--- a/storm-client/src/jvm/org/apache/storm/stats/StatsUtil.java
+++ b/storm-client/src/jvm/org/apache/storm/stats/StatsUtil.java
@@ -2377,11 +2377,11 @@ public class StatsUtil {
return map.get(key);
}
- public static Map getMapByKey(Map map, String key) {
+ public static <K, V> Map<K,V> getMapByKey(Map map, String key) {
if (map == null) {
return null;
}
- return (Map) map.get(key);
+ return (Map<K,V>) map.get(key);
}
private static <K, V extends Number> long sumValues(Map<K, V> m) {
http://git-wip-us.apache.org/repos/asf/storm/blob/4e00e48d/storm-client/src/jvm/org/apache/storm/testing/BatchNumberList.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/testing/BatchNumberList.java b/storm-client/src/jvm/org/apache/storm/testing/BatchNumberList.java
index c58dac5..b958243 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/BatchNumberList.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/BatchNumberList.java
@@ -29,7 +29,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-public class BatchNumberList extends BaseBatchBolt {
+public class BatchNumberList extends BaseBatchBolt<Object> {
@Override
public void declareOutputFields(OutputFieldsDeclarer declarer) {
http://git-wip-us.apache.org/repos/asf/storm/blob/4e00e48d/storm-client/src/jvm/org/apache/storm/testing/CountingBatchBolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/testing/CountingBatchBolt.java b/storm-client/src/jvm/org/apache/storm/testing/CountingBatchBolt.java
index 2940dad..982eb87 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/CountingBatchBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/CountingBatchBolt.java
@@ -26,7 +26,7 @@ import org.apache.storm.tuple.Tuple;
import org.apache.storm.tuple.Values;
import java.util.Map;
-public class CountingBatchBolt extends BaseBatchBolt {
+public class CountingBatchBolt extends BaseBatchBolt<Object> {
BatchOutputCollector _collector;
Object _id;
int _count = 0;
http://git-wip-us.apache.org/repos/asf/storm/blob/4e00e48d/storm-client/src/jvm/org/apache/storm/testing/KeyedCountingBatchBolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/testing/KeyedCountingBatchBolt.java b/storm-client/src/jvm/org/apache/storm/testing/KeyedCountingBatchBolt.java
index 8212c75..c345147 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/KeyedCountingBatchBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/KeyedCountingBatchBolt.java
@@ -29,7 +29,7 @@ import org.apache.storm.utils.Utils;
import java.util.HashMap;
import java.util.Map;
-public class KeyedCountingBatchBolt extends BaseBatchBolt {
+public class KeyedCountingBatchBolt extends BaseBatchBolt<Object> {
BatchOutputCollector _collector;
Object _id;
Map<Object, Integer> _counts = new HashMap<Object, Integer>();
http://git-wip-us.apache.org/repos/asf/storm/blob/4e00e48d/storm-client/src/jvm/org/apache/storm/testing/KeyedSummingBatchBolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/testing/KeyedSummingBatchBolt.java b/storm-client/src/jvm/org/apache/storm/testing/KeyedSummingBatchBolt.java
index b508bf1..2e26516 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/KeyedSummingBatchBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/KeyedSummingBatchBolt.java
@@ -28,7 +28,7 @@ import org.apache.storm.utils.Utils;
import java.util.HashMap;
import java.util.Map;
-public class KeyedSummingBatchBolt extends BaseBatchBolt {
+public class KeyedSummingBatchBolt extends BaseBatchBolt<Object> {
BatchOutputCollector _collector;
Object _id;
Map<Object, Number> _sums = new HashMap<Object, Number>();
http://git-wip-us.apache.org/repos/asf/storm/blob/4e00e48d/storm-client/src/jvm/org/apache/storm/trident/operation/impl/IdentityMultiReducer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/IdentityMultiReducer.java b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/IdentityMultiReducer.java
index 68f2c89..0d5d129 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/IdentityMultiReducer.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/IdentityMultiReducer.java
@@ -24,24 +24,24 @@ import org.apache.storm.trident.operation.TridentMultiReducerContext;
import org.apache.storm.trident.tuple.TridentTuple;
-public class IdentityMultiReducer implements MultiReducer {
+public class IdentityMultiReducer<T> implements MultiReducer<T> {
@Override
public void prepare(Map conf, TridentMultiReducerContext context) {
}
@Override
- public Object init(TridentCollector collector) {
+ public T init(TridentCollector collector) {
return null;
}
@Override
- public void execute(Object state, int streamIndex, TridentTuple input, TridentCollector collector) {
+ public void execute(T state, int streamIndex, TridentTuple input, TridentCollector collector) {
collector.emit(input);
}
@Override
- public void complete(Object state, TridentCollector collector) {
+ public void complete(T state, TridentCollector collector) {
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/4e00e48d/storm-client/src/jvm/org/apache/storm/trident/spout/BatchSpoutExecutor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/spout/BatchSpoutExecutor.java b/storm-client/src/jvm/org/apache/storm/trident/spout/BatchSpoutExecutor.java
index 25cceba..0f1c066 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/spout/BatchSpoutExecutor.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/spout/BatchSpoutExecutor.java
@@ -23,8 +23,8 @@ import org.apache.storm.tuple.Fields;
import java.util.Map;
import org.apache.storm.trident.operation.TridentCollector;
-public class BatchSpoutExecutor implements ITridentSpout {
- public static class EmptyCoordinator implements BatchCoordinator {
+public class BatchSpoutExecutor implements ITridentSpout<Object> {
+ public static class EmptyCoordinator implements BatchCoordinator<Object> {
@Override
public Object initializeTransaction(long txid, Object prevMetadata, Object currMetadata) {
return null;
@@ -44,7 +44,7 @@ public class BatchSpoutExecutor implements ITridentSpout {
}
}
- public class BatchSpoutEmitter implements Emitter {
+ public class BatchSpoutEmitter implements Emitter<Object> {
@Override
public void emitBatch(TransactionAttempt tx, Object coordinatorMeta, TridentCollector collector) {
@@ -69,12 +69,12 @@ public class BatchSpoutExecutor implements ITridentSpout {
}
@Override
- public BatchCoordinator getCoordinator(String txStateId, Map conf, TopologyContext context) {
+ public BatchCoordinator<Object> getCoordinator(String txStateId, Map conf, TopologyContext context) {
return new EmptyCoordinator();
}
@Override
- public Emitter getEmitter(String txStateId, Map conf, TopologyContext context) {
+ public Emitter<Object> getEmitter(String txStateId, Map conf, TopologyContext context) {
_spout.open(conf, context);
return new BatchSpoutEmitter();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/4e00e48d/storm-client/src/jvm/org/apache/storm/trident/spout/RichSpoutBatchExecutor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/spout/RichSpoutBatchExecutor.java b/storm-client/src/jvm/org/apache/storm/trident/spout/RichSpoutBatchExecutor.java
index d5236a4..6980c81 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/spout/RichSpoutBatchExecutor.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/spout/RichSpoutBatchExecutor.java
@@ -31,7 +31,7 @@ import org.apache.storm.trident.operation.TridentCollector;
import org.apache.storm.trident.topology.TransactionAttempt;
import org.apache.storm.trident.util.TridentUtils;
-public class RichSpoutBatchExecutor implements ITridentSpout {
+public class RichSpoutBatchExecutor implements ITridentSpout<Object> {
public static final String MAX_BATCH_SIZE_CONF = "topology.spout.max.batch.size";
IRichSpout _spout;
@@ -52,12 +52,12 @@ public class RichSpoutBatchExecutor implements ITridentSpout {
}
@Override
- public BatchCoordinator getCoordinator(String txStateId, Map conf, TopologyContext context) {
+ public BatchCoordinator<Object> getCoordinator(String txStateId, Map conf, TopologyContext context) {
return new RichSpoutCoordinator();
}
@Override
- public Emitter getEmitter(String txStateId, Map conf, TopologyContext context) {
+ public Emitter<Object> getEmitter(String txStateId, Map conf, TopologyContext context) {
return new RichSpoutEmitter(conf, context);
}
@@ -146,7 +146,7 @@ public class RichSpoutBatchExecutor implements ITridentSpout {
}
- private static class RichSpoutCoordinator implements ITridentSpout.BatchCoordinator {
+ private static class RichSpoutCoordinator implements ITridentSpout.BatchCoordinator<Object> {
@Override
public Object initializeTransaction(long txid, Object prevMetadata, Object currMetadata) {
return null;
http://git-wip-us.apache.org/repos/asf/storm/blob/4e00e48d/storm-client/src/jvm/org/apache/storm/trident/testing/FeederBatchSpout.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/testing/FeederBatchSpout.java b/storm-client/src/jvm/org/apache/storm/trident/testing/FeederBatchSpout.java
index 6975500..1f0859b 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/testing/FeederBatchSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/testing/FeederBatchSpout.java
@@ -32,7 +32,7 @@ import org.apache.storm.trident.spout.ITridentSpout;
import org.apache.storm.trident.topology.TransactionAttempt;
import org.apache.storm.trident.topology.TridentTopologyBuilder;
-public class FeederBatchSpout implements ITridentSpout, IFeeder {
+public class FeederBatchSpout implements ITridentSpout<Map<Integer, List<List<Object>>>>, IFeeder {
String _id;
String _semaphoreId;
@@ -167,7 +167,7 @@ public class FeederBatchSpout implements ITridentSpout, IFeeder {
}
@Override
- public BatchCoordinator getCoordinator(String txStateId, Map conf, TopologyContext context) {
+ public BatchCoordinator<Map<Integer, List<List<Object>>>> getCoordinator(String txStateId, Map conf, TopologyContext context) {
int numTasks = context.getComponentTasks(
TridentTopologyBuilder.spoutIdFromCoordinatorId(
context.getThisComponentId()))
@@ -176,7 +176,7 @@ public class FeederBatchSpout implements ITridentSpout, IFeeder {
}
@Override
- public Emitter getEmitter(String txStateId, Map conf, TopologyContext context) {
+ public Emitter<Map<Integer, List<List<Object>>>> getEmitter(String txStateId, Map conf, TopologyContext context) {
return new FeederEmitter(context.getThisTaskIndex());
}
http://git-wip-us.apache.org/repos/asf/storm/blob/4e00e48d/storm-client/src/jvm/org/apache/storm/trident/testing/FeederCommitterBatchSpout.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/testing/FeederCommitterBatchSpout.java b/storm-client/src/jvm/org/apache/storm/trident/testing/FeederCommitterBatchSpout.java
index 24d4fa3..8609ed2 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/testing/FeederCommitterBatchSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/testing/FeederCommitterBatchSpout.java
@@ -27,7 +27,7 @@ import org.apache.storm.trident.spout.ITridentSpout;
import org.apache.storm.trident.topology.TransactionAttempt;
-public class FeederCommitterBatchSpout implements ICommitterTridentSpout, IFeeder {
+public class FeederCommitterBatchSpout implements ICommitterTridentSpout<Map<Integer, List<List<Object>>>>, IFeeder {
FeederBatchSpout _spout;
@@ -74,7 +74,7 @@ public class FeederCommitterBatchSpout implements ICommitterTridentSpout, IFeede
}
@Override
- public BatchCoordinator getCoordinator(String txStateId, Map conf, TopologyContext context) {
+ public BatchCoordinator<Map<Integer, List<List<Object>>>> getCoordinator(String txStateId, Map conf, TopologyContext context) {
return _spout.getCoordinator(txStateId, conf, context);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/4e00e48d/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 effaba2..fad8235 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/Utils.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/Utils.java
@@ -932,32 +932,39 @@ public class Utils {
return store;
}
- private static Object normalizeConf(Object conf) {
- if (conf == null) return new HashMap();
- if (conf instanceof Map) {
- Map<Object, Object> confMap = new HashMap((Map) conf);
- for (Map.Entry<Object, Object> entry : confMap.entrySet()) {
- confMap.put(entry.getKey(), normalizeConf(entry.getValue()));
- }
- return confMap;
- } else if (conf instanceof List) {
- List confList = new ArrayList((List) conf);
+ @SuppressWarnings("unchecked")
+ private static Object normalizeConfValue(Object obj) {
+ if (obj instanceof Map) {
+ return normalizeConf((Map<String, Object>) obj);
+ } else if (obj instanceof Collection) {
+ List<Object> confList = new ArrayList<>((Collection<Object>) obj);
for (int i = 0; i < confList.size(); i++) {
Object val = confList.get(i);
- confList.set(i, normalizeConf(val));
+ confList.set(i, normalizeConfValue(val));
}
return confList;
- } else if (conf instanceof Integer) {
- return ((Integer) conf).longValue();
- } else if (conf instanceof Float) {
- return ((Float) conf).doubleValue();
+ } else if (obj instanceof Integer) {
+ return ((Number) obj).longValue();
+ } else if (obj instanceof Float) {
+ return ((Float) obj).doubleValue();
} else {
- return conf;
+ return obj;
+ }
+ }
+
+ private static Map<String, Object> normalizeConf(Map<String, Object> conf) {
+ if (conf == null) {
+ return new HashMap<>();
}
+ Map<String, Object> ret = new HashMap<>(conf);
+ for (Map.Entry<String, Object> entry : ret.entrySet()) {
+ ret.put(entry.getKey(), normalizeConfValue(entry.getValue()));
+ }
+ return ret;
}
public static boolean isValidConf(Map<String, Object> stormConf) {
- return normalizeConf(stormConf).equals(normalizeConf((Map) JSONValue.parse(JSONValue.toJSONString(stormConf))));
+ return normalizeConf(stormConf).equals(normalizeConf((Map<String, Object>) JSONValue.parse(JSONValue.toJSONString(stormConf))));
}
public static TopologyInfo getTopologyInfo(String name, String asUser, Map stormConf) {
http://git-wip-us.apache.org/repos/asf/storm/blob/4e00e48d/storm-client/test/jvm/org/apache/storm/TestConfigValidate.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/TestConfigValidate.java b/storm-client/test/jvm/org/apache/storm/TestConfigValidate.java
index ee4d143..63f2cd9 100644
--- a/storm-client/test/jvm/org/apache/storm/TestConfigValidate.java
+++ b/storm-client/test/jvm/org/apache/storm/TestConfigValidate.java
@@ -86,7 +86,7 @@ public class TestConfigValidate {
@Test(expected = InvalidTopologyException.class)
public void testValidateTopologyBlobStoreMap() throws InvalidTopologyException {
- Map<String,Map> stormConf = new HashMap<>();
+ Map<String, Object> stormConf = new HashMap<>();
Map<String,Map> topologyMap = new HashMap<>();
topologyMap.put("key1", new HashMap<String,String>());
topologyMap.put("key2", new HashMap<String,String>());
http://git-wip-us.apache.org/repos/asf/storm/blob/4e00e48d/storm-client/test/jvm/org/apache/storm/security/auth/AuthUtilsTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/security/auth/AuthUtilsTest.java b/storm-client/test/jvm/org/apache/storm/security/auth/AuthUtilsTest.java
index 40a0062..7b948f5 100644
--- a/storm-client/test/jvm/org/apache/storm/security/auth/AuthUtilsTest.java
+++ b/storm-client/test/jvm/org/apache/storm/security/auth/AuthUtilsTest.java
@@ -23,6 +23,7 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -93,40 +94,36 @@ public class AuthUtilsTest {
Assert.assertNull(AuthUtils.pullConfig(null, "foo"));
Assert.assertNull(AuthUtils.get(null, "foo", "bar"));
- Map emptyMap = new HashMap<String, String>();
- Assert.assertNull(AuthUtils.GetConfiguration(emptyMap));
+ Assert.assertNull(AuthUtils.GetConfiguration(Collections.emptyMap()));
}
@Test
public void getAutoCredentialsTest() {
- Map emptyMap = new HashMap<String, String>();
- Map<String, Collection<String>> map = new HashMap<String, Collection<String>>();
+ Map<String, Object> map = new HashMap<>();
map.put(Config.TOPOLOGY_AUTO_CREDENTIALS,
Arrays.asList(new String[]{"org.apache.storm.security.auth.AuthUtilsTestMock"}));
- Assert.assertTrue(AuthUtils.GetAutoCredentials(emptyMap).isEmpty());
+ Assert.assertTrue(AuthUtils.GetAutoCredentials(Collections.emptyMap()).isEmpty());
Assert.assertEquals(AuthUtils.GetAutoCredentials(map).size(), 1);
}
@Test
public void getNimbusAutoCredPluginTest() {
- Map emptyMap = new HashMap<String, String>();
- Map<String, Collection<String>> map = new HashMap<String, Collection<String>>();
+ Map<String, Object> map = new HashMap<>();
map.put(Config.NIMBUS_AUTO_CRED_PLUGINS,
Arrays.asList(new String[]{"org.apache.storm.security.auth.AuthUtilsTestMock"}));
- Assert.assertTrue(AuthUtils.getNimbusAutoCredPlugins(emptyMap).isEmpty());
+ Assert.assertTrue(AuthUtils.getNimbusAutoCredPlugins(Collections.emptyMap()).isEmpty());
Assert.assertEquals(AuthUtils.getNimbusAutoCredPlugins(map).size(), 1);
}
@Test
public void GetCredentialRenewersTest() {
- Map emptyMap = new HashMap<String, String>();
- Map<String, Collection<String>> map = new HashMap<String, Collection<String>>();
+ Map<String, Object> map = new HashMap<>();
map.put(Config.NIMBUS_CREDENTIAL_RENEWERS,
Arrays.asList(new String[]{"org.apache.storm.security.auth.AuthUtilsTestMock"}));
- Assert.assertTrue(AuthUtils.GetCredentialRenewers(emptyMap).isEmpty());
+ Assert.assertTrue(AuthUtils.GetCredentialRenewers(Collections.emptyMap()).isEmpty());
Assert.assertEquals(AuthUtils.GetCredentialRenewers(map).size(), 1);
}
@@ -175,7 +172,7 @@ public class AuthUtilsTest {
@Test(expected = RuntimeException.class)
public void invalidConfigResultsInIOException() throws RuntimeException {
- HashMap<String, String> conf = new HashMap<String, String>();
+ HashMap<String, Object> conf = new HashMap<>();
conf.put("java.security.auth.login.config", "__FAKE_FILE__");
Assert.assertNotNull(AuthUtils.GetConfiguration(conf));
}
@@ -188,14 +185,14 @@ public class AuthUtilsTest {
@Test
public void validConfigResultsInNotNullConfigurationTest() throws IOException {
File file1 = folder.newFile("mockfile.txt");
- HashMap<String, String> conf = new HashMap<String, String>();
+ HashMap<String, Object> conf = new HashMap<>();
conf.put("java.security.auth.login.config", file1.getAbsolutePath());
Assert.assertNotNull(AuthUtils.GetConfiguration(conf));
}
@Test
public void uiHttpCredentialsPluginTest(){
- Map conf = new HashMap<String, String>();
+ Map<String, Object> conf = new HashMap<>();
conf.put(
Config.UI_HTTP_CREDS_PLUGIN,
"org.apache.storm.security.auth.AuthUtilsTestMock");
http://git-wip-us.apache.org/repos/asf/storm/blob/4e00e48d/storm-client/test/jvm/org/apache/storm/security/auth/AuthUtilsTestMock.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/security/auth/AuthUtilsTestMock.java b/storm-client/test/jvm/org/apache/storm/security/auth/AuthUtilsTestMock.java
index 9bf041d..7a5946c 100644
--- a/storm-client/test/jvm/org/apache/storm/security/auth/AuthUtilsTestMock.java
+++ b/storm-client/test/jvm/org/apache/storm/security/auth/AuthUtilsTestMock.java
@@ -40,43 +40,54 @@ public class AuthUtilsTestMock implements IAutoCredentials,
// INimbusCredentialPlugin
// IPrincipalToLocal
// IGroupMappingServiceProvider
+ @Override
public void prepare(Map conf) {}
// IHttpCredentialsPlugin
+ @Override
public ReqContext populateContext(ReqContext ctx, HttpServletRequest req) {
return null;
}
// IHttpCredentialsPlugin
+ @Override
public String getUserName(HttpServletRequest req){
return null;
}
// IPrincipalToLocal
+ @Override
public String toLocal(Principal principal) {
return null;
}
// IGroupMappingServiceProvider
+ @Override
public Set<String> getGroups(String user) throws IOException {
return null;
}
// ICredentialsRenewer
+ @Override
public void renew(Map<String, String> credentials, Map topologyConf) {}
// IAutoCredentials
- public void updateSubject(Subject subject, Map<String,String> conf) {}
+ @Override
+ public void updateSubject(Subject subject, Map<String,String> creds) {}
// IAutoCredentials
- public void populateSubject(Subject subject, Map<String,String> conf) {}
+ @Override
+ public void populateSubject(Subject subject, Map<String,String> creds) {}
// IAutoCredentials
- public void populateCredentials(Map<String,String> conf) {}
+ @Override
+ public void populateCredentials(Map<String,String> creds) {}
// INimbusCredentialPlugin
+ @Override
public void populateCredentials(Map<String,String> credentials, Map conf) {}
// Shutdownable via INimbusCredentailPlugin
+ @Override
public void shutdown() {}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/4e00e48d/storm-server/src/main/java/org/apache/storm/daemon/drpc/DRPC.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/drpc/DRPC.java b/storm-server/src/main/java/org/apache/storm/daemon/drpc/DRPC.java
index 2550203..b4606ca 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/drpc/DRPC.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/drpc/DRPC.java
@@ -76,7 +76,7 @@ public class DRPC implements AutoCloseable {
ThriftAccessLogger.logAccessFunction(reqContext.requestID(), reqContext.remoteAddress(), reqContext.principal(), operation, function);
}
if (auth != null) {
- Map<String, String> map = new HashMap<>();
+ Map<String, Object> map = new HashMap<>();
map.put(DRPCAuthorizerBase.FUNCTION_NAME, function);
if (!auth.permit(reqContext, operation, map)) {
Principal principal = reqContext.principal();
http://git-wip-us.apache.org/repos/asf/storm/blob/4e00e48d/transform.sh
----------------------------------------------------------------------
diff --git a/transform.sh b/transform.sh
new file mode 100755
index 0000000..4abfeee
--- /dev/null
+++ b/transform.sh
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+
+find . -iname \*.java | xargs sed -i .back \
+ -e 's/stormConf/topoConf/g' \
+ -e 's/storm_conf/topoConf/g' \
+ -e 's/topology_conf/topoConf/g' \
+ -e 's/Map topoConf/Map<String, Object> topoConf/g' \
+ -e 's/Map topologyConf/Map<String, Object> topologyConf/g' \
+ -e 's/Map conf/Map<String, Object> conf/g' \
+ -e 's/Map<String, *String> topoConf/Map<String, Object> topoConf/g' \
+ -e 's/Map<String, *String> conf/Map<String, Object> conf/g' \
+ -e 's/Map<String, *?> topoConf/Map<String, Object> topoConf/g' \
+ -e 's/Map<String, *?> conf/Map<String, Object> conf/g' \
+ -e 's/Map<Object, *Object> conf/Map<String, Object> conf/g' \
+ -e 's/conf = new HashMap<String, *String>/conf = new HashMap<>/g'
+find . -iname \*.java.back | xargs rm -f
[09/13] storm git commit: STORM-2477: Result of transforming the code
Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 f49369a..423c679 100644
--- a/storm-client/src/jvm/org/apache/storm/StormSubmitter.java
+++ b/storm-client/src/jvm/org/apache/storm/StormSubmitter.java
@@ -76,7 +76,7 @@ public class StormSubmitter {
}
@SuppressWarnings("unchecked")
- public static Map prepareZookeeperAuthentication(Map conf) {
+ public static Map prepareZookeeperAuthentication(Map<String, Object> conf) {
Map toRet = new HashMap();
// Is the topology ZooKeeper authentication configuration unset?
@@ -96,7 +96,7 @@ public class StormSubmitter {
return toRet;
}
- private static Map<String,String> populateCredentials(Map conf, Map<String, String> creds) {
+ private static Map<String,String> populateCredentials(Map<String, Object> conf, Map<String, String> creds) {
Map<String,String> ret = new HashMap<>();
for (IAutoCredentials autoCred: AuthUtils.GetAutoCredentials(conf)) {
LOG.info("Running "+autoCred);
@@ -111,18 +111,18 @@ public class StormSubmitter {
/**
* Push a new set of credentials to the running topology.
* @param name the name of the topology to push credentials to.
- * @param stormConf the topology-specific configuration, if desired. See {@link Config}.
+ * @param topoConf the topology-specific configuration, if desired. See {@link Config}.
* @param credentials the credentials to push.
* @throws AuthorizationException if you are not authorized ot push credentials.
* @throws NotAliveException if the topology is not alive
* @throws InvalidTopologyException if any other error happens
*/
- public static void pushCredentials(String name, Map stormConf, Map<String, String> credentials)
+ public static void pushCredentials(String name, Map<String, Object> topoConf, Map<String, String> credentials)
throws AuthorizationException, NotAliveException, InvalidTopologyException {
- stormConf = new HashMap(stormConf);
- stormConf.putAll(Utils.readCommandLineOpts());
- Map conf = Utils.readStormConfig();
- conf.putAll(stormConf);
+ topoConf = new HashMap(topoConf);
+ topoConf.putAll(Utils.readCommandLineOpts());
+ Map<String, Object> conf = Utils.readStormConfig();
+ conf.putAll(topoConf);
Map<String,String> fullCreds = populateCredentials(conf, credentials);
if (fullCreds.isEmpty()) {
LOG.warn("No credentials were found to push to " + name);
@@ -151,16 +151,16 @@ public class StormSubmitter {
*
*
* @param name the name of the storm.
- * @param stormConf the topology-specific configuration. See {@link Config}.
+ * @param topoConf the topology-specific configuration. See {@link Config}.
* @param topology the processing to execute.
* @throws AlreadyAliveException if a topology with this name is already running
* @throws InvalidTopologyException if an invalid topology was submitted
* @throws AuthorizationException if authorization is failed
* @thorws SubmitterHookException if any Exception occurs during initialization or invocation of registered {@link ISubmitterHook}
*/
- public static void submitTopology(String name, Map stormConf, StormTopology topology)
+ public static void submitTopology(String name, Map<String, Object> topoConf, StormTopology topology)
throws AlreadyAliveException, InvalidTopologyException, AuthorizationException {
- submitTopology(name, stormConf, topology, null, null);
+ submitTopology(name, topoConf, topology, null, null);
}
/**
@@ -168,7 +168,7 @@ public class StormSubmitter {
* explicitly killed.
*
* @param name the name of the storm.
- * @param stormConf the topology-specific configuration. See {@link Config}.
+ * @param topoConf the topology-specific configuration. See {@link Config}.
* @param topology the processing to execute.
* @param opts to manipulate the starting of the topology.
* @throws AlreadyAliveException if a topology with this name is already running
@@ -176,9 +176,9 @@ public class StormSubmitter {
* @throws AuthorizationException if authorization is failed
* @thorws SubmitterHookException if any Exception occurs during initialization or invocation of registered {@link ISubmitterHook}
*/
- public static void submitTopology(String name, Map stormConf, StormTopology topology, SubmitOptions opts)
+ public static void submitTopology(String name, Map<String, Object> topoConf, StormTopology topology, SubmitOptions opts)
throws AlreadyAliveException, InvalidTopologyException, AuthorizationException {
- submitTopology(name, stormConf, topology, opts, null);
+ submitTopology(name, topoConf, topology, opts, null);
}
/**
@@ -186,7 +186,7 @@ public class StormSubmitter {
* explicitly killed.
*
* @param name
- * @param stormConf
+ * @param topoConf
* @param topology
* @param opts
* @param progressListener
@@ -197,16 +197,16 @@ public class StormSubmitter {
* @throws IllegalArgumentException thrown if configs will yield an unschedulable topology. validateConfs validates confs
* @thorws SubmitterHookException if any Exception occurs during initialization or invocation of registered {@link ISubmitterHook}
*/
- public static void submitTopologyAs(String name, Map stormConf, StormTopology topology, SubmitOptions opts, ProgressListener progressListener, String asUser)
+ public static void submitTopologyAs(String name, Map<String, Object> topoConf, StormTopology topology, SubmitOptions opts, ProgressListener progressListener, String asUser)
throws AlreadyAliveException, InvalidTopologyException, AuthorizationException, IllegalArgumentException {
- if(!Utils.isValidConf(stormConf)) {
+ if(!Utils.isValidConf(topoConf)) {
throw new IllegalArgumentException("Storm conf is not valid. Must be json-serializable");
}
- stormConf = new HashMap(stormConf);
- stormConf.putAll(Utils.readCommandLineOpts());
- Map conf = Utils.readStormConfig();
- conf.putAll(stormConf);
- stormConf.putAll(prepareZookeeperAuthentication(conf));
+ topoConf = new HashMap(topoConf);
+ topoConf.putAll(Utils.readCommandLineOpts());
+ Map<String, Object> conf = Utils.readStormConfig();
+ conf.putAll(topoConf);
+ topoConf.putAll(prepareZookeeperAuthentication(conf));
validateConfs(conf, topology);
@@ -228,14 +228,14 @@ public class StormSubmitter {
if (localNimbus!=null) {
LOG.info("Submitting topology " + name + " in local mode");
if (opts!=null) {
- localNimbus.submitTopologyWithOpts(name, stormConf, topology, opts);
+ localNimbus.submitTopologyWithOpts(name, topoConf, topology, opts);
} else {
// this is for backwards compatibility
- localNimbus.submitTopology(name, stormConf, topology);
+ localNimbus.submitTopology(name, topoConf, topology);
}
LOG.info("Finished submitting topology: " + name);
} else {
- String serConf = JSONValue.toJSONString(stormConf);
+ String serConf = JSONValue.toJSONString(topoConf);
try (NimbusClient client = NimbusClient.getConfiguredClientAs(conf, asUser)) {
if (topologyNameExists(name, client)) {
throw new RuntimeException("Topology with name `" + name + "` already exists on cluster");
@@ -317,7 +317,7 @@ public class StormSubmitter {
}
private static void submitTopologyInDistributeMode(String name, StormTopology topology, SubmitOptions opts,
- ProgressListener progressListener, String asUser, Map conf,
+ ProgressListener progressListener, String asUser, Map<String, Object> conf,
String serConf, NimbusClient client) throws TException {
try {
String jar = submitJarAs(conf, System.getProperty("storm.jar"), progressListener, client);
@@ -343,16 +343,16 @@ public class StormSubmitter {
*
* @param name
* @param asUser
- * @param stormConf
+ * @param topoConf
* @param topology
*
* @thorws SubmitterHookException This is thrown when any Exception occurs during initialization or invocation of registered {@link ISubmitterHook}
*/
- private static void invokeSubmitterHook(String name, String asUser, Map stormConf, StormTopology topology) {
+ private static void invokeSubmitterHook(String name, String asUser, Map<String, Object> topoConf, StormTopology topology) {
String submissionNotifierClassName = null;
try {
- if (stormConf.containsKey(Config.STORM_TOPOLOGY_SUBMISSION_NOTIFIER_PLUGIN)) {
- submissionNotifierClassName = stormConf.get(Config.STORM_TOPOLOGY_SUBMISSION_NOTIFIER_PLUGIN).toString();
+ if (topoConf.containsKey(Config.STORM_TOPOLOGY_SUBMISSION_NOTIFIER_PLUGIN)) {
+ submissionNotifierClassName = topoConf.get(Config.STORM_TOPOLOGY_SUBMISSION_NOTIFIER_PLUGIN).toString();
LOG.info("Initializing the registered ISubmitterHook [{}]", submissionNotifierClassName);
if(submissionNotifierClassName == null || submissionNotifierClassName.isEmpty()) {
@@ -360,9 +360,9 @@ public class StormSubmitter {
}
ISubmitterHook submitterHook = (ISubmitterHook) Class.forName(submissionNotifierClassName).newInstance();
- TopologyInfo topologyInfo = Utils.getTopologyInfo(name, asUser, stormConf);
+ TopologyInfo topologyInfo = Utils.getTopologyInfo(name, asUser, topoConf);
LOG.info("Invoking the registered ISubmitterHook [{}]", submissionNotifierClassName);
- submitterHook.notify(topologyInfo, stormConf, topology);
+ submitterHook.notify(topologyInfo, topoConf, topology);
}
} catch (Exception e) {
LOG.warn("Error occurred in invoking submitter hook:[{}] ",submissionNotifierClassName, e);
@@ -376,7 +376,7 @@ public class StormSubmitter {
*
*
* @param name the name of the storm.
- * @param stormConf the topology-specific configuration. See {@link Config}.
+ * @param topoConf the topology-specific configuration. See {@link Config}.
* @param topology the processing to execute.
* @param opts to manipulate the starting of the topology
* @param progressListener to track the progress of the jar upload process
@@ -386,9 +386,9 @@ public class StormSubmitter {
* @thorws SubmitterHookException if any Exception occurs during initialization or invocation of registered {@link ISubmitterHook}
*/
@SuppressWarnings("unchecked")
- public static void submitTopology(String name, Map stormConf, StormTopology topology, SubmitOptions opts,
+ public static void submitTopology(String name, Map<String, Object> topoConf, StormTopology topology, SubmitOptions opts,
ProgressListener progressListener) throws AlreadyAliveException, InvalidTopologyException, AuthorizationException {
- submitTopologyAs(name, stormConf, topology, opts, progressListener, null);
+ submitTopologyAs(name, topoConf, topology, opts, progressListener, null);
}
/**
@@ -397,15 +397,15 @@ public class StormSubmitter {
*
*
* @param name the name of the storm.
- * @param stormConf the topology-specific configuration. See {@link Config}.
+ * @param topoConf the topology-specific configuration. See {@link Config}.
* @param topology the processing to execute.
* @throws AlreadyAliveException if a topology with this name is already running
* @throws InvalidTopologyException if an invalid topology was submitted
* @throws AuthorizationException if authorization is failed
*/
- public static void submitTopologyWithProgressBar(String name, Map stormConf, StormTopology topology) throws AlreadyAliveException, InvalidTopologyException, AuthorizationException {
- submitTopologyWithProgressBar(name, stormConf, topology, null);
+ public static void submitTopologyWithProgressBar(String name, Map<String, Object> topoConf, StormTopology topology) throws AlreadyAliveException, InvalidTopologyException, AuthorizationException {
+ submitTopologyWithProgressBar(name, topoConf, topology, null);
}
/**
@@ -414,7 +414,7 @@ public class StormSubmitter {
*
*
* @param name the name of the storm.
- * @param stormConf the topology-specific configuration. See {@link Config}.
+ * @param topoConf the topology-specific configuration. See {@link Config}.
* @param topology the processing to execute.
* @param opts to manipulate the starting of the topology
* @throws AlreadyAliveException if a topology with this name is already running
@@ -422,9 +422,9 @@ public class StormSubmitter {
* @throws AuthorizationException if authorization is failed
* @thorws SubmitterHookException if any Exception occurs during initialization or invocation of registered {@link ISubmitterHook}
*/
- public static void submitTopologyWithProgressBar(String name, Map stormConf, StormTopology topology, SubmitOptions opts) throws AlreadyAliveException, InvalidTopologyException, AuthorizationException {
+ public static void submitTopologyWithProgressBar(String name, Map<String, Object> topoConf, StormTopology topology, SubmitOptions opts) throws AlreadyAliveException, InvalidTopologyException, AuthorizationException {
// show a progress bar so we know we're not stuck (especially on slow connections)
- submitTopology(name, stormConf, topology, opts, new StormSubmitter.ProgressListener() {
+ submitTopology(name, topoConf, topology, opts, new StormSubmitter.ProgressListener() {
@Override
public void onStart(String srcFile, String targetFile, long totalBytes) {
System.out.printf("Start uploading file '%s' to '%s' (%d bytes)\n", srcFile, targetFile, totalBytes);
@@ -455,7 +455,7 @@ public class StormSubmitter {
}
}
- private static String submitJar(Map conf, ProgressListener listener) {
+ private static String submitJar(Map<String, Object> conf, ProgressListener listener) {
return submitJar(conf, System.getProperty("storm.jar"), listener);
}
@@ -465,11 +465,11 @@ public class StormSubmitter {
* @param localJar file path of the jar file to submit
* @return the remote location of the submitted jar
*/
- public static String submitJar(Map conf, String localJar) {
+ public static String submitJar(Map<String, Object> conf, String localJar) {
return submitJar(conf, localJar, null);
}
- public static String submitJarAs(Map conf, String localJar, ProgressListener listener, NimbusClient client) {
+ public static String submitJarAs(Map<String, Object> conf, String localJar, ProgressListener listener, NimbusClient client) {
if (localJar == null) {
throw new RuntimeException("Must submit topologies using the 'storm' client script so that StormSubmitter knows which jar to upload.");
}
@@ -508,7 +508,7 @@ public class StormSubmitter {
}
}
- public static String submitJarAs(Map conf, String localJar, ProgressListener listener, String asUser) {
+ public static String submitJarAs(Map<String, Object> conf, String localJar, ProgressListener listener, String asUser) {
if (localJar == null) {
throw new RuntimeException("Must submit topologies using the 'storm' client script so that StormSubmitter knows which jar to upload.");
}
@@ -525,7 +525,7 @@ public class StormSubmitter {
* @param listener progress listener to track the jar file upload
* @return the remote location of the submitted jar
*/
- public static String submitJar(Map conf, String localJar, ProgressListener listener) {
+ public static String submitJar(Map<String, Object> conf, String localJar, ProgressListener listener) {
return submitJarAs(conf,localJar, listener, (String)null);
}
@@ -559,23 +559,23 @@ public class StormSubmitter {
public void onCompleted(String srcFile, String targetFile, long totalBytes);
}
- private static void validateConfs(Map<String, Object> stormConf, StormTopology topology) throws IllegalArgumentException, InvalidTopologyException {
- ConfigValidation.validateFields(stormConf);
- validateTopologyWorkerMaxHeapSizeMBConfigs(stormConf, topology);
- Utils.validateTopologyBlobStoreMap(stormConf, getListOfKeysFromBlobStore(stormConf));
+ private static void validateConfs(Map<String, Object> topoConf, StormTopology topology) throws IllegalArgumentException, InvalidTopologyException {
+ ConfigValidation.validateFields(topoConf);
+ validateTopologyWorkerMaxHeapSizeMBConfigs(topoConf, topology);
+ Utils.validateTopologyBlobStoreMap(topoConf, getListOfKeysFromBlobStore(topoConf));
}
- private static void validateTopologyWorkerMaxHeapSizeMBConfigs(Map<String, Object> stormConf, StormTopology topology) {
- double largestMemReq = getMaxExecutorMemoryUsageForTopo(topology, stormConf);
- Double topologyWorkerMaxHeapSize = ObjectReader.getDouble(stormConf.get(Config.TOPOLOGY_WORKER_MAX_HEAP_SIZE_MB));
+ private static void validateTopologyWorkerMaxHeapSizeMBConfigs(Map<String, Object> topoConf, StormTopology topology) {
+ double largestMemReq = getMaxExecutorMemoryUsageForTopo(topology, topoConf);
+ Double topologyWorkerMaxHeapSize = ObjectReader.getDouble(topoConf.get(Config.TOPOLOGY_WORKER_MAX_HEAP_SIZE_MB));
if(topologyWorkerMaxHeapSize < largestMemReq) {
throw new IllegalArgumentException("Topology will not be able to be successfully scheduled: Config TOPOLOGY_WORKER_MAX_HEAP_SIZE_MB="
- + ObjectReader.getDouble(stormConf.get(Config.TOPOLOGY_WORKER_MAX_HEAP_SIZE_MB)) + " < "
+ + ObjectReader.getDouble(topoConf.get(Config.TOPOLOGY_WORKER_MAX_HEAP_SIZE_MB)) + " < "
+ largestMemReq + " (Largest memory requirement of a component in the topology). Perhaps set TOPOLOGY_WORKER_MAX_HEAP_SIZE_MB to a larger amount");
}
}
- private static double getMaxExecutorMemoryUsageForTopo(StormTopology topology, Map topologyConf) {
+ private static double getMaxExecutorMemoryUsageForTopo(StormTopology topology, Map<String, Object> topologyConf) {
double largestMemoryOperator = 0.0;
for(Map<String, Double> entry : ResourceUtils.getBoltsResources(topology, topologyConf).values()) {
double memoryRequirement = entry.get(Config.TOPOLOGY_COMPONENT_RESOURCES_OFFHEAP_MEMORY_MB)
@@ -594,9 +594,9 @@ public class StormSubmitter {
return largestMemoryOperator;
}
- private static Set<String> getListOfKeysFromBlobStore(Map<String, Object> stormConf) {
+ private static Set<String> getListOfKeysFromBlobStore(Map<String, Object> topoConf) {
try (NimbusBlobStore client = new NimbusBlobStore()) {
- client.prepare(stormConf);
+ client.prepare(topoConf);
return Sets.newHashSet(client.listKeys());
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 2e5080a..bffd04f 100644
--- a/storm-client/src/jvm/org/apache/storm/Thrift.java
+++ b/storm-client/src/jvm/org/apache/storm/Thrift.java
@@ -78,9 +78,9 @@ public class Thrift {
public static class SpoutDetails {
private IRichSpout spout;
private Integer parallelism;
- private Map conf;
+ private Map<String, Object> conf;
- public SpoutDetails(IRichSpout spout, Integer parallelism, Map conf) {
+ public SpoutDetails(IRichSpout spout, Integer parallelism, Map<String, Object> conf) {
this.spout = spout;
this.parallelism = parallelism;
this.conf = conf;
@@ -101,11 +101,11 @@ public class Thrift {
public static class BoltDetails {
private Object bolt;
- private Map conf;
+ private Map<String, Object> conf;
private Integer parallelism;
private Map<GlobalStreamId, Grouping> inputs;
- public BoltDetails(Object bolt, Map conf, Integer parallelism,
+ public BoltDetails(Object bolt, Map<String, Object> conf, Integer parallelism,
Map<GlobalStreamId, Grouping> inputs) {
this.bolt = bolt;
this.conf = conf;
@@ -256,7 +256,7 @@ public class Thrift {
}
public static ComponentCommon prepareComponentCommon(Map<GlobalStreamId, Grouping> inputs, Map<String, StreamInfo> outputs,
- Integer parallelismHint, Map conf) {
+ Integer parallelismHint, Map<String, Object> conf) {
Map<GlobalStreamId, Grouping> mappedInputs = new HashMap<>();
Map<String, StreamInfo> mappedOutputs = new HashMap<>();
if (inputs != null && !inputs.isEmpty()) {
@@ -281,7 +281,7 @@ public class Thrift {
}
public static Bolt prepareSerializedBoltDetails(Map<GlobalStreamId, Grouping> inputs, IBolt bolt, Map<String, StreamInfo> outputs,
- Integer parallelismHint, Map conf) {
+ Integer parallelismHint, Map<String, Object> conf) {
ComponentCommon common = prepareComponentCommon(inputs, outputs, parallelismHint, conf);
return new Bolt(ComponentObject.serialized_java(Utils.javaSerialize(bolt)), common);
}
@@ -296,7 +296,7 @@ public class Thrift {
}
public static BoltDetails prepareBoltDetails(Map<GlobalStreamId, Grouping> inputs, Object bolt,
- Integer parallelismHint, Map conf) {
+ Integer parallelismHint, Map<String, Object> conf) {
BoltDetails details = new BoltDetails(bolt, conf, parallelismHint, inputs);
return details;
}
@@ -309,7 +309,7 @@ public class Thrift {
return prepareSpoutDetails(spout, parallelismHint, null);
}
- public static SpoutDetails prepareSpoutDetails(IRichSpout spout, Integer parallelismHint, Map conf) {
+ public static SpoutDetails prepareSpoutDetails(IRichSpout spout, Integer parallelismHint, Map<String, Object> conf) {
SpoutDetails details = new SpoutDetails(spout, parallelismHint, conf);
return details;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/blobstore/BlobStore.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/blobstore/BlobStore.java b/storm-client/src/jvm/org/apache/storm/blobstore/BlobStore.java
index 643bc3f..bb177a1 100644
--- a/storm-client/src/jvm/org/apache/storm/blobstore/BlobStore.java
+++ b/storm-client/src/jvm/org/apache/storm/blobstore/BlobStore.java
@@ -73,7 +73,7 @@ public abstract class BlobStore implements Shutdownable {
* @param baseDir The directory path to store the blobs
* @param nimbusInfo Contains the nimbus host, port and leadership information.
*/
- public abstract void prepare(Map conf, String baseDir, NimbusInfo nimbusInfo);
+ public abstract void prepare(Map<String, Object> conf, String baseDir, NimbusInfo nimbusInfo);
/**
* Creates the blob.
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/blobstore/BlobStoreAclHandler.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/blobstore/BlobStoreAclHandler.java b/storm-client/src/jvm/org/apache/storm/blobstore/BlobStoreAclHandler.java
index 5b3866d..4eb2a22 100644
--- a/storm-client/src/jvm/org/apache/storm/blobstore/BlobStoreAclHandler.java
+++ b/storm-client/src/jvm/org/apache/storm/blobstore/BlobStoreAclHandler.java
@@ -56,7 +56,7 @@ public class BlobStoreAclHandler {
private Set<String> _admins;
private boolean doAclValidation;
- public BlobStoreAclHandler(Map conf) {
+ public BlobStoreAclHandler(Map<String, Object> conf) {
_ptol = AuthUtils.GetPrincipalToLocalPlugin(conf);
_supervisors = new HashSet<String>();
_admins = new HashSet<String>();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/blobstore/ClientBlobStore.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/blobstore/ClientBlobStore.java b/storm-client/src/jvm/org/apache/storm/blobstore/ClientBlobStore.java
index a1499aa..3291eb7 100644
--- a/storm-client/src/jvm/org/apache/storm/blobstore/ClientBlobStore.java
+++ b/storm-client/src/jvm/org/apache/storm/blobstore/ClientBlobStore.java
@@ -50,7 +50,7 @@ import java.util.Map;
* @see org.apache.storm.hdfs.blobstore.HdfsBlobStore
*/
public abstract class ClientBlobStore implements Shutdownable {
- protected Map conf;
+ protected Map<String, Object> conf;
public interface WithBlobstore {
void run(ClientBlobStore blobStore) throws Exception;
@@ -71,7 +71,7 @@ public abstract class ClientBlobStore implements Shutdownable {
* Sets up the client API by parsing the configs.
* @param conf The storm conf containing the config details.
*/
- public abstract void prepare(Map conf);
+ public abstract void prepare(Map<String, Object> conf);
/**
* Client facing API to create a blob.
@@ -157,7 +157,7 @@ public abstract class ClientBlobStore implements Shutdownable {
* @param client NimbusClient
* @return indicates where the client connection has been setup.
*/
- public abstract boolean setClient(Map conf, NimbusClient client);
+ public abstract boolean setClient(Map<String, Object> conf, NimbusClient client);
/**
* Creates state inside a zookeeper.
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/blobstore/NimbusBlobStore.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/blobstore/NimbusBlobStore.java b/storm-client/src/jvm/org/apache/storm/blobstore/NimbusBlobStore.java
index 5b7713d..f586b82 100644
--- a/storm-client/src/jvm/org/apache/storm/blobstore/NimbusBlobStore.java
+++ b/storm-client/src/jvm/org/apache/storm/blobstore/NimbusBlobStore.java
@@ -264,7 +264,7 @@ public class NimbusBlobStore extends ClientBlobStore implements AutoCloseable {
private int bufferSize = 4096;
@Override
- public void prepare(Map conf) {
+ public void prepare(Map<String, Object> conf) {
this.client = NimbusClient.getConfiguredClient(conf);
if (conf != null) {
this.bufferSize = ObjectReader.getInt(conf.get(Config.STORM_BLOBSTORE_INPUTSTREAM_BUFFER_SIZE_BYTES), bufferSize);
@@ -397,7 +397,7 @@ public class NimbusBlobStore extends ClientBlobStore implements AutoCloseable {
}
@Override
- public boolean setClient(Map conf, NimbusClient client) {
+ public boolean setClient(Map<String, Object> conf, NimbusClient client) {
if (this.client != null) {
this.client.close();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/bolt/JoinBolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/bolt/JoinBolt.java b/storm-client/src/jvm/org/apache/storm/bolt/JoinBolt.java
index 007a958..f454e3f 100644
--- a/storm-client/src/jvm/org/apache/storm/bolt/JoinBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/bolt/JoinBolt.java
@@ -165,7 +165,7 @@ public class JoinBolt extends BaseWindowedBolt {
}
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
this.collector = collector;
// initialize the hashedInputs data structure
int i=0;
@@ -592,4 +592,4 @@ public class JoinBolt extends BaseWindowedBolt {
public BaseWindowedBolt withWatermarkInterval(Duration interval) {
return (JoinBolt) super.withWatermarkInterval(interval);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/callback/ZKStateChangedCallback.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/callback/ZKStateChangedCallback.java b/storm-client/src/jvm/org/apache/storm/callback/ZKStateChangedCallback.java
index 75b0e99..1206a0f 100644
--- a/storm-client/src/jvm/org/apache/storm/callback/ZKStateChangedCallback.java
+++ b/storm-client/src/jvm/org/apache/storm/callback/ZKStateChangedCallback.java
@@ -22,4 +22,4 @@ import org.apache.zookeeper.Watcher;
public interface ZKStateChangedCallback {
public void changed(Watcher.Event.EventType type, String path);
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 a800b07..43b0574 100644
--- a/storm-client/src/jvm/org/apache/storm/cluster/ClusterUtils.java
+++ b/storm-client/src/jvm/org/apache/storm/cluster/ClusterUtils.java
@@ -91,7 +91,7 @@ public class ClusterUtils {
_instance = INSTANCE;
}
- public static List<ACL> mkTopoOnlyAcls(Map topoConf) throws NoSuchAlgorithmException {
+ public static List<ACL> mkTopoOnlyAcls(Map<String, Object> topoConf) throws NoSuchAlgorithmException {
List<ACL> aclList = null;
String payload = (String) topoConf.get(Config.STORM_ZOOKEEPER_TOPOLOGY_AUTH_PAYLOAD);
if (Utils.isZkAuthenticationConfiguredTopology(topoConf)) {
@@ -213,7 +213,7 @@ public class ClusterUtils {
}
}
- public IStateStorage mkStateStorageImpl(Map config, Map auth_conf, List<ACL> acls, ClusterStateContext context) throws Exception {
+ public IStateStorage mkStateStorageImpl(Map<String, Object> config, Map auth_conf, List<ACL> acls, ClusterStateContext context) throws Exception {
String className = null;
IStateStorage stateStorage = null;
if (config.get(Config.STORM_CLUSTER_STATE_STORE) != null) {
@@ -227,7 +227,7 @@ public class ClusterUtils {
return stateStorage;
}
- public static IStateStorage mkStateStorage(Map config, Map auth_conf, List<ACL> acls, ClusterStateContext context) throws Exception {
+ public static IStateStorage mkStateStorage(Map<String, Object> config, Map auth_conf, List<ACL> acls, ClusterStateContext context) throws Exception {
return _instance.mkStateStorageImpl(config, auth_conf, acls, context);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 3574506..e4e1552 100644
--- a/storm-client/src/jvm/org/apache/storm/cluster/PaceMakerStateStorageFactory.java
+++ b/storm-client/src/jvm/org/apache/storm/cluster/PaceMakerStateStorageFactory.java
@@ -25,7 +25,7 @@ import org.apache.zookeeper.data.ACL;
public class PaceMakerStateStorageFactory implements StateStorageFactory {
@Override
- public IStateStorage mkStore(Map config, Map auth_conf, List<ACL> acls, ClusterStateContext context) {
+ public IStateStorage mkStore(Map<String, Object> config, Map auth_conf, List<ACL> acls, ClusterStateContext context) {
try {
ZKStateStorageFactory zkfact = new ZKStateStorageFactory();
IStateStorage zkState = zkfact.mkStore(config, auth_conf, acls, context);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 0929750..2619104 100644
--- a/storm-client/src/jvm/org/apache/storm/cluster/StateStorageFactory.java
+++ b/storm-client/src/jvm/org/apache/storm/cluster/StateStorageFactory.java
@@ -24,5 +24,5 @@ import org.apache.zookeeper.data.ACL;
public interface StateStorageFactory {
- IStateStorage mkStore(Map config, Map auth_conf, List<ACL> acls, ClusterStateContext context);
+ IStateStorage mkStore(Map<String, Object> config, Map auth_conf, List<ACL> acls, ClusterStateContext context);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 b255dad..a5aa8ef 100644
--- a/storm-client/src/jvm/org/apache/storm/cluster/ZKStateStorage.java
+++ b/storm-client/src/jvm/org/apache/storm/cluster/ZKStateStorage.java
@@ -51,7 +51,7 @@ public class ZKStateStorage implements IStateStorage {
private boolean isNimbus;
private Map authConf;
- private Map<Object, Object> conf;
+ private Map<String, Object> conf;
private class ZkWatcherCallBack implements WatcherCallBack{
@Override
@@ -73,7 +73,7 @@ public class ZKStateStorage implements IStateStorage {
}
}
- public ZKStateStorage(Map<Object, Object> conf, Map authConf, List<ACL> acls, ClusterStateContext context) throws Exception {
+ public ZKStateStorage(Map<String, Object> conf, Map authConf, List<ACL> acls, 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/64e29f36/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 3715e48..d38e211 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 config, Map auth_conf, List<ACL> acls, ClusterStateContext context) {
+ public IStateStorage mkStore(Map<String, Object> config, Map auth_conf, List<ACL> acls, ClusterStateContext context) {
try {
return new ZKStateStorage(config, auth_conf, acls, context);
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/coordination/BatchBoltExecutor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/coordination/BatchBoltExecutor.java b/storm-client/src/jvm/org/apache/storm/coordination/BatchBoltExecutor.java
index 2a9a1d8..b3cd7dd 100644
--- a/storm-client/src/jvm/org/apache/storm/coordination/BatchBoltExecutor.java
+++ b/storm-client/src/jvm/org/apache/storm/coordination/BatchBoltExecutor.java
@@ -46,7 +46,7 @@ public class BatchBoltExecutor implements IRichBolt, FinishedCallback, TimeoutCa
}
@Override
- public void prepare(Map conf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> conf, TopologyContext context, OutputCollector collector) {
_conf = conf;
_context = context;
_collector = new BatchOutputCollectorImpl(collector);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/coordination/BatchSubtopologyBuilder.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/coordination/BatchSubtopologyBuilder.java b/storm-client/src/jvm/org/apache/storm/coordination/BatchSubtopologyBuilder.java
index bd72c89..6a167c4 100644
--- a/storm-client/src/jvm/org/apache/storm/coordination/BatchSubtopologyBuilder.java
+++ b/storm-client/src/jvm/org/apache/storm/coordination/BatchSubtopologyBuilder.java
@@ -86,7 +86,7 @@ public class BatchSubtopologyBuilder {
for(InputDeclaration decl: _masterBolt.declarations) {
decl.declare(declarer);
}
- for(Map conf: _masterBolt.componentConfs) {
+ for(Map<String, Object> conf: _masterBolt.componentConfs) {
declarer.addConfigurations(conf);
}
for(String id: _bolts.keySet()) {
@@ -108,7 +108,7 @@ public class BatchSubtopologyBuilder {
coordinatedArgs,
null),
component.parallelism);
- for(Map conf: component.componentConfs) {
+ for(Map<String, Object> conf: component.componentConfs) {
input.addConfigurations(conf);
}
for(String c: componentBoltSubscriptions(component)) {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/coordination/CoordinatedBolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/coordination/CoordinatedBolt.java b/storm-client/src/jvm/org/apache/storm/coordination/CoordinatedBolt.java
index 71919a0..b0706c2 100644
--- a/storm-client/src/jvm/org/apache/storm/coordination/CoordinatedBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/coordination/CoordinatedBolt.java
@@ -207,7 +207,7 @@ public class CoordinatedBolt implements IRichBolt {
_idStreamSpec = idStreamSpec;
}
- public void prepare(Map config, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> config, TopologyContext context, OutputCollector collector) {
TimeCacheMap.ExpiredCallback<Object, TrackingInfo> callback = null;
if(_delegate instanceof TimeoutCallback) {
callback = new TimeoutItems();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/coordination/IBatchBolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/coordination/IBatchBolt.java b/storm-client/src/jvm/org/apache/storm/coordination/IBatchBolt.java
index 7ea46b0..58ff254 100644
--- a/storm-client/src/jvm/org/apache/storm/coordination/IBatchBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/coordination/IBatchBolt.java
@@ -24,7 +24,7 @@ import java.io.Serializable;
import java.util.Map;
public interface IBatchBolt<T> extends Serializable, IComponent {
- void prepare(Map conf, TopologyContext context, BatchOutputCollector collector, T id);
+ void prepare(Map<String, Object> conf, TopologyContext context, BatchOutputCollector collector, T id);
void execute(Tuple tuple);
void finishBatch();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/daemon/Acker.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/daemon/Acker.java b/storm-client/src/jvm/org/apache/storm/daemon/Acker.java
index 339e91c..c41baee 100644
--- a/storm-client/src/jvm/org/apache/storm/daemon/Acker.java
+++ b/storm-client/src/jvm/org/apache/storm/daemon/Acker.java
@@ -59,7 +59,7 @@ public class Acker implements IBolt {
}
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
this.collector = collector;
this.pending = new RotatingMap<Object, AckObject>(TIMEOUT_BUCKET_NUM);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/daemon/GrouperFactory.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/daemon/GrouperFactory.java b/storm-client/src/jvm/org/apache/storm/daemon/GrouperFactory.java
index c4fdaf9..7c61136 100644
--- a/storm-client/src/jvm/org/apache/storm/daemon/GrouperFactory.java
+++ b/storm-client/src/jvm/org/apache/storm/daemon/GrouperFactory.java
@@ -46,7 +46,7 @@ public class GrouperFactory {
public static LoadAwareCustomStreamGrouping mkGrouper(WorkerTopologyContext context, String componentId, String streamId, Fields outFields,
Grouping thriftGrouping,
List<Integer> unsortedTargetTasks,
- Map topoConf) {
+ Map<String, Object> topoConf) {
List<Integer> targetTasks = Ordering.natural().sortedCopy(unsortedTargetTasks);
final boolean isNotLoadAware = (null != topoConf.get(Config.TOPOLOGY_DISABLE_LOADAWARE_MESSAGING) && (boolean) topoConf
.get(Config.TOPOLOGY_DISABLE_LOADAWARE_MESSAGING));
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 372df1f..3b7167d 100644
--- a/storm-client/src/jvm/org/apache/storm/daemon/StormCommon.java
+++ b/storm-client/src/jvm/org/apache/storm/daemon/StormCommon.java
@@ -99,7 +99,7 @@ public class StormCommon {
return stormClusterState.getTopoId(topologyName).get();
}
- public static void validateDistributedMode(Map conf) {
+ public static void validateDistributedMode(Map<String, Object> conf) {
if (ConfigUtils.isLocalMode(conf)) {
throw new IllegalArgumentException("Cannot start server in local mode!");
}
@@ -191,7 +191,7 @@ public class StormCommon {
Map<String, Object> componentMap = allComponents(topology);
for (Object componentObj : componentMap.values()) {
- Map conf = componentConf(componentObj);
+ Map<String, Object> conf = componentConf(componentObj);
ComponentCommon common = getComponentCommon(componentObj);
int parallelismHintNum = Thrift.getParallelismHint(common);
Integer taskNum = ObjectReader.getInt(conf.get(Config.TOPOLOGY_TASKS), 0);
@@ -276,7 +276,7 @@ public class StormCommon {
}
@SuppressWarnings("unchecked")
- public static void addAcker(Map conf, StormTopology topology) {
+ public static void addAcker(Map<String, Object> conf, StormTopology topology) {
int ackerNum = ObjectReader.getInt(conf.get(Config.TOPOLOGY_ACKER_EXECUTORS), ObjectReader.getInt(conf.get(Config.TOPOLOGY_WORKERS)));
Map<GlobalStreamId, Grouping> inputs = ackerInputs(topology);
@@ -363,7 +363,7 @@ public class StormCommon {
return inputs;
}
- public static void addEventLogger(Map conf, StormTopology topology) {
+ public static void addEventLogger(Map<String, Object> conf, StormTopology topology) {
Integer numExecutors = ObjectReader.getInt(conf.get(Config.TOPOLOGY_EVENTLOGGER_EXECUTORS),
ObjectReader.getInt(conf.get(Config.TOPOLOGY_WORKERS)));
HashMap<String, Object> componentConf = new HashMap<>();
@@ -380,7 +380,7 @@ public class StormCommon {
}
@SuppressWarnings("unchecked")
- public static Map<String, Bolt> metricsConsumerBoltSpecs(Map conf, StormTopology topology) {
+ public static Map<String, Bolt> metricsConsumerBoltSpecs(Map<String, Object> conf, StormTopology topology) {
Map<String, Bolt> metricsConsumerBolts = new HashMap<>();
Set<String> componentIdsEmitMetrics = new HashSet<>();
@@ -434,7 +434,7 @@ public class StormCommon {
return metricsConsumerBolts;
}
- public static void addMetricComponents(Map conf, StormTopology topology) {
+ public static void addMetricComponents(Map<String, Object> conf, StormTopology topology) {
Map<String, Bolt> metricsConsumerBolts = metricsConsumerBoltSpecs(conf, topology);
for (Map.Entry<String, Bolt> entry : metricsConsumerBolts.entrySet()) {
topology.put_to_bolts(entry.getKey(), entry.getValue());
@@ -442,7 +442,7 @@ public class StormCommon {
}
@SuppressWarnings("unused")
- public static void addSystemComponents(Map conf, StormTopology topology) {
+ public static void addSystemComponents(Map<String, Object> conf, StormTopology topology) {
Map<String, StreamInfo> outputStreams = new HashMap<>();
outputStreams.put(Constants.SYSTEM_TICK_STREAM_ID, Thrift.outputFields(Arrays.asList("rate_secs")));
outputStreams.put(Constants.METRICS_TICK_STREAM_ID, Thrift.outputFields(Arrays.asList("interval")));
@@ -455,20 +455,20 @@ public class StormCommon {
topology.put_to_bolts(Constants.SYSTEM_COMPONENT_ID, systemBoltSpec);
}
- public static StormTopology systemTopology(Map stormConf, StormTopology topology) throws InvalidTopologyException {
- return _instance.systemTopologyImpl(stormConf, topology);
+ public static StormTopology systemTopology(Map<String, Object> topoConf, StormTopology topology) throws InvalidTopologyException {
+ return _instance.systemTopologyImpl(topoConf, topology);
}
- protected StormTopology systemTopologyImpl(Map stormConf, StormTopology topology) throws InvalidTopologyException {
+ protected StormTopology systemTopologyImpl(Map<String, Object> topoConf, StormTopology topology) throws InvalidTopologyException {
validateBasic(topology);
StormTopology ret = topology.deepCopy();
- addAcker(stormConf, ret);
- if (hasEventLoggers(stormConf)) {
- addEventLogger(stormConf, ret);
+ addAcker(topoConf, ret);
+ if (hasEventLoggers(topoConf)) {
+ addEventLogger(topoConf, ret);
}
- addMetricComponents(stormConf, ret);
- addSystemComponents(stormConf, ret);
+ addMetricComponents(topoConf, ret);
+ addSystemComponents(topoConf, ret);
addMetricStreams(ret);
addSystemStreams(ret);
@@ -477,13 +477,13 @@ public class StormCommon {
return ret;
}
- public static boolean hasAckers(Map stormConf) {
- Object ackerNum = stormConf.get(Config.TOPOLOGY_ACKER_EXECUTORS);
+ public static boolean hasAckers(Map<String, Object> topoConf) {
+ Object ackerNum = topoConf.get(Config.TOPOLOGY_ACKER_EXECUTORS);
return ackerNum == null || ObjectReader.getInt(ackerNum) > 0;
}
- public static boolean hasEventLoggers(Map stormConf) {
- Object eventLoggerNum = stormConf.get(Config.TOPOLOGY_EVENTLOGGER_EXECUTORS);
+ public static boolean hasEventLoggers(Map<String, Object> topoConf) {
+ Object eventLoggerNum = topoConf.get(Config.TOPOLOGY_EVENTLOGGER_EXECUTORS);
return eventLoggerNum == null || ObjectReader.getInt(eventLoggerNum) > 0;
}
@@ -492,21 +492,21 @@ public class StormCommon {
return Thrift.getParallelismHint(common);
}
- public static Map<Integer, String> stormTaskInfo(StormTopology userTopology, Map stormConf) throws InvalidTopologyException {
- return _instance.stormTaskInfoImpl(userTopology, stormConf);
+ public static Map<Integer, String> stormTaskInfo(StormTopology userTopology, Map<String, Object> topoConf) throws InvalidTopologyException {
+ return _instance.stormTaskInfoImpl(userTopology, topoConf);
}
/*
* Returns map from task -> componentId
*/
- protected Map<Integer, String> stormTaskInfoImpl(StormTopology userTopology, Map stormConf) throws InvalidTopologyException {
+ protected Map<Integer, String> stormTaskInfoImpl(StormTopology userTopology, Map<String, Object> topoConf) throws InvalidTopologyException {
Map<Integer, String> taskIdToComponentId = new HashMap<>();
- StormTopology systemTopology = systemTopology(stormConf, userTopology);
+ StormTopology systemTopology = systemTopology(topoConf, userTopology);
Map<String, Object> components = allComponents(systemTopology);
Map<String, Integer> componentIdToTaskNum = new TreeMap<>();
for (Map.Entry<String, Object> entry : components.entrySet()) {
- Map conf = componentConf(entry.getValue());
+ Map<String, Object> conf = componentConf(entry.getValue());
Object taskNum = conf.get(Config.TOPOLOGY_TASKS);
componentIdToTaskNum.put(entry.getKey(), ObjectReader.getInt(taskNum));
}
@@ -545,12 +545,12 @@ public class StormCommon {
return tasksToNodePort;
}
- public static IAuthorizer mkAuthorizationHandler(String klassName, Map conf)
+ public static IAuthorizer mkAuthorizationHandler(String klassName, Map<String, Object> conf)
throws IllegalAccessException, InstantiationException, ClassNotFoundException {
return _instance.mkAuthorizationHandlerImpl(klassName, conf);
}
- protected IAuthorizer mkAuthorizationHandlerImpl(String klassName, Map conf)
+ protected IAuthorizer mkAuthorizationHandlerImpl(String klassName, Map<String, Object> conf)
throws ClassNotFoundException, IllegalAccessException, InstantiationException {
IAuthorizer aznHandler = null;
if (StringUtils.isNotBlank(klassName)) {
@@ -571,21 +571,21 @@ public class StormCommon {
public static WorkerTopologyContext makeWorkerContext(Map<String, Object> workerData) {
try {
StormTopology stormTopology = (StormTopology) workerData.get(Constants.SYSTEM_TOPOLOGY);
- Map stormConf = (Map) workerData.get(Constants.STORM_CONF);
+ Map<String, Object> topoConf = (Map) workerData.get(Constants.STORM_CONF);
Map<Integer, String> taskToComponent = (Map<Integer, String>) workerData.get(Constants.TASK_TO_COMPONENT);
Map<String, List<Integer>> componentToSortedTasks =
(Map<String, List<Integer>>) workerData.get(Constants.COMPONENT_TO_SORTED_TASKS);
Map<String, Map<String, Fields>> componentToStreamToFields =
(Map<String, Map<String, Fields>>) workerData.get(Constants.COMPONENT_TO_STREAM_TO_FIELDS);
String stormId = (String) workerData.get(Constants.STORM_ID);
- Map conf = (Map) workerData.get(Constants.CONF);
+ Map<String, Object> conf = (Map) workerData.get(Constants.CONF);
Integer port = (Integer) workerData.get(Constants.PORT);
String codeDir = ConfigUtils.supervisorStormResourcesPath(ConfigUtils.supervisorStormDistRoot(conf, stormId));
String pidDir = ConfigUtils.workerPidsRoot(conf, stormId);
List<Integer> workerTasks = (List<Integer>) workerData.get(Constants.TASK_IDS);
Map<String, Object> defaultResources = (Map<String, Object>) workerData.get(Constants.DEFAULT_SHARED_RESOURCES);
Map<String, Object> userResources = (Map<String, Object>) workerData.get(Constants.USER_SHARED_RESOURCES);
- return new WorkerTopologyContext(stormTopology, stormConf, taskToComponent, componentToSortedTasks,
+ return new WorkerTopologyContext(stormTopology, topoConf, taskToComponent, componentToSortedTasks,
componentToStreamToFields, stormId, codeDir, pidDir, port, workerTasks, defaultResources, userResources);
} catch (IOException e) {
throw Utils.wrapInRuntime(e);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/daemon/Task.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/daemon/Task.java b/storm-client/src/jvm/org/apache/storm/daemon/Task.java
index 6316564..5b180c8 100644
--- a/storm-client/src/jvm/org/apache/storm/daemon/Task.java
+++ b/storm-client/src/jvm/org/apache/storm/daemon/Task.java
@@ -66,7 +66,7 @@ public class Task {
private Integer taskId;
private String componentId;
private Object taskObject; // Spout/Bolt object
- private Map stormConf;
+ private Map<String, Object> topoConf;
private Callable<Boolean> emitSampler;
private CommonStats executorStats;
private Map<String, Map<String, LoadAwareCustomStreamGrouping>> streamComponentToGrouper;
@@ -77,18 +77,18 @@ public class Task {
this.taskId = taskId;
this.executor = executor;
this.workerData = executor.getWorkerData();
- this.stormConf = executor.getStormConf();
+ this.topoConf = executor.getStormConf();
this.componentId = executor.getComponentId();
this.streamComponentToGrouper = executor.getStreamToComponentToGrouper();
this.executorStats = executor.getStats();
this.builtInMetrics = BuiltinMetricsUtil.mkData(executor.getType(), this.executorStats);
this.workerTopologyContext = executor.getWorkerTopologyContext();
- this.emitSampler = ConfigUtils.mkStatsSampler(stormConf);
+ this.emitSampler = ConfigUtils.mkStatsSampler(topoConf);
this.loadMapping = workerData.getLoadMapping();
this.systemTopologyContext = mkTopologyContext(workerData.getSystemTopology());
this.userTopologyContext = mkTopologyContext(workerData.getTopology());
this.taskObject = mkTaskObject();
- this.debug = stormConf.containsKey(Config.TOPOLOGY_DEBUG) && (Boolean) stormConf.get(Config.TOPOLOGY_DEBUG);
+ this.debug = topoConf.containsKey(Config.TOPOLOGY_DEBUG) && (Boolean) topoConf.get(Config.TOPOLOGY_DEBUG);
this.addTaskHooks();
}
@@ -178,7 +178,7 @@ public class Task {
}
private TopologyContext mkTopologyContext(StormTopology topology) throws IOException {
- Map conf = workerData.getConf();
+ Map<String, Object> conf = workerData.getConf();
return new TopologyContext(
topology,
workerData.getTopologyConf(),
@@ -232,7 +232,7 @@ public class Task {
}
private void addTaskHooks() {
- List<String> hooksClassList = (List<String>) stormConf.get(Config.TOPOLOGY_AUTO_TASK_HOOKS);
+ List<String> hooksClassList = (List<String>) topoConf.get(Config.TOPOLOGY_AUTO_TASK_HOOKS);
if (null != hooksClassList) {
for (String hookClass : hooksClassList) {
try {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/daemon/metrics/BuiltinMetrics.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/daemon/metrics/BuiltinMetrics.java b/storm-client/src/jvm/org/apache/storm/daemon/metrics/BuiltinMetrics.java
index 0dacad1..994481f 100644
--- a/storm-client/src/jvm/org/apache/storm/daemon/metrics/BuiltinMetrics.java
+++ b/storm-client/src/jvm/org/apache/storm/daemon/metrics/BuiltinMetrics.java
@@ -25,9 +25,9 @@ import org.apache.storm.task.TopologyContext;
public abstract class BuiltinMetrics {
protected final Map<String, IMetric> metricMap = new HashMap<>();
- public void registerAll(Map stormConf, TopologyContext context) {
+ public void registerAll(Map<String, Object> topoConf, TopologyContext context) {
for (Map.Entry<String, IMetric> entry : metricMap.entrySet()) {
- BuiltinMetricsUtil.registerMetric("__" + entry.getKey(), entry.getValue(), stormConf, context);
+ BuiltinMetricsUtil.registerMetric("__" + entry.getKey(), entry.getValue(), topoConf, context);
}
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 2827420..ccb1f71 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
@@ -40,13 +40,13 @@ public class BuiltinMetricsUtil {
throw new RuntimeException("Invalid component type!");
}
- public static void registerIconnectionServerMetric(Object server, Map stormConf, TopologyContext context) {
+ public static void registerIconnectionServerMetric(Object server, Map<String, Object> topoConf, TopologyContext context) {
if (server instanceof IStatefulObject) {
- registerMetric("__recv-iconnection", new StateMetric((IStatefulObject) server), stormConf, context);
+ registerMetric("__recv-iconnection", new StateMetric((IStatefulObject) server), topoConf, context);
}
}
- public static void registerIconnectionClientMetrics(final Map nodePortToSocket, Map stormConf, TopologyContext context) {
+ public static void registerIconnectionClientMetrics(final Map nodePortToSocket, Map<String, Object> topoConf, TopologyContext context) {
IMetric metric = new IMetric() {
@Override
public Object getValueAndReset() {
@@ -62,20 +62,20 @@ public class BuiltinMetricsUtil {
return ret;
}
};
- registerMetric("__send-iconnection", metric, stormConf, context);
+ registerMetric("__send-iconnection", metric, topoConf, context);
}
- public static void registerQueueMetrics(Map queues, Map stormConf, TopologyContext context) {
+ public static void registerQueueMetrics(Map queues, Map<String, Object> topoConf, TopologyContext context) {
for (Object o : queues.entrySet()) {
Map.Entry entry = (Map.Entry) o;
String name = "__" + entry.getKey();
IMetric metric = new StateMetric((IStatefulObject) entry.getValue());
- registerMetric(name, metric, stormConf, context);
+ registerMetric(name, metric, topoConf, context);
}
}
- public static void registerMetric(String name, IMetric metric, Map stormConf, TopologyContext context) {
- int bucketSize = ((Number) stormConf.get(Config.TOPOLOGY_BUILTIN_METRICS_BUCKET_SIZE_SECS)).intValue();
+ public static void registerMetric(String name, IMetric metric, Map<String, Object> topoConf, TopologyContext context) {
+ int bucketSize = ((Number) topoConf.get(Config.TOPOLOGY_BUILTIN_METRICS_BUCKET_SIZE_SECS)).intValue();
context.registerMetric(name, metric, bucketSize);
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/daemon/metrics/SpoutThrottlingMetrics.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/daemon/metrics/SpoutThrottlingMetrics.java b/storm-client/src/jvm/org/apache/storm/daemon/metrics/SpoutThrottlingMetrics.java
index 3c7f524..1d2bffe 100644
--- a/storm-client/src/jvm/org/apache/storm/daemon/metrics/SpoutThrottlingMetrics.java
+++ b/storm-client/src/jvm/org/apache/storm/daemon/metrics/SpoutThrottlingMetrics.java
@@ -54,4 +54,4 @@ public class SpoutThrottlingMetrics extends BuiltinMetrics {
public void skippedInactive(CommonStats stats) {
this.skippedInactive.incrBy(stats.getRate());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/daemon/supervisor/ClientSupervisorUtils.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/daemon/supervisor/ClientSupervisorUtils.java b/storm-client/src/jvm/org/apache/storm/daemon/supervisor/ClientSupervisorUtils.java
index 8cd7261..b898aee 100644
--- a/storm-client/src/jvm/org/apache/storm/daemon/supervisor/ClientSupervisorUtils.java
+++ b/storm-client/src/jvm/org/apache/storm/daemon/supervisor/ClientSupervisorUtils.java
@@ -145,23 +145,23 @@ public class ClientSupervisorUtils {
return process;
}
- public static void setupStormCodeDir(Map<String, Object> conf, Map<String, Object> stormConf, String dir) throws IOException {
+ public static void setupStormCodeDir(Map<String, Object> conf, Map<String, Object> topoConf, String dir) throws IOException {
if (ObjectReader.getBoolean(conf.get(Config.SUPERVISOR_RUN_WORKER_AS_USER), false)) {
String logPrefix = "Storm Code Dir Setup for " + dir;
List<String> commands = new ArrayList<>();
commands.add("code-dir");
commands.add(dir);
- processLauncherAndWait(conf, (String) (stormConf.get(Config.TOPOLOGY_SUBMITTER_USER)), commands, null, logPrefix);
+ processLauncherAndWait(conf, (String) (topoConf.get(Config.TOPOLOGY_SUBMITTER_USER)), commands, null, logPrefix);
}
}
- public static void setupWorkerArtifactsDir(Map<String, Object> conf, Map<String, Object> stormConf, String dir) throws IOException {
+ public static void setupWorkerArtifactsDir(Map<String, Object> conf, Map<String, Object> topoConf, String dir) throws IOException {
if (ObjectReader.getBoolean(conf.get(Config.SUPERVISOR_RUN_WORKER_AS_USER), false)) {
String logPrefix = "Worker Artifacts Setup for " + dir;
List<String> commands = new ArrayList<>();
commands.add("artifacts-dir");
commands.add(dir);
- processLauncherAndWait(conf, (String) (stormConf.get(Config.TOPOLOGY_SUBMITTER_USER)), commands, null, logPrefix);
+ processLauncherAndWait(conf, (String) (topoConf.get(Config.TOPOLOGY_SUBMITTER_USER)), commands, null, logPrefix);
}
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/daemon/supervisor/ExitCodeCallback.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/daemon/supervisor/ExitCodeCallback.java b/storm-client/src/jvm/org/apache/storm/daemon/supervisor/ExitCodeCallback.java
index 082f205..f6a52f6 100644
--- a/storm-client/src/jvm/org/apache/storm/daemon/supervisor/ExitCodeCallback.java
+++ b/storm-client/src/jvm/org/apache/storm/daemon/supervisor/ExitCodeCallback.java
@@ -27,4 +27,4 @@ public interface ExitCodeCallback {
* @param exitCode the exit code of the finished process.
*/
public void call(int exitCode);
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java b/storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java
index 74f5c5f..5e49593 100644
--- a/storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java
+++ b/storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java
@@ -79,7 +79,7 @@ import uk.org.lidalia.sysoutslf4j.context.SysOutOverSLF4J;
public class Worker implements Shutdownable, DaemonCommon {
private static final Logger LOG = LoggerFactory.getLogger(Worker.class);
- private final Map conf;
+ private final Map<String, Object> conf;
private final IContext context;
private final String topologyId;
private final String assignmentId;
@@ -111,7 +111,7 @@ public class Worker implements Shutdownable, DaemonCommon {
* @param workerId - worker id
*/
- public Worker(Map conf, IContext context, String topologyId, String assignmentId, int port, String workerId) {
+ public Worker(Map<String, Object> conf, IContext context, String topologyId, String assignmentId, int port, String workerId) {
this.conf = conf;
this.context = context;
this.topologyId = topologyId;
@@ -135,7 +135,7 @@ public class Worker implements Shutdownable, DaemonCommon {
FileUtils.writeStringToFile(new File(ConfigUtils.workerArtifactsPidPath(conf, topologyId, port)), pid,
Charset.forName("UTF-8"));
}
- final Map topologyConf =
+ final Map<String, Object> topologyConf =
ConfigUtils.overrideLoginConfigWithSystemProperty(ConfigUtils.readSupervisorStormConf(conf, topologyId));
List<ACL> acls = Utils.getWorkerACL(topologyConf);
IStateStorage stateStorage =
@@ -449,7 +449,7 @@ public class Worker implements Shutdownable, DaemonCommon {
String assignmentId = args[1];
String portStr = args[2];
String workerId = args[3];
- Map conf = Utils.readStormConfig();
+ Map<String, Object> conf = Utils.readStormConfig();
Utils.setupDefaultUncaughtExceptionHandler();
StormCommon.validateDistributedMode(conf);
Worker worker = new Worker(conf, null, stormId, assignmentId, Integer.parseInt(portStr), workerId);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 3913c32..55def51 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
@@ -75,7 +75,7 @@ public class WorkerState {
private static final Logger LOG = LoggerFactory.getLogger(WorkerState.class);
- final Map conf;
+ final Map<String, Object> conf;
final IContext mqContext;
public Map getConf() {
@@ -185,7 +185,7 @@ public class WorkerState {
// executors and taskIds running in this worker
final Set<List<Long>> executors;
final List<Integer> taskIds;
- final Map topologyConf;
+ final Map<String, Object> topologyConf;
final StormTopology topology;
final StormTopology systemTopology;
final Map<Integer, String> taskToComponent;
@@ -259,8 +259,8 @@ public class WorkerState {
private static final long LOAD_REFRESH_INTERVAL_MS = 5000L;
- public WorkerState(Map conf, IContext mqContext, String topologyId, String assignmentId, int port, String workerId,
- Map topologyConf, IStateStorage stateStorage, IStormClusterState stormClusterState)
+ public WorkerState(Map<String, Object> conf, IContext mqContext, String topologyId, String assignmentId, int port, String workerId,
+ Map<String, Object> topologyConf, IStateStorage stateStorage, IStormClusterState stormClusterState)
throws IOException, InvalidTopologyException {
this.executors = new HashSet<>(readWorkerExecutors(stormClusterState, topologyId, assignmentId, port));
this.transferQueue = new DisruptorQueue("worker-transfer-queue",
@@ -628,7 +628,7 @@ public class WorkerState {
return executorsAssignedToThisWorker;
}
- private Map<List<Long>, DisruptorQueue> mkReceiveQueueMap(Map topologyConf, Set<List<Long>> executors) {
+ private Map<List<Long>, DisruptorQueue> mkReceiveQueueMap(Map<String, Object> topologyConf, Set<List<Long>> executors) {
Map<List<Long>, DisruptorQueue> receiveQueueMap = new HashMap<>();
for (List<Long> executor : executors) {
receiveQueueMap.put(executor, new DisruptorQueue("receive-queue",
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/dependency/DependencyPropertiesParser.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/dependency/DependencyPropertiesParser.java b/storm-client/src/jvm/org/apache/storm/dependency/DependencyPropertiesParser.java
index d360ae0..ac7b679 100644
--- a/storm-client/src/jvm/org/apache/storm/dependency/DependencyPropertiesParser.java
+++ b/storm-client/src/jvm/org/apache/storm/dependency/DependencyPropertiesParser.java
@@ -58,4 +58,4 @@ public class DependencyPropertiesParser {
throw new RuntimeException(e);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/dependency/DependencyUploader.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/dependency/DependencyUploader.java b/storm-client/src/jvm/org/apache/storm/dependency/DependencyUploader.java
index 3514a86..7242d73 100644
--- a/storm-client/src/jvm/org/apache/storm/dependency/DependencyUploader.java
+++ b/storm-client/src/jvm/org/apache/storm/dependency/DependencyUploader.java
@@ -171,4 +171,4 @@ public class DependencyUploader {
}
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/dependency/FileNotAvailableException.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/dependency/FileNotAvailableException.java b/storm-client/src/jvm/org/apache/storm/dependency/FileNotAvailableException.java
index 442e470..874485b 100644
--- a/storm-client/src/jvm/org/apache/storm/dependency/FileNotAvailableException.java
+++ b/storm-client/src/jvm/org/apache/storm/dependency/FileNotAvailableException.java
@@ -30,4 +30,4 @@ public class FileNotAvailableException extends RuntimeException {
private static String createMessage(String fileName) {
return "This file is not available: " + fileName;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/drpc/DRPCInvocationsClient.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/drpc/DRPCInvocationsClient.java b/storm-client/src/jvm/org/apache/storm/drpc/DRPCInvocationsClient.java
index 956999e..6a5acfa 100644
--- a/storm-client/src/jvm/org/apache/storm/drpc/DRPCInvocationsClient.java
+++ b/storm-client/src/jvm/org/apache/storm/drpc/DRPCInvocationsClient.java
@@ -37,7 +37,7 @@ public class DRPCInvocationsClient extends ThriftClient implements DistributedRP
private String host;
private int port;
- public DRPCInvocationsClient(Map conf, String host, int port) throws TTransportException {
+ public DRPCInvocationsClient(Map<String, Object> conf, String host, int port) throws TTransportException {
super(conf, ThriftConnectionType.DRPC_INVOCATIONS, host, port, null);
this.host = host;
this.port = port;
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 f359722..b36b7c1 100644
--- a/storm-client/src/jvm/org/apache/storm/drpc/DRPCSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/drpc/DRPCSpout.java
@@ -95,9 +95,9 @@ public class DRPCSpout extends BaseRichSpout {
private class Adder implements Callable<Void> {
private String server;
private int port;
- private Map conf;
+ private Map<String, Object> conf;
- public Adder(String server, int port, Map conf) {
+ public Adder(String server, int port, Map<String, Object> conf) {
this.server = server;
this.port = port;
this.conf = conf;
@@ -148,7 +148,7 @@ public class DRPCSpout extends BaseRichSpout {
}
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
_collector = collector;
if(_local_drpc_id==null) {
_backround = new ExtendedThreadPoolExecutor(0, Integer.MAX_VALUE,
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/drpc/KeyedFairBolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/drpc/KeyedFairBolt.java b/storm-client/src/jvm/org/apache/storm/drpc/KeyedFairBolt.java
index 39860e6..8c16040 100644
--- a/storm-client/src/jvm/org/apache/storm/drpc/KeyedFairBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/drpc/KeyedFairBolt.java
@@ -45,11 +45,11 @@ public class KeyedFairBolt implements IRichBolt, FinishedCallback {
}
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
if(_delegate instanceof FinishedCallback) {
_callback = (FinishedCallback) _delegate;
}
- _delegate.prepare(stormConf, context, collector);
+ _delegate.prepare(topoConf, context, collector);
_rrQueue = new KeyedRoundRobinQueue<Tuple>();
_executor = new Thread(new Runnable() {
public void run() {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 8f03356..04ddf25 100644
--- a/storm-client/src/jvm/org/apache/storm/drpc/ReturnResults.java
+++ b/storm-client/src/jvm/org/apache/storm/drpc/ReturnResults.java
@@ -51,10 +51,10 @@ public class ReturnResults extends BaseRichBolt {
Map<List, DRPCInvocationsClient> _clients = new HashMap<List, DRPCInvocationsClient>();
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
- _conf = stormConf;
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
+ _conf = topoConf;
_collector = collector;
- local = stormConf.get(Config.STORM_CLUSTER_MODE).equals("local");
+ local = topoConf.get(Config.STORM_CLUSTER_MODE).equals("local");
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 d89ac69..c97725e 100644
--- a/storm-client/src/jvm/org/apache/storm/executor/Executor.java
+++ b/storm-client/src/jvm/org/apache/storm/executor/Executor.java
@@ -89,8 +89,8 @@ public abstract class Executor implements Callable, EventHandler<Object> {
protected final List<Integer> taskIds;
protected final String componentId;
protected final AtomicBoolean openOrPrepareWasCalled;
- protected final Map stormConf;
- protected final Map conf;
+ protected final Map<String, Object> topoConf;
+ protected final Map<String, Object> conf;
protected final String stormId;
protected final HashMap sharedExecutorData;
protected final AtomicBoolean stormActive;
@@ -124,7 +124,7 @@ public abstract class Executor implements Callable, EventHandler<Object> {
this.taskIds = StormCommon.executorIdToTasks(executorId);
this.componentId = workerTopologyContext.getComponentId(taskIds.get(0));
this.openOrPrepareWasCalled = new AtomicBoolean(false);
- this.stormConf = normalizedComponentConf(workerData.getTopologyConf(), workerTopologyContext, componentId);
+ this.topoConf = normalizedComponentConf(workerData.getTopologyConf(), workerTopologyContext, componentId);
this.receiveQueue = (workerData.getExecutorReceiveQueueMap().get(executorId));
this.stormId = workerData.getTopologyId();
this.conf = workerData.getConf();
@@ -132,12 +132,12 @@ public abstract class Executor implements Callable, EventHandler<Object> {
this.stormActive = workerData.getIsTopologyActive();
this.stormComponentDebug = workerData.getStormComponentToDebug();
- this.transferQueue = mkExecutorBatchQueue(stormConf, executorId);
- this.executorTransfer = new ExecutorTransfer(workerData, transferQueue, stormConf);
+ this.transferQueue = mkExecutorBatchQueue(topoConf, executorId);
+ this.executorTransfer = new ExecutorTransfer(workerData, transferQueue, topoConf);
this.suicideFn = workerData.getSuicideCallback();
try {
- this.stormClusterState = ClusterUtils.mkStormClusterState(workerData.getStateStorage(), Utils.getWorkerACL(stormConf),
+ this.stormClusterState = ClusterUtils.mkStormClusterState(workerData.getStateStorage(), Utils.getWorkerACL(topoConf),
new ClusterStateContext(DaemonType.WORKER));
} catch (Exception e) {
throw Utils.wrapInRuntime(e);
@@ -148,25 +148,25 @@ public abstract class Executor implements Callable, EventHandler<Object> {
Map<String, Bolt> bolts = topology.get_bolts();
if (spouts.containsKey(componentId)) {
this.type = StatsUtil.SPOUT;
- this.stats = new SpoutExecutorStats(ConfigUtils.samplingRate(stormConf),ObjectReader.getInt(stormConf.get(Config.NUM_STAT_BUCKETS)));
+ this.stats = new SpoutExecutorStats(ConfigUtils.samplingRate(topoConf),ObjectReader.getInt(topoConf.get(Config.NUM_STAT_BUCKETS)));
} else if (bolts.containsKey(componentId)) {
this.type = StatsUtil.BOLT;
- this.stats = new BoltExecutorStats(ConfigUtils.samplingRate(stormConf),ObjectReader.getInt(stormConf.get(Config.NUM_STAT_BUCKETS)));
+ this.stats = new BoltExecutorStats(ConfigUtils.samplingRate(topoConf),ObjectReader.getInt(topoConf.get(Config.NUM_STAT_BUCKETS)));
} else {
throw new RuntimeException("Could not find " + componentId + " in " + topology);
}
this.intervalToTaskToMetricToRegistry = new HashMap<>();
this.taskToComponent = workerData.getTaskToComponent();
- this.streamToComponentToGrouper = outboundComponents(workerTopologyContext, componentId, stormConf);
- this.reportError = new ReportError(stormConf, stormClusterState, stormId, componentId, workerTopologyContext);
+ this.streamToComponentToGrouper = outboundComponents(workerTopologyContext, componentId, topoConf);
+ this.reportError = new ReportError(topoConf, stormClusterState, stormId, componentId, workerTopologyContext);
this.reportErrorDie = new ReportErrorAndDie(reportError, suicideFn);
- this.sampler = ConfigUtils.mkStatsSampler(stormConf);
+ this.sampler = ConfigUtils.mkStatsSampler(topoConf);
this.throttleOn = workerData.getThrottleOn();
- this.isDebug = ObjectReader.getBoolean(stormConf.get(Config.TOPOLOGY_DEBUG), false);
+ this.isDebug = ObjectReader.getBoolean(topoConf.get(Config.TOPOLOGY_DEBUG), false);
this.rand = new Random(Utils.secureRandomLong());
this.credentials = credentials;
- this.hasEventLoggers = StormCommon.hasEventLoggers(stormConf);
+ this.hasEventLoggers = StormCommon.hasEventLoggers(topoConf);
try {
this.hostname = Utils.hostname();
@@ -349,14 +349,14 @@ public abstract class Executor implements Callable, EventHandler<Object> {
WorkerBackpressureThread.notifyBackpressureChecker(workerData.getBackpressureTrigger());
}
});
- receiveQueue.setHighWaterMark(ObjectReader.getDouble(stormConf.get(Config.BACKPRESSURE_DISRUPTOR_HIGH_WATERMARK)));
- receiveQueue.setLowWaterMark(ObjectReader.getDouble(stormConf.get(Config.BACKPRESSURE_DISRUPTOR_LOW_WATERMARK)));
- receiveQueue.setEnableBackpressure(ObjectReader.getBoolean(stormConf.get(Config.TOPOLOGY_BACKPRESSURE_ENABLE), false));
+ receiveQueue.setHighWaterMark(ObjectReader.getDouble(topoConf.get(Config.BACKPRESSURE_DISRUPTOR_HIGH_WATERMARK)));
+ receiveQueue.setLowWaterMark(ObjectReader.getDouble(topoConf.get(Config.BACKPRESSURE_DISRUPTOR_LOW_WATERMARK)));
+ receiveQueue.setEnableBackpressure(ObjectReader.getBoolean(topoConf.get(Config.TOPOLOGY_BACKPRESSURE_ENABLE), false));
}
protected void setupTicks(boolean isSpout) {
- final Integer tickTimeSecs = ObjectReader.getInt(stormConf.get(Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS), null);
- boolean enableMessageTimeout = (Boolean) stormConf.get(Config.TOPOLOGY_ENABLE_MESSAGE_TIMEOUTS);
+ final Integer tickTimeSecs = ObjectReader.getInt(topoConf.get(Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS), null);
+ boolean enableMessageTimeout = (Boolean) topoConf.get(Config.TOPOLOGY_ENABLE_MESSAGE_TIMEOUTS);
if (tickTimeSecs != null) {
if (Utils.isSystemId(componentId) || (!enableMessageTimeout && isSpout)) {
LOG.info("Timeouts disabled for executor " + componentId + ":" + executorId);
@@ -377,11 +377,11 @@ public abstract class Executor implements Callable, EventHandler<Object> {
}
- private DisruptorQueue mkExecutorBatchQueue(Map stormConf, List<Long> executorId) {
- int sendSize = ObjectReader.getInt(stormConf.get(Config.TOPOLOGY_EXECUTOR_SEND_BUFFER_SIZE));
- int waitTimeOutMs = ObjectReader.getInt(stormConf.get(Config.TOPOLOGY_DISRUPTOR_WAIT_TIMEOUT_MILLIS));
- int batchSize = ObjectReader.getInt(stormConf.get(Config.TOPOLOGY_DISRUPTOR_BATCH_SIZE));
- int batchTimeOutMs = ObjectReader.getInt(stormConf.get(Config.TOPOLOGY_DISRUPTOR_BATCH_TIMEOUT_MILLIS));
+ private DisruptorQueue mkExecutorBatchQueue(Map<String, Object> topoConf, List<Long> executorId) {
+ int sendSize = ObjectReader.getInt(topoConf.get(Config.TOPOLOGY_EXECUTOR_SEND_BUFFER_SIZE));
+ int waitTimeOutMs = ObjectReader.getInt(topoConf.get(Config.TOPOLOGY_DISRUPTOR_WAIT_TIMEOUT_MILLIS));
+ int batchSize = ObjectReader.getInt(topoConf.get(Config.TOPOLOGY_DISRUPTOR_BATCH_SIZE));
+ int batchTimeOutMs = ObjectReader.getInt(topoConf.get(Config.TOPOLOGY_DISRUPTOR_BATCH_TIMEOUT_MILLIS));
return new DisruptorQueue("executor" + executorId + "-send-queue", ProducerType.SINGLE,
sendSize, waitTimeOutMs, batchSize, batchTimeOutMs);
}
@@ -390,7 +390,7 @@ public abstract class Executor implements Callable, EventHandler<Object> {
* Returns map of stream id to component id to grouper
*/
private Map<String, Map<String, LoadAwareCustomStreamGrouping>> outboundComponents(
- WorkerTopologyContext workerTopologyContext, String componentId, Map stormConf) {
+ WorkerTopologyContext workerTopologyContext, String componentId, Map<String, Object> topoConf) {
Map<String, Map<String, LoadAwareCustomStreamGrouping>> ret = new HashMap<>();
Map<String, Map<String, Grouping>> outputGroupings = workerTopologyContext.getTargets(componentId);
@@ -404,7 +404,7 @@ public abstract class Executor implements Callable, EventHandler<Object> {
Grouping grouping = cg.getValue();
List<Integer> outTasks = workerTopologyContext.getComponentTasks(component);
LoadAwareCustomStreamGrouping grouper = GrouperFactory.mkGrouper(
- workerTopologyContext, componentId, streamId, outFields, grouping, outTasks, stormConf);
+ workerTopologyContext, componentId, streamId, outFields, grouping, outTasks, topoConf);
componentGrouper.put(component, grouper);
}
if (componentGrouper.size() > 0) {
@@ -421,7 +421,7 @@ public abstract class Executor implements Callable, EventHandler<Object> {
return ret;
}
- private Map normalizedComponentConf(Map stormConf, WorkerTopologyContext topologyContext, String componentId) {
+ private Map normalizedComponentConf(Map<String, Object> topoConf, WorkerTopologyContext topologyContext, String componentId) {
List<Object> keysToRemove = All_CONFIGS();
keysToRemove.remove(Config.TOPOLOGY_DEBUG);
keysToRemove.remove(Config.TOPOLOGY_MAX_SPOUT_PENDING);
@@ -456,7 +456,7 @@ public abstract class Executor implements Callable, EventHandler<Object> {
}
Map<Object, Object> ret = new HashMap<>();
- ret.putAll(stormConf);
+ ret.putAll(topoConf);
ret.putAll(componentConf);
return ret;
@@ -483,7 +483,7 @@ public abstract class Executor implements Callable, EventHandler<Object> {
}
public Map getStormConf() {
- return stormConf;
+ return topoConf;
}
public String getStormId() {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/executor/ExecutorTransfer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/executor/ExecutorTransfer.java b/storm-client/src/jvm/org/apache/storm/executor/ExecutorTransfer.java
index 0012e4d..1e66305 100644
--- a/storm-client/src/jvm/org/apache/storm/executor/ExecutorTransfer.java
+++ b/storm-client/src/jvm/org/apache/storm/executor/ExecutorTransfer.java
@@ -39,18 +39,18 @@ public class ExecutorTransfer implements EventHandler, Callable {
private final WorkerState workerData;
private final DisruptorQueue batchTransferQueue;
- private final Map stormConf;
+ private final Map<String, Object> topoConf;
private final KryoTupleSerializer serializer;
private final MutableObject cachedEmit;
private final boolean isDebug;
- public ExecutorTransfer(WorkerState workerData, DisruptorQueue batchTransferQueue, Map stormConf) {
+ public ExecutorTransfer(WorkerState workerData, DisruptorQueue batchTransferQueue, Map<String, Object> topoConf) {
this.workerData = workerData;
this.batchTransferQueue = batchTransferQueue;
- this.stormConf = stormConf;
- this.serializer = new KryoTupleSerializer(stormConf, workerData.getWorkerTopologyContext());
+ this.topoConf = topoConf;
+ this.serializer = new KryoTupleSerializer(topoConf, workerData.getWorkerTopologyContext());
this.cachedEmit = new MutableObject(new ArrayList<>());
- this.isDebug = ObjectReader.getBoolean(stormConf.get(Config.TOPOLOGY_DEBUG), false);
+ this.isDebug = ObjectReader.getBoolean(topoConf.get(Config.TOPOLOGY_DEBUG), false);
}
public void transfer(int task, Tuple tuple) {
[13/13] storm git commit: STORM-2477: Result of transforming the code
Posted by bo...@apache.org.
STORM-2477: Result of transforming the code
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/64e29f36
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/64e29f36
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/64e29f36
Branch: refs/heads/master
Commit: 64e29f365c9b5d3e15b33f33ab64e200345333e4
Parents: b7cb2d5
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Thu May 18 08:51:20 2017 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Thu May 18 08:51:20 2017 -0500
----------------------------------------------------------------------
.travis.yml | 1 -
.../elasticsearch/bolt/EsIndexTopology.java | 2 +-
.../trident/TridentEsTopology.java | 2 +-
.../storm/hbase/topology/TotalWordCounter.java | 2 +-
.../storm/hbase/topology/WordCounter.java | 2 +-
.../apache/storm/hbase/topology/WordSpout.java | 2 +-
.../storm/hdfs/bolt/HdfsFileTopology.java | 4 +-
.../storm/hdfs/bolt/SequenceFileTopology.java | 4 +-
.../storm/hdfs/spout/HdfsSpoutTopology.java | 2 +-
.../storm/hdfs/trident/FixedBatchSpout.java | 2 +-
.../storm/hive/bolt/BucketTestHiveTopology.java | 2 +-
.../apache/storm/hive/bolt/HiveTopology.java | 2 +-
.../hive/bolt/HiveTopologyPartitioned.java | 2 +-
.../storm/hive/trident/TridentHiveTopology.java | 2 +-
.../org/apache/storm/jdbc/spout/UserSpout.java | 2 +-
.../apache/storm/jms/example/GenericBolt.java | 2 +-
.../mongodb/topology/TotalWordCounter.java | 2 +-
.../storm/mongodb/topology/WordCounter.java | 2 +-
.../storm/mongodb/topology/WordSpout.java | 2 +-
.../storm/opentsdb/MetricGenBatchSpout.java | 2 +-
.../apache/storm/opentsdb/MetricGenSpout.java | 4 +-
.../storm/perf/HdfsSpoutNullBoltTopo.java | 4 +-
.../org/apache/storm/perf/KafkaHdfsTopo.java | 6 +-
.../storm/perf/KafkaSpoutNullBoltTopo.java | 4 +-
.../storm/perf/StrGenSpoutHdfsBoltTopo.java | 2 +-
.../org/apache/storm/perf/bolt/CountBolt.java | 2 +-
.../org/apache/storm/perf/bolt/DevNullBolt.java | 2 +-
.../java/org/apache/storm/perf/bolt/IdBolt.java | 4 +-
.../storm/perf/bolt/SplitSentenceBolt.java | 2 +-
.../org/apache/storm/perf/spout/ConstSpout.java | 2 +-
.../apache/storm/perf/spout/FileReadSpout.java | 2 +-
.../apache/storm/perf/spout/StringGenSpout.java | 2 +-
.../storm/perf/utils/BasicMetricsCollector.java | 14 +--
.../org/apache/storm/perf/utils/Helper.java | 2 +-
.../apache/storm/perf/utils/IdentityBolt.java | 2 +-
.../apache/storm/perf/utils/MetricsSample.java | 2 +-
.../apache/storm/pmml/RawInputFromCSVSpout.java | 2 +-
.../storm/redis/topology/LookupWordCount.java | 2 +-
.../redis/topology/WhitelistWordCount.java | 2 +-
.../storm/redis/topology/WordCounter.java | 2 +-
.../apache/storm/redis/topology/WordSpout.java | 2 +-
.../storm/rocketmq/topology/WordCounter.java | 2 +-
.../storm/solr/spout/SolrFieldsSpout.java | 2 +-
.../apache/storm/solr/spout/SolrJsonSpout.java | 2 +-
.../starter/BlobStoreAPIWordCountTopology.java | 2 +-
.../storm/starter/ExclamationTopology.java | 2 +-
.../storm/starter/FastWordCountTopology.java | 2 +-
.../storm/starter/InOrderDeliveryTest.java | 2 +-
.../storm/starter/MultipleLoggerTopology.java | 2 +-
.../org/apache/storm/starter/ReachTopology.java | 4 +-
.../starter/ResourceAwareExampleTopology.java | 2 +-
.../storm/starter/SlidingWindowTopology.java | 2 +-
.../apache/storm/starter/StatefulTopology.java | 2 +-
.../starter/StatefulWindowingTopology.java | 2 +-
.../storm/starter/ThroughputVsLatency.java | 2 +-
.../storm/starter/TransactionalGlobalCount.java | 4 +-
.../storm/starter/TransactionalWords.java | 4 +-
.../storm/starter/bolt/RollingCountAggBolt.java | 2 +-
.../storm/starter/bolt/RollingCountBolt.java | 2 +-
.../storm/starter/bolt/SingleJoinBolt.java | 2 +-
.../starter/bolt/SlidingWindowSumBolt.java | 2 +-
.../storm/starter/spout/RandomIntegerSpout.java | 2 +-
.../spout/RandomNumberGeneratorSpout.java | 2 +-
.../starter/spout/RandomSentenceSpout.java | 2 +-
.../streams/GroupByKeyAndWindowExample.java | 2 +-
.../storm/starter/streams/JoinExample.java | 2 +-
.../starter/streams/StateQueryExample.java | 2 +-
.../starter/trident/DebugMemoryMapState.java | 2 +-
.../storm/starter/trident/TridentReach.java | 2 +-
.../starter/bolt/RollingCountBoltTest.java | 4 +-
.../apache/storm/common/AbstractAutoCreds.java | 20 ++--
.../apache/storm/hbase/security/AutoHBase.java | 14 +--
.../storm/hbase/security/HBaseSecurityUtil.java | 2 +-
.../apache/storm/hdfs/security/AutoHDFS.java | 14 +--
.../storm/hdfs/security/HdfsSecurityUtil.java | 2 +-
.../apache/storm/hive/security/AutoHive.java | 14 +--
.../storm/cassandra/CassandraContext.java | 12 +-
.../storm/cassandra/bolt/BaseCassandraBolt.java | 8 +-
.../bolt/BatchCassandraWriterBolt.java | 6 +-
.../cassandra/bolt/CassandraWriterBolt.java | 2 +-
.../storm/cassandra/client/ClusterFactory.java | 6 +-
.../cassandra/context/BaseBeanFactory.java | 8 +-
.../storm/cassandra/context/BeanFactory.java | 6 +-
.../storm/cassandra/context/WorkerCtx.java | 12 +-
.../query/BaseCQLStatementTupleMapper.java | 2 +-
.../query/CQLStatementTupleMapper.java | 4 +-
.../storm/cassandra/query/ContextQuery.java | 8 +-
.../impl/BatchCQLStatementTupleMapper.java | 2 +-
.../impl/BoundCQLStatementTupleMapper.java | 2 +-
.../query/impl/SimpleCQLStatementMapper.java | 2 +-
.../trident/state/CassandraBackingMap.java | 4 +-
.../trident/state/CassandraMapStateFactory.java | 2 +-
.../cassandra/trident/state/CassandraState.java | 4 +-
.../trident/state/CassandraStateFactory.java | 2 +-
.../cassandra/trident/state/SimpleTuple.java | 2 +-
.../testtools/EmbeddedCassandraResource.java | 2 +-
.../storm/cassandra/trident/MapStateTest.java | 4 +-
.../cassandra/trident/WeatherBatchSpout.java | 2 +-
.../apache/storm/druid/bolt/DruidBeamBolt.java | 4 +-
.../druid/trident/DruidBeamStateFactory.java | 2 +-
.../storm/druid/SampleDruidBeamFactoryImpl.java | 2 +-
.../apache/storm/druid/SimpleBatchSpout.java | 2 +-
.../org/apache/storm/druid/SimpleSpout.java | 2 +-
.../apache/storm/elasticsearch/doc/Shards.java | 2 +-
.../elasticsearch/trident/EsStateFactory.java | 2 +-
.../storm/eventhubs/bolt/EventHubBolt.java | 2 +-
.../eventhubs/spout/EventHubException.java | 2 +-
.../storm/eventhubs/spout/EventHubSpout.java | 4 +-
.../trident/OpaqueTridentEventHubSpout.java | 4 +-
.../TransactionalTridentEventHubSpout.java | 4 +-
.../eventhubs/samples/bolt/GlobalCountBolt.java | 2 +-
.../samples/bolt/PartialCountBolt.java | 2 +-
.../storm/hbase/bolt/AbstractHBaseBolt.java | 2 +-
.../storm/hbase/bolt/HBaseLookupBolt.java | 2 +-
.../hbase/trident/state/HBaseMapState.java | 2 +-
.../trident/windowing/HBaseWindowsStore.java | 6 +-
.../windowing/HBaseWindowsStoreFactory.java | 4 +-
.../hdfs/avro/ConfluentAvroSerializer.java | 6 +-
.../storm/hdfs/avro/GenericAvroSerializer.java | 2 +-
.../storm/hdfs/blobstore/HdfsBlobStore.java | 6 +-
.../hdfs/blobstore/HdfsClientBlobStore.java | 4 +-
.../storm/hdfs/bolt/AbstractHdfsBolt.java | 4 +-
.../storm/hdfs/bolt/AvroGenericRecordBolt.java | 2 +-
.../org/apache/storm/hdfs/bolt/HdfsBolt.java | 2 +-
.../storm/hdfs/bolt/SequenceFileBolt.java | 2 +-
.../hdfs/bolt/format/DefaultFileNameFormat.java | 2 +-
.../storm/hdfs/bolt/format/FileNameFormat.java | 2 +-
.../hdfs/bolt/format/SimpleFileNameFormat.java | 2 +-
.../org/apache/storm/hdfs/spout/FileOffset.java | 2 +-
.../org/apache/storm/hdfs/spout/HdfsSpout.java | 4 +-
.../storm/hdfs/spout/SequenceFileReader.java | 4 +-
.../apache/storm/hdfs/spout/TextFileReader.java | 6 +-
.../apache/storm/hdfs/trident/HdfsState.java | 12 +-
.../storm/hdfs/trident/HdfsStateFactory.java | 2 +-
.../trident/format/DefaultFileNameFormat.java | 2 +-
.../hdfs/trident/format/FileNameFormat.java | 2 +-
.../trident/format/SimpleFileNameFormat.java | 2 +-
.../storm/hdfs/blobstore/BlobStoreTest.java | 4 +-
.../hdfs/blobstore/HdfsBlobStoreImplTest.java | 4 +-
.../apache/storm/hdfs/spout/TestHdfsSpout.java | 28 ++---
.../storm/hdfs/trident/HdfsStateTest.java | 4 +-
.../org/apache/storm/hive/bolt/HiveBolt.java | 2 +-
.../org/apache/storm/hive/common/HiveUtils.java | 2 +-
.../apache/storm/hive/trident/HiveState.java | 2 +-
.../storm/hive/trident/HiveStateFactory.java | 2 +-
.../java/org/apache/storm/jms/bolt/JmsBolt.java | 2 +-
.../org/apache/storm/jms/spout/JmsSpout.java | 2 +-
.../storm/jms/trident/TridentJmsSpout.java | 8 +-
.../org/apache/storm/kafka/bolt/KafkaBolt.java | 8 +-
.../apache/storm/kafka/spout/KafkaSpout.java | 2 +-
.../spout/ManualPartitionNamedSubscription.java | 2 +-
.../ManualPartitionPatternSubscription.java | 2 +-
.../storm/kafka/spout/internal/Timer.java | 2 +-
.../spout/trident/KafkaTridentSpoutOpaque.java | 4 +-
.../trident/KafkaTridentSpoutTransactional.java | 4 +-
.../kafka/trident/TridentKafkaStateFactory.java | 2 +-
.../java/org/apache/storm/kafka/KafkaUnit.java | 2 +-
.../org/apache/storm/kafka/KafkaUnitRule.java | 2 +-
.../kafka/spout/test/KafkaSpoutTestBolt.java | 2 +-
.../storm/kafka/DynamicBrokersReader.java | 4 +-
.../ExponentialBackoffMsgRetryManager.java | 2 +-
.../storm/kafka/FailedMsgRetryManager.java | 2 +-
.../jvm/org/apache/storm/kafka/KafkaSpout.java | 2 +-
.../jvm/org/apache/storm/kafka/KafkaUtils.java | 4 +-
.../apache/storm/kafka/PartitionManager.java | 14 +--
.../apache/storm/kafka/StaticCoordinator.java | 4 +-
.../org/apache/storm/kafka/ZkCoordinator.java | 16 +--
.../org/apache/storm/kafka/bolt/KafkaBolt.java | 6 +-
.../apache/storm/kafka/trident/Coordinator.java | 2 +-
.../kafka/trident/OpaqueTridentKafkaSpout.java | 4 +-
.../trident/TransactionalTridentKafkaSpout.java | 4 +-
.../kafka/trident/TridentKafkaEmitter.java | 2 +-
.../kafka/trident/TridentKafkaStateFactory.java | 2 +-
.../storm/kafka/trident/ZkBrokerReader.java | 2 +-
.../apache/storm/kafka/ZkCoordinatorTest.java | 8 +-
.../storm/kinesis/spout/KinesisSpout.java | 2 +-
.../kinesis/spout/test/KinesisBoltTest.java | 2 +-
.../storm/mongodb/bolt/AbstractMongoBolt.java | 2 +-
.../storm/mongodb/bolt/MongoInsertBolt.java | 4 +-
.../mongodb/trident/state/MongoMapState.java | 2 +-
.../trident/state/MongoStateFactory.java | 2 +-
.../org/apache/storm/mqtt/bolt/MqttBolt.java | 2 +-
.../apache/storm/mqtt/spout/AckableMessage.java | 2 +-
.../org/apache/storm/mqtt/spout/MqttSpout.java | 4 +-
.../storm/mqtt/trident/MqttPublishFunction.java | 2 +-
.../storm/opentsdb/bolt/OpenTsdbBolt.java | 2 +-
.../storm/opentsdb/trident/OpenTsdbState.java | 4 +-
.../opentsdb/trident/OpenTsdbStateFactory.java | 2 +-
.../apache/storm/pmml/PMMLPredictorBolt.java | 2 +-
.../pmml/model/jpmml/JpmmlModelOutputs.java | 4 +-
.../storm/pmml/runner/jpmml/JpmmlFactory.java | 6 +-
.../storm/redis/bolt/AbstractRedisBolt.java | 2 +-
.../redis/state/RedisKeyValueStateProvider.java | 12 +-
.../trident/state/RedisClusterMapState.java | 2 +-
.../redis/trident/state/RedisClusterState.java | 2 +-
.../trident/state/RedisClusterStateQuerier.java | 2 +-
.../redis/trident/state/RedisMapState.java | 2 +-
.../storm/redis/trident/state/RedisState.java | 2 +-
.../redis/trident/state/RedisStateQuerier.java | 2 +-
.../redis/state/DefaultStateSerializerTest.java | 2 +-
.../state/RedisKeyValueStateProviderTest.java | 14 +--
.../redis/state/RedisKeyValueStateTest.java | 2 +-
.../storm/rocketmq/bolt/RocketMQBolt.java | 2 +-
.../storm/rocketmq/spout/RocketMQSpout.java | 2 +-
.../trident/state/RocketMQStateFactory.java | 2 +-
.../apache/storm/solr/bolt/SolrUpdateBolt.java | 2 +-
.../flux/examples/StatefulWordCounter.java | 2 +-
.../storm/flux/examples/TestWindowBolt.java | 2 +-
.../apache/storm/flux/examples/WordCounter.java | 2 +-
.../org/apache/storm/ExclamationTopology.java | 2 +-
.../topology/window/SlidingTimeCorrectness.java | 4 +-
.../window/SlidingWindowCorrectness.java | 4 +-
.../window/TumblingTimeCorrectness.java | 4 +-
.../window/TumblingWindowCorrectness.java | 4 +-
.../apache/storm/st/wrapper/StormCluster.java | 2 +-
.../src/jvm/org/apache/storm/sql/StormSql.java | 2 +-
.../jvm/org/apache/storm/sql/StormSqlImpl.java | 4 +-
.../org/apache/storm/sql/StormSqlRunner.java | 2 +-
.../sql/compiler/RexNodeToJavaCodeCompiler.java | 2 +-
.../storm/sql/javac/CompilingClassLoader.java | 2 +-
.../backends/standalone/TestCompilerUtils.java | 2 +-
.../backends/trident/TestCompilerUtils.java | 2 +-
.../backends/trident/TestPlanCompiler.java | 2 +-
.../apache/storm/sql/parser/TestSqlParser.java | 2 +-
.../datasource/socket/trident/SocketState.java | 4 +-
.../socket/trident/TridentSocketSpout.java | 2 +-
.../sql/runtime/serde/avro/CachedSchemas.java | 2 +-
.../trident/functions/EvaluationCalc.java | 2 +-
.../trident/functions/EvaluationFilter.java | 2 +-
.../trident/functions/EvaluationFunction.java | 2 +-
.../test/org/apache/storm/sql/TestUtils.java | 14 +--
.../socket/TestSocketDataSourceProvider.java | 2 +-
.../metric/HttpForwardingMetricsConsumer.java | 4 +-
.../metric/HttpForwardingMetricsServer.java | 2 +-
.../src/jvm/org/apache/storm/Config.java | 44 +++----
.../jvm/org/apache/storm/ISubmitterHook.java | 2 +-
.../jvm/org/apache/storm/StormSubmitter.java | 114 +++++++++----------
.../src/jvm/org/apache/storm/Thrift.java | 16 +--
.../org/apache/storm/blobstore/BlobStore.java | 2 +-
.../storm/blobstore/BlobStoreAclHandler.java | 2 +-
.../apache/storm/blobstore/ClientBlobStore.java | 6 +-
.../apache/storm/blobstore/NimbusBlobStore.java | 4 +-
.../src/jvm/org/apache/storm/bolt/JoinBolt.java | 4 +-
.../storm/callback/ZKStateChangedCallback.java | 2 +-
.../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 +-
.../storm/coordination/BatchBoltExecutor.java | 2 +-
.../coordination/BatchSubtopologyBuilder.java | 4 +-
.../storm/coordination/CoordinatedBolt.java | 2 +-
.../apache/storm/coordination/IBatchBolt.java | 2 +-
.../src/jvm/org/apache/storm/daemon/Acker.java | 2 +-
.../org/apache/storm/daemon/GrouperFactory.java | 2 +-
.../org/apache/storm/daemon/StormCommon.java | 58 +++++-----
.../src/jvm/org/apache/storm/daemon/Task.java | 12 +-
.../storm/daemon/metrics/BuiltinMetrics.java | 4 +-
.../daemon/metrics/BuiltinMetricsUtil.java | 16 +--
.../daemon/metrics/SpoutThrottlingMetrics.java | 2 +-
.../supervisor/ClientSupervisorUtils.java | 8 +-
.../daemon/supervisor/ExitCodeCallback.java | 2 +-
.../org/apache/storm/daemon/worker/Worker.java | 8 +-
.../apache/storm/daemon/worker/WorkerState.java | 10 +-
.../dependency/DependencyPropertiesParser.java | 2 +-
.../storm/dependency/DependencyUploader.java | 2 +-
.../dependency/FileNotAvailableException.java | 2 +-
.../storm/drpc/DRPCInvocationsClient.java | 2 +-
.../jvm/org/apache/storm/drpc/DRPCSpout.java | 6 +-
.../org/apache/storm/drpc/KeyedFairBolt.java | 4 +-
.../org/apache/storm/drpc/ReturnResults.java | 6 +-
.../jvm/org/apache/storm/executor/Executor.java | 56 ++++-----
.../apache/storm/executor/ExecutorTransfer.java | 10 +-
.../storm/executor/bolt/BoltExecutor.java | 14 +--
.../storm/executor/error/ReportError.java | 10 +-
.../storm/executor/spout/SpoutExecutor.java | 18 +--
.../storm/generated/TopologyPageInfo.java | 96 ++++++++--------
.../org/apache/storm/hooks/BaseTaskHook.java | 2 +-
.../org/apache/storm/hooks/BaseWorkerHook.java | 4 +-
.../jvm/org/apache/storm/hooks/ITaskHook.java | 2 +-
.../jvm/org/apache/storm/hooks/IWorkerHook.java | 4 +-
.../org/apache/storm/lambda/LambdaSpout.java | 2 +-
.../DeserializingConnectionCallback.java | 2 +-
.../org/apache/storm/messaging/IContext.java | 6 +-
.../storm/messaging/TransportFactory.java | 10 +-
.../apache/storm/messaging/local/Context.java | 2 +-
.../apache/storm/messaging/netty/Client.java | 30 ++---
.../apache/storm/messaging/netty/Context.java | 12 +-
.../netty/KerberosSaslClientHandler.java | 8 +-
.../netty/KerberosSaslNettyClient.java | 4 +-
.../netty/KerberosSaslNettyServer.java | 4 +-
.../netty/KerberosSaslServerHandler.java | 8 +-
.../apache/storm/messaging/netty/SaslUtils.java | 2 +-
.../apache/storm/messaging/netty/Server.java | 18 +--
.../messaging/netty/StormClientHandler.java | 2 +-
.../netty/StormClientPipelineFactory.java | 4 +-
.../netty/StormServerPipelineFactory.java | 2 +-
.../apache/storm/metric/EventLoggerBolt.java | 4 +-
.../storm/metric/FileBasedEventLogger.java | 4 +-
.../org/apache/storm/metric/IEventLogger.java | 2 +-
.../storm/metric/LoggingMetricsConsumer.java | 2 +-
.../storm/metric/MetricsConsumerBolt.java | 4 +-
.../jvm/org/apache/storm/metric/SystemBolt.java | 2 +-
.../storm/metric/api/IMetricsConsumer.java | 2 +-
.../storm/metric/filter/FilterByMetricName.java | 2 +-
.../org/apache/storm/multilang/ISerializer.java | 2 +-
.../apache/storm/multilang/JsonSerializer.java | 2 +-
.../apache/storm/pacemaker/PacemakerClient.java | 2 +-
.../storm/pacemaker/PacemakerClientPool.java | 4 +-
.../pacemaker/codec/ThriftNettyClientCodec.java | 8 +-
.../jvm/org/apache/storm/scheduler/Cluster.java | 6 +-
.../jvm/org/apache/storm/scheduler/INimbus.java | 2 +-
.../org/apache/storm/scheduler/IScheduler.java | 2 +-
.../org/apache/storm/scheduler/ISupervisor.java | 2 +-
.../apache/storm/scheduler/TopologyDetails.java | 8 +-
.../storm/scheduler/resource/ResourceUtils.java | 12 +-
.../scheduler/resource/SchedulingState.java | 4 +-
.../storm/security/INimbusCredentialPlugin.java | 4 +-
.../apache/storm/security/auth/AuthUtils.java | 36 +++---
.../org/apache/storm/security/auth/AutoSSL.java | 8 +-
.../auth/DefaultHttpCredentialsPlugin.java | 4 +-
.../security/auth/DefaultPrincipalToLocal.java | 2 +-
.../apache/storm/security/auth/IAuthorizer.java | 8 +-
.../storm/security/auth/IAutoCredentials.java | 2 +-
.../security/auth/ICredentialsRenewer.java | 4 +-
.../auth/IGroupMappingServiceProvider.java | 4 +-
.../security/auth/IHttpCredentialsPlugin.java | 4 +-
.../storm/security/auth/IPrincipalToLocal.java | 4 +-
.../storm/security/auth/ITransportPlugin.java | 4 +-
.../security/auth/KerberosPrincipalToLocal.java | 4 +-
.../security/auth/SaslTransportPlugin.java | 14 +--
.../security/auth/ShellBasedGroupsMapping.java | 6 +-
.../security/auth/SimpleTransportPlugin.java | 18 +--
.../storm/security/auth/ThriftClient.java | 14 +--
.../security/auth/ThriftConnectionType.java | 12 +-
.../storm/security/auth/ThriftServer.java | 10 +-
.../auth/authorizer/DRPCAuthorizerBase.java | 2 +-
.../authorizer/DRPCSimpleACLAuthorizer.java | 4 +-
.../auth/authorizer/DenyAuthorizer.java | 6 +-
.../authorizer/ImpersonationAuthorizer.java | 4 +-
.../auth/authorizer/NoopAuthorizer.java | 6 +-
.../auth/authorizer/SimpleACLAuthorizer.java | 14 +--
.../authorizer/SimpleWhitelistAuthorizer.java | 6 +-
.../storm/security/auth/kerberos/AutoTGT.java | 8 +-
.../kerberos/KerberosSaslTransportPlugin.java | 2 +-
.../auth/kerberos/ServerCallbackHandler.java | 2 +-
.../serialization/BlowfishTupleSerializer.java | 4 +-
.../storm/serialization/DefaultKryoFactory.java | 8 +-
.../DefaultSerializationDelegate.java | 2 +-
.../GzipBridgeSerializationDelegate.java | 6 +-
.../GzipBridgeThriftSerializationDelegate.java | 6 +-
.../GzipSerializationDelegate.java | 2 +-
.../GzipThriftSerializationDelegate.java | 2 +-
.../storm/serialization/IKryoFactory.java | 8 +-
.../serialization/KryoTupleDeserializer.java | 2 +-
.../serialization/KryoTupleSerializer.java | 2 +-
.../serialization/KryoValuesDeserializer.java | 2 +-
.../serialization/KryoValuesSerializer.java | 2 +-
.../serialization/SerializationDelegate.java | 2 +-
.../serialization/SerializationFactory.java | 6 +-
.../ThriftSerializationDelegate.java | 2 +-
.../org/apache/storm/spout/CheckpointSpout.java | 10 +-
.../src/jvm/org/apache/storm/spout/ISpout.java | 2 +-
.../apache/storm/spout/ISpoutWaitStrategy.java | 2 +-
.../storm/spout/NothingEmptyEmitStrategy.java | 2 +-
.../jvm/org/apache/storm/spout/ShellSpout.java | 10 +-
.../storm/spout/SleepSpoutWaitStrategy.java | 2 +-
.../jvm/org/apache/storm/state/IStateSpout.java | 2 +-
.../state/InMemoryKeyValueStateProvider.java | 2 +-
.../org/apache/storm/state/StateFactory.java | 10 +-
.../org/apache/storm/state/StateProvider.java | 4 +-
.../org/apache/storm/streams/ProcessorBolt.java | 4 +-
.../storm/streams/ProcessorBoltDelegate.java | 6 +-
.../storm/streams/StatefulProcessorBolt.java | 4 +-
.../org/apache/storm/streams/StreamState.java | 2 +-
.../storm/streams/WindowedProcessorBolt.java | 4 +-
.../storm/task/GeneralTopologyContext.java | 10 +-
.../src/jvm/org/apache/storm/task/IBolt.java | 4 +-
.../jvm/org/apache/storm/task/ShellBolt.java | 14 +--
.../org/apache/storm/task/TopologyContext.java | 6 +-
.../storm/task/WorkerTopologyContext.java | 4 +-
.../apache/storm/testing/BatchNumberList.java | 2 +-
.../apache/storm/testing/CountingBatchBolt.java | 2 +-
.../storm/testing/CountingCommitBolt.java | 2 +-
.../org/apache/storm/testing/FeederSpout.java | 4 +-
.../apache/storm/testing/FixedTupleSpout.java | 2 +-
.../testing/ForwardingMetricsConsumer.java | 2 +-
.../storm/testing/KeyedCountingBatchBolt.java | 2 +-
.../storm/testing/KeyedSummingBatchBolt.java | 2 +-
.../storm/testing/MemoryTransactionalSpout.java | 6 +-
.../storm/testing/NonRichBoltTracker.java | 4 +-
.../testing/OpaqueMemoryTransactionalSpout.java | 6 +-
.../storm/testing/PythonShellMetricsBolt.java | 4 +-
.../storm/testing/PythonShellMetricsSpout.java | 2 +-
.../org/apache/storm/testing/SpoutTracker.java | 2 +-
.../storm/testing/TestAggregatesCounter.java | 2 +-
.../org/apache/storm/testing/TestConfBolt.java | 2 +-
.../apache/storm/testing/TestEventLogSpout.java | 2 +-
.../storm/testing/TestEventOrderCheckBolt.java | 2 +-
.../apache/storm/testing/TestGlobalCount.java | 2 +-
.../apache/storm/testing/TestPlannerBolt.java | 2 +-
.../apache/storm/testing/TestPlannerSpout.java | 2 +-
.../apache/storm/testing/TestWordCounter.java | 2 +-
.../org/apache/storm/testing/TestWordSpout.java | 2 +-
.../jvm/org/apache/storm/testing/TmpPath.java | 2 +-
.../apache/storm/testing/TupleCaptureBolt.java | 2 +-
.../storm/topology/BasicBoltExecutor.java | 4 +-
.../topology/CheckpointTupleForwarder.java | 4 +-
.../org/apache/storm/topology/IBasicBolt.java | 2 +-
.../apache/storm/topology/IStatefulBolt.java | 2 +-
.../apache/storm/topology/IWindowedBolt.java | 2 +-
.../storm/topology/StatefulBoltExecutor.java | 8 +-
.../topology/StatefulWindowedBoltExecutor.java | 20 ++--
.../apache/storm/topology/TopologyBuilder.java | 6 +-
.../storm/topology/WindowedBoltExecutor.java | 60 +++++-----
.../storm/topology/base/BaseBasicBolt.java | 2 +-
.../storm/topology/base/BaseStatefulBolt.java | 2 +-
.../storm/topology/base/BaseWindowedBolt.java | 2 +-
.../ICommitterTransactionalSpout.java | 2 +-
.../transactional/ITransactionalSpout.java | 4 +-
.../TransactionalSpoutBatchExecutor.java | 2 +-
.../TransactionalSpoutCoordinator.java | 2 +-
.../TransactionalTopologyBuilder.java | 2 +-
.../IOpaquePartitionedTransactionalSpout.java | 4 +-
.../IPartitionedTransactionalSpout.java | 4 +-
...uePartitionedTransactionalSpoutExecutor.java | 8 +-
.../PartitionedTransactionalSpoutExecutor.java | 8 +-
.../state/TestTransactionalState.java | 2 +-
.../transactional/state/TransactionalState.java | 6 +-
.../apache/storm/trident/JoinOutFieldsMode.java | 2 +-
.../apache/storm/trident/TridentTopology.java | 2 +-
.../trident/drpc/ReturnResultsReducer.java | 4 +-
.../trident/operation/BaseMultiReducer.java | 2 +-
.../storm/trident/operation/BaseOperation.java | 2 +-
.../operation/DefaultResourceDeclarer.java | 2 +-
.../trident/operation/GroupedMultiReducer.java | 2 +-
.../storm/trident/operation/MultiReducer.java | 2 +-
.../storm/trident/operation/Operation.java | 2 +-
.../storm/trident/operation/builtin/Negate.java | 2 +-
.../operation/impl/ChainedAggregatorImpl.java | 2 +-
.../operation/impl/CombinerAggStateUpdater.java | 2 +-
.../impl/CombinerAggregatorCombineImpl.java | 2 +-
.../impl/CombinerAggregatorInitImpl.java | 2 +-
.../trident/operation/impl/FilterExecutor.java | 2 +-
.../operation/impl/FlatMapFunctionExecutor.java | 2 +-
.../operation/impl/GroupedAggregator.java | 2 +-
.../impl/GroupedMultiReducerExecutor.java | 2 +-
.../operation/impl/IdentityMultiReducer.java | 2 +-
.../operation/impl/JoinerMultiReducer.java | 2 +-
.../operation/impl/MapFunctionExecutor.java | 2 +-
...PreservingFieldsOrderJoinerMultiReducer.java | 2 +-
.../operation/impl/ReducerAggStateUpdater.java | 2 +-
.../operation/impl/ReducerAggregatorImpl.java | 2 +-
.../operation/impl/SingleEmitAggregator.java | 2 +-
.../trident/operation/impl/TrueFilter.java | 2 +-
.../storm/trident/planner/SubtopologyBolt.java | 2 +-
.../storm/trident/planner/TridentProcessor.java | 2 +-
.../planner/processor/AggregateProcessor.java | 2 +-
.../planner/processor/EachProcessor.java | 2 +-
.../trident/planner/processor/MapProcessor.java | 2 +-
.../processor/MultiReducerProcessor.java | 2 +-
.../processor/PartitionPersistProcessor.java | 2 +-
.../planner/processor/ProjectedProcessor.java | 2 +-
.../planner/processor/StateQueryProcessor.java | 2 +-
.../storm/trident/spout/BatchSpoutExecutor.java | 4 +-
.../apache/storm/trident/spout/IBatchSpout.java | 2 +-
.../trident/spout/ICommitterTridentSpout.java | 2 +-
.../spout/IOpaquePartitionedTridentSpout.java | 4 +-
.../trident/spout/IPartitionedTridentSpout.java | 4 +-
.../storm/trident/spout/ITridentSpout.java | 4 +-
.../OpaquePartitionedTridentSpoutExecutor.java | 8 +-
.../spout/PartitionedTridentSpoutExecutor.java | 8 +-
.../trident/spout/RichSpoutBatchExecutor.java | 6 +-
.../trident/spout/RichSpoutBatchTriggerer.java | 2 +-
.../trident/spout/TridentSpoutCoordinator.java | 2 +-
.../trident/spout/TridentSpoutExecutor.java | 2 +-
.../storm/trident/state/StateFactory.java | 2 +-
.../state/map/MapCombinerAggStateUpdater.java | 2 +-
.../state/map/MapReducerAggStateUpdater.java | 2 +-
.../storm/trident/testing/FeederBatchSpout.java | 4 +-
.../testing/FeederCommitterBatchSpout.java | 4 +-
.../storm/trident/testing/FixedBatchSpout.java | 2 +-
.../trident/testing/LRUMemoryMapState.java | 2 +-
.../storm/trident/testing/MemoryMapState.java | 2 +-
.../trident/topology/ITridentBatchBolt.java | 2 +-
.../topology/MasterBatchCoordinator.java | 2 +-
.../trident/topology/TridentBoltExecutor.java | 2 +-
.../topology/state/TestTransactionalState.java | 2 +-
.../topology/state/TransactionalState.java | 6 +-
.../windowing/InMemoryTridentWindowManager.java | 2 +-
.../windowing/InMemoryWindowsStoreFactory.java | 2 +-
.../trident/windowing/WindowKryoSerializer.java | 4 +-
.../windowing/WindowTridentProcessor.java | 8 +-
.../trident/windowing/WindowsStateFactory.java | 2 +-
.../trident/windowing/WindowsStateUpdater.java | 2 +-
.../trident/windowing/WindowsStoreFactory.java | 4 +-
.../jvm/org/apache/storm/utils/ConfigUtils.java | 60 +++++-----
.../org/apache/storm/utils/CuratorUtils.java | 14 +--
.../jvm/org/apache/storm/utils/DRPCClient.java | 6 +-
.../org/apache/storm/utils/NimbusClient.java | 14 +--
.../org/apache/storm/utils/ShellProcess.java | 6 +-
.../src/jvm/org/apache/storm/utils/Utils.java | 34 +++---
.../apache/storm/utils/ZookeeperAuthInfo.java | 2 +-
.../apache/storm/zookeeper/ClientZookeeper.java | 12 +-
.../org/apache/storm/TestConfigValidate.java | 10 +-
.../storm/blobstore/ClientBlobStoreTest.java | 6 +-
.../DependencyPropertiesParserTest.java | 2 +-
.../dependency/DependencyUploaderTest.java | 2 +-
.../storm/grouping/ShuffleGroupingTest.java | 2 +-
.../metric/filter/FilterByMetricNameTest.java | 2 +-
.../metric/util/DataPointExpanderTest.java | 2 +-
.../storm/security/auth/AuthUtilsTestMock.java | 6 +-
.../apache/storm/security/auth/AutoSSLTest.java | 6 +-
.../storm/security/auth/ThriftClientTest.java | 2 +-
.../authorizer/DRPCSimpleACLAuthorizerTest.java | 2 +-
.../BlowfishTupleSerializerTest.java | 6 +-
.../serialization/SerializationFactoryTest.java | 6 +-
.../apache/storm/spout/CheckpointSpoutTest.java | 24 ++--
.../storm/state/InMemoryKeyValueStateTest.java | 2 +-
.../apache/storm/streams/StreamBuilderTest.java | 6 +-
.../streams/processors/JoinProcessorTest.java | 2 +-
.../topology/StatefulBoltExecutorTest.java | 2 +-
.../StatefulWindowedBoltExecutorTest.java | 2 +-
.../storm/topology/TopologyBuilderTest.java | 2 +-
.../storm/trident/TridentWindowingTest.java | 2 +-
.../jvm/org/apache/storm/utils/UtilsTest.java | 2 +-
.../org/apache/storm/clojure/ClojureBolt.java | 6 +-
.../org/apache/storm/clojure/ClojureSpout.java | 2 +-
.../org/apache/storm/command/HealthCheck.java | 2 +-
.../apache/storm/testing/MockLeaderElector.java | 2 +-
.../apache/storm/utils/TopologySpoutLag.java | 10 +-
.../test/jvm/org/apache/storm/MockAutoCred.java | 6 +-
.../apache/storm/metric/FakeMetricConsumer.java | 2 +-
.../storm/serialization/SerializationTest.java | 10 +-
.../staticmocking/ConfigUtilsInstaller.java | 2 +-
.../staticmocking/ReflectionUtilsInstaller.java | 2 +-
.../ServerConfigUtilsInstaller.java | 2 +-
.../utils/staticmocking/UtilsInstaller.java | 2 +-
.../java/org/apache/storm/DaemonConfig.java | 8 +-
.../storm/blobstore/BlobSynchronizer.java | 4 +-
.../storm/blobstore/KeySequenceNumber.java | 2 +-
.../storm/blobstore/LocalFsBlobStore.java | 4 +-
.../storm/daemon/metrics/MetricsUtils.java | 26 ++---
.../reporters/ConsolePreparableReporter.java | 8 +-
.../reporters/CsvPreparableReporter.java | 10 +-
.../reporters/JmxPreparableReporter.java | 6 +-
.../metrics/reporters/PreparableReporter.java | 2 +-
.../org/apache/storm/daemon/nimbus/Nimbus.java | 4 +-
.../storm/daemon/nimbus/TopologyResources.java | 2 +-
.../storm/daemon/supervisor/BasicContainer.java | 8 +-
.../supervisor/EventManagerPushCallback.java | 2 +-
.../daemon/supervisor/StandaloneSupervisor.java | 6 +-
.../daemon/supervisor/SupervisorUtils.java | 8 +-
.../supervisor/timer/SupervisorHeartbeat.java | 2 +-
.../daemon/supervisor/timer/UpdateBlobs.java | 8 +-
.../apache/storm/healthcheck/HealthChecker.java | 4 +-
.../apache/storm/localizer/AsyncLocalizer.java | 16 +--
.../localizer/LocalDownloadedResource.java | 2 +-
.../org/apache/storm/localizer/Localizer.java | 6 +-
.../metric/ClusterMetricsConsumerExecutor.java | 2 +-
.../metric/LoggingClusterMetricsConsumer.java | 2 +-
.../storm/metric/StormMetricsRegistry.java | 12 +-
.../org/apache/storm/metric/api/DataPoint.java | 2 +-
.../metric/api/IClusterMetricsConsumer.java | 2 +-
.../storm/nimbus/DefaultTopologyValidator.java | 2 +-
.../org/apache/storm/nimbus/ILeaderElector.java | 2 +-
.../apache/storm/nimbus/ITopologyValidator.java | 2 +-
.../org/apache/storm/pacemaker/Pacemaker.java | 6 +-
.../apache/storm/pacemaker/PacemakerServer.java | 2 +-
.../pacemaker/codec/ThriftNettyServerCodec.java | 10 +-
.../storm/scheduler/DefaultScheduler.java | 2 +-
.../apache/storm/scheduler/EvenScheduler.java | 2 +-
.../storm/scheduler/IsolationScheduler.java | 2 +-
.../multitenant/MultitenantScheduler.java | 2 +-
.../resource/ResourceAwareScheduler.java | 4 +-
.../storm/testing/CompleteTopologyParam.java | 12 +-
.../storm/testing/InProcessZookeeper.java | 2 +-
.../org/apache/storm/utils/ServerUtils.java | 8 +-
.../storm/utils/StormCommonInstaller.java | 2 +-
.../storm/zookeeper/LeaderElectorImp.java | 6 +-
.../org/apache/storm/zookeeper/Zookeeper.java | 6 +-
.../java/org/apache/storm/MessagingTest.java | 8 +-
.../test/java/org/apache/storm/TestCgroups.java | 4 +-
.../java/org/apache/storm/TickTupleTest.java | 14 +--
.../apache/storm/blobstore/BlobStoreTest.java | 4 +-
.../storm/blobstore/BlobSynchronizerTest.java | 4 +-
.../apache/storm/localizer/LocalizerTest.java | 20 ++--
.../ClusterMetricsConsumerExecutorTest.java | 2 +-
.../apache/storm/nimbus/LocalNimbusTest.java | 14 +--
.../TestUtilsForResourceAwareScheduler.java | 8 +-
.../submit/command/DependencyResolverMain.java | 2 +-
.../storm/submit/dependency/AetherUtils.java | 2 +-
.../submit/dependency/DependencyResolver.java | 2 +-
.../submit/dependency/AetherUtilsTest.java | 2 +-
.../dependency/DependencyResolverTest.java | 2 +-
.../daemon/drpc/webapp/DRPCApplication.java | 2 +-
transform.sh | 34 ------
597 files changed, 1490 insertions(+), 1525 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 78506ec..f70d5e0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,6 @@ before_install:
- rvm use 2.1.5 --install
- nvm install 0.12.2
- nvm use 0.12.2
- - ./transform.sh
install: /bin/bash ./dev-tools/travis/travis-install.sh `pwd`
script:
- /bin/bash ./dev-tools/travis/travis-script.sh `pwd` $MODULES
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexTopology.java
----------------------------------------------------------------------
diff --git a/examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexTopology.java b/examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexTopology.java
index c7ec7d0..8de9b11 100644
--- a/examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexTopology.java
+++ b/examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexTopology.java
@@ -74,7 +74,7 @@ public class EsIndexTopology {
declarer.declare(new Fields("source", "index", "type", "id"));
}
- public void open(Map config, TopologyContext context,
+ public void open(Map<String, Object> config, TopologyContext context,
SpoutOutputCollector collector) {
this.collector = collector;
this.pending = new ConcurrentHashMap<UUID, Values>();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/trident/TridentEsTopology.java
----------------------------------------------------------------------
diff --git a/examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/trident/TridentEsTopology.java b/examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/trident/TridentEsTopology.java
index e7fb2ef..9fdd4a8 100644
--- a/examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/trident/TridentEsTopology.java
+++ b/examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/trident/TridentEsTopology.java
@@ -87,7 +87,7 @@ public class TridentEsTopology {
}
@Override
- public void open(Map conf, TopologyContext context) {
+ public void open(Map<String, Object> conf, TopologyContext context) {
index = 0;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 61b0dd8..aa28a52 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
@@ -38,7 +38,7 @@ public class TotalWordCounter implements IBasicBolt {
private static final Logger LOG = LoggerFactory.getLogger(TotalWordCounter.class);
private static final Random RANDOM = new Random();
@SuppressWarnings("rawtypes")
- public void prepare(Map stormConf, TopologyContext context) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context) {
}
/*
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 3a350a8..6054699 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
@@ -32,7 +32,7 @@ public class WordCounter implements IBasicBolt {
@SuppressWarnings("rawtypes")
- public void prepare(Map stormConf, TopologyContext context) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context) {
}
/*
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 c5fc490..00ac67d 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
@@ -46,7 +46,7 @@ public class WordSpout implements IRichSpout {
}
@SuppressWarnings("rawtypes")
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/bolt/HdfsFileTopology.java
----------------------------------------------------------------------
diff --git a/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/bolt/HdfsFileTopology.java b/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/bolt/HdfsFileTopology.java
index ea3ab94..f8d69ca 100644
--- a/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/bolt/HdfsFileTopology.java
+++ b/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/bolt/HdfsFileTopology.java
@@ -128,7 +128,7 @@ public class HdfsFileTopology {
declarer.declare(new Fields("sentence", "timestamp"));
}
- public void open(Map config, TopologyContext context,
+ public void open(Map<String, Object> config, TopologyContext context,
SpoutOutputCollector collector) {
this.collector = collector;
this.pending = new ConcurrentHashMap<UUID, Values>();
@@ -167,7 +167,7 @@ public class HdfsFileTopology {
private HashMap<String, Long> counts = null;
private OutputCollector collector;
- public void prepare(Map config, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> config, TopologyContext context, OutputCollector collector) {
this.counts = new HashMap<String, Long>();
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/bolt/SequenceFileTopology.java
----------------------------------------------------------------------
diff --git a/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/bolt/SequenceFileTopology.java b/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/bolt/SequenceFileTopology.java
index 0ef3868..2707af5 100644
--- a/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/bolt/SequenceFileTopology.java
+++ b/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/bolt/SequenceFileTopology.java
@@ -134,7 +134,7 @@ public class SequenceFileTopology {
declarer.declare(new Fields("sentence", "timestamp"));
}
- public void open(Map config, TopologyContext context,
+ public void open(Map<String, Object> config, TopologyContext context,
SpoutOutputCollector collector) {
this.collector = collector;
this.pending = new ConcurrentHashMap<UUID, Values>();
@@ -175,7 +175,7 @@ public class SequenceFileTopology {
private HashMap<String, Long> counts = null;
private OutputCollector collector;
- public void prepare(Map config, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> config, TopologyContext context, OutputCollector collector) {
this.counts = new HashMap<String, Long>();
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 580cb91..a5d283e 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
@@ -60,7 +60,7 @@ public class HdfsSpoutTopology {
}
@Override
- public void prepare(Map conf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> conf, TopologyContext context, OutputCollector collector) {
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/trident/FixedBatchSpout.java
----------------------------------------------------------------------
diff --git a/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/trident/FixedBatchSpout.java b/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/trident/FixedBatchSpout.java
index 76cc2aa..1553971 100644
--- a/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/trident/FixedBatchSpout.java
+++ b/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/trident/FixedBatchSpout.java
@@ -49,7 +49,7 @@ public class FixedBatchSpout implements IBatchSpout {
}
@Override
- public void open(Map conf, TopologyContext context) {
+ public void open(Map<String, Object> conf, TopologyContext context) {
index = 0;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/BucketTestHiveTopology.java
----------------------------------------------------------------------
diff --git a/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/BucketTestHiveTopology.java b/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/BucketTestHiveTopology.java
index 50ab532..19bf4d4 100644
--- a/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/BucketTestHiveTopology.java
+++ b/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/BucketTestHiveTopology.java
@@ -123,7 +123,7 @@ public class BucketTestHiveTopology {
declarer.declare(new Fields(this.outputFields));
}
- public void open(Map config, TopologyContext context,
+ public void open(Map<String, Object> config, TopologyContext context,
SpoutOutputCollector collector) {
this.collector = collector;
this.pending = new ConcurrentHashMap<UUID, Values>();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/HiveTopology.java
----------------------------------------------------------------------
diff --git a/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/HiveTopology.java b/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/HiveTopology.java
index 39c9d5f..d9d4ea9 100644
--- a/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/HiveTopology.java
+++ b/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/HiveTopology.java
@@ -104,7 +104,7 @@ public class HiveTopology {
declarer.declare(new Fields("id","name","phone","street","city","state"));
}
- public void open(Map config, TopologyContext context,
+ public void open(Map<String, Object> config, TopologyContext context,
SpoutOutputCollector collector) {
this.collector = collector;
this.pending = new ConcurrentHashMap<UUID, Values>();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/HiveTopologyPartitioned.java
----------------------------------------------------------------------
diff --git a/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/HiveTopologyPartitioned.java b/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/HiveTopologyPartitioned.java
index dc51708..4d8089d 100644
--- a/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/HiveTopologyPartitioned.java
+++ b/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/HiveTopologyPartitioned.java
@@ -105,7 +105,7 @@ public class HiveTopologyPartitioned {
declarer.declare(new Fields("id","name","phone","street","city","state"));
}
- public void open(Map config, TopologyContext context,
+ public void open(Map<String, Object> config, TopologyContext context,
SpoutOutputCollector collector) {
this.collector = collector;
this.pending = new ConcurrentHashMap<UUID, Values>();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 5204f5b..09bb331 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
@@ -142,7 +142,7 @@ public class TridentHiveTopology {
}
@Override
- public void open(Map conf, TopologyContext context) {
+ public void open(Map<String, Object> conf, TopologyContext context) {
index = 0;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 fdcd053..f05f79a 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
@@ -48,7 +48,7 @@ public class UserSpout implements IRichSpout {
}
@SuppressWarnings("rawtypes")
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 57de1ba..be6afb0 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
@@ -68,7 +68,7 @@ public class GenericBolt extends BaseRichBolt {
}
@SuppressWarnings("rawtypes")
- public void prepare(Map stormConf, TopologyContext context,
+ public void prepare(Map<String, Object> topoConf, TopologyContext context,
OutputCollector collector) {
this.collector = collector;
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 137aac4..3827e77 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
@@ -38,7 +38,7 @@ public class TotalWordCounter implements IBasicBolt {
private static final Logger LOG = LoggerFactory.getLogger(TotalWordCounter.class);
private static final Random RANDOM = new Random();
@SuppressWarnings("rawtypes")
- public void prepare(Map stormConf, TopologyContext context) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context) {
}
/*
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/WordCounter.java
----------------------------------------------------------------------
diff --git a/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/WordCounter.java b/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/WordCounter.java
index bc1e797..4054274 100644
--- a/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/WordCounter.java
+++ b/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/WordCounter.java
@@ -31,7 +31,7 @@ import java.util.Map;
public class WordCounter implements IBasicBolt {
private Map<String, Integer> wordCounter = Maps.newHashMap();
- public void prepare(Map stormConf, TopologyContext context) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context) {
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 885b1e8..086ac2f 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
@@ -46,7 +46,7 @@ public class WordSpout implements IRichSpout {
}
@SuppressWarnings("rawtypes")
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-opentsdb-examples/src/main/java/org/apache/storm/opentsdb/MetricGenBatchSpout.java
----------------------------------------------------------------------
diff --git a/examples/storm-opentsdb-examples/src/main/java/org/apache/storm/opentsdb/MetricGenBatchSpout.java b/examples/storm-opentsdb-examples/src/main/java/org/apache/storm/opentsdb/MetricGenBatchSpout.java
index b0580f6..4e57d9a 100644
--- a/examples/storm-opentsdb-examples/src/main/java/org/apache/storm/opentsdb/MetricGenBatchSpout.java
+++ b/examples/storm-opentsdb-examples/src/main/java/org/apache/storm/opentsdb/MetricGenBatchSpout.java
@@ -45,7 +45,7 @@ public class MetricGenBatchSpout implements IBatchSpout {
}
@Override
- public void open(Map conf, TopologyContext context) {
+ public void open(Map<String, Object> conf, TopologyContext context) {
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-opentsdb-examples/src/main/java/org/apache/storm/opentsdb/MetricGenSpout.java
----------------------------------------------------------------------
diff --git a/examples/storm-opentsdb-examples/src/main/java/org/apache/storm/opentsdb/MetricGenSpout.java b/examples/storm-opentsdb-examples/src/main/java/org/apache/storm/opentsdb/MetricGenSpout.java
index 21af196..09904ee 100644
--- a/examples/storm-opentsdb-examples/src/main/java/org/apache/storm/opentsdb/MetricGenSpout.java
+++ b/examples/storm-opentsdb-examples/src/main/java/org/apache/storm/opentsdb/MetricGenSpout.java
@@ -41,7 +41,7 @@ public class MetricGenSpout extends BaseRichSpout {
TupleOpenTsdbDatapointMapper.DEFAULT_MAPPER.getValueField(),
TupleOpenTsdbDatapointMapper.DEFAULT_MAPPER.getTagsField());
- private Map conf;
+ private Map<String, Object> conf;
private TopologyContext context;
private SpoutOutputCollector collector;
@@ -51,7 +51,7 @@ public class MetricGenSpout extends BaseRichSpout {
}
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
this.conf = conf;
this.context = context;
this.collector = collector;
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-perf/src/main/java/org/apache/storm/perf/HdfsSpoutNullBoltTopo.java
----------------------------------------------------------------------
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/HdfsSpoutNullBoltTopo.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/HdfsSpoutNullBoltTopo.java
index 248b523..2917587 100644
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/HdfsSpoutNullBoltTopo.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/HdfsSpoutNullBoltTopo.java
@@ -54,7 +54,7 @@ public class HdfsSpoutNullBoltTopo {
public static final int DEFAULT_BOLT_NUM = 1;
- public static StormTopology getTopology(Map config) {
+ public static StormTopology getTopology(Map<String, Object> config) {
final int spoutNum = Helper.getInt(config, SPOUT_NUM, DEFAULT_SPOUT_NUM);
final int boltNum = Helper.getInt(config, BOLT_NUM, DEFAULT_BOLT_NUM);
@@ -93,7 +93,7 @@ public class HdfsSpoutNullBoltTopo {
}
Integer durationSec = Integer.parseInt(args[0]);
- Map topoConf = Utils.findAndReadConfigFile(args[1]);
+ Map<String, Object> topoConf = Utils.findAndReadConfigFile(args[1]);
// Submit to Storm cluster
Helper.runOnClusterAndPrintMetrics(durationSec, TOPOLOGY_NAME, topoConf, getTopology(topoConf));
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-perf/src/main/java/org/apache/storm/perf/KafkaHdfsTopo.java
----------------------------------------------------------------------
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/KafkaHdfsTopo.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/KafkaHdfsTopo.java
index 1dda177..d2ed691 100755
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/KafkaHdfsTopo.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/KafkaHdfsTopo.java
@@ -72,7 +72,7 @@ public class KafkaHdfsTopo {
- public static StormTopology getTopology(Map config) {
+ public static StormTopology getTopology(Map<String, Object> config) {
final int spoutNum = getInt(config, SPOUT_NUM, DEFAULT_SPOUT_NUM);
final int boltNum = getInt(config, BOLT_NUM, DEFAULT_BOLT_NUM);
@@ -136,7 +136,7 @@ public class KafkaHdfsTopo {
Integer durationSec = Integer.parseInt(args[0]);
String confFile = args[1];
- Map topoConf = Utils.findAndReadConfigFile(confFile);
+ Map<String, Object> topoConf = Utils.findAndReadConfigFile(confFile);
// Submit topology to Storm cluster
Helper.runOnClusterAndPrintMetrics(durationSec, TOPOLOGY_NAME, topoConf, getTopology(topoConf));
@@ -166,4 +166,4 @@ public class KafkaHdfsTopo {
return (tuple.getValueByField(fieldName).toString() + this.lineDelimiter).getBytes();
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-perf/src/main/java/org/apache/storm/perf/KafkaSpoutNullBoltTopo.java
----------------------------------------------------------------------
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/KafkaSpoutNullBoltTopo.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/KafkaSpoutNullBoltTopo.java
index e755ec5..321ab78 100755
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/KafkaSpoutNullBoltTopo.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/KafkaSpoutNullBoltTopo.java
@@ -60,7 +60,7 @@ public class KafkaSpoutNullBoltTopo {
public static final String BOLT_ID = "devNullBolt";
- public static StormTopology getTopology(Map config) {
+ public static StormTopology getTopology(Map<String, Object> config) {
final int spoutNum = getInt(config, SPOUT_NUM, DEFAULT_SPOUT_NUM);
final int boltNum = getInt(config, BOLT_NUM, DEFAULT_BOLT_NUM);
@@ -107,7 +107,7 @@ public class KafkaSpoutNullBoltTopo {
return;
}
Integer durationSec = Integer.parseInt(args[0]);
- Map topoConf = Utils.findAndReadConfigFile(args[1]);
+ Map<String, Object> topoConf = Utils.findAndReadConfigFile(args[1]);
// Submit to Storm cluster
Helper.runOnClusterAndPrintMetrics(durationSec, TOPOLOGY_NAME, topoConf, getTopology(topoConf));
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-perf/src/main/java/org/apache/storm/perf/StrGenSpoutHdfsBoltTopo.java
----------------------------------------------------------------------
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/StrGenSpoutHdfsBoltTopo.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/StrGenSpoutHdfsBoltTopo.java
index ed81a4a..61cf394 100755
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/StrGenSpoutHdfsBoltTopo.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/StrGenSpoutHdfsBoltTopo.java
@@ -150,4 +150,4 @@ public class StrGenSpoutHdfsBoltTopo {
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/CountBolt.java
----------------------------------------------------------------------
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/CountBolt.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/CountBolt.java
index b79a0ee..3286ac3 100644
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/CountBolt.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/CountBolt.java
@@ -37,7 +37,7 @@ public class CountBolt extends BaseBasicBolt {
Map<String, Integer> counts = new HashMap<>();
@Override
- public void prepare(Map stormConf, TopologyContext context) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context) {
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/DevNullBolt.java
----------------------------------------------------------------------
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/DevNullBolt.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/DevNullBolt.java
index b85ce15..f9d045e 100755
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/DevNullBolt.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/DevNullBolt.java
@@ -31,7 +31,7 @@ public class DevNullBolt extends BaseRichBolt {
private OutputCollector collector;
@Override
- public void prepare(Map stormConf, 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/64e29f36/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/IdBolt.java
----------------------------------------------------------------------
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/IdBolt.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/IdBolt.java
index 116265e..3735447 100644
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/IdBolt.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/IdBolt.java
@@ -32,7 +32,7 @@ public class IdBolt extends BaseRichBolt {
private OutputCollector collector;
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
this.collector = collector;
}
@@ -46,4 +46,4 @@ public class IdBolt extends BaseRichBolt {
public void declareOutputFields(OutputFieldsDeclarer declarer) {
declarer.declare(new Fields("field1"));
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/SplitSentenceBolt.java
----------------------------------------------------------------------
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/SplitSentenceBolt.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/SplitSentenceBolt.java
index 96f9f73..f32628d 100644
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/SplitSentenceBolt.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/SplitSentenceBolt.java
@@ -33,7 +33,7 @@ public class SplitSentenceBolt extends BaseBasicBolt {
public static final String FIELDS = "word";
@Override
- public void prepare(Map stormConf, TopologyContext context) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context) {
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/ConstSpout.java
----------------------------------------------------------------------
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/ConstSpout.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/ConstSpout.java
index b66e4f3..afd2ebc 100755
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/ConstSpout.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/ConstSpout.java
@@ -52,7 +52,7 @@ public class ConstSpout 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;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/FileReadSpout.java
----------------------------------------------------------------------
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/FileReadSpout.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/FileReadSpout.java
index 959e7c6..4815a02 100644
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/FileReadSpout.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/FileReadSpout.java
@@ -56,7 +56,7 @@ public class FileReadSpout extends BaseRichSpout {
}
@Override
- public void open(Map conf, TopologyContext context,
+ public void open(Map<String, Object> conf, TopologyContext context,
SpoutOutputCollector collector) {
this.collector = collector;
Object ackObj = conf.get("topology.acker.executors");
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/StringGenSpout.java
----------------------------------------------------------------------
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/StringGenSpout.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/StringGenSpout.java
index f9c665b..6adb2e3 100755
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/StringGenSpout.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/StringGenSpout.java
@@ -61,7 +61,7 @@ public class StringGenSpout extends BaseRichSpout {
}
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
this.records = genStringList(strLen, strCount);
this.collector = collector;
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/BasicMetricsCollector.java
----------------------------------------------------------------------
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/BasicMetricsCollector.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/BasicMetricsCollector.java
index a008888..97c1aa9 100755
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/BasicMetricsCollector.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/BasicMetricsCollector.java
@@ -77,9 +77,9 @@ public class BasicMetricsCollector implements AutoCloseable {
boolean first = true;
- public BasicMetricsCollector(String topoName, Map<String, Object> stormConfig) {
+ public BasicMetricsCollector(String topoName, Map<String, Object> topoConfig) {
Set<MetricsItem> items = getMetricsToCollect();
- this.config = new MetricsCollectorConfig(topoName, stormConfig);
+ this.config = new MetricsCollectorConfig(topoName, topoConfig);
collectTopologyStats = collectTopologyStats(items);
collectExecutorStats = collectExecutorStats(items);
collectThroughput = collectThroughput(items);
@@ -252,15 +252,15 @@ public class BasicMetricsCollector implements AutoCloseable {
private static final Logger LOG = Logger.getLogger(MetricsCollectorConfig.class);
// storm configuration
- public final Map<String, Object> stormConfig;
+ public final Map<String, Object> topoConfig;
// storm topology name
public final String name;
// benchmark label
public final String label;
- public MetricsCollectorConfig(String topoName, Map<String, Object> stormConfig) {
- this.stormConfig = stormConfig;
- String labelStr = (String) stormConfig.get("benchmark.label");
+ public MetricsCollectorConfig(String topoName, Map<String, Object> topoConfig) {
+ this.topoConfig = topoConfig;
+ String labelStr = (String) topoConfig.get("benchmark.label");
this.name = topoName;
if (labelStr == null) {
LOG.warn("'benchmark.label' not found in config. Defaulting to topology name");
@@ -270,4 +270,4 @@ public class BasicMetricsCollector implements AutoCloseable {
}
} // MetricsCollectorConfig
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 d26078a..e34cb6e 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
@@ -84,7 +84,7 @@ public class Helper {
});
}
- public static void runOnClusterAndPrintMetrics(int durationSec, String topoName, Map topoConf, StormTopology topology) throws Exception {
+ public static void runOnClusterAndPrintMetrics(int durationSec, String topoName, Map<String, Object> topoConf, StormTopology topology) throws Exception {
// submit topology
StormSubmitter.submitTopologyWithProgressBar(topoName, topoConf, topology);
setupShutdownHook(topoName); // handle Ctrl-C
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/IdentityBolt.java
----------------------------------------------------------------------
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/IdentityBolt.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/IdentityBolt.java
index 396ad53..54f8ee1 100755
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/IdentityBolt.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/IdentityBolt.java
@@ -33,7 +33,7 @@ public class IdentityBolt extends BaseRichBolt {
private OutputCollector collector;
@Override
- public void prepare(Map stormConf, 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/64e29f36/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/MetricsSample.java
----------------------------------------------------------------------
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/MetricsSample.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/MetricsSample.java
index fbcea13..9becb0a 100755
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/MetricsSample.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/MetricsSample.java
@@ -238,4 +238,4 @@ public class MetricsSample {
return this.usedSlots;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-pmml-examples/src/main/java/org/apache/storm/pmml/RawInputFromCSVSpout.java
----------------------------------------------------------------------
diff --git a/examples/storm-pmml-examples/src/main/java/org/apache/storm/pmml/RawInputFromCSVSpout.java b/examples/storm-pmml-examples/src/main/java/org/apache/storm/pmml/RawInputFromCSVSpout.java
index ddfc36e..444837b 100644
--- a/examples/storm-pmml-examples/src/main/java/org/apache/storm/pmml/RawInputFromCSVSpout.java
+++ b/examples/storm-pmml-examples/src/main/java/org/apache/storm/pmml/RawInputFromCSVSpout.java
@@ -71,7 +71,7 @@ public class RawInputFromCSVSpout 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;
openReader();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/LookupWordCount.java
----------------------------------------------------------------------
diff --git a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/LookupWordCount.java b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/LookupWordCount.java
index 43798d0..475bbab 100644
--- a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/LookupWordCount.java
+++ b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/LookupWordCount.java
@@ -55,7 +55,7 @@ public class LookupWordCount {
private OutputCollector collector;
@Override
- public void prepare(Map stormConf, 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/64e29f36/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WhitelistWordCount.java
----------------------------------------------------------------------
diff --git a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WhitelistWordCount.java b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WhitelistWordCount.java
index 4ac410a..9999afe 100644
--- a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WhitelistWordCount.java
+++ b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WhitelistWordCount.java
@@ -52,7 +52,7 @@ public class WhitelistWordCount {
private OutputCollector collector;
@Override
- public void prepare(Map stormConf, 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/64e29f36/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 2dd95ff..6c6e67a 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
@@ -32,7 +32,7 @@ public class WordCounter implements IBasicBolt {
private Map<String, Integer> wordCounter = Maps.newHashMap();
@SuppressWarnings("rawtypes")
- public void prepare(Map stormConf, TopologyContext context) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context) {
}
public void execute(Tuple input, BasicOutputCollector collector) {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 e2cdfde..76b2887 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
@@ -46,7 +46,7 @@ public class WordSpout implements IRichSpout {
}
@SuppressWarnings("rawtypes")
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-rocketmq-examples/src/main/java/org/apache/storm/rocketmq/topology/WordCounter.java
----------------------------------------------------------------------
diff --git a/examples/storm-rocketmq-examples/src/main/java/org/apache/storm/rocketmq/topology/WordCounter.java b/examples/storm-rocketmq-examples/src/main/java/org/apache/storm/rocketmq/topology/WordCounter.java
index 327c11a..b679643 100644
--- a/examples/storm-rocketmq-examples/src/main/java/org/apache/storm/rocketmq/topology/WordCounter.java
+++ b/examples/storm-rocketmq-examples/src/main/java/org/apache/storm/rocketmq/topology/WordCounter.java
@@ -31,7 +31,7 @@ import java.util.Map;
public class WordCounter implements IBasicBolt {
private Map<String, Integer> wordCounter = new HashMap<>();
- public void prepare(Map stormConf, TopologyContext context) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context) {
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/spout/SolrFieldsSpout.java
----------------------------------------------------------------------
diff --git a/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/spout/SolrFieldsSpout.java b/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/spout/SolrFieldsSpout.java
index 8e3390d..2959eed 100644
--- a/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/spout/SolrFieldsSpout.java
+++ b/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/spout/SolrFieldsSpout.java
@@ -48,7 +48,7 @@ public class SolrFieldsSpout 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;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/spout/SolrJsonSpout.java
----------------------------------------------------------------------
diff --git a/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/spout/SolrJsonSpout.java b/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/spout/SolrJsonSpout.java
index e42155d..4f52668 100644
--- a/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/spout/SolrJsonSpout.java
+++ b/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/spout/SolrJsonSpout.java
@@ -39,7 +39,7 @@ public class SolrJsonSpout extends BaseRichSpout {
getPojoValues("1"), getPojoValues("2")); // Tuple contains Java object that must be serialized to JSON by SolrJsonMapper
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-starter/src/jvm/org/apache/storm/starter/BlobStoreAPIWordCountTopology.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/BlobStoreAPIWordCountTopology.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/BlobStoreAPIWordCountTopology.java
index a6352c9..2fc28d2 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/BlobStoreAPIWordCountTopology.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/BlobStoreAPIWordCountTopology.java
@@ -78,7 +78,7 @@ public class BlobStoreAPIWordCountTopology {
SpoutOutputCollector _collector;
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
_collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-starter/src/jvm/org/apache/storm/starter/ExclamationTopology.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/ExclamationTopology.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/ExclamationTopology.java
index ed93686..a691201 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/ExclamationTopology.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/ExclamationTopology.java
@@ -39,7 +39,7 @@ public class ExclamationTopology extends ConfigurableTopology {
OutputCollector _collector;
@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/64e29f36/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 1c48480..7c1cffd 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
@@ -55,7 +55,7 @@ public class FastWordCountTopology {
};
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
_collector = collector;
_rand = ThreadLocalRandom.current();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 63be726..f725d14 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
@@ -44,7 +44,7 @@ public class InOrderDeliveryTest {
int _i = 0;
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
_collector = collector;
_base = context.getThisTaskIndex();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-starter/src/jvm/org/apache/storm/starter/MultipleLoggerTopology.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/MultipleLoggerTopology.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/MultipleLoggerTopology.java
index 26c4ee8..aeedc78 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/MultipleLoggerTopology.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/MultipleLoggerTopology.java
@@ -46,7 +46,7 @@ public class MultipleLoggerTopology {
Logger _subLogger = LoggerFactory.getLogger ("com.myapp.sub");
@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/64e29f36/examples/storm-starter/src/jvm/org/apache/storm/starter/ReachTopology.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/ReachTopology.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/ReachTopology.java
index efac86a..4da1c85 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/ReachTopology.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/ReachTopology.java
@@ -115,7 +115,7 @@ public class ReachTopology {
Set<String> _followers = new HashSet<String>();
@Override
- public void prepare(Map conf, TopologyContext context, BatchOutputCollector collector, Object id) {
+ public void prepare(Map<String, Object> conf, TopologyContext context, BatchOutputCollector collector, Object id) {
_collector = collector;
_id = id;
}
@@ -142,7 +142,7 @@ public class ReachTopology {
int _count = 0;
@Override
- public void prepare(Map conf, TopologyContext context, BatchOutputCollector collector, Object id) {
+ public void prepare(Map<String, Object> conf, TopologyContext context, BatchOutputCollector collector, Object id) {
_collector = collector;
_id = id;
}
[03/13] storm git commit: STORM-2477: Result of transforming the code
Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/zookeeper/LeaderElectorImp.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/zookeeper/LeaderElectorImp.java b/storm-server/src/main/java/org/apache/storm/zookeeper/LeaderElectorImp.java
index 74a9bb0..09c14ba 100644
--- a/storm-server/src/main/java/org/apache/storm/zookeeper/LeaderElectorImp.java
+++ b/storm-server/src/main/java/org/apache/storm/zookeeper/LeaderElectorImp.java
@@ -36,7 +36,7 @@ import java.util.concurrent.atomic.AtomicReference;
public class LeaderElectorImp implements ILeaderElector {
private static Logger LOG = LoggerFactory.getLogger(LeaderElectorImp.class);
- private final Map conf;
+ private final Map<String, Object> conf;
private final List<String> servers;
private final CuratorFramework zk;
private final String leaderlockPath;
@@ -45,7 +45,7 @@ public class LeaderElectorImp implements ILeaderElector {
private final AtomicReference<LeaderLatchListener> leaderLatchListener;
private final BlobStore blobStore;
- public LeaderElectorImp(Map conf, List<String> servers, CuratorFramework zk, String leaderlockPath, String id, AtomicReference<LeaderLatch> leaderLatch,
+ public LeaderElectorImp(Map<String, Object> conf, List<String> servers, CuratorFramework zk, String leaderlockPath, String id, AtomicReference<LeaderLatch> leaderLatch,
AtomicReference<LeaderLatchListener> leaderLatchListener, BlobStore blobStore) {
this.conf = conf;
this.servers = servers;
@@ -58,7 +58,7 @@ public class LeaderElectorImp implements ILeaderElector {
}
@Override
- public void prepare(Map conf) {
+ public void prepare(Map<String, Object> conf) {
// no-op for zookeeper implementation
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/zookeeper/Zookeeper.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/zookeeper/Zookeeper.java b/storm-server/src/main/java/org/apache/storm/zookeeper/Zookeeper.java
index 2569573..4979588 100644
--- a/storm-server/src/main/java/org/apache/storm/zookeeper/Zookeeper.java
+++ b/storm-server/src/main/java/org/apache/storm/zookeeper/Zookeeper.java
@@ -124,7 +124,7 @@ public class Zookeeper {
}
// Leader latch listener that will be invoked when we either gain or lose leadership
- public static LeaderLatchListener leaderLatchListenerImpl(final Map conf, final CuratorFramework zk, final BlobStore blobStore, final LeaderLatch leaderLatch) throws UnknownHostException {
+ public static LeaderLatchListener leaderLatchListenerImpl(final Map<String, Object> conf, final CuratorFramework zk, final BlobStore blobStore, final LeaderLatch leaderLatch) throws UnknownHostException {
final String hostName = InetAddress.getLocalHost().getCanonicalHostName();
return new LeaderLatchListener() {
final String STORM_JAR_SUFFIX = "-stormjar.jar";
@@ -241,11 +241,11 @@ public class Zookeeper {
};
}
- public static ILeaderElector zkLeaderElector(Map conf, BlobStore blobStore) throws UnknownHostException {
+ public static ILeaderElector zkLeaderElector(Map<String, Object> conf, BlobStore blobStore) throws UnknownHostException {
return _instance.zkLeaderElectorImpl(conf, blobStore);
}
- protected ILeaderElector zkLeaderElectorImpl(Map conf, BlobStore blobStore) throws UnknownHostException {
+ protected ILeaderElector zkLeaderElectorImpl(Map<String, Object> conf, BlobStore blobStore) throws UnknownHostException {
List<String> servers = (List<String>) conf.get(Config.STORM_ZOOKEEPER_SERVERS);
Object port = conf.get(Config.STORM_ZOOKEEPER_PORT);
CuratorFramework zk = ClientZookeeper.mkClient(conf, servers, port, "", new DefaultWatcherCallBack(), conf);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/test/java/org/apache/storm/MessagingTest.java
----------------------------------------------------------------------
diff --git a/storm-server/src/test/java/org/apache/storm/MessagingTest.java b/storm-server/src/test/java/org/apache/storm/MessagingTest.java
index 2f348d8..5686bc3 100644
--- a/storm-server/src/test/java/org/apache/storm/MessagingTest.java
+++ b/storm-server/src/test/java/org/apache/storm/MessagingTest.java
@@ -35,13 +35,13 @@ public class MessagingTest {
@Test
public void testLocalTransport() throws Exception {
- Config stormConf = new Config();
- stormConf.put(Config.TOPOLOGY_WORKERS, 2);
- stormConf.put(Config.STORM_MESSAGING_TRANSPORT , "org.apache.storm.messaging.netty.Context");
+ Config topoConf = new Config();
+ topoConf.put(Config.TOPOLOGY_WORKERS, 2);
+ topoConf.put(Config.STORM_MESSAGING_TRANSPORT , "org.apache.storm.messaging.netty.Context");
try (ILocalCluster cluster = new LocalCluster.Builder().withSimulatedTime()
.withSupervisors(1).withPortsPerSupervisor(2)
- .withDaemonConf(stormConf).build()) {
+ .withDaemonConf(topoConf).build()) {
TopologyBuilder builder = new TopologyBuilder();
builder.setSpout("1", new TestWordSpout(true), 2);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/test/java/org/apache/storm/TestCgroups.java
----------------------------------------------------------------------
diff --git a/storm-server/src/test/java/org/apache/storm/TestCgroups.java b/storm-server/src/test/java/org/apache/storm/TestCgroups.java
index 2eeec5d..0a57cc5 100644
--- a/storm-server/src/test/java/org/apache/storm/TestCgroups.java
+++ b/storm-server/src/test/java/org/apache/storm/TestCgroups.java
@@ -100,12 +100,12 @@ public class TestCgroups {
Assert.assertFalse("Make sure cgroup was removed properly", dirExists(pathToWorkerCgroupDir));
}
- private boolean stormCgroupHierarchyExists(Map config) {
+ private boolean stormCgroupHierarchyExists(Map<String, Object> config) {
String pathToStormCgroupHierarchy = (String) config.get(Config.STORM_CGROUP_HIERARCHY_DIR);
return dirExists(pathToStormCgroupHierarchy);
}
- private boolean stormCgroupSupervisorRootDirExists(Map config) {
+ private boolean stormCgroupSupervisorRootDirExists(Map<String, Object> config) {
String pathTostormCgroupSupervisorRootDir = ((String) config.get(Config.STORM_CGROUP_HIERARCHY_DIR))
+ "/" + ((String) config.get(DaemonConfig.STORM_SUPERVISOR_CGROUP_ROOTDIR));
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/test/java/org/apache/storm/TickTupleTest.java
----------------------------------------------------------------------
diff --git a/storm-server/src/test/java/org/apache/storm/TickTupleTest.java b/storm-server/src/test/java/org/apache/storm/TickTupleTest.java
index 503bd2a..2ee9a0c 100644
--- a/storm-server/src/test/java/org/apache/storm/TickTupleTest.java
+++ b/storm-server/src/test/java/org/apache/storm/TickTupleTest.java
@@ -43,11 +43,11 @@ public class TickTupleTest {
try {
cluster = new LocalCluster.Builder().withSimulatedTime().withNimbusDaemon(true).build();
StormTopology topology = createNoOpTopology();
- Config stormConf = new Config();
- stormConf.putAll(Utils.readDefaultConfig());
- stormConf.put("storm.cluster.mode", "local");
- stormConf.put(Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS, 1);
- cluster.submitTopology("test", stormConf, topology);
+ Config topoConf = new Config();
+ topoConf.putAll(Utils.readDefaultConfig());
+ topoConf.put("storm.cluster.mode", "local");
+ topoConf.put(Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS, 1);
+ cluster.submitTopology("test", topoConf, topology);
cluster.advanceClusterTime(2);
Assert.assertTrue("Test is passed", true);
} finally {
@@ -64,7 +64,7 @@ public class TickTupleTest {
}
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
}
@Override
@@ -79,7 +79,7 @@ public class TickTupleTest {
private BaseRichBolt makeNoOpBolt() {
return new BaseRichBolt() {
@Override
- public void prepare(Map conf, TopologyContext topologyContext, OutputCollector outputCollector) {}
+ public void prepare(Map<String, Object> conf, TopologyContext topologyContext, OutputCollector outputCollector) {}
@Override
public void execute(Tuple tuple) {}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/test/java/org/apache/storm/blobstore/BlobStoreTest.java
----------------------------------------------------------------------
diff --git a/storm-server/src/test/java/org/apache/storm/blobstore/BlobStoreTest.java b/storm-server/src/test/java/org/apache/storm/blobstore/BlobStoreTest.java
index a1804bc..07333d8 100644
--- a/storm-server/src/test/java/org/apache/storm/blobstore/BlobStoreTest.java
+++ b/storm-server/src/test/java/org/apache/storm/blobstore/BlobStoreTest.java
@@ -57,7 +57,7 @@ public class BlobStoreTest {
private static final Logger LOG = LoggerFactory.getLogger(BlobStoreTest.class);
URI base;
File baseFile;
- private static Map conf = new HashMap();
+ private static Map<String, Object> conf = new HashMap();
public static final int READ = 0x01;
public static final int WRITE = 0x02;
public static final int ADMIN = 0x04;
@@ -146,7 +146,7 @@ public class BlobStoreTest {
Mockito.doNothing().when(spy).checkForBlobUpdate("test-empty-subject-WE");
Mockito.doNothing().when(spy).checkForBlobUpdate("test-empty-subject-DEF");
Mockito.doNothing().when(spy).checkForBlobUpdate("test-empty-acls");
- Map conf = Utils.readStormConfig();
+ Map<String, Object> conf = Utils.readStormConfig();
conf.put(Config.STORM_LOCAL_DIR, baseFile.getAbsolutePath());
conf.put(Config.STORM_PRINCIPAL_TO_LOCAL_PLUGIN,"org.apache.storm.security.auth.DefaultPrincipalToLocal");
spy.prepare(conf, null, null);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/test/java/org/apache/storm/blobstore/BlobSynchronizerTest.java
----------------------------------------------------------------------
diff --git a/storm-server/src/test/java/org/apache/storm/blobstore/BlobSynchronizerTest.java b/storm-server/src/test/java/org/apache/storm/blobstore/BlobSynchronizerTest.java
index 40201a8..c9f2825 100644
--- a/storm-server/src/test/java/org/apache/storm/blobstore/BlobSynchronizerTest.java
+++ b/storm-server/src/test/java/org/apache/storm/blobstore/BlobSynchronizerTest.java
@@ -45,7 +45,7 @@ import static org.junit.Assert.assertTrue;
public class BlobSynchronizerTest {
private URI base;
private File baseFile;
- private static Map conf = new HashMap();
+ private static Map<String, Object> conf = new HashMap();
private NIOServerCnxnFactory factory;
@Before
@@ -71,7 +71,7 @@ public class BlobSynchronizerTest {
private LocalFsBlobStore initLocalFs() {
LocalFsBlobStore store = new LocalFsBlobStore();
- Map conf = Utils.readStormConfig();
+ Map<String, Object> conf = Utils.readStormConfig();
conf.put(Config.STORM_LOCAL_DIR, baseFile.getAbsolutePath());
conf.put(Config.STORM_PRINCIPAL_TO_LOCAL_PLUGIN,"org.apache.storm.security.auth.DefaultPrincipalToLocal");
this.conf = conf;
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/test/java/org/apache/storm/localizer/LocalizerTest.java
----------------------------------------------------------------------
diff --git a/storm-server/src/test/java/org/apache/storm/localizer/LocalizerTest.java b/storm-server/src/test/java/org/apache/storm/localizer/LocalizerTest.java
index 8596602..5814c43 100644
--- a/storm-server/src/test/java/org/apache/storm/localizer/LocalizerTest.java
+++ b/storm-server/src/test/java/org/apache/storm/localizer/LocalizerTest.java
@@ -63,7 +63,7 @@ public class LocalizerTest {
class TestLocalizer extends Localizer {
- TestLocalizer(Map conf, String baseDir) {
+ TestLocalizer(Map<String, Object> conf, String baseDir) {
super(conf, baseDir);
}
@@ -143,7 +143,7 @@ public class LocalizerTest {
@Test
public void testDirPaths() throws Exception {
- Map conf = new HashMap();
+ Map<String, Object> conf = new HashMap();
Localizer localizer = new TestLocalizer(conf, baseDir.toString());
String expectedDir = constructUserCacheDir(baseDir.toString(), user1);
@@ -157,7 +157,7 @@ public class LocalizerTest {
@Test
public void testReconstruct() throws Exception {
- Map conf = new HashMap();
+ Map<String, Object> conf = new HashMap();
String expectedFileDir1 = constructExpectedFilesDir(baseDir.toString(), user1);
String expectedArchiveDir1 = constructExpectedArchivesDir(baseDir.toString(), user1);
@@ -271,7 +271,7 @@ public class LocalizerTest {
supportSymlinks = false;
}
- Map conf = new HashMap();
+ Map<String, Object> conf = new HashMap();
// set clean time really high so doesn't kick in
conf.put(DaemonConfig.SUPERVISOR_LOCALIZER_CACHE_CLEANUP_INTERVAL_MS, 60*60*1000);
@@ -348,7 +348,7 @@ public class LocalizerTest {
@Test
public void testBasic() throws Exception {
- Map conf = new HashMap();
+ Map<String, Object> conf = new HashMap();
// set clean time really high so doesn't kick in
conf.put(DaemonConfig.SUPERVISOR_LOCALIZER_CACHE_CLEANUP_INTERVAL_MS, 60*60*1000);
@@ -415,7 +415,7 @@ public class LocalizerTest {
@Test
public void testMultipleKeysOneUser() throws Exception {
- Map conf = new HashMap();
+ Map<String, Object> conf = new HashMap();
// set clean time really high so doesn't kick in
conf.put(DaemonConfig.SUPERVISOR_LOCALIZER_CACHE_CLEANUP_INTERVAL_MS, 60*60*1000);
@@ -504,7 +504,7 @@ public class LocalizerTest {
@Test(expected = AuthorizationException.class)
public void testFailAcls() throws Exception {
- Map conf = new HashMap();
+ Map<String, Object> conf = new HashMap();
// set clean time really high so doesn't kick in
conf.put(DaemonConfig.SUPERVISOR_LOCALIZER_CACHE_CLEANUP_INTERVAL_MS, 60 * 60 * 1000);
@@ -528,7 +528,7 @@ public class LocalizerTest {
@Test(expected = KeyNotFoundException.class)
public void testKeyNotFoundException() throws Exception {
- Map conf = Utils.readStormConfig();
+ Map<String, Object> conf = Utils.readStormConfig();
String key1 = "key1";
conf.put(Config.STORM_LOCAL_DIR, "target");
LocalFsBlobStore bs = new LocalFsBlobStore();
@@ -541,7 +541,7 @@ public class LocalizerTest {
@Test
public void testMultipleUsers() throws Exception {
- Map conf = new HashMap();
+ Map<String, Object> conf = new HashMap();
// set clean time really high so doesn't kick in
conf.put(DaemonConfig.SUPERVISOR_LOCALIZER_CACHE_CLEANUP_INTERVAL_MS, 60*60*1000);
@@ -625,7 +625,7 @@ public class LocalizerTest {
@Test
public void testUpdate() throws Exception {
- Map conf = new HashMap();
+ Map<String, Object> conf = new HashMap();
// set clean time really high so doesn't kick in
conf.put(DaemonConfig.SUPERVISOR_LOCALIZER_CACHE_CLEANUP_INTERVAL_MS, 60*60*1000);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/test/java/org/apache/storm/metric/ClusterMetricsConsumerExecutorTest.java
----------------------------------------------------------------------
diff --git a/storm-server/src/test/java/org/apache/storm/metric/ClusterMetricsConsumerExecutorTest.java b/storm-server/src/test/java/org/apache/storm/metric/ClusterMetricsConsumerExecutorTest.java
index b8b3afd..0d7b520 100644
--- a/storm-server/src/test/java/org/apache/storm/metric/ClusterMetricsConsumerExecutorTest.java
+++ b/storm-server/src/test/java/org/apache/storm/metric/ClusterMetricsConsumerExecutorTest.java
@@ -130,4 +130,4 @@ public class ClusterMetricsConsumerExecutorTest {
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/test/java/org/apache/storm/nimbus/LocalNimbusTest.java
----------------------------------------------------------------------
diff --git a/storm-server/src/test/java/org/apache/storm/nimbus/LocalNimbusTest.java b/storm-server/src/test/java/org/apache/storm/nimbus/LocalNimbusTest.java
index b0430a0..4a1152e 100644
--- a/storm-server/src/test/java/org/apache/storm/nimbus/LocalNimbusTest.java
+++ b/storm-server/src/test/java/org/apache/storm/nimbus/LocalNimbusTest.java
@@ -51,18 +51,18 @@ public class LocalNimbusTest {
localClusterConf.put("nimbus-daemon", true);
ILocalCluster localCluster = Testing.getLocalCluster(localClusterConf);
- Config stormConf = new Config();
- stormConf.putAll(Utils.readDefaultConfig());
- stormConf.setDebug(true);
- stormConf.put("storm.cluster.mode", "local"); // default is aways "distributed" but here local cluster is being used.
- stormConf.put(Config.STORM_TOPOLOGY_SUBMISSION_NOTIFIER_PLUGIN, InmemoryTopologySubmitterHook.class.getName());
+ Config topoConf = new Config();
+ topoConf.putAll(Utils.readDefaultConfig());
+ topoConf.setDebug(true);
+ topoConf.put("storm.cluster.mode", "local"); // default is aways "distributed" but here local cluster is being used.
+ topoConf.put(Config.STORM_TOPOLOGY_SUBMISSION_NOTIFIER_PLUGIN, InmemoryTopologySubmitterHook.class.getName());
List<TopologyDetails> topologyNames =new ArrayList<>();
for (int i=0; i<4; i++) {
final String topologyName = "word-count-"+ UUID.randomUUID().toString();
final StormTopology stormTopology = createTestTopology();
topologyNames.add(new TopologyDetails(topologyName, stormTopology));
- localCluster.submitTopology(topologyName, stormConf, stormTopology);
+ localCluster.submitTopology(topologyName, topoConf, stormTopology);
}
Assert.assertEquals(InmemoryTopologySubmitterHook.submittedTopologies, topologyNames);
@@ -87,7 +87,7 @@ public class LocalNimbusTest {
public static final List<TopologyDetails> submittedTopologies = new ArrayList<>();
@Override
- public void notify(TopologyInfo topologyInfo, Map stormConf, StormTopology topology) throws IllegalAccessException {
+ public void notify(TopologyInfo topologyInfo, Map<String, Object> topoConf, StormTopology topology) throws IllegalAccessException {
submittedTopologies.add(new TopologyDetails(topologyInfo.get_name(), topology));
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/test/java/org/apache/storm/scheduler/resource/TestUtilsForResourceAwareScheduler.java
----------------------------------------------------------------------
diff --git a/storm-server/src/test/java/org/apache/storm/scheduler/resource/TestUtilsForResourceAwareScheduler.java b/storm-server/src/test/java/org/apache/storm/scheduler/resource/TestUtilsForResourceAwareScheduler.java
index bc69725..ba17ce3 100644
--- a/storm-server/src/test/java/org/apache/storm/scheduler/resource/TestUtilsForResourceAwareScheduler.java
+++ b/storm-server/src/test/java/org/apache/storm/scheduler/resource/TestUtilsForResourceAwareScheduler.java
@@ -140,7 +140,7 @@ public class TestUtilsForResourceAwareScheduler {
return retMap;
}
- 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, int priority) {
Config conf = new Config();
@@ -191,7 +191,7 @@ public class TestUtilsForResourceAwareScheduler {
_isDistributed = isDistributed;
}
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
_collector = collector;
}
@@ -232,7 +232,7 @@ public class TestUtilsForResourceAwareScheduler {
OutputCollector _collector;
@Override
- public void prepare(Map conf, TopologyContext context,
+ public void prepare(Map<String, Object> conf, TopologyContext context,
OutputCollector collector) {
_collector = collector;
}
@@ -250,7 +250,7 @@ public class TestUtilsForResourceAwareScheduler {
public static class INimbusTest implements INimbus {
@Override
- public void prepare(Map stormConf, String schedulerLocalDir) {
+ public void prepare(Map<String, Object> topoConf, String schedulerLocalDir) {
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-submit-tools/src/main/java/org/apache/storm/submit/command/DependencyResolverMain.java
----------------------------------------------------------------------
diff --git a/storm-submit-tools/src/main/java/org/apache/storm/submit/command/DependencyResolverMain.java b/storm-submit-tools/src/main/java/org/apache/storm/submit/command/DependencyResolverMain.java
index 300a202..26cd124 100644
--- a/storm-submit-tools/src/main/java/org/apache/storm/submit/command/DependencyResolverMain.java
+++ b/storm-submit-tools/src/main/java/org/apache/storm/submit/command/DependencyResolverMain.java
@@ -159,4 +159,4 @@ public class DependencyResolverMain {
return null;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-submit-tools/src/main/java/org/apache/storm/submit/dependency/AetherUtils.java
----------------------------------------------------------------------
diff --git a/storm-submit-tools/src/main/java/org/apache/storm/submit/dependency/AetherUtils.java b/storm-submit-tools/src/main/java/org/apache/storm/submit/dependency/AetherUtils.java
index a0b7146..e1e8ca5 100644
--- a/storm-submit-tools/src/main/java/org/apache/storm/submit/dependency/AetherUtils.java
+++ b/storm-submit-tools/src/main/java/org/apache/storm/submit/dependency/AetherUtils.java
@@ -88,4 +88,4 @@ public class AetherUtils {
return new RemoteRepository.Builder(parts[0], "default", parts[1]).build();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-submit-tools/src/main/java/org/apache/storm/submit/dependency/DependencyResolver.java
----------------------------------------------------------------------
diff --git a/storm-submit-tools/src/main/java/org/apache/storm/submit/dependency/DependencyResolver.java b/storm-submit-tools/src/main/java/org/apache/storm/submit/dependency/DependencyResolver.java
index a2241fa..4834107 100644
--- a/storm-submit-tools/src/main/java/org/apache/storm/submit/dependency/DependencyResolver.java
+++ b/storm-submit-tools/src/main/java/org/apache/storm/submit/dependency/DependencyResolver.java
@@ -95,4 +95,4 @@ public class DependencyResolver {
return system.resolveDependencies(session, dependencyRequest).getArtifactResults();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-submit-tools/src/test/java/org/apache/storm/submit/dependency/AetherUtilsTest.java
----------------------------------------------------------------------
diff --git a/storm-submit-tools/src/test/java/org/apache/storm/submit/dependency/AetherUtilsTest.java b/storm-submit-tools/src/test/java/org/apache/storm/submit/dependency/AetherUtilsTest.java
index 5b5ce3e..cb8325d 100644
--- a/storm-submit-tools/src/test/java/org/apache/storm/submit/dependency/AetherUtilsTest.java
+++ b/storm-submit-tools/src/test/java/org/apache/storm/submit/dependency/AetherUtilsTest.java
@@ -99,4 +99,4 @@ public class AetherUtilsTest {
assertEquals("org.apache.storm:storm-core:jar:1.0.0", ret);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-submit-tools/src/test/java/org/apache/storm/submit/dependency/DependencyResolverTest.java
----------------------------------------------------------------------
diff --git a/storm-submit-tools/src/test/java/org/apache/storm/submit/dependency/DependencyResolverTest.java b/storm-submit-tools/src/test/java/org/apache/storm/submit/dependency/DependencyResolverTest.java
index 8f7b750..a28a66e 100644
--- a/storm-submit-tools/src/test/java/org/apache/storm/submit/dependency/DependencyResolverTest.java
+++ b/storm-submit-tools/src/test/java/org/apache/storm/submit/dependency/DependencyResolverTest.java
@@ -80,4 +80,4 @@ public class DependencyResolverTest {
throw new AssertionError("Result doesn't contain expected artifact > " + groupId + ":" + artifactId + ":" + version);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/webapp/DRPCApplication.java
----------------------------------------------------------------------
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/webapp/DRPCApplication.java b/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/webapp/DRPCApplication.java
index da77a49..b209abb 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/webapp/DRPCApplication.java
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/webapp/DRPCApplication.java
@@ -44,4 +44,4 @@ public class DRPCApplication extends Application {
public static void setup(DRPC drpc) {
_drpc = drpc;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/transform.sh
----------------------------------------------------------------------
diff --git a/transform.sh b/transform.sh
deleted file mode 100755
index 4abfeee..0000000
--- a/transform.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-
-find . -iname \*.java | xargs sed -i .back \
- -e 's/stormConf/topoConf/g' \
- -e 's/storm_conf/topoConf/g' \
- -e 's/topology_conf/topoConf/g' \
- -e 's/Map topoConf/Map<String, Object> topoConf/g' \
- -e 's/Map topologyConf/Map<String, Object> topologyConf/g' \
- -e 's/Map conf/Map<String, Object> conf/g' \
- -e 's/Map<String, *String> topoConf/Map<String, Object> topoConf/g' \
- -e 's/Map<String, *String> conf/Map<String, Object> conf/g' \
- -e 's/Map<String, *?> topoConf/Map<String, Object> topoConf/g' \
- -e 's/Map<String, *?> conf/Map<String, Object> conf/g' \
- -e 's/Map<Object, *Object> conf/Map<String, Object> conf/g' \
- -e 's/conf = new HashMap<String, *String>/conf = new HashMap<>/g'
-find . -iname \*.java.back | xargs rm -f
[08/13] storm git commit: STORM-2477: Result of transforming the code
Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 c3a18ad..9e52cb2 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
@@ -50,7 +50,7 @@ public class BoltExecutor extends Executor {
public BoltExecutor(WorkerState workerData, List<Long> executorId, Map<String, String> credentials) {
super(workerData, executorId, credentials);
- this.executeSampler = ConfigUtils.mkStatsSampler(stormConf);
+ this.executeSampler = ConfigUtils.mkStatsSampler(topoConf);
}
public void init(Map<Integer, Task> idToTask) {
@@ -63,25 +63,25 @@ public class BoltExecutor extends Executor {
Task taskData = entry.getValue();
IBolt boltObject = (IBolt) taskData.getTaskObject();
TopologyContext userContext = taskData.getUserContext();
- taskData.getBuiltInMetrics().registerAll(stormConf, userContext);
+ taskData.getBuiltInMetrics().registerAll(topoConf, userContext);
if (boltObject instanceof ICredentialsListener) {
((ICredentialsListener) boltObject).setCredentials(credentials);
}
if (Constants.SYSTEM_COMPONENT_ID.equals(componentId)) {
Map<String, DisruptorQueue> map = ImmutableMap.of("sendqueue", transferQueue, "receive", receiveQueue,
"transfer", workerData.getTransferQueue());
- BuiltinMetricsUtil.registerQueueMetrics(map, stormConf, userContext);
+ BuiltinMetricsUtil.registerQueueMetrics(map, topoConf, userContext);
Map cachedNodePortToSocket = (Map) workerData.getCachedNodeToPortSocket().get();
- BuiltinMetricsUtil.registerIconnectionClientMetrics(cachedNodePortToSocket, stormConf, userContext);
- BuiltinMetricsUtil.registerIconnectionServerMetric(workerData.getReceiver(), stormConf, userContext);
+ BuiltinMetricsUtil.registerIconnectionClientMetrics(cachedNodePortToSocket, topoConf, userContext);
+ BuiltinMetricsUtil.registerIconnectionServerMetric(workerData.getReceiver(), topoConf, userContext);
} else {
Map<String, DisruptorQueue> map = ImmutableMap.of("sendqueue", transferQueue, "receive", receiveQueue);
- BuiltinMetricsUtil.registerQueueMetrics(map, stormConf, userContext);
+ BuiltinMetricsUtil.registerQueueMetrics(map, topoConf, userContext);
}
IOutputCollector outputCollector = new BoltOutputCollectorImpl(this, taskData, entry.getKey(), rand, hasEventLoggers, isDebug);
- boltObject.prepare(stormConf, userContext, new OutputCollector(outputCollector));
+ boltObject.prepare(topoConf, userContext, new OutputCollector(outputCollector));
}
openOrPrepareWasCalled.set(true);
LOG.info("Prepared bolt {}:{}", componentId, idToTask.keySet());
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/executor/error/ReportError.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/executor/error/ReportError.java b/storm-client/src/jvm/org/apache/storm/executor/error/ReportError.java
index 3272b85..d1c80e3 100644
--- a/storm-client/src/jvm/org/apache/storm/executor/error/ReportError.java
+++ b/storm-client/src/jvm/org/apache/storm/executor/error/ReportError.java
@@ -34,7 +34,7 @@ public class ReportError implements IReportError {
private static final Logger LOG = LoggerFactory.getLogger(ReportError.class);
- private final Map stormConf;
+ private final Map<String, Object> topoConf;
private final IStormClusterState stormClusterState;
private final String stormId;
private final String componentId;
@@ -45,14 +45,14 @@ public class ReportError implements IReportError {
private AtomicInteger intervalStartTime;
private AtomicInteger intervalErrors;
- public ReportError(Map stormConf, IStormClusterState stormClusterState, String stormId, String componentId, WorkerTopologyContext workerTopologyContext) {
- this.stormConf = stormConf;
+ public ReportError(Map<String, Object> topoConf, IStormClusterState stormClusterState, String stormId, String componentId, WorkerTopologyContext workerTopologyContext) {
+ this.topoConf = topoConf;
this.stormClusterState = stormClusterState;
this.stormId = stormId;
this.componentId = componentId;
this.workerTopologyContext = workerTopologyContext;
- this.errorIntervalSecs = ObjectReader.getInt(stormConf.get(Config.TOPOLOGY_ERROR_THROTTLE_INTERVAL_SECS));
- this.maxPerInterval = ObjectReader.getInt(stormConf.get(Config.TOPOLOGY_MAX_ERROR_REPORT_PER_INTERVAL));
+ this.errorIntervalSecs = ObjectReader.getInt(topoConf.get(Config.TOPOLOGY_ERROR_THROTTLE_INTERVAL_SECS));
+ this.maxPerInterval = ObjectReader.getInt(topoConf.get(Config.TOPOLOGY_MAX_ERROR_REPORT_PER_INTERVAL));
this.intervalStartTime = new AtomicInteger(Time.currentTimeSecs());
this.intervalErrors = new AtomicInteger(0);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/executor/spout/SpoutExecutor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/executor/spout/SpoutExecutor.java b/storm-client/src/jvm/org/apache/storm/executor/spout/SpoutExecutor.java
index 9e7622c..36f1892 100644
--- a/storm-client/src/jvm/org/apache/storm/executor/spout/SpoutExecutor.java
+++ b/storm-client/src/jvm/org/apache/storm/executor/spout/SpoutExecutor.java
@@ -70,13 +70,13 @@ public class SpoutExecutor extends Executor {
public SpoutExecutor(final WorkerState workerData, final List<Long> executorId, Map<String, String> credentials) {
super(workerData, executorId, credentials);
- this.spoutWaitStrategy = ReflectionUtils.newInstance((String) stormConf.get(Config.TOPOLOGY_SPOUT_WAIT_STRATEGY));
- this.spoutWaitStrategy.prepare(stormConf);
+ this.spoutWaitStrategy = ReflectionUtils.newInstance((String) topoConf.get(Config.TOPOLOGY_SPOUT_WAIT_STRATEGY));
+ this.spoutWaitStrategy.prepare(topoConf);
- this.backPressureEnabled = ObjectReader.getBoolean(stormConf.get(Config.TOPOLOGY_BACKPRESSURE_ENABLE), false);
+ this.backPressureEnabled = ObjectReader.getBoolean(topoConf.get(Config.TOPOLOGY_BACKPRESSURE_ENABLE), false);
this.lastActive = new AtomicBoolean(false);
- this.hasAckers = StormCommon.hasAckers(stormConf);
+ this.hasAckers = StormCommon.hasAckers(topoConf);
this.emittedCount = new MutableLong(0);
this.emptyEmitStreak = new MutableLong(0);
this.spoutThrottlingMetrics = new SpoutThrottlingMetrics();
@@ -89,7 +89,7 @@ public class SpoutExecutor extends Executor {
LOG.info("Opening spout {}:{}", componentId, idToTask.keySet());
this.idToTask = idToTask;
- this.maxSpoutPending = ObjectReader.getInt(stormConf.get(Config.TOPOLOGY_MAX_SPOUT_PENDING), 0) * idToTask.size();
+ this.maxSpoutPending = ObjectReader.getInt(topoConf.get(Config.TOPOLOGY_MAX_SPOUT_PENDING), 0) * idToTask.size();
this.spouts = new ArrayList<>();
for (Task task : idToTask.values()) {
this.spouts.add((ISpout) task.getTaskObject());
@@ -105,7 +105,7 @@ public class SpoutExecutor extends Executor {
}
});
- this.spoutThrottlingMetrics.registerAll(stormConf, idToTask.values().iterator().next().getUserContext());
+ this.spoutThrottlingMetrics.registerAll(topoConf, idToTask.values().iterator().next().getUserContext());
this.outputCollectors = new ArrayList<>();
for (Map.Entry<Integer, Task> entry : idToTask.entrySet()) {
Task taskData = entry.getValue();
@@ -116,14 +116,14 @@ public class SpoutExecutor extends Executor {
SpoutOutputCollector outputCollector = new SpoutOutputCollector(spoutOutputCollector);
this.outputCollectors.add(outputCollector);
- taskData.getBuiltInMetrics().registerAll(stormConf, taskData.getUserContext());
+ taskData.getBuiltInMetrics().registerAll(topoConf, taskData.getUserContext());
Map<String, DisruptorQueue> map = ImmutableMap.of("sendqueue", transferQueue, "receive", receiveQueue);
- BuiltinMetricsUtil.registerQueueMetrics(map, stormConf, taskData.getUserContext());
+ BuiltinMetricsUtil.registerQueueMetrics(map, topoConf, taskData.getUserContext());
if (spoutObject instanceof ICredentialsListener) {
((ICredentialsListener) spoutObject).setCredentials(credentials);
}
- spoutObject.open(stormConf, taskData.getUserContext(), outputCollector);
+ spoutObject.open(topoConf, taskData.getUserContext(), outputCollector);
}
openOrPrepareWasCalled.set(true);
LOG.info("Opened spout {}:{}", componentId, idToTask.keySet());
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/generated/TopologyPageInfo.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/TopologyPageInfo.java b/storm-client/src/jvm/org/apache/storm/generated/TopologyPageInfo.java
index a0e25ce..25bda95 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/TopologyPageInfo.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/TopologyPageInfo.java
@@ -62,7 +62,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
private static final org.apache.thrift.protocol.TField NUM_TASKS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_tasks", org.apache.thrift.protocol.TType.I32, (short)5);
private static final org.apache.thrift.protocol.TField NUM_WORKERS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_workers", org.apache.thrift.protocol.TType.I32, (short)6);
private static final org.apache.thrift.protocol.TField NUM_EXECUTORS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_executors", org.apache.thrift.protocol.TType.I32, (short)7);
- private static final org.apache.thrift.protocol.TField TOPOLOGY_CONF_FIELD_DESC = new org.apache.thrift.protocol.TField("topology_conf", org.apache.thrift.protocol.TType.STRING, (short)8);
+ private static final org.apache.thrift.protocol.TField TOPOLOGY_CONF_FIELD_DESC = new org.apache.thrift.protocol.TField("topoConf", org.apache.thrift.protocol.TType.STRING, (short)8);
private static final org.apache.thrift.protocol.TField ID_TO_SPOUT_AGG_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("id_to_spout_agg_stats", org.apache.thrift.protocol.TType.MAP, (short)9);
private static final org.apache.thrift.protocol.TField ID_TO_BOLT_AGG_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("id_to_bolt_agg_stats", org.apache.thrift.protocol.TType.MAP, (short)10);
private static final org.apache.thrift.protocol.TField SCHED_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("sched_status", org.apache.thrift.protocol.TType.STRING, (short)11);
@@ -91,7 +91,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
private int num_tasks; // optional
private int num_workers; // optional
private int num_executors; // optional
- private String topology_conf; // optional
+ private String topoConf; // optional
private Map<String,ComponentAggregateStats> id_to_spout_agg_stats; // optional
private Map<String,ComponentAggregateStats> id_to_bolt_agg_stats; // optional
private String sched_status; // optional
@@ -116,7 +116,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
NUM_TASKS((short)5, "num_tasks"),
NUM_WORKERS((short)6, "num_workers"),
NUM_EXECUTORS((short)7, "num_executors"),
- TOPOLOGY_CONF((short)8, "topology_conf"),
+ TOPOLOGY_CONF((short)8, "topoConf"),
ID_TO_SPOUT_AGG_STATS((short)9, "id_to_spout_agg_stats"),
ID_TO_BOLT_AGG_STATS((short)10, "id_to_bolt_agg_stats"),
SCHED_STATUS((short)11, "sched_status"),
@@ -259,7 +259,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
tmpMap.put(_Fields.NUM_EXECUTORS, new org.apache.thrift.meta_data.FieldMetaData("num_executors", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
- tmpMap.put(_Fields.TOPOLOGY_CONF, new org.apache.thrift.meta_data.FieldMetaData("topology_conf", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.TOPOLOGY_CONF, new org.apache.thrift.meta_data.FieldMetaData("topoConf", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.ID_TO_SPOUT_AGG_STATS, new org.apache.thrift.meta_data.FieldMetaData("id_to_spout_agg_stats", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
@@ -326,8 +326,8 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
this.num_tasks = other.num_tasks;
this.num_workers = other.num_workers;
this.num_executors = other.num_executors;
- if (other.is_set_topology_conf()) {
- this.topology_conf = other.topology_conf;
+ if (other.is_set_topoConf()) {
+ this.topoConf = other.topoConf;
}
if (other.is_set_id_to_spout_agg_stats()) {
Map<String,ComponentAggregateStats> __this__id_to_spout_agg_stats = new HashMap<String,ComponentAggregateStats>(other.id_to_spout_agg_stats.size());
@@ -404,7 +404,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
this.num_workers = 0;
set_num_executors_isSet(false);
this.num_executors = 0;
- this.topology_conf = null;
+ this.topoConf = null;
this.id_to_spout_agg_stats = null;
this.id_to_bolt_agg_stats = null;
this.sched_status = null;
@@ -585,26 +585,26 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
__isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID, value);
}
- public String get_topology_conf() {
- return this.topology_conf;
+ public String get_topoConf() {
+ return this.topoConf;
}
- public void set_topology_conf(String topology_conf) {
- this.topology_conf = topology_conf;
+ public void set_topoConf(String topoConf) {
+ this.topoConf = topoConf;
}
- public void unset_topology_conf() {
- this.topology_conf = null;
+ public void unset_topoConf() {
+ this.topoConf = null;
}
- /** Returns true if field topology_conf is set (has been assigned a value) and false otherwise */
- public boolean is_set_topology_conf() {
- return this.topology_conf != null;
+ /** Returns true if field topoConf is set (has been assigned a value) and false otherwise */
+ public boolean is_set_topoConf() {
+ return this.topoConf != null;
}
- public void set_topology_conf_isSet(boolean value) {
+ public void set_topoConf_isSet(boolean value) {
if (!value) {
- this.topology_conf = null;
+ this.topoConf = null;
}
}
@@ -1020,9 +1020,9 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
case TOPOLOGY_CONF:
if (value == null) {
- unset_topology_conf();
+ unset_topoConf();
} else {
- set_topology_conf((String)value);
+ set_topoConf((String)value);
}
break;
@@ -1165,7 +1165,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
return get_num_executors();
case TOPOLOGY_CONF:
- return get_topology_conf();
+ return get_topoConf();
case ID_TO_SPOUT_AGG_STATS:
return get_id_to_spout_agg_stats();
@@ -1235,7 +1235,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
case NUM_EXECUTORS:
return is_set_num_executors();
case TOPOLOGY_CONF:
- return is_set_topology_conf();
+ return is_set_topoConf();
case ID_TO_SPOUT_AGG_STATS:
return is_set_id_to_spout_agg_stats();
case ID_TO_BOLT_AGG_STATS:
@@ -1344,12 +1344,12 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
return false;
}
- boolean this_present_topology_conf = true && this.is_set_topology_conf();
- boolean that_present_topology_conf = true && that.is_set_topology_conf();
- if (this_present_topology_conf || that_present_topology_conf) {
- if (!(this_present_topology_conf && that_present_topology_conf))
+ boolean this_present_topoConf = true && this.is_set_topoConf();
+ boolean that_present_topoConf = true && that.is_set_topoConf();
+ if (this_present_topoConf || that_present_topoConf) {
+ if (!(this_present_topoConf && that_present_topoConf))
return false;
- if (!this.topology_conf.equals(that.topology_conf))
+ if (!this.topoConf.equals(that.topoConf))
return false;
}
@@ -1521,10 +1521,10 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
if (present_num_executors)
list.add(num_executors);
- boolean present_topology_conf = true && (is_set_topology_conf());
- list.add(present_topology_conf);
- if (present_topology_conf)
- list.add(topology_conf);
+ boolean present_topoConf = true && (is_set_topoConf());
+ list.add(present_topoConf);
+ if (present_topoConf)
+ list.add(topoConf);
boolean present_id_to_spout_agg_stats = true && (is_set_id_to_spout_agg_stats());
list.add(present_id_to_spout_agg_stats);
@@ -1677,12 +1677,12 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_topology_conf()).compareTo(other.is_set_topology_conf());
+ lastComparison = Boolean.valueOf(is_set_topoConf()).compareTo(other.is_set_topoConf());
if (lastComparison != 0) {
return lastComparison;
}
- if (is_set_topology_conf()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.topology_conf, other.topology_conf);
+ if (is_set_topoConf()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.topoConf, other.topoConf);
if (lastComparison != 0) {
return lastComparison;
}
@@ -1898,13 +1898,13 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
sb.append(this.num_executors);
first = false;
}
- if (is_set_topology_conf()) {
+ if (is_set_topoConf()) {
if (!first) sb.append(", ");
- sb.append("topology_conf:");
- if (this.topology_conf == null) {
+ sb.append("topoConf:");
+ if (this.topoConf == null) {
sb.append("null");
} else {
- sb.append(this.topology_conf);
+ sb.append(this.topoConf);
}
first = false;
}
@@ -2133,8 +2133,8 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
break;
case 8: // TOPOLOGY_CONF
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.topology_conf = iprot.readString();
- struct.set_topology_conf_isSet(true);
+ struct.topoConf = iprot.readString();
+ struct.set_topoConf_isSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -2342,10 +2342,10 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
oprot.writeI32(struct.num_executors);
oprot.writeFieldEnd();
}
- if (struct.topology_conf != null) {
- if (struct.is_set_topology_conf()) {
+ if (struct.topoConf != null) {
+ if (struct.is_set_topoConf()) {
oprot.writeFieldBegin(TOPOLOGY_CONF_FIELD_DESC);
- oprot.writeString(struct.topology_conf);
+ oprot.writeString(struct.topoConf);
oprot.writeFieldEnd();
}
}
@@ -2493,7 +2493,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
if (struct.is_set_num_executors()) {
optionals.set(5);
}
- if (struct.is_set_topology_conf()) {
+ if (struct.is_set_topoConf()) {
optionals.set(6);
}
if (struct.is_set_id_to_spout_agg_stats()) {
@@ -2557,8 +2557,8 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
if (struct.is_set_num_executors()) {
oprot.writeI32(struct.num_executors);
}
- if (struct.is_set_topology_conf()) {
- oprot.writeString(struct.topology_conf);
+ if (struct.is_set_topoConf()) {
+ oprot.writeString(struct.topoConf);
}
if (struct.is_set_id_to_spout_agg_stats()) {
{
@@ -2655,8 +2655,8 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
struct.set_num_executors_isSet(true);
}
if (incoming.get(6)) {
- struct.topology_conf = iprot.readString();
- struct.set_topology_conf_isSet(true);
+ struct.topoConf = iprot.readString();
+ struct.set_topoConf_isSet(true);
}
if (incoming.get(7)) {
{
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/hooks/BaseTaskHook.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/hooks/BaseTaskHook.java b/storm-client/src/jvm/org/apache/storm/hooks/BaseTaskHook.java
index 3eee8d8..e09602b 100644
--- a/storm-client/src/jvm/org/apache/storm/hooks/BaseTaskHook.java
+++ b/storm-client/src/jvm/org/apache/storm/hooks/BaseTaskHook.java
@@ -28,7 +28,7 @@ import java.util.Map;
public class BaseTaskHook implements ITaskHook {
@Override
- public void prepare(Map conf, TopologyContext context) {
+ public void prepare(Map<String, Object> conf, TopologyContext context) {
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/hooks/BaseWorkerHook.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/hooks/BaseWorkerHook.java b/storm-client/src/jvm/org/apache/storm/hooks/BaseWorkerHook.java
index e178280..526a5df 100644
--- a/storm-client/src/jvm/org/apache/storm/hooks/BaseWorkerHook.java
+++ b/storm-client/src/jvm/org/apache/storm/hooks/BaseWorkerHook.java
@@ -33,11 +33,11 @@ public class BaseWorkerHook implements IWorkerHook, Serializable {
/**
* This method is called when a worker is started
*
- * @param stormConf The Storm configuration for this worker
+ * @param topoConf The Storm configuration for this worker
* @param context This object can be used to get information about this worker's place within the topology
*/
@Override
- public void start(Map stormConf, WorkerTopologyContext context) {
+ public void start(Map<String, Object> topoConf, WorkerTopologyContext context) {
// NOOP
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/hooks/ITaskHook.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/hooks/ITaskHook.java b/storm-client/src/jvm/org/apache/storm/hooks/ITaskHook.java
index 519af0c..ae65f46 100644
--- a/storm-client/src/jvm/org/apache/storm/hooks/ITaskHook.java
+++ b/storm-client/src/jvm/org/apache/storm/hooks/ITaskHook.java
@@ -27,7 +27,7 @@ import org.apache.storm.task.TopologyContext;
import java.util.Map;
public interface ITaskHook {
- void prepare(Map conf, TopologyContext context);
+ void prepare(Map<String, Object> conf, TopologyContext context);
void cleanup();
void emit(EmitInfo info);
void spoutAck(SpoutAckInfo info);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/hooks/IWorkerHook.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/hooks/IWorkerHook.java b/storm-client/src/jvm/org/apache/storm/hooks/IWorkerHook.java
index 5f49fe3..6318e24 100644
--- a/storm-client/src/jvm/org/apache/storm/hooks/IWorkerHook.java
+++ b/storm-client/src/jvm/org/apache/storm/hooks/IWorkerHook.java
@@ -32,10 +32,10 @@ public interface IWorkerHook extends Serializable {
/**
* This method is called when a worker is started
*
- * @param stormConf The Storm configuration for this worker
+ * @param topoConf The Storm configuration for this worker
* @param context This object can be used to get information about this worker's place within the topology
*/
- void start(Map stormConf, WorkerTopologyContext context);
+ void start(Map<String, Object> topoConf, WorkerTopologyContext context);
/**
* This method is called right before a worker shuts down
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/lambda/LambdaSpout.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/lambda/LambdaSpout.java b/storm-client/src/jvm/org/apache/storm/lambda/LambdaSpout.java
index 6d0ba3a..35abc41 100644
--- a/storm-client/src/jvm/org/apache/storm/lambda/LambdaSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/lambda/LambdaSpout.java
@@ -35,7 +35,7 @@ public class LambdaSpout 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;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 8f415c2..75e58d9 100644
--- a/storm-client/src/jvm/org/apache/storm/messaging/DeserializingConnectionCallback.java
+++ b/storm-client/src/jvm/org/apache/storm/messaging/DeserializingConnectionCallback.java
@@ -41,7 +41,7 @@ public class DeserializingConnectionCallback implements IConnectionCallback {
}
};
- public DeserializingConnectionCallback(final Map conf, final GeneralTopologyContext context, WorkerState.ILocalTransferCallback callback) {
+ public DeserializingConnectionCallback(final Map<String, Object> conf, final GeneralTopologyContext context, WorkerState.ILocalTransferCallback callback) {
_conf = conf;
_context = context;
_cb = callback;
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/messaging/IContext.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/messaging/IContext.java b/storm-client/src/jvm/org/apache/storm/messaging/IContext.java
index 72812b1..97148ce 100644
--- a/storm-client/src/jvm/org/apache/storm/messaging/IContext.java
+++ b/storm-client/src/jvm/org/apache/storm/messaging/IContext.java
@@ -25,15 +25,15 @@ import java.util.Map;
* Messaging plugin is specified via Storm config parameter, storm.messaging.transport.
*
* A messaging plugin should have a default constructor and implements IContext interface.
- * Upon construction, we will invoke IContext::prepare(storm_conf) to enable context to be configured
+ * Upon construction, we will invoke IContext::prepare(topoConf) to enable context to be configured
* according to storm configuration.
*/
public interface IContext {
/**
* This method is invoked at the startup of messaging plugin
- * @param storm_conf storm configuration
+ * @param topoConf storm configuration
*/
- public void prepare(Map storm_conf);
+ public void prepare(Map<String, Object> topoConf);
/**
* This method is invoked when a worker is unload a messaging plugin
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/messaging/TransportFactory.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/messaging/TransportFactory.java b/storm-client/src/jvm/org/apache/storm/messaging/TransportFactory.java
index 511257d..e98ea64 100644
--- a/storm-client/src/jvm/org/apache/storm/messaging/TransportFactory.java
+++ b/storm-client/src/jvm/org/apache/storm/messaging/TransportFactory.java
@@ -26,10 +26,10 @@ import org.apache.storm.Config;
public class TransportFactory {
public static final Logger LOG = LoggerFactory.getLogger(TransportFactory.class);
- public static IContext makeContext(Map storm_conf) {
+ public static IContext makeContext(Map<String, Object> topoConf) {
//get factory class name
- String transport_plugin_klassName = (String)storm_conf.get(Config.STORM_MESSAGING_TRANSPORT);
+ String transport_plugin_klassName = (String)topoConf.get(Config.STORM_MESSAGING_TRANSPORT);
LOG.info("Storm peer transport plugin:"+transport_plugin_klassName);
IContext transport;
@@ -42,12 +42,12 @@ public class TransportFactory {
//case 1: plugin is a IContext class
transport = (IContext)obj;
//initialize with storm configuration
- transport.prepare(storm_conf);
+ transport.prepare(topoConf);
} else {
- //case 2: Non-IContext plugin must have a makeContext(storm_conf) method that returns IContext object
+ //case 2: Non-IContext plugin must have a makeContext(topoConf) method that returns IContext object
Method method = klass.getMethod("makeContext", Map.class);
LOG.debug("object:"+obj+" method:"+method);
- transport = (IContext) method.invoke(obj, storm_conf);
+ transport = (IContext) method.invoke(obj, topoConf);
}
} catch(Exception e) {
throw new RuntimeException("Fail to construct messaging plugin from plugin "+transport_plugin_klassName, e);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 7300847..06318b8 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
@@ -196,7 +196,7 @@ public class Context implements IContext {
@SuppressWarnings("rawtypes")
@Override
- public void prepare(Map storm_conf) {
+ public void prepare(Map<String, Object> topoConf) {
//NOOP
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 8463af6..52fdda8 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
@@ -77,7 +77,7 @@ public class Client extends ConnectionWithStatus implements IStatefulObject, ISa
private static final long NO_DELAY_MS = 0L;
private static final Timer timer = new Timer("Netty-ChannelAlive-Timer", true);
- private final Map stormConf;
+ private final Map<String, Object> topoConf;
private final StormBoundedExponentialBackoffRetry retryPolicy;
private final ClientBootstrap bootstrap;
private final InetSocketAddress dstAddress;
@@ -139,24 +139,24 @@ public class Client extends ConnectionWithStatus implements IStatefulObject, ISa
private final Object writeLock = new Object();
@SuppressWarnings("rawtypes")
- Client(Map stormConf, ChannelFactory factory, HashedWheelTimer scheduler, String host, int port, Context context) {
- this.stormConf = stormConf;
+ Client(Map<String, Object> topoConf, ChannelFactory factory, HashedWheelTimer scheduler, String host, int port, Context context) {
+ this.topoConf = topoConf;
closing = false;
this.scheduler = scheduler;
this.context = context;
- int bufferSize = ObjectReader.getInt(stormConf.get(Config.STORM_MESSAGING_NETTY_BUFFER_SIZE));
+ int bufferSize = ObjectReader.getInt(topoConf.get(Config.STORM_MESSAGING_NETTY_BUFFER_SIZE));
// if SASL authentication is disabled, saslChannelReady is initialized as true; otherwise false
- saslChannelReady.set(!ObjectReader.getBoolean(stormConf.get(Config.STORM_MESSAGING_NETTY_AUTHENTICATION), false));
+ saslChannelReady.set(!ObjectReader.getBoolean(topoConf.get(Config.STORM_MESSAGING_NETTY_AUTHENTICATION), false));
LOG.info("creating Netty Client, connecting to {}:{}, bufferSize: {}", host, port, bufferSize);
- int messageBatchSize = ObjectReader.getInt(stormConf.get(Config.STORM_NETTY_MESSAGE_BATCH_SIZE), 262144);
+ int messageBatchSize = ObjectReader.getInt(topoConf.get(Config.STORM_NETTY_MESSAGE_BATCH_SIZE), 262144);
- int maxReconnectionAttempts = ObjectReader.getInt(stormConf.get(Config.STORM_MESSAGING_NETTY_MAX_RETRIES));
- int minWaitMs = ObjectReader.getInt(stormConf.get(Config.STORM_MESSAGING_NETTY_MIN_SLEEP_MS));
- int maxWaitMs = ObjectReader.getInt(stormConf.get(Config.STORM_MESSAGING_NETTY_MAX_SLEEP_MS));
+ int maxReconnectionAttempts = ObjectReader.getInt(topoConf.get(Config.STORM_MESSAGING_NETTY_MAX_RETRIES));
+ int minWaitMs = ObjectReader.getInt(topoConf.get(Config.STORM_MESSAGING_NETTY_MIN_SLEEP_MS));
+ int maxWaitMs = ObjectReader.getInt(topoConf.get(Config.STORM_MESSAGING_NETTY_MAX_SLEEP_MS));
retryPolicy = new StormBoundedExponentialBackoffRetry(minWaitMs, maxWaitMs, maxReconnectionAttempts);
// Initiate connection to remote destination
- bootstrap = createClientBootstrap(factory, bufferSize, stormConf);
+ bootstrap = createClientBootstrap(factory, bufferSize, topoConf);
dstAddress = new InetSocketAddress(host, port);
dstAddressPrefixedName = prefixedName(dstAddress);
launchChannelAliveThread();
@@ -189,12 +189,12 @@ public class Client extends ConnectionWithStatus implements IStatefulObject, ISa
}, 0, CHANNEL_ALIVE_INTERVAL_MS);
}
- private ClientBootstrap createClientBootstrap(ChannelFactory factory, int bufferSize, Map stormConf) {
+ private ClientBootstrap createClientBootstrap(ChannelFactory factory, int bufferSize, Map<String, Object> topoConf) {
ClientBootstrap bootstrap = new ClientBootstrap(factory);
bootstrap.setOption("tcpNoDelay", true);
bootstrap.setOption("sendBufferSize", bufferSize);
bootstrap.setOption("keepAlive", true);
- bootstrap.setPipelineFactory(new StormClientPipelineFactory(this, stormConf));
+ bootstrap.setPipelineFactory(new StormClientPipelineFactory(this, topoConf));
return bootstrap;
}
@@ -495,7 +495,7 @@ public class Client extends ConnectionWithStatus implements IStatefulObject, ISa
}
public Map getConfig() {
- return stormConf;
+ return topoConf;
}
/** ISaslClient interface **/
@@ -508,11 +508,11 @@ public class Client extends ConnectionWithStatus implements IStatefulObject, ISa
}
public String name() {
- return (String)stormConf.get(Config.TOPOLOGY_NAME);
+ return (String)topoConf.get(Config.TOPOLOGY_NAME);
}
public String secretKey() {
- return SaslUtils.getSecretKey(stormConf);
+ return SaslUtils.getSecretKey(topoConf);
}
/** end **/
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 0f7c66b..10ffc83 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,7 @@ import org.apache.storm.messaging.IContext;
public class Context implements IContext {
@SuppressWarnings("rawtypes")
- private Map storm_conf;
+ private Map<String, Object> topoConf;
private Map<String, IConnection> connections;
private NioClientSocketChannelFactory clientChannelFactory;
@@ -41,12 +41,12 @@ public class Context implements IContext {
* initialization per Storm configuration
*/
@SuppressWarnings("rawtypes")
- public void prepare(Map storm_conf) {
- this.storm_conf = storm_conf;
+ public void prepare(Map<String, Object> topoConf) {
+ this.topoConf = topoConf;
connections = new HashMap<>();
//each context will have a single client channel factory
- int maxWorkers = ObjectReader.getInt(storm_conf.get(Config.STORM_MESSAGING_NETTY_CLIENT_WORKER_THREADS));
+ int maxWorkers = ObjectReader.getInt(topoConf.get(Config.STORM_MESSAGING_NETTY_CLIENT_WORKER_THREADS));
ThreadFactory bossFactory = new NettyRenameThreadFactory("client" + "-boss");
ThreadFactory workerFactory = new NettyRenameThreadFactory("client" + "-worker");
if (maxWorkers > 0) {
@@ -64,7 +64,7 @@ public class Context implements IContext {
* establish a server with a binding port
*/
public synchronized IConnection bind(String storm_id, int port) {
- IConnection server = new Server(storm_conf, port);
+ IConnection server = new Server(topoConf, port);
connections.put(key(storm_id, port), server);
return server;
}
@@ -78,7 +78,7 @@ public class Context implements IContext {
{
return connection;
}
- IConnection client = new Client(storm_conf, clientChannelFactory,
+ IConnection client = new Client(topoConf, clientChannelFactory,
clientScheduleService, host, port, this);
connections.put(key(host, port), client);
return client;
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslClientHandler.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslClientHandler.java b/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslClientHandler.java
index d7b20d6..abaadfb 100644
--- a/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslClientHandler.java
+++ b/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslClientHandler.java
@@ -35,13 +35,13 @@ public class KerberosSaslClientHandler extends SimpleChannelUpstreamHandler {
private ISaslClient client;
long start_time;
/** Used for client or server's token to send or receive from each other. */
- private Map storm_conf;
+ private Map<String, Object> topoConf;
private String jaas_section;
private String host;
- public KerberosSaslClientHandler(ISaslClient client, Map storm_conf, String jaas_section, String host) throws IOException {
+ public KerberosSaslClientHandler(ISaslClient client, Map<String, Object> topoConf, String jaas_section, String host) throws IOException {
this.client = client;
- this.storm_conf = storm_conf;
+ this.topoConf = topoConf;
this.jaas_section = jaas_section;
this.host = host;
start_time = System.currentTimeMillis();
@@ -64,7 +64,7 @@ public class KerberosSaslClientHandler extends SimpleChannelUpstreamHandler {
if (saslNettyClient == null) {
LOG.debug("Creating saslNettyClient now for channel: {}",
channel);
- saslNettyClient = new KerberosSaslNettyClient(storm_conf, jaas_section, host);
+ saslNettyClient = new KerberosSaslNettyClient(topoConf, jaas_section, host);
KerberosSaslNettyClientState.getKerberosSaslNettyClient.set(channel,
saslNettyClient);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyClient.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyClient.java b/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyClient.java
index 2efcb19..0ebb9f8 100644
--- a/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyClient.java
+++ b/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyClient.java
@@ -58,7 +58,7 @@ public class KerberosSaslNettyClient {
/**
* Create a KerberosSaslNettyClient for authentication with servers.
*/
- public KerberosSaslNettyClient(Map storm_conf, String jaas_section, String host) {
+ public KerberosSaslNettyClient(Map<String, Object> topoConf, String jaas_section, String host) {
LOG.debug("KerberosSaslNettyClient: Creating SASL {} client to authenticate to server ",
SaslUtils.KERBEROS);
@@ -66,7 +66,7 @@ public class KerberosSaslNettyClient {
Configuration login_conf;
try {
- login_conf = AuthUtils.GetConfiguration(storm_conf);
+ login_conf = AuthUtils.GetConfiguration(topoConf);
}
catch (Throwable t) {
LOG.error("Failed to get login_conf: ", t);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyServer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyServer.java b/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyServer.java
index 72486ef..a36ac47 100644
--- a/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyServer.java
+++ b/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyServer.java
@@ -53,12 +53,12 @@ class KerberosSaslNettyServer {
private Subject subject;
private List<String> authorizedUsers;
- KerberosSaslNettyServer(Map storm_conf, String jaas_section, List<String> authorizedUsers) {
+ KerberosSaslNettyServer(Map<String, Object> topoConf, String jaas_section, List<String> authorizedUsers) {
this.authorizedUsers = authorizedUsers;
LOG.debug("Getting Configuration.");
Configuration login_conf;
try {
- login_conf = AuthUtils.GetConfiguration(storm_conf);
+ login_conf = AuthUtils.GetConfiguration(topoConf);
}
catch (Throwable t) {
LOG.error("Failed to get login_conf: ", t);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslServerHandler.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslServerHandler.java b/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslServerHandler.java
index 14ac172..d57b8ab 100644
--- a/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslServerHandler.java
+++ b/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslServerHandler.java
@@ -33,16 +33,16 @@ public class KerberosSaslServerHandler extends SimpleChannelUpstreamHandler {
ISaslServer server;
/** Used for client or server's token to send or receive from each other. */
- private Map storm_conf;
+ private Map<String, Object> topoConf;
private String jaas_section;
private List<String> authorizedUsers;
private static final Logger LOG = LoggerFactory
.getLogger(KerberosSaslServerHandler.class);
- public KerberosSaslServerHandler(ISaslServer server, Map storm_conf, String jaas_section, List<String> authorizedUsers) throws IOException {
+ public KerberosSaslServerHandler(ISaslServer server, Map<String, Object> topoConf, String jaas_section, List<String> authorizedUsers) throws IOException {
this.server = server;
- this.storm_conf = storm_conf;
+ this.topoConf = topoConf;
this.jaas_section = jaas_section;
this.authorizedUsers = authorizedUsers;
}
@@ -70,7 +70,7 @@ public class KerberosSaslServerHandler extends SimpleChannelUpstreamHandler {
if (saslNettyServer == null) {
LOG.debug("No saslNettyServer for {} yet; creating now, with topology token: ", channel);
try {
- saslNettyServer = new KerberosSaslNettyServer(storm_conf, jaas_section, authorizedUsers);
+ saslNettyServer = new KerberosSaslNettyServer(topoConf, jaas_section, authorizedUsers);
KerberosSaslNettyServerState.getKerberosSaslNettyServer.set(channel,
saslNettyServer);
} catch (RuntimeException ioe) {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/messaging/netty/SaslUtils.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/messaging/netty/SaslUtils.java b/storm-client/src/jvm/org/apache/storm/messaging/netty/SaslUtils.java
index b5c6b6b..9308100 100644
--- a/storm-client/src/jvm/org/apache/storm/messaging/netty/SaslUtils.java
+++ b/storm-client/src/jvm/org/apache/storm/messaging/netty/SaslUtils.java
@@ -61,7 +61,7 @@ class SaslUtils {
return new String(Base64.encodeBase64(identifier), Charsets.UTF_8);
}
- static String getSecretKey(Map conf) {
+ static String getSecretKey(Map<String, Object> conf) {
return conf == null || conf.isEmpty() ? null : (String) conf.get(Config.STORM_ZOOKEEPER_TOPOLOGY_AUTH_PAYLOAD);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 fce00e8..376006f 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
@@ -51,7 +51,7 @@ class Server extends ConnectionWithStatus implements IStatefulObject, ISaslServe
private static final Logger LOG = LoggerFactory.getLogger(Server.class);
@SuppressWarnings("rawtypes")
- Map storm_conf;
+ Map<String, Object> topoConf;
int port;
private final ConcurrentHashMap<String, AtomicInteger> messagesEnqueued = new ConcurrentHashMap<>();
private final AtomicInteger messagesDequeued = new AtomicInteger(0);
@@ -66,15 +66,15 @@ class Server extends ConnectionWithStatus implements IStatefulObject, ISaslServe
private IConnectionCallback _cb = null;
@SuppressWarnings("rawtypes")
- Server(Map storm_conf, int port) {
- this.storm_conf = storm_conf;
+ Server(Map<String, Object> topoConf, int port) {
+ this.topoConf = topoConf;
this.port = port;
- _ser = new KryoValuesSerializer(storm_conf);
+ _ser = new KryoValuesSerializer(topoConf);
// Configure the server.
- int buffer_size = ObjectReader.getInt(storm_conf.get(Config.STORM_MESSAGING_NETTY_BUFFER_SIZE));
- int backlog = ObjectReader.getInt(storm_conf.get(Config.STORM_MESSAGING_NETTY_SOCKET_BACKLOG), 500);
- int maxWorkers = ObjectReader.getInt(storm_conf.get(Config.STORM_MESSAGING_NETTY_SERVER_WORKER_THREADS));
+ int buffer_size = ObjectReader.getInt(topoConf.get(Config.STORM_MESSAGING_NETTY_BUFFER_SIZE));
+ int backlog = ObjectReader.getInt(topoConf.get(Config.STORM_MESSAGING_NETTY_SOCKET_BACKLOG), 500);
+ int maxWorkers = ObjectReader.getInt(topoConf.get(Config.STORM_MESSAGING_NETTY_SERVER_WORKER_THREADS));
ThreadFactory bossFactory = new NettyRenameThreadFactory(netty_name() + "-boss");
ThreadFactory workerFactory = new NettyRenameThreadFactory(netty_name() + "-worker");
@@ -256,11 +256,11 @@ class Server extends ConnectionWithStatus implements IStatefulObject, ISaslServe
}
public String name() {
- return (String)storm_conf.get(Config.TOPOLOGY_NAME);
+ return (String)topoConf.get(Config.TOPOLOGY_NAME);
}
public String secretKey() {
- return SaslUtils.getSecretKey(storm_conf);
+ return SaslUtils.getSecretKey(topoConf);
}
public void authenticated(Channel c) {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/messaging/netty/StormClientHandler.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/messaging/netty/StormClientHandler.java b/storm-client/src/jvm/org/apache/storm/messaging/netty/StormClientHandler.java
index a28b076..3487003 100644
--- a/storm-client/src/jvm/org/apache/storm/messaging/netty/StormClientHandler.java
+++ b/storm-client/src/jvm/org/apache/storm/messaging/netty/StormClientHandler.java
@@ -41,7 +41,7 @@ public class StormClientHandler extends SimpleChannelUpstreamHandler {
private Client client;
private KryoValuesDeserializer _des;
- StormClientHandler(Client client, Map conf) {
+ StormClientHandler(Client client, Map<String, Object> conf) {
this.client = client;
_des = new KryoValuesDeserializer(conf);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/messaging/netty/StormClientPipelineFactory.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/messaging/netty/StormClientPipelineFactory.java b/storm-client/src/jvm/org/apache/storm/messaging/netty/StormClientPipelineFactory.java
index e36eb65..3fd7641 100644
--- a/storm-client/src/jvm/org/apache/storm/messaging/netty/StormClientPipelineFactory.java
+++ b/storm-client/src/jvm/org/apache/storm/messaging/netty/StormClientPipelineFactory.java
@@ -26,9 +26,9 @@ import java.util.Map;
class StormClientPipelineFactory implements ChannelPipelineFactory {
private Client client;
- private Map conf;
+ private Map<String, Object> conf;
- StormClientPipelineFactory(Client client, Map conf) {
+ StormClientPipelineFactory(Client client, Map<String, Object> conf) {
this.client = client;
this.conf = conf;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/messaging/netty/StormServerPipelineFactory.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/messaging/netty/StormServerPipelineFactory.java b/storm-client/src/jvm/org/apache/storm/messaging/netty/StormServerPipelineFactory.java
index d28790b..2e4f418 100644
--- a/storm-client/src/jvm/org/apache/storm/messaging/netty/StormServerPipelineFactory.java
+++ b/storm-client/src/jvm/org/apache/storm/messaging/netty/StormServerPipelineFactory.java
@@ -39,7 +39,7 @@ class StormServerPipelineFactory implements ChannelPipelineFactory {
// Encoder
pipeline.addLast("encoder", new MessageEncoder());
- boolean isNettyAuth = (Boolean) this.server.storm_conf
+ boolean isNettyAuth = (Boolean) this.server.topoConf
.get(Config.STORM_MESSAGING_NETTY_AUTHENTICATION);
if (isNettyAuth) {
// Authenticate: Removed after authentication completes
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/metric/EventLoggerBolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/metric/EventLoggerBolt.java b/storm-client/src/jvm/org/apache/storm/metric/EventLoggerBolt.java
index 2950e08..901375d 100644
--- a/storm-client/src/jvm/org/apache/storm/metric/EventLoggerBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/metric/EventLoggerBolt.java
@@ -42,10 +42,10 @@ public class EventLoggerBolt implements IBolt {
private IEventLogger eventLogger;
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
LOG.info("EventLoggerBolt prepare called");
eventLogger = new FileBasedEventLogger();
- eventLogger.prepare(stormConf, context);
+ eventLogger.prepare(topoConf, context);
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/metric/FileBasedEventLogger.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/metric/FileBasedEventLogger.java b/storm-client/src/jvm/org/apache/storm/metric/FileBasedEventLogger.java
index f6822ff..8f5632a 100644
--- a/storm-client/src/jvm/org/apache/storm/metric/FileBasedEventLogger.java
+++ b/storm-client/src/jvm/org/apache/storm/metric/FileBasedEventLogger.java
@@ -79,7 +79,7 @@ public class FileBasedEventLogger implements IEventLogger {
@Override
- public void prepare(Map stormConf, TopologyContext context) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context) {
String stormId = context.getStormId();
int port = context.getThisWorkerPort();
@@ -87,7 +87,7 @@ public class FileBasedEventLogger implements IEventLogger {
* Include the topology name & worker port in the file name so that
* multiple event loggers can log independently.
*/
- String workersArtifactRoot = ConfigUtils.workerArtifactsRoot(stormConf, stormId, port);
+ String workersArtifactRoot = ConfigUtils.workerArtifactsRoot(topoConf, stormId, port);
Path path = Paths.get(workersArtifactRoot, "events.log");
File dir = path.toFile().getParentFile();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/metric/IEventLogger.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/metric/IEventLogger.java b/storm-client/src/jvm/org/apache/storm/metric/IEventLogger.java
index ce81602..70c5a8d 100644
--- a/storm-client/src/jvm/org/apache/storm/metric/IEventLogger.java
+++ b/storm-client/src/jvm/org/apache/storm/metric/IEventLogger.java
@@ -56,7 +56,7 @@ public interface IEventLogger {
}
}
- void prepare(Map stormConf, TopologyContext context);
+ void prepare(Map<String, Object> topoConf, TopologyContext context);
/**
* This method would be invoked when the {@link EventLoggerBolt} receives a tuple from the spouts or bolts that has
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/metric/LoggingMetricsConsumer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/metric/LoggingMetricsConsumer.java b/storm-client/src/jvm/org/apache/storm/metric/LoggingMetricsConsumer.java
index 4957501..934bc92 100644
--- a/storm-client/src/jvm/org/apache/storm/metric/LoggingMetricsConsumer.java
+++ b/storm-client/src/jvm/org/apache/storm/metric/LoggingMetricsConsumer.java
@@ -49,7 +49,7 @@ public class LoggingMetricsConsumer implements IMetricsConsumer {
public static final Logger LOG = LoggerFactory.getLogger(LoggingMetricsConsumer.class);
@Override
- public void prepare(Map stormConf, Object registrationArgument, TopologyContext context, IErrorReporter errorReporter) { }
+ public void prepare(Map<String, Object> topoConf, Object registrationArgument, TopologyContext context, IErrorReporter errorReporter) { }
static private String padding = " ";
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/metric/MetricsConsumerBolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/metric/MetricsConsumerBolt.java b/storm-client/src/jvm/org/apache/storm/metric/MetricsConsumerBolt.java
index 8feed00..8fdb69e 100644
--- a/storm-client/src/jvm/org/apache/storm/metric/MetricsConsumerBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/metric/MetricsConsumerBolt.java
@@ -68,14 +68,14 @@ public class MetricsConsumerBolt implements IBolt {
}
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
try {
_metricsConsumer = (IMetricsConsumer)Class.forName(_consumerClassName).newInstance();
} catch (Exception e) {
throw new RuntimeException("Could not instantiate a class listed in config under section " +
Config.TOPOLOGY_METRICS_CONSUMER_REGISTER + " with fully qualified name " + _consumerClassName, e);
}
- _metricsConsumer.prepare(stormConf, _registrationArgument, context, collector);
+ _metricsConsumer.prepare(topoConf, _registrationArgument, context, collector);
_collector = collector;
_taskExecuteThread = new Thread(new MetricsHandlerRunnable());
_taskExecuteThread.setDaemon(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 f1426f7..67be2c9 100644
--- a/storm-client/src/jvm/org/apache/storm/metric/SystemBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/metric/SystemBolt.java
@@ -91,7 +91,7 @@ public class SystemBolt implements IBolt {
@SuppressWarnings({ "unchecked", "rawtypes" })
@Override
- public void prepare(final Map topoConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(final Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
if(_prepareWasCalled && !"local".equals(topoConf.get(Config.STORM_CLUSTER_MODE))) {
throw new RuntimeException("A single worker should have 1 SystemBolt instance.");
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/metric/api/IMetricsConsumer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/metric/api/IMetricsConsumer.java b/storm-client/src/jvm/org/apache/storm/metric/api/IMetricsConsumer.java
index f2623be..def04a3 100644
--- a/storm-client/src/jvm/org/apache/storm/metric/api/IMetricsConsumer.java
+++ b/storm-client/src/jvm/org/apache/storm/metric/api/IMetricsConsumer.java
@@ -80,7 +80,7 @@ public interface IMetricsConsumer {
}
}
- void prepare(Map stormConf, Object registrationArgument, TopologyContext context, IErrorReporter errorReporter);
+ void prepare(Map<String, Object> topoConf, Object registrationArgument, TopologyContext context, IErrorReporter errorReporter);
void handleDataPoints(TaskInfo taskInfo, Collection<DataPoint> dataPoints);
void cleanup();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/metric/filter/FilterByMetricName.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/metric/filter/FilterByMetricName.java b/storm-client/src/jvm/org/apache/storm/metric/filter/FilterByMetricName.java
index 9c95428..05fe861 100644
--- a/storm-client/src/jvm/org/apache/storm/metric/filter/FilterByMetricName.java
+++ b/storm-client/src/jvm/org/apache/storm/metric/filter/FilterByMetricName.java
@@ -107,4 +107,4 @@ public class FilterByMetricName implements MetricsFilter {
return !valueWhenMatched;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/multilang/ISerializer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/multilang/ISerializer.java b/storm-client/src/jvm/org/apache/storm/multilang/ISerializer.java
index e3e6651..e4dce96 100644
--- a/storm-client/src/jvm/org/apache/storm/multilang/ISerializer.java
+++ b/storm-client/src/jvm/org/apache/storm/multilang/ISerializer.java
@@ -49,7 +49,7 @@ public interface ISerializer extends Serializable {
* @param context topology context
* @return process pid
*/
- Number connect(Map conf, TopologyContext context) throws IOException,
+ Number connect(Map<String, Object> conf, TopologyContext context) throws IOException,
NoOutputException;
/**
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/multilang/JsonSerializer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/multilang/JsonSerializer.java b/storm-client/src/jvm/org/apache/storm/multilang/JsonSerializer.java
index 8800573..0353d83 100644
--- a/storm-client/src/jvm/org/apache/storm/multilang/JsonSerializer.java
+++ b/storm-client/src/jvm/org/apache/storm/multilang/JsonSerializer.java
@@ -57,7 +57,7 @@ public class JsonSerializer implements ISerializer {
}
}
- public Number connect(Map conf, TopologyContext context)
+ public Number connect(Map<String, Object> conf, TopologyContext context)
throws IOException, NoOutputException {
JSONObject setupInfo = new JSONObject();
setupInfo.put("pidDir", context.getPIDDir());
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java b/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java
index cbbfe7f..be09b3e 100644
--- a/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java
+++ b/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java
@@ -65,7 +65,7 @@ public class PacemakerClient implements ISaslClient {
public PacemakerClient() {
bootstrap = new ClientBootstrap();
}
- public PacemakerClient(Map config, String host) {
+ public PacemakerClient(Map<String, Object> config, String host) {
int port = (int)config.get(Config.PACEMAKER_PORT);
client_name = (String)config.get(Config.TOPOLOGY_NAME);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClientPool.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClientPool.java b/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClientPool.java
index 1ec0ee4..0069b59 100644
--- a/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClientPool.java
+++ b/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClientPool.java
@@ -34,9 +34,9 @@ public class PacemakerClientPool {
private ConcurrentHashMap<String, PacemakerClient> clientForServer = new ConcurrentHashMap<>();
private ConcurrentLinkedQueue<String> servers;
- private Map config;
+ private Map<String, Object> config;
- public PacemakerClientPool(Map config) {
+ public PacemakerClientPool(Map<String, Object> config) {
this.config = config;
List<String> serverList = (List<String>)config.get(Config.PACEMAKER_SERVERS);
if(serverList == null) {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/pacemaker/codec/ThriftNettyClientCodec.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/pacemaker/codec/ThriftNettyClientCodec.java b/storm-client/src/jvm/org/apache/storm/pacemaker/codec/ThriftNettyClientCodec.java
index 79c6ea4..42a68fd 100644
--- a/storm-client/src/jvm/org/apache/storm/pacemaker/codec/ThriftNettyClientCodec.java
+++ b/storm-client/src/jvm/org/apache/storm/pacemaker/codec/ThriftNettyClientCodec.java
@@ -46,13 +46,13 @@ public class ThriftNettyClientCodec {
private PacemakerClient client;
private AuthMethod authMethod;
- private Map storm_conf;
+ private Map<String, Object> topoConf;
private String host;
- public ThriftNettyClientCodec(PacemakerClient pacemaker_client, Map storm_conf, AuthMethod authMethod, String host) {
+ public ThriftNettyClientCodec(PacemakerClient pacemaker_client, Map<String, Object> topoConf, AuthMethod authMethod, String host) {
client = pacemaker_client;
this.authMethod = authMethod;
- this.storm_conf = storm_conf;
+ this.topoConf = topoConf;
this.host = host;
}
@@ -68,7 +68,7 @@ public class ThriftNettyClientCodec {
LOG.debug("Adding KerberosSaslClientHandler to pacemaker client pipeline.");
pipeline.addLast(KERBEROS_HANDLER,
new KerberosSaslClientHandler(client,
- storm_conf,
+ topoConf,
AuthUtils.LOGIN_CONTEXT_PACEMAKER_CLIENT,
host));
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/scheduler/Cluster.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/scheduler/Cluster.java b/storm-client/src/jvm/org/apache/storm/scheduler/Cluster.java
index b04a659..968c68a 100644
--- a/storm-client/src/jvm/org/apache/storm/scheduler/Cluster.java
+++ b/storm-client/src/jvm/org/apache/storm/scheduler/Cluster.java
@@ -73,12 +73,12 @@ public class Cluster {
*/
private Map<String, List<String>> hostToId;
- private Map conf = null;
+ private Map<String, Object> conf = null;
private Set<String> blackListedHosts = new HashSet<String>();
private INimbus inimbus;
- public Cluster(INimbus nimbus, Map<String, SupervisorDetails> supervisors, Map<String, SchedulerAssignmentImpl> assignments, Map storm_conf){
+ public Cluster(INimbus nimbus, Map<String, SupervisorDetails> supervisors, Map<String, SchedulerAssignmentImpl> assignments, Map<String, Object> topoConf){
this.inimbus = nimbus;
this.supervisors = new HashMap<String, SupervisorDetails>(supervisors.size());
this.supervisors.putAll(supervisors);
@@ -98,7 +98,7 @@ public class Cluster {
}
this.hostToId.get(host).add(nodeId);
}
- this.conf = storm_conf;
+ this.conf = topoConf;
}
/**
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/scheduler/INimbus.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/scheduler/INimbus.java b/storm-client/src/jvm/org/apache/storm/scheduler/INimbus.java
index 6b0fda1..5f64eaa 100644
--- a/storm-client/src/jvm/org/apache/storm/scheduler/INimbus.java
+++ b/storm-client/src/jvm/org/apache/storm/scheduler/INimbus.java
@@ -22,7 +22,7 @@ import java.util.Map;
import java.util.Set;
public interface INimbus {
- void prepare(Map stormConf, String schedulerLocalDir);
+ void prepare(Map<String, Object> topoConf, String schedulerLocalDir);
/**
* Returns all slots that are available for the next round of scheduling. A slot is available for scheduling
* if it is free and can be assigned to, or if it is used and can be reassigned.
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/scheduler/IScheduler.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/scheduler/IScheduler.java b/storm-client/src/jvm/org/apache/storm/scheduler/IScheduler.java
index ef9268b..f97755b 100644
--- a/storm-client/src/jvm/org/apache/storm/scheduler/IScheduler.java
+++ b/storm-client/src/jvm/org/apache/storm/scheduler/IScheduler.java
@@ -22,7 +22,7 @@ import java.util.Map;
public interface IScheduler {
- void prepare(Map conf);
+ void prepare(Map<String, Object> conf);
/**
* Set assignments for the topologies which needs scheduling. The new assignments is available
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/scheduler/ISupervisor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/scheduler/ISupervisor.java b/storm-client/src/jvm/org/apache/storm/scheduler/ISupervisor.java
index 2ca3aa6..8b44f9e 100644
--- a/storm-client/src/jvm/org/apache/storm/scheduler/ISupervisor.java
+++ b/storm-client/src/jvm/org/apache/storm/scheduler/ISupervisor.java
@@ -22,7 +22,7 @@ import java.util.Collection;
public interface ISupervisor {
- void prepare(Map stormConf, String schedulerLocalDir);
+ void prepare(Map<String, Object> topoConf, String schedulerLocalDir);
// for mesos, this is {hostname}-{topologyid}
/**
* The id used for writing metadata into ZK.
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/scheduler/TopologyDetails.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/scheduler/TopologyDetails.java b/storm-client/src/jvm/org/apache/storm/scheduler/TopologyDetails.java
index a103cc6..9d63311 100644
--- a/storm-client/src/jvm/org/apache/storm/scheduler/TopologyDetails.java
+++ b/storm-client/src/jvm/org/apache/storm/scheduler/TopologyDetails.java
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
public class TopologyDetails {
private String topologyId;
- private Map topologyConf;
+ private Map<String, Object> topologyConf;
private StormTopology topology;
private Map<ExecutorDetails, String> executorToComponent;
private int numWorkers;
@@ -57,16 +57,16 @@ public class TopologyDetails {
private static final Logger LOG = LoggerFactory.getLogger(TopologyDetails.class);
- public TopologyDetails(String topologyId, Map topologyConf, StormTopology topology, int numWorkers) {
+ public TopologyDetails(String topologyId, Map<String, Object> topologyConf, StormTopology topology, int numWorkers) {
this(topologyId, topologyConf, topology, numWorkers, null, 0);
}
- public TopologyDetails(String topologyId, Map topologyConf, StormTopology topology,
+ public TopologyDetails(String topologyId, Map<String, Object> topologyConf, StormTopology topology,
int numWorkers, Map<ExecutorDetails, String> executorToComponents) {
this(topologyId, topologyConf, topology, numWorkers, executorToComponents, 0);
}
- public TopologyDetails(String topologyId, Map topologyConf, StormTopology topology,
+ public TopologyDetails(String topologyId, Map<String, Object> topologyConf, StormTopology topology,
int numWorkers, Map<ExecutorDetails, String> executorToComponents, int launchTime) {
this.topologyId = topologyId;
this.topologyConf = topologyConf;
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/scheduler/resource/ResourceUtils.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/scheduler/resource/ResourceUtils.java b/storm-client/src/jvm/org/apache/storm/scheduler/resource/ResourceUtils.java
index a36bd36..85c04f2 100644
--- a/storm-client/src/jvm/org/apache/storm/scheduler/resource/ResourceUtils.java
+++ b/storm-client/src/jvm/org/apache/storm/scheduler/resource/ResourceUtils.java
@@ -42,7 +42,7 @@ import java.util.Map;
public class ResourceUtils {
private static final Logger LOG = LoggerFactory.getLogger(ResourceUtils.class);
- public static Map<String, Map<String, Double>> getBoltsResources(StormTopology topology, Map topologyConf) {
+ public static Map<String, Map<String, Double>> getBoltsResources(StormTopology topology, Map<String, Object> topologyConf) {
Map<String, Map<String, Double>> boltResources = new HashMap<String, Map<String, Double>>();
if (topology.get_bolts() != null) {
for (Map.Entry<String, Bolt> bolt : topology.get_bolts().entrySet()) {
@@ -54,7 +54,7 @@ public class ResourceUtils {
return boltResources;
}
- public static Map<String, Map<String, Double>> getSpoutsResources(StormTopology topology, Map topologyConf) {
+ public static Map<String, Map<String, Double>> getSpoutsResources(StormTopology topology, Map<String, Object> topologyConf) {
Map<String, Map<String, Double>> spoutResources = new HashMap<String, Map<String, Double>>();
if (topology.get_spouts() != null) {
for (Map.Entry<String, SpoutSpec> spout : topology.get_spouts().entrySet()) {
@@ -66,12 +66,12 @@ public class ResourceUtils {
return spoutResources;
}
- public static void checkIntialization(Map<String, Double> topology_resources, String Com, Map topologyConf) {
+ public static void checkIntialization(Map<String, Double> topology_resources, String Com, Map<String, Object> topologyConf) {
checkInitMem(topology_resources, Com, topologyConf);
checkInitCPU(topology_resources, Com, topologyConf);
}
- public static void checkInitMem(Map<String, Double> topology_resources, String Com, Map topologyConf) {
+ public static void checkInitMem(Map<String, Double> topology_resources, String Com, Map<String, Object> topologyConf) {
if (!topology_resources.containsKey(Config.TOPOLOGY_COMPONENT_RESOURCES_ONHEAP_MEMORY_MB)) {
topology_resources.put(Config.TOPOLOGY_COMPONENT_RESOURCES_ONHEAP_MEMORY_MB,
ObjectReader.getDouble(topologyConf.get(Config.TOPOLOGY_COMPONENT_RESOURCES_ONHEAP_MEMORY_MB), null));
@@ -84,7 +84,7 @@ public class ResourceUtils {
}
}
- public static void checkInitCPU(Map<String, Double> topology_resources, String Com, Map topologyConf) {
+ public static void checkInitCPU(Map<String, Double> topology_resources, String Com, Map<String, Object> topologyConf) {
if (!topology_resources.containsKey(Config.TOPOLOGY_COMPONENT_CPU_PCORE_PERCENT)) {
topology_resources.put(Config.TOPOLOGY_COMPONENT_CPU_PCORE_PERCENT,
ObjectReader.getDouble(topologyConf.get(Config.TOPOLOGY_COMPONENT_CPU_PCORE_PERCENT), null));
@@ -123,7 +123,7 @@ public class ResourceUtils {
return topology_resources;
}
- private static void debugMessage(String memoryType, String Com, Map topologyConf) {
+ private static void debugMessage(String memoryType, String Com, Map<String, Object> topologyConf) {
if (memoryType.equals("ONHEAP")) {
LOG.debug(
"Unable to extract resource requirement for Component {} \n Resource : Memory Type : On Heap set to default {}",
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/scheduler/resource/SchedulingState.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/scheduler/resource/SchedulingState.java b/storm-client/src/jvm/org/apache/storm/scheduler/resource/SchedulingState.java
index 8a28ac0..80f5e9b 100644
--- a/storm-client/src/jvm/org/apache/storm/scheduler/resource/SchedulingState.java
+++ b/storm-client/src/jvm/org/apache/storm/scheduler/resource/SchedulingState.java
@@ -33,9 +33,9 @@ public class SchedulingState {
public final Cluster cluster;
public final Topologies topologies;
public final RAS_Nodes nodes;
- public final Map conf = new Config();
+ public final Map<String, Object> conf = new Config();
- public SchedulingState(Map<String, User> userMap, Cluster cluster, Topologies topologies, Map conf) {
+ public SchedulingState(Map<String, User> userMap, Cluster cluster, Topologies topologies, Map<String, Object> conf) {
for (Map.Entry<String, User> userMapEntry : userMap.entrySet()) {
String userId = userMapEntry.getKey();
User user = userMapEntry.getValue();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/security/INimbusCredentialPlugin.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/INimbusCredentialPlugin.java b/storm-client/src/jvm/org/apache/storm/security/INimbusCredentialPlugin.java
index 4de0cfa..1378f0a 100644
--- a/storm-client/src/jvm/org/apache/storm/security/INimbusCredentialPlugin.java
+++ b/storm-client/src/jvm/org/apache/storm/security/INimbusCredentialPlugin.java
@@ -32,7 +32,7 @@ public interface INimbusCredentialPlugin extends Shutdownable {
* this method will be called when nimbus initializes.
* @param conf
*/
- void prepare(Map conf);
+ void prepare(Map<String, Object> conf);
/**
* Method that will be called on nimbus as part of submit topology. This plugin will be called
@@ -43,5 +43,5 @@ public interface INimbusCredentialPlugin extends Shutdownable {
* @param conf topology configuration
* @return
*/
- void populateCredentials(Map<String, String> credentials, Map conf);
+ void populateCredentials(Map<String, String> credentials, Map<String, Object> conf);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/security/auth/AuthUtils.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/AuthUtils.java b/storm-client/src/jvm/org/apache/storm/security/auth/AuthUtils.java
index e282040..e87c701 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/AuthUtils.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/AuthUtils.java
@@ -56,14 +56,14 @@ public class AuthUtils {
/**
* Construct a JAAS configuration object per storm configuration file
- * @param storm_conf Storm configuration
+ * @param topoConf Storm configuration
* @return JAAS configuration object
*/
- public static Configuration GetConfiguration(Map storm_conf) {
+ public static Configuration GetConfiguration(Map<String, Object> topoConf) {
Configuration login_conf = null;
//find login file configuration from Storm configuration
- String loginConfigurationFile = (String)storm_conf.get("java.security.auth.login.config");
+ String loginConfigurationFile = (String)topoConf.get("java.security.auth.login.config");
if ((loginConfigurationFile != null) && (loginConfigurationFile.length()>0)) {
File config_file = new File(loginConfigurationFile);
if (!config_file.canRead()) {
@@ -151,13 +151,13 @@ public class AuthUtils {
/**
* Construct a principal to local plugin
- * @param storm_conf storm configuration
+ * @param topoConf storm configuration
* @return the plugin
*/
- public static IPrincipalToLocal GetPrincipalToLocalPlugin(Map<String, Object> storm_conf) {
+ public static IPrincipalToLocal GetPrincipalToLocalPlugin(Map<String, Object> topoConf) {
IPrincipalToLocal ptol = null;
try {
- String ptol_klassName = (String) storm_conf.get(Config.STORM_PRINCIPAL_TO_LOCAL_PLUGIN);
+ String ptol_klassName = (String) topoConf.get(Config.STORM_PRINCIPAL_TO_LOCAL_PLUGIN);
if (ptol_klassName == null) {
LOG.warn("No principal to local given {}", Config.STORM_PRINCIPAL_TO_LOCAL_PLUGIN);
} else {
@@ -165,7 +165,7 @@ public class AuthUtils {
//TODO this can only ever be null if someone is doing something odd with mocking
// We should really fix the mocking and remove this
if (ptol != null) {
- ptol.prepare(storm_conf);
+ ptol.prepare(topoConf);
}
}
} catch (Exception e) {
@@ -202,7 +202,7 @@ public class AuthUtils {
* @param conf the storm configuration to use.
* @return the configured credential renewers.
*/
- public static Collection<ICredentialsRenewer> GetCredentialRenewers(Map conf) {
+ public static Collection<ICredentialsRenewer> GetCredentialRenewers(Map<String, Object> conf) {
try {
Set<ICredentialsRenewer> ret = new HashSet<>();
Collection<String> clazzes = (Collection<String>)conf.get(Config.NIMBUS_CREDENTIAL_RENEWERS);
@@ -224,7 +224,7 @@ public class AuthUtils {
* @param conf nimbus configuration to use.
* @return nimbus auto credential plugins.
*/
- public static Collection<INimbusCredentialPlugin> getNimbusAutoCredPlugins(Map conf) {
+ public static Collection<INimbusCredentialPlugin> getNimbusAutoCredPlugins(Map<String, Object> conf) {
try {
Set<INimbusCredentialPlugin> ret = new HashSet<>();
Collection<String> clazzes = (Collection<String>)conf.get(Config.NIMBUS_AUTO_CRED_PLUGINS);
@@ -243,17 +243,17 @@ public class AuthUtils {
/**
* Get all of the configured AutoCredential Plugins.
- * @param storm_conf the storm configuration to use.
+ * @param topoConf the storm configuration to use.
* @return the configured auto credentials.
*/
- public static Collection<IAutoCredentials> GetAutoCredentials(Map storm_conf) {
+ public static Collection<IAutoCredentials> GetAutoCredentials(Map<String, Object> topoConf) {
try {
Set<IAutoCredentials> autos = new HashSet<>();
- Collection<String> clazzes = (Collection<String>)storm_conf.get(Config.TOPOLOGY_AUTO_CREDENTIALS);
+ Collection<String> clazzes = (Collection<String>)topoConf.get(Config.TOPOLOGY_AUTO_CREDENTIALS);
if (clazzes != null) {
for (String clazz : clazzes) {
IAutoCredentials a = ReflectionUtils.newInstance(clazz);
- a.prepare(storm_conf);
+ a.prepare(topoConf);
autos.add(a);
}
}
@@ -308,11 +308,11 @@ public class AuthUtils {
/**
* Construct a transport plugin per storm configuration
*/
- public static ITransportPlugin GetTransportPlugin(ThriftConnectionType type, Map storm_conf, Configuration login_conf) {
+ public static ITransportPlugin GetTransportPlugin(ThriftConnectionType type, Map<String, Object> topoConf, Configuration login_conf) {
try {
- String transport_plugin_klassName = type.getTransportPlugin(storm_conf);
+ String transport_plugin_klassName = type.getTransportPlugin(topoConf);
ITransportPlugin transportPlugin = ReflectionUtils.newInstance(transport_plugin_klassName);
- transportPlugin.prepare(type, storm_conf, login_conf);
+ transportPlugin.prepare(type, topoConf, login_conf);
return transportPlugin;
} catch (Exception e) {
throw new RuntimeException(e);
@@ -339,7 +339,7 @@ public class AuthUtils {
* @param conf storm configuration
* @return the plugin
*/
- public static IHttpCredentialsPlugin GetUiHttpCredentialsPlugin(Map conf) {
+ public static IHttpCredentialsPlugin GetUiHttpCredentialsPlugin(Map<String, Object> conf) {
String klassName = (String)conf.get(Config.UI_HTTP_CREDS_PLUGIN);
return AuthUtils.GetHttpCredentialsPlugin(conf, klassName);
}
@@ -350,7 +350,7 @@ public class AuthUtils {
* @param conf storm configuration
* @return the plugin
*/
- public static IHttpCredentialsPlugin GetDrpcHttpCredentialsPlugin(Map conf) {
+ public static IHttpCredentialsPlugin GetDrpcHttpCredentialsPlugin(Map<String, Object> conf) {
String klassName = (String)conf.get(Config.DRPC_HTTP_CREDS_PLUGIN);
return klassName == null ? null : AuthUtils.GetHttpCredentialsPlugin(conf, klassName);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/security/auth/AutoSSL.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/AutoSSL.java b/storm-client/src/jvm/org/apache/storm/security/auth/AutoSSL.java
index 7838855..aa68153 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/AutoSSL.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/AutoSSL.java
@@ -45,23 +45,23 @@ import java.util.Map;
*/
public class AutoSSL implements IAutoCredentials {
private static final Logger LOG = LoggerFactory.getLogger(AutoSSL.class);
- private Map conf;
+ private Map<String, Object> conf;
private String writeDir = "./";
public static final String SSL_FILES_CONF = "ssl.credential.files";
- public void prepare(Map conf) {
+ public void prepare(Map<String, Object> conf) {
this.conf = conf;
writeDir = getSSLWriteDirFromConf(this.conf);
}
@VisibleForTesting
- protected String getSSLWriteDirFromConf(Map conf) {
+ protected String getSSLWriteDirFromConf(Map<String, Object> conf) {
return "./";
}
@VisibleForTesting
- Collection<String> getSSLFilesFromConf(Map conf) {
+ Collection<String> getSSLFilesFromConf(Map<String, Object> conf) {
Object sslConf = conf.get(SSL_FILES_CONF);
if (sslConf == null) {
LOG.info("No ssl files requested, if you want to use SSL please set {} to the " +
[07/13] storm git commit: STORM-2477: Result of transforming the code
Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/security/auth/DefaultHttpCredentialsPlugin.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/DefaultHttpCredentialsPlugin.java b/storm-client/src/jvm/org/apache/storm/security/auth/DefaultHttpCredentialsPlugin.java
index c0c9951..fb873d5 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/DefaultHttpCredentialsPlugin.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/DefaultHttpCredentialsPlugin.java
@@ -34,10 +34,10 @@ public class DefaultHttpCredentialsPlugin implements IHttpCredentialsPlugin {
/**
* No-op
- * @param storm_conf Storm configuration
+ * @param topoConf Storm configuration
*/
@Override
- public void prepare(Map storm_conf) {
+ public void prepare(Map<String, Object> topoConf) {
// Do nothing.
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/security/auth/DefaultPrincipalToLocal.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/DefaultPrincipalToLocal.java b/storm-client/src/jvm/org/apache/storm/security/auth/DefaultPrincipalToLocal.java
index e780771..af41441 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/DefaultPrincipalToLocal.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/DefaultPrincipalToLocal.java
@@ -29,7 +29,7 @@ public class DefaultPrincipalToLocal implements IPrincipalToLocal {
/**
* Invoked once immediately after construction
*/
- public void prepare(Map storm_conf) {}
+ public void prepare(Map<String, Object> topoConf) {}
/**
* Convert a Principal to a local user name.
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/security/auth/IAuthorizer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/IAuthorizer.java b/storm-client/src/jvm/org/apache/storm/security/auth/IAuthorizer.java
index bc60af9..70f9e32 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/IAuthorizer.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/IAuthorizer.java
@@ -38,16 +38,16 @@ import java.util.Map;
public interface IAuthorizer {
/**
* Invoked once immediately after construction
- * @param storm_conf Storm configuration
+ * @param topoConf Storm configuration
*/
- void prepare(Map storm_conf);
+ void prepare(Map<String, Object> topoConf);
/**
* permit() method is invoked for each incoming Thrift request.
* @param context request context includes info about
* @param operation operation name
- * @param topology_conf configuration of targeted topology
+ * @param topoConf configuration of targeted topology
* @return true if the request is authorized, false if reject
*/
- public boolean permit(ReqContext context, String operation, Map topology_conf);
+ public boolean permit(ReqContext context, String operation, Map<String, Object> topoConf);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/security/auth/IAutoCredentials.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/IAutoCredentials.java b/storm-client/src/jvm/org/apache/storm/security/auth/IAutoCredentials.java
index 00d59df..ebaad69 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/IAutoCredentials.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/IAutoCredentials.java
@@ -28,7 +28,7 @@ import javax.security.auth.Subject;
*/
public interface IAutoCredentials {
- public void prepare(Map conf);
+ public void prepare(Map<String, Object> conf);
/**
* Called to populate the credentials on the client side.
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/security/auth/ICredentialsRenewer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/ICredentialsRenewer.java b/storm-client/src/jvm/org/apache/storm/security/auth/ICredentialsRenewer.java
index 1f947aa..0f529e6 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/ICredentialsRenewer.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/ICredentialsRenewer.java
@@ -29,12 +29,12 @@ public interface ICredentialsRenewer {
* Called when initializing the service.
* @param conf the storm cluster configuration.
*/
- public void prepare(Map conf);
+ public void prepare(Map<String, Object> conf);
/**
* Renew any credentials that need to be renewed. (Update the credentials if needed)
* @param credentials the credentials that may have something to renew.
* @param topologyConf topology configuration.
*/
- public void renew(Map<String, String> credentials, Map topologyConf);
+ public void renew(Map<String, String> credentials, Map<String, Object> topologyConf);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/security/auth/IGroupMappingServiceProvider.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/IGroupMappingServiceProvider.java b/storm-client/src/jvm/org/apache/storm/security/auth/IGroupMappingServiceProvider.java
index 2075939..d1a17d4 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/IGroupMappingServiceProvider.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/IGroupMappingServiceProvider.java
@@ -26,9 +26,9 @@ public interface IGroupMappingServiceProvider {
/**
* Invoked once immediately after construction
- * @param storm_conf Storm configuration
+ * @param topoConf Storm configuration
*/
- void prepare(Map storm_conf);
+ void prepare(Map<String, Object> topoConf);
/**
* Get all various group memberships of a given user.
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/security/auth/IHttpCredentialsPlugin.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/IHttpCredentialsPlugin.java b/storm-client/src/jvm/org/apache/storm/security/auth/IHttpCredentialsPlugin.java
index 62c8271..54c16ac 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/IHttpCredentialsPlugin.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/IHttpCredentialsPlugin.java
@@ -27,9 +27,9 @@ import javax.servlet.http.HttpServletRequest;
public interface IHttpCredentialsPlugin {
/**
* Invoked once immediately after construction
- * @param storm_conf Storm configuration
+ * @param topoConf Storm configuration
*/
- void prepare(Map storm_conf);
+ void prepare(Map<String, Object> topoConf);
/**
* Gets the user name from the request.
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/security/auth/IPrincipalToLocal.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/IPrincipalToLocal.java b/storm-client/src/jvm/org/apache/storm/security/auth/IPrincipalToLocal.java
index 996166d..35c96d8 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/IPrincipalToLocal.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/IPrincipalToLocal.java
@@ -28,9 +28,9 @@ import java.security.Principal;
public interface IPrincipalToLocal {
/**
* Invoked once immediately after construction
- * @param storm_conf Storm configuration
+ * @param topoConf Storm configuration
*/
- void prepare(Map storm_conf);
+ void prepare(Map<String, Object> topoConf);
/**
* Convert a Principal to a local user name.
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/security/auth/ITransportPlugin.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/ITransportPlugin.java b/storm-client/src/jvm/org/apache/storm/security/auth/ITransportPlugin.java
index c60b2f2..f51b1e2 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/ITransportPlugin.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/ITransportPlugin.java
@@ -34,10 +34,10 @@ public interface ITransportPlugin {
/**
* Invoked once immediately after construction
* @param type the type of connection this will process.
- * @param storm_conf Storm configuration
+ * @param topoConf Storm configuration
* @param login_conf login configuration
*/
- void prepare(ThriftConnectionType type, Map storm_conf, Configuration login_conf);
+ void prepare(ThriftConnectionType type, Map<String, Object> topoConf, Configuration login_conf);
/**
* Create a server associated with a given port, service handler, and purpose
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/security/auth/KerberosPrincipalToLocal.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/KerberosPrincipalToLocal.java b/storm-client/src/jvm/org/apache/storm/security/auth/KerberosPrincipalToLocal.java
index 9f5985e..52c4263 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/KerberosPrincipalToLocal.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/KerberosPrincipalToLocal.java
@@ -28,9 +28,9 @@ public class KerberosPrincipalToLocal implements IPrincipalToLocal {
/**
* Invoked once immediately after construction
- * @param storm_conf Storm configuration
+ * @param topoConf Storm configuration
*/
- public void prepare(Map storm_conf) {}
+ public void prepare(Map<String, Object> topoConf) {}
/**
* Convert a Principal to a local user name.
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/security/auth/SaslTransportPlugin.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/SaslTransportPlugin.java b/storm-client/src/jvm/org/apache/storm/security/auth/SaslTransportPlugin.java
index d93573b..5ad3a5a 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/SaslTransportPlugin.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/SaslTransportPlugin.java
@@ -51,21 +51,21 @@ import org.apache.thrift.transport.TTransportFactory;
*/
public abstract class SaslTransportPlugin implements ITransportPlugin {
protected ThriftConnectionType type;
- protected Map storm_conf;
+ protected Map<String, Object> topoConf;
protected Configuration login_conf;
private int port;
@Override
- public void prepare(ThriftConnectionType type, Map storm_conf, Configuration login_conf) {
+ public void prepare(ThriftConnectionType type, Map<String, Object> topoConf, Configuration login_conf) {
this.type = type;
- this.storm_conf = storm_conf;
+ this.topoConf = topoConf;
this.login_conf = login_conf;
}
@Override
public TServer getServer(TProcessor processor) throws IOException, TTransportException {
- int configuredPort = type.getPort(storm_conf);
- Integer socketTimeout = type.getSocketTimeOut(storm_conf);
+ int configuredPort = type.getPort(topoConf);
+ Integer socketTimeout = type.getSocketTimeOut(topoConf);
TTransportFactory serverTransportFactory = getServerTransportFactory();
TServerSocket serverTransport = null;
if (socketTimeout != null) {
@@ -74,8 +74,8 @@ public abstract class SaslTransportPlugin implements ITransportPlugin {
serverTransport = new TServerSocket(configuredPort);
}
this.port = serverTransport.getServerSocket().getLocalPort();
- int numWorkerThreads = type.getNumThreads(storm_conf);
- Integer queueSize = type.getQueueSize(storm_conf);
+ int numWorkerThreads = type.getNumThreads(topoConf);
+ Integer queueSize = type.getQueueSize(topoConf);
TThreadPoolServer.Args server_args = new TThreadPoolServer.Args(serverTransport).
processor(new TUGIWrapProcessor(processor)).
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/security/auth/ShellBasedGroupsMapping.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/ShellBasedGroupsMapping.java b/storm-client/src/jvm/org/apache/storm/security/auth/ShellBasedGroupsMapping.java
index c9f14cd..3ee5754 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/ShellBasedGroupsMapping.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/ShellBasedGroupsMapping.java
@@ -40,11 +40,11 @@ public class ShellBasedGroupsMapping implements
/**
* Invoked once immediately after construction
- * @param storm_conf Storm configuration
+ * @param topoConf Storm configuration
*/
@Override
- public void prepare(Map storm_conf) {
- int timeout = ObjectReader.getInt(storm_conf.get(Config.STORM_GROUP_MAPPING_SERVICE_CACHE_DURATION_SECS));
+ public void prepare(Map<String, Object> topoConf) {
+ int timeout = ObjectReader.getInt(topoConf.get(Config.STORM_GROUP_MAPPING_SERVICE_CACHE_DURATION_SECS));
cachedGroups = new TimeCacheMap<>(timeout);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/security/auth/SimpleTransportPlugin.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/SimpleTransportPlugin.java b/storm-client/src/jvm/org/apache/storm/security/auth/SimpleTransportPlugin.java
index b41af75..698f797 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/SimpleTransportPlugin.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/SimpleTransportPlugin.java
@@ -52,26 +52,26 @@ import org.slf4j.LoggerFactory;
*/
public class SimpleTransportPlugin implements ITransportPlugin {
protected ThriftConnectionType type;
- protected Map storm_conf;
+ protected Map<String, Object> topoConf;
protected Configuration login_conf;
private static final Logger LOG = LoggerFactory.getLogger(SimpleTransportPlugin.class);
private int port;
@Override
- public void prepare(ThriftConnectionType type, Map storm_conf, Configuration login_conf) {
+ public void prepare(ThriftConnectionType type, Map<String, Object> topoConf, Configuration login_conf) {
this.type = type;
- this.storm_conf = storm_conf;
+ this.topoConf = topoConf;
this.login_conf = login_conf;
}
@Override
public TServer getServer(TProcessor processor) throws IOException, TTransportException {
- int configuredPort = type.getPort(storm_conf);
+ int configuredPort = type.getPort(topoConf);
TNonblockingServerSocket serverTransport = new TNonblockingServerSocket(configuredPort);
this.port = serverTransport.getPort();
- int numWorkerThreads = type.getNumThreads(storm_conf);
- int maxBufferSize = type.getMaxBufferSize(storm_conf);
- Integer queueSize = type.getQueueSize(storm_conf);
+ int numWorkerThreads = type.getNumThreads(topoConf);
+ int maxBufferSize = type.getMaxBufferSize(topoConf);
+ Integer queueSize = type.getQueueSize(topoConf);
THsHaServer.Args server_args = new THsHaServer.Args(serverTransport).
processor(new SimpleWrapProcessor(processor)).
@@ -97,7 +97,7 @@ public class SimpleTransportPlugin implements ITransportPlugin {
*/
@Override
public TTransport connect(TTransport transport, String serverHost, String asUser) throws TTransportException {
- int maxBufferSize = type.getMaxBufferSize(storm_conf);
+ int maxBufferSize = type.getMaxBufferSize(topoConf);
//create a framed transport
TTransport conn = new TFramedTransport(transport, maxBufferSize);
@@ -151,7 +151,7 @@ public class SimpleTransportPlugin implements ITransportPlugin {
//anonymous user
Subject s = getDefaultSubject();
if (s == null) {
- final String user = (String)storm_conf.get("debug.simple.transport.user");
+ final String user = (String)topoConf.get("debug.simple.transport.user");
if (user != null) {
HashSet<Principal> principals = new HashSet<>();
principals.add(new Principal() {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/security/auth/ThriftClient.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/ThriftClient.java b/storm-client/src/jvm/org/apache/storm/security/auth/ThriftClient.java
index d84c5fa..febf5e2 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/ThriftClient.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/ThriftClient.java
@@ -38,22 +38,22 @@ public class ThriftClient implements AutoCloseable {
private String _asUser;
protected boolean _retryForever = false;
- public ThriftClient(Map storm_conf, ThriftConnectionType type, String host) {
- this(storm_conf, type, host, null, null, null);
+ public ThriftClient(Map<String, Object> topoConf, ThriftConnectionType type, String host) {
+ this(topoConf, type, host, null, null, null);
}
- public ThriftClient(Map storm_conf, ThriftConnectionType type, String host, Integer port, Integer timeout){
- this(storm_conf, type, host, port, timeout, null);
+ public ThriftClient(Map<String, Object> topoConf, ThriftConnectionType type, String host, Integer port, Integer timeout){
+ this(topoConf, type, host, port, timeout, null);
}
- public ThriftClient(Map storm_conf, ThriftConnectionType type, String host, Integer port, Integer timeout, String asUser) {
+ public ThriftClient(Map<String, Object> topoConf, ThriftConnectionType type, String host, Integer port, Integer timeout, String asUser) {
//create a socket with server
if (host==null) {
throw new IllegalArgumentException("host is not set");
}
if (port == null) {
- port = type.getPort(storm_conf);
+ port = type.getPort(topoConf);
}
if (port<=0 && !type.isFake()) {
@@ -63,7 +63,7 @@ public class ThriftClient implements AutoCloseable {
_host = host;
_port = port;
_timeout = timeout;
- _conf = storm_conf;
+ _conf = topoConf;
_type = type;
_asUser = asUser;
if (!type.isFake()) {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/security/auth/ThriftConnectionType.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/ThriftConnectionType.java b/storm-client/src/jvm/org/apache/storm/security/auth/ThriftConnectionType.java
index 19d8dd6..2d86e47 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/ThriftConnectionType.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/ThriftConnectionType.java
@@ -66,7 +66,7 @@ public enum ThriftConnectionType {
return _isFake;
}
- public String getTransportPlugin(Map conf) {
+ public String getTransportPlugin(Map<String, Object> conf) {
String ret = (String)conf.get(_transConf);
if (ret == null) {
ret = (String)conf.get(Config.STORM_THRIFT_TRANSPORT_PLUGIN);
@@ -74,35 +74,35 @@ public enum ThriftConnectionType {
return ret;
}
- public int getPort(Map conf) {
+ public int getPort(Map<String, Object> conf) {
if (_isFake) {
return -1;
}
return ObjectReader.getInt(conf.get(_portConf));
}
- public Integer getQueueSize(Map conf) {
+ public Integer getQueueSize(Map<String, Object> conf) {
if (_qConf == null) {
return null;
}
return (Integer)conf.get(_qConf);
}
- public int getNumThreads(Map conf) {
+ public int getNumThreads(Map<String, Object> conf) {
if (_isFake) {
return 1;
}
return ObjectReader.getInt(conf.get(_threadsConf));
}
- public int getMaxBufferSize(Map conf) {
+ public int getMaxBufferSize(Map<String, Object> conf) {
if (_isFake) {
return 1;
}
return ObjectReader.getInt(conf.get(_buffConf));
}
- public Integer getSocketTimeOut(Map conf) {
+ public Integer getSocketTimeOut(Map<String, Object> conf) {
if (_socketTimeoutConf == null) {
return null;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/security/auth/ThriftServer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/ThriftServer.java b/storm-client/src/jvm/org/apache/storm/security/auth/ThriftServer.java
index 059b0d6..8fa8a7e 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/ThriftServer.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/ThriftServer.java
@@ -30,27 +30,27 @@ import org.slf4j.LoggerFactory;
public class ThriftServer {
private static final Logger LOG = LoggerFactory.getLogger(ThriftServer.class);
- private Map _storm_conf; //storm configuration
+ private Map _topoConf; //storm configuration
protected TProcessor _processor = null;
private final ThriftConnectionType _type;
private TServer _server;
private Configuration _login_conf;
private int _port;
- public ThriftServer(Map storm_conf, TProcessor processor, ThriftConnectionType type) {
- _storm_conf = storm_conf;
+ public ThriftServer(Map<String, Object> topoConf, TProcessor processor, ThriftConnectionType type) {
+ _topoConf = topoConf;
_processor = processor;
_type = type;
try {
//retrieve authentication configuration
- _login_conf = AuthUtils.GetConfiguration(_storm_conf);
+ _login_conf = AuthUtils.GetConfiguration(_topoConf);
} catch (Exception x) {
LOG.error(x.getMessage(), x);
}
try {
//locate our thrift transport plugin
- ITransportPlugin transportPlugin = AuthUtils.GetTransportPlugin(_type, _storm_conf, _login_conf);
+ ITransportPlugin transportPlugin = AuthUtils.GetTransportPlugin(_type, _topoConf, _login_conf);
//server
_server = transportPlugin.getServer(_processor);
_port = transportPlugin.getPort();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 3447377..fdcd31e 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
@@ -34,7 +34,7 @@ public abstract class DRPCAuthorizerBase implements IAuthorizer {
public static final String FUNCTION_NAME = "function.name";
@Override
- public abstract void prepare(Map conf);
+ public abstract void prepare(Map<String, Object> conf);
abstract protected boolean permitClientRequest(ReqContext context, String operation, Map params);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 cd6cab2..dc4d911 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
@@ -71,7 +71,7 @@ public class DRPCSimpleACLAuthorizer extends DRPCAuthorizerBase {
long now = System.currentTimeMillis();
if ((now - 5000) > _lastUpdate || _acl == null) {
Map<String,AclFunctionEntry> acl = new HashMap<>();
- Map conf = Utils.findAndReadConfigFile(_aclFileName);
+ Map<String, Object> conf = Utils.findAndReadConfigFile(_aclFileName);
if (conf.containsKey(Config.DRPC_AUTHORIZER_ACL)) {
Map<String,Map<String,?>> confAcl =
(Map<String,Map<String,?>>)
@@ -99,7 +99,7 @@ public class DRPCSimpleACLAuthorizer extends DRPCAuthorizerBase {
}
@Override
- public void prepare(Map conf) {
+ public void prepare(Map<String, Object> conf) {
Boolean isStrict =
(Boolean) conf.get(Config.DRPC_AUTHORIZER_ACL_STRICT);
_permitWhenMissingFunctionEntry =
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/DenyAuthorizer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/DenyAuthorizer.java b/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/DenyAuthorizer.java
index 85f3ae4..a1c18ea 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/DenyAuthorizer.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/DenyAuthorizer.java
@@ -31,17 +31,17 @@ public class DenyAuthorizer implements IAuthorizer {
* Invoked once immediately after construction
* @param conf Storm configuration
*/
- public void prepare(Map conf) {
+ public void prepare(Map<String, Object> conf) {
}
/**
* permit() method is invoked for each incoming Thrift request
* @param context request context
* @param operation operation name
- * @param topology_conf configuration of targeted topology
+ * @param topoConf configuration of targeted topology
* @return true if the request is authorized, false if reject
*/
- public boolean permit(ReqContext context, String operation, Map topology_conf) {
+ public boolean permit(ReqContext context, String operation, Map<String, Object> topoConf) {
return false;
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/ImpersonationAuthorizer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/ImpersonationAuthorizer.java b/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/ImpersonationAuthorizer.java
index 6f7c4de..4cb3145 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/ImpersonationAuthorizer.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/ImpersonationAuthorizer.java
@@ -37,7 +37,7 @@ public class ImpersonationAuthorizer implements IAuthorizer {
protected IGroupMappingServiceProvider _groupMappingProvider;
@Override
- public void prepare(Map conf) {
+ public void prepare(Map<String, Object> conf) {
userImpersonationACL = new HashMap<>();
Map<String, Map<String, List<String>>> userToHostAndGroup = (Map<String, Map<String, List<String>>>) conf.get(Config.NIMBUS_IMPERSONATION_ACL);
@@ -56,7 +56,7 @@ public class ImpersonationAuthorizer implements IAuthorizer {
}
@Override
- public boolean permit(ReqContext context, String operation, Map topology_conf) {
+ public boolean permit(ReqContext context, String operation, Map<String, Object> topoConf) {
if (!context.isImpersonating()) {
LOG.debug("Not an impersonation attempt.");
return true;
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/NoopAuthorizer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/NoopAuthorizer.java b/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/NoopAuthorizer.java
index fc11c18..68d117d 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/NoopAuthorizer.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/NoopAuthorizer.java
@@ -31,17 +31,17 @@ public class NoopAuthorizer implements IAuthorizer {
* Invoked once immediately after construction
* @param conf Storm configuration
*/
- public void prepare(Map conf) {
+ public void prepare(Map<String, Object> conf) {
}
/**
* permit() method is invoked for each incoming Thrift request
* @param context request context includes info about
* @param operation operation name
- * @param topology_conf configuration of targeted topology
+ * @param topoConf configuration of targeted topology
* @return true if the request is authorized, false if reject
*/
- public boolean permit(ReqContext context, String operation, Map topology_conf) {
+ public boolean permit(ReqContext context, String operation, Map<String, Object> topoConf) {
return true;
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/SimpleACLAuthorizer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/SimpleACLAuthorizer.java b/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/SimpleACLAuthorizer.java
index 71705ce..783e28c 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/SimpleACLAuthorizer.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/SimpleACLAuthorizer.java
@@ -84,7 +84,7 @@ public class SimpleACLAuthorizer implements IAuthorizer {
* @param conf Storm configuration
*/
@Override
- public void prepare(Map conf) {
+ public void prepare(Map<String, Object> conf) {
_admins = new HashSet<>();
_supervisors = new HashSet<>();
_nimbusUsers = new HashSet<>();
@@ -112,11 +112,11 @@ public class SimpleACLAuthorizer implements IAuthorizer {
* permit() method is invoked for each incoming Thrift request
* @param context request context includes info about
* @param operation operation name
- * @param topology_conf configuration of targeted topology
+ * @param topoConf configuration of targeted topology
* @return true if the request is authorized, false if reject
*/
@Override
- public boolean permit(ReqContext context, String operation, Map topology_conf) {
+ public boolean permit(ReqContext context, String operation, Map<String, Object> topoConf) {
String principal = context.principal().getName();
String user = _ptol.toLocal(context.principal());
Set<String> userGroups = new HashSet<>();
@@ -143,8 +143,8 @@ public class SimpleACLAuthorizer implements IAuthorizer {
if (_topoCommands.contains(operation)) {
Set topoUsers = new HashSet<String>();
- if (topology_conf.containsKey(Config.TOPOLOGY_USERS)) {
- topoUsers.addAll((Collection<String>)topology_conf.get(Config.TOPOLOGY_USERS));
+ if (topoConf.containsKey(Config.TOPOLOGY_USERS)) {
+ topoUsers.addAll((Collection<String>)topoConf.get(Config.TOPOLOGY_USERS));
}
if (topoUsers.contains(principal) || topoUsers.contains(user)) {
@@ -152,8 +152,8 @@ public class SimpleACLAuthorizer implements IAuthorizer {
}
Set<String> topoGroups = new HashSet<>();
- if (topology_conf.containsKey(Config.TOPOLOGY_GROUPS) && topology_conf.get(Config.TOPOLOGY_GROUPS) != null) {
- topoGroups.addAll((Collection<String>)topology_conf.get(Config.TOPOLOGY_GROUPS));
+ if (topoConf.containsKey(Config.TOPOLOGY_GROUPS) && topoConf.get(Config.TOPOLOGY_GROUPS) != null) {
+ topoGroups.addAll((Collection<String>)topoConf.get(Config.TOPOLOGY_GROUPS));
}
if (checkUserGroupAllowed(userGroups, topoGroups)) return true;
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/SimpleWhitelistAuthorizer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/SimpleWhitelistAuthorizer.java b/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/SimpleWhitelistAuthorizer.java
index 7c89a6d..762500c 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/SimpleWhitelistAuthorizer.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/SimpleWhitelistAuthorizer.java
@@ -39,7 +39,7 @@ public class SimpleWhitelistAuthorizer implements IAuthorizer {
* @param conf Storm configuration
*/
@Override
- public void prepare(Map conf) {
+ public void prepare(Map<String, Object> conf) {
users = new HashSet<>();
if (conf.containsKey(WHITELIST_USERS_CONF)) {
users.addAll((Collection<String>)conf.get(WHITELIST_USERS_CONF));
@@ -50,11 +50,11 @@ public class SimpleWhitelistAuthorizer implements IAuthorizer {
* `permit()` method is invoked for each incoming Thrift request
* @param context request context includes info about
* @param operation operation name
- * @param topology_conf configuration of targeted topology
+ * @param topoConf configuration of targeted topology
* @return true if the request is authorized, false if reject
*/
@Override
- public boolean permit(ReqContext context, String operation, Map topology_conf) {
+ public boolean permit(ReqContext context, String operation, Map<String, Object> topoConf) {
return context.principal() != null ? users.contains(context.principal().getName()) : false;
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/AutoTGT.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/AutoTGT.java b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/AutoTGT.java
index c3f8560..6d8057b 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/AutoTGT.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/AutoTGT.java
@@ -49,9 +49,9 @@ public class AutoTGT implements IAutoCredentials, ICredentialsRenewer {
private static final Logger LOG = LoggerFactory.getLogger(AutoTGT.class);
private static final float TICKET_RENEW_WINDOW = 0.80f;
protected static final AtomicReference<KerberosTicket> kerbTicket = new AtomicReference<>();
- private Map conf;
+ private Map<String, Object> conf;
- public void prepare(Map conf) {
+ public void prepare(Map<String, Object> conf) {
this.conf = conf;
}
@@ -238,7 +238,7 @@ public class AutoTGT implements IAutoCredentials, ICredentialsRenewer {
}
@Override
- public void renew(Map<String,String> credentials, Map topologyConf) {
+ public void renew(Map<String,String> credentials, Map<String, Object> topologyConf) {
KerberosTicket tgt = getTGT(credentials);
if (tgt != null) {
long refreshTime = getRefreshTime(tgt);
@@ -257,7 +257,7 @@ public class AutoTGT implements IAutoCredentials, ICredentialsRenewer {
public static void main(String[] args) throws Exception {
AutoTGT at = new AutoTGT();
- Map conf = new java.util.HashMap();
+ Map<String, Object> conf = new java.util.HashMap();
conf.put("java.security.auth.login.config", args[0]);
at.prepare(conf);
Map<String,String> creds = new java.util.HashMap<String,String>();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
index d2df9dd..642be76 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
@@ -93,7 +93,7 @@ public class KerberosSaslTransportPlugin extends SaslTransportPlugin {
public TTransportFactory getServerTransportFactory() throws IOException {
//create an authentication callback handler
- CallbackHandler server_callback_handler = new ServerCallbackHandler(login_conf, storm_conf);
+ CallbackHandler server_callback_handler = new ServerCallbackHandler(login_conf, topoConf);
//login our principal
Subject subject = null;
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/ServerCallbackHandler.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/ServerCallbackHandler.java b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/ServerCallbackHandler.java
index ba2f4af..59eb80d 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/ServerCallbackHandler.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/ServerCallbackHandler.java
@@ -40,7 +40,7 @@ public class ServerCallbackHandler implements CallbackHandler {
private String userName;
- public ServerCallbackHandler(Configuration configuration, Map stormConf) throws IOException {
+ public ServerCallbackHandler(Configuration configuration, Map<String, Object> topoConf) throws IOException {
if (configuration==null) return;
AppConfigurationEntry configurationEntries[] = configuration.getAppConfigurationEntry(AuthUtils.LOGIN_CONTEXT_SERVER);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/security/serialization/BlowfishTupleSerializer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/serialization/BlowfishTupleSerializer.java b/storm-client/src/jvm/org/apache/storm/security/serialization/BlowfishTupleSerializer.java
index 8cc2f23..00cca44 100644
--- a/storm-client/src/jvm/org/apache/storm/security/serialization/BlowfishTupleSerializer.java
+++ b/storm-client/src/jvm/org/apache/storm/security/serialization/BlowfishTupleSerializer.java
@@ -49,10 +49,10 @@ public class BlowfishTupleSerializer extends Serializer<ListDelegate> {
private static final Logger LOG = LoggerFactory.getLogger(BlowfishTupleSerializer.class);
private BlowfishSerializer _serializer;
- public BlowfishTupleSerializer(Kryo kryo, Map storm_conf) {
+ public BlowfishTupleSerializer(Kryo kryo, Map<String, Object> topoConf) {
String encryption_key;
try {
- encryption_key = (String)storm_conf.get(SECRET_KEY);
+ encryption_key = (String)topoConf.get(SECRET_KEY);
LOG.debug("Blowfish serializer being constructed ...");
if (encryption_key == null) {
throw new RuntimeException("Blowfish encryption key not specified");
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/serialization/DefaultKryoFactory.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/serialization/DefaultKryoFactory.java b/storm-client/src/jvm/org/apache/storm/serialization/DefaultKryoFactory.java
index 89436f7..7a7cf00 100644
--- a/storm-client/src/jvm/org/apache/storm/serialization/DefaultKryoFactory.java
+++ b/storm-client/src/jvm/org/apache/storm/serialization/DefaultKryoFactory.java
@@ -43,7 +43,7 @@ public class DefaultKryoFactory implements IKryoFactory {
}
@Override
- public Kryo getKryo(Map conf) {
+ public Kryo getKryo(Map<String, Object> conf) {
KryoSerializableDefault k = new KryoSerializableDefault();
k.setRegistrationRequired(!((Boolean) conf.get(Config.TOPOLOGY_FALL_BACK_ON_JAVA_SERIALIZATION)));
k.setReferences(false);
@@ -51,14 +51,14 @@ public class DefaultKryoFactory implements IKryoFactory {
}
@Override
- public void preRegister(Kryo k, Map conf) {
+ public void preRegister(Kryo k, Map<String, Object> conf) {
}
- public void postRegister(Kryo k, Map conf) {
+ public void postRegister(Kryo k, Map<String, Object> conf) {
((KryoSerializableDefault)k).overrideDefault(true);
}
@Override
- public void postDecorate(Kryo k, Map conf) {
+ public void postDecorate(Kryo k, Map<String, Object> conf) {
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/serialization/DefaultSerializationDelegate.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/serialization/DefaultSerializationDelegate.java b/storm-client/src/jvm/org/apache/storm/serialization/DefaultSerializationDelegate.java
index f104481..60b3982 100644
--- a/storm-client/src/jvm/org/apache/storm/serialization/DefaultSerializationDelegate.java
+++ b/storm-client/src/jvm/org/apache/storm/serialization/DefaultSerializationDelegate.java
@@ -24,7 +24,7 @@ import java.util.Map;
public class DefaultSerializationDelegate implements SerializationDelegate {
@Override
- public void prepare(Map stormConf) {
+ public void prepare(Map<String, Object> topoConf) {
// No-op
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/serialization/GzipBridgeSerializationDelegate.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/serialization/GzipBridgeSerializationDelegate.java b/storm-client/src/jvm/org/apache/storm/serialization/GzipBridgeSerializationDelegate.java
index 93b725b..8b4b207 100644
--- a/storm-client/src/jvm/org/apache/storm/serialization/GzipBridgeSerializationDelegate.java
+++ b/storm-client/src/jvm/org/apache/storm/serialization/GzipBridgeSerializationDelegate.java
@@ -32,9 +32,9 @@ public class GzipBridgeSerializationDelegate implements SerializationDelegate {
private GzipSerializationDelegate gzipDelegate = new GzipSerializationDelegate();
@Override
- public void prepare(Map stormConf) {
- defaultDelegate.prepare(stormConf);
- gzipDelegate.prepare(stormConf);
+ public void prepare(Map<String, Object> topoConf) {
+ defaultDelegate.prepare(topoConf);
+ gzipDelegate.prepare(topoConf);
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/serialization/GzipBridgeThriftSerializationDelegate.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/serialization/GzipBridgeThriftSerializationDelegate.java b/storm-client/src/jvm/org/apache/storm/serialization/GzipBridgeThriftSerializationDelegate.java
index 4b072e4..0ab494b 100644
--- a/storm-client/src/jvm/org/apache/storm/serialization/GzipBridgeThriftSerializationDelegate.java
+++ b/storm-client/src/jvm/org/apache/storm/serialization/GzipBridgeThriftSerializationDelegate.java
@@ -31,9 +31,9 @@ public class GzipBridgeThriftSerializationDelegate implements SerializationDeleg
private GzipThriftSerializationDelegate gzipDelegate = new GzipThriftSerializationDelegate();
@Override
- public void prepare(Map stormConf) {
- defaultDelegate.prepare(stormConf);
- gzipDelegate.prepare(stormConf);
+ public void prepare(Map<String, Object> topoConf) {
+ defaultDelegate.prepare(topoConf);
+ gzipDelegate.prepare(topoConf);
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/serialization/GzipSerializationDelegate.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/serialization/GzipSerializationDelegate.java b/storm-client/src/jvm/org/apache/storm/serialization/GzipSerializationDelegate.java
index 7d64628..18e50ba 100644
--- a/storm-client/src/jvm/org/apache/storm/serialization/GzipSerializationDelegate.java
+++ b/storm-client/src/jvm/org/apache/storm/serialization/GzipSerializationDelegate.java
@@ -28,7 +28,7 @@ import java.util.zip.GZIPOutputStream;
public class GzipSerializationDelegate implements SerializationDelegate {
@Override
- public void prepare(Map stormConf) {
+ public void prepare(Map<String, Object> topoConf) {
// No-op
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/serialization/GzipThriftSerializationDelegate.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/serialization/GzipThriftSerializationDelegate.java b/storm-client/src/jvm/org/apache/storm/serialization/GzipThriftSerializationDelegate.java
index 867ac7d..bfec065 100644
--- a/storm-client/src/jvm/org/apache/storm/serialization/GzipThriftSerializationDelegate.java
+++ b/storm-client/src/jvm/org/apache/storm/serialization/GzipThriftSerializationDelegate.java
@@ -31,7 +31,7 @@ import org.apache.thrift.TSerializer;
public class GzipThriftSerializationDelegate implements SerializationDelegate {
@Override
- public void prepare(Map stormConf) {
+ public void prepare(Map<String, Object> topoConf) {
// No-op
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/serialization/IKryoFactory.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/serialization/IKryoFactory.java b/storm-client/src/jvm/org/apache/storm/serialization/IKryoFactory.java
index 409e7dd..ef6fec5 100644
--- a/storm-client/src/jvm/org/apache/storm/serialization/IKryoFactory.java
+++ b/storm-client/src/jvm/org/apache/storm/serialization/IKryoFactory.java
@@ -33,8 +33,8 @@ import java.util.Map;
* 7. Storm calls postDecorate hook
*/
public interface IKryoFactory {
- Kryo getKryo(Map conf);
- void preRegister(Kryo k, Map conf);
- void postRegister(Kryo k, Map conf);
- void postDecorate(Kryo k, Map conf);
+ Kryo getKryo(Map<String, Object> conf);
+ void preRegister(Kryo k, Map<String, Object> conf);
+ void postRegister(Kryo k, Map<String, Object> conf);
+ void postDecorate(Kryo k, Map<String, Object> conf);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/serialization/KryoTupleDeserializer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/serialization/KryoTupleDeserializer.java b/storm-client/src/jvm/org/apache/storm/serialization/KryoTupleDeserializer.java
index 4e877a8..f2d8bf1 100644
--- a/storm-client/src/jvm/org/apache/storm/serialization/KryoTupleDeserializer.java
+++ b/storm-client/src/jvm/org/apache/storm/serialization/KryoTupleDeserializer.java
@@ -32,7 +32,7 @@ public class KryoTupleDeserializer implements ITupleDeserializer {
SerializationFactory.IdDictionary _ids;
Input _kryoInput;
- public KryoTupleDeserializer(final Map conf, final GeneralTopologyContext context) {
+ public KryoTupleDeserializer(final Map<String, Object> conf, final GeneralTopologyContext context) {
_kryo = new KryoValuesDeserializer(conf);
_context = context;
_ids = new SerializationFactory.IdDictionary(context.getRawTopology());
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/serialization/KryoTupleSerializer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/serialization/KryoTupleSerializer.java b/storm-client/src/jvm/org/apache/storm/serialization/KryoTupleSerializer.java
index 3151c33..7302278 100644
--- a/storm-client/src/jvm/org/apache/storm/serialization/KryoTupleSerializer.java
+++ b/storm-client/src/jvm/org/apache/storm/serialization/KryoTupleSerializer.java
@@ -28,7 +28,7 @@ public class KryoTupleSerializer implements ITupleSerializer {
SerializationFactory.IdDictionary _ids;
Output _kryoOut;
- public KryoTupleSerializer(final Map conf, final GeneralTopologyContext context) {
+ public KryoTupleSerializer(final Map<String, Object> conf, final GeneralTopologyContext context) {
_kryo = new KryoValuesSerializer(conf);
_kryoOut = new Output(2000, 2000000000);
_ids = new SerializationFactory.IdDictionary(context.getRawTopology());
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/serialization/KryoValuesDeserializer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/serialization/KryoValuesDeserializer.java b/storm-client/src/jvm/org/apache/storm/serialization/KryoValuesDeserializer.java
index 0e9edea..2ef326a 100644
--- a/storm-client/src/jvm/org/apache/storm/serialization/KryoValuesDeserializer.java
+++ b/storm-client/src/jvm/org/apache/storm/serialization/KryoValuesDeserializer.java
@@ -28,7 +28,7 @@ public class KryoValuesDeserializer {
Kryo _kryo;
Input _kryoInput;
- public KryoValuesDeserializer(Map conf) {
+ public KryoValuesDeserializer(Map<String, Object> conf) {
_kryo = SerializationFactory.getKryo(conf);
_kryoInput = new Input(1);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/serialization/KryoValuesSerializer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/serialization/KryoValuesSerializer.java b/storm-client/src/jvm/org/apache/storm/serialization/KryoValuesSerializer.java
index 2d936a9..af41e15 100644
--- a/storm-client/src/jvm/org/apache/storm/serialization/KryoValuesSerializer.java
+++ b/storm-client/src/jvm/org/apache/storm/serialization/KryoValuesSerializer.java
@@ -29,7 +29,7 @@ public class KryoValuesSerializer {
ListDelegate _delegate;
Output _kryoOut;
- public KryoValuesSerializer(Map conf) {
+ public KryoValuesSerializer(Map<String, Object> conf) {
_kryo = SerializationFactory.getKryo(conf);
_delegate = new ListDelegate();
_kryoOut = new Output(2000, 2000000000);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/serialization/SerializationDelegate.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/serialization/SerializationDelegate.java b/storm-client/src/jvm/org/apache/storm/serialization/SerializationDelegate.java
index 7087397..2c8c27b 100644
--- a/storm-client/src/jvm/org/apache/storm/serialization/SerializationDelegate.java
+++ b/storm-client/src/jvm/org/apache/storm/serialization/SerializationDelegate.java
@@ -27,7 +27,7 @@ public interface SerializationDelegate {
/**
* Lifecycle step that will be called after instantiating with nullary constructor.
*/
- void prepare(Map stormConf);
+ void prepare(Map<String, Object> topoConf);
byte[] serialize(Object object);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/serialization/SerializationFactory.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/serialization/SerializationFactory.java b/storm-client/src/jvm/org/apache/storm/serialization/SerializationFactory.java
index fbe4cfa..1faa926 100644
--- a/storm-client/src/jvm/org/apache/storm/serialization/SerializationFactory.java
+++ b/storm-client/src/jvm/org/apache/storm/serialization/SerializationFactory.java
@@ -48,7 +48,7 @@ public class SerializationFactory {
public static final Logger LOG = LoggerFactory.getLogger(SerializationFactory.class);
public static final ServiceLoader<SerializationRegister> loader = ServiceLoader.load(SerializationRegister.class);
- public static Kryo getKryo(Map conf) {
+ public static Kryo getKryo(Map<String, Object> conf) {
IKryoFactory kryoFactory = (IKryoFactory) ReflectionUtils.newInstance((String) conf.get(Config.TOPOLOGY_KRYO_FACTORY));
Kryo k = kryoFactory.getKryo(conf);
k.register(byte[].class);
@@ -188,7 +188,7 @@ public class SerializationFactory {
}
}
- private static Serializer resolveSerializerInstance(Kryo k, Class superClass, Class<? extends Serializer> serializerClass, Map conf) {
+ private static Serializer resolveSerializerInstance(Kryo k, Class superClass, Class<? extends Serializer> serializerClass, Map<String, Object> conf) {
try {
try {
return serializerClass.getConstructor(Kryo.class, Class.class, Map.class).newInstance(k, superClass, conf);
@@ -223,7 +223,7 @@ public class SerializationFactory {
}
}
- private static Map<String, String> normalizeKryoRegister(Map conf) {
+ private static Map<String, String> normalizeKryoRegister(Map<String, Object> conf) {
// TODO: de-duplicate this logic with the code in nimbus
Object res = conf.get(Config.TOPOLOGY_KRYO_REGISTER);
if(res==null) return new TreeMap<>();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/serialization/ThriftSerializationDelegate.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/serialization/ThriftSerializationDelegate.java b/storm-client/src/jvm/org/apache/storm/serialization/ThriftSerializationDelegate.java
index ed3cdf6..a2dfecf 100644
--- a/storm-client/src/jvm/org/apache/storm/serialization/ThriftSerializationDelegate.java
+++ b/storm-client/src/jvm/org/apache/storm/serialization/ThriftSerializationDelegate.java
@@ -27,7 +27,7 @@ import java.util.Map;
public class ThriftSerializationDelegate implements SerializationDelegate {
@Override
- public void prepare(Map stormConf) {
+ public void prepare(Map<String, Object> topoConf) {
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/spout/CheckpointSpout.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/spout/CheckpointSpout.java b/storm-client/src/jvm/org/apache/storm/spout/CheckpointSpout.java
index 14d6572..798ebff 100644
--- a/storm-client/src/jvm/org/apache/storm/spout/CheckpointSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/spout/CheckpointSpout.java
@@ -63,7 +63,7 @@ public class CheckpointSpout extends BaseRichSpout {
private CheckPointState curTxState;
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
open(context, collector, loadCheckpointInterval(conf), loadCheckpointState(conf, context));
}
@@ -132,7 +132,7 @@ public class CheckpointSpout extends BaseRichSpout {
/**
* Loads the last saved checkpoint state the from persistent storage.
*/
- private KeyValueState<String, CheckPointState> loadCheckpointState(Map conf, TopologyContext ctx) {
+ private KeyValueState<String, CheckPointState> loadCheckpointState(Map<String, Object> conf, TopologyContext ctx) {
String namespace = ctx.getThisComponentId() + "-" + ctx.getThisTaskId();
KeyValueState<String, CheckPointState> state =
(KeyValueState<String, CheckPointState>) StateFactory.getState(namespace, conf, ctx);
@@ -147,10 +147,10 @@ public class CheckpointSpout extends BaseRichSpout {
return state;
}
- private int loadCheckpointInterval(Map stormConf) {
+ private int loadCheckpointInterval(Map<String, Object> topoConf) {
int interval = 0;
- if (stormConf.containsKey(Config.TOPOLOGY_STATE_CHECKPOINT_INTERVAL)) {
- interval = ((Number) stormConf.get(Config.TOPOLOGY_STATE_CHECKPOINT_INTERVAL)).intValue();
+ if (topoConf.containsKey(Config.TOPOLOGY_STATE_CHECKPOINT_INTERVAL)) {
+ interval = ((Number) topoConf.get(Config.TOPOLOGY_STATE_CHECKPOINT_INTERVAL)).intValue();
}
// ensure checkpoint interval is not less than a sane low value.
interval = Math.max(100, interval);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/spout/ISpout.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/spout/ISpout.java b/storm-client/src/jvm/org/apache/storm/spout/ISpout.java
index 48986c4..f889fc3 100644
--- a/storm-client/src/jvm/org/apache/storm/spout/ISpout.java
+++ b/storm-client/src/jvm/org/apache/storm/spout/ISpout.java
@@ -54,7 +54,7 @@ public interface ISpout extends Serializable {
* @param context This object can be used to get information about this task's place within the topology, including the task id and component id of this task, input and output information, etc.
* @param collector The collector is used to emit tuples from this spout. Tuples can be emitted at any time, including the open and close methods. The collector is thread-safe and should be saved as an instance variable of this spout object.
*/
- void open(Map conf, TopologyContext context, SpoutOutputCollector collector);
+ void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector);
/**
* Called when an ISpout is going to be shutdown. There is no guarentee that close
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/spout/ISpoutWaitStrategy.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/spout/ISpoutWaitStrategy.java b/storm-client/src/jvm/org/apache/storm/spout/ISpoutWaitStrategy.java
index 3f1fcf6..3726f12 100644
--- a/storm-client/src/jvm/org/apache/storm/spout/ISpoutWaitStrategy.java
+++ b/storm-client/src/jvm/org/apache/storm/spout/ISpoutWaitStrategy.java
@@ -29,6 +29,6 @@ import java.util.Map;
* The default strategy sleeps for one millisecond.
*/
public interface ISpoutWaitStrategy {
- void prepare(Map conf);
+ void prepare(Map<String, Object> conf);
void emptyEmit(long streak);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/spout/NothingEmptyEmitStrategy.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/spout/NothingEmptyEmitStrategy.java b/storm-client/src/jvm/org/apache/storm/spout/NothingEmptyEmitStrategy.java
index a334dc3..cc1f1eb 100644
--- a/storm-client/src/jvm/org/apache/storm/spout/NothingEmptyEmitStrategy.java
+++ b/storm-client/src/jvm/org/apache/storm/spout/NothingEmptyEmitStrategy.java
@@ -25,7 +25,7 @@ public class NothingEmptyEmitStrategy implements ISpoutWaitStrategy {
}
@Override
- public void prepare(Map conf) {
+ public void prepare(Map<String, Object> conf) {
throw new UnsupportedOperationException("Not supported yet.");
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/spout/ShellSpout.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/spout/ShellSpout.java b/storm-client/src/jvm/org/apache/storm/spout/ShellSpout.java
index 72b7f17..eb65c9a 100644
--- a/storm-client/src/jvm/org/apache/storm/spout/ShellSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/spout/ShellSpout.java
@@ -92,15 +92,15 @@ public class ShellSpout implements ISpout {
this.changeDirectory = changeDirectory;
}
- public void open(Map stormConf, TopologyContext context,
+ public void open(Map<String, Object> topoConf, TopologyContext context,
SpoutOutputCollector collector) {
_collector = collector;
_context = context;
- if (stormConf.containsKey(Config.TOPOLOGY_SUBPROCESS_TIMEOUT_SECS)) {
- workerTimeoutMills = 1000 * ObjectReader.getInt(stormConf.get(Config.TOPOLOGY_SUBPROCESS_TIMEOUT_SECS));
+ if (topoConf.containsKey(Config.TOPOLOGY_SUBPROCESS_TIMEOUT_SECS)) {
+ workerTimeoutMills = 1000 * ObjectReader.getInt(topoConf.get(Config.TOPOLOGY_SUBPROCESS_TIMEOUT_SECS));
} else {
- workerTimeoutMills = 1000 * ObjectReader.getInt(stormConf.get(Config.SUPERVISOR_WORKER_TIMEOUT_SECS));
+ workerTimeoutMills = 1000 * ObjectReader.getInt(topoConf.get(Config.SUPERVISOR_WORKER_TIMEOUT_SECS));
}
_process = new ShellProcess(_command);
@@ -108,7 +108,7 @@ public class ShellSpout implements ISpout {
_process.setEnv(env);
}
- Number subpid = _process.launch(stormConf, context, changeDirectory);
+ Number subpid = _process.launch(topoConf, context, changeDirectory);
LOG.info("Launched subprocess with pid " + subpid);
heartBeatExecutorService = MoreExecutors.getExitingScheduledExecutorService(new ScheduledThreadPoolExecutor(1));
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/spout/SleepSpoutWaitStrategy.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/spout/SleepSpoutWaitStrategy.java b/storm-client/src/jvm/org/apache/storm/spout/SleepSpoutWaitStrategy.java
index b67253a..c7826f9 100644
--- a/storm-client/src/jvm/org/apache/storm/spout/SleepSpoutWaitStrategy.java
+++ b/storm-client/src/jvm/org/apache/storm/spout/SleepSpoutWaitStrategy.java
@@ -26,7 +26,7 @@ public class SleepSpoutWaitStrategy implements ISpoutWaitStrategy {
long sleepMillis;
@Override
- public void prepare(Map conf) {
+ public void prepare(Map<String, Object> conf) {
sleepMillis = ((Number) conf.get(Config.TOPOLOGY_SLEEP_SPOUT_WAIT_STRATEGY_TIME_MS)).longValue();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/state/IStateSpout.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/state/IStateSpout.java b/storm-client/src/jvm/org/apache/storm/state/IStateSpout.java
index 19026d2..de523ce 100644
--- a/storm-client/src/jvm/org/apache/storm/state/IStateSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/state/IStateSpout.java
@@ -22,7 +22,7 @@ import java.io.Serializable;
import java.util.Map;
public interface IStateSpout extends Serializable {
- void open(Map conf, TopologyContext context);
+ void open(Map<String, Object> conf, TopologyContext context);
void close();
void nextTuple(StateSpoutOutputCollector collector);
void synchronize(SynchronizeOutputCollector collector);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/state/InMemoryKeyValueStateProvider.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/state/InMemoryKeyValueStateProvider.java b/storm-client/src/jvm/org/apache/storm/state/InMemoryKeyValueStateProvider.java
index bc33241..624f12e 100644
--- a/storm-client/src/jvm/org/apache/storm/state/InMemoryKeyValueStateProvider.java
+++ b/storm-client/src/jvm/org/apache/storm/state/InMemoryKeyValueStateProvider.java
@@ -29,7 +29,7 @@ public class InMemoryKeyValueStateProvider implements StateProvider {
private final ConcurrentHashMap<String, State> states = new ConcurrentHashMap<>();
@Override
- public State newState(String namespace, Map stormConf, TopologyContext context) {
+ public State newState(String namespace, Map<String, Object> topoConf, TopologyContext context) {
State state = states.get(namespace);
if (state == null) {
State newState = new InMemoryKeyValueState<>();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/state/StateFactory.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/state/StateFactory.java b/storm-client/src/jvm/org/apache/storm/state/StateFactory.java
index d5ec7ae..79e6d96 100644
--- a/storm-client/src/jvm/org/apache/storm/state/StateFactory.java
+++ b/storm-client/src/jvm/org/apache/storm/state/StateFactory.java
@@ -37,23 +37,23 @@ public class StateFactory {
* {@link InMemoryKeyValueState} if no provider is configured.
*
* @param namespace the state namespace
- * @param stormConf the storm conf
+ * @param topoConf the storm conf
* @param context the topology context
* @return the state instance
*/
- public static State getState(String namespace, Map stormConf, TopologyContext context) {
+ public static State getState(String namespace, Map<String, Object> topoConf, TopologyContext context) {
State state;
try {
String provider = null;
- if (stormConf.containsKey(Config.TOPOLOGY_STATE_PROVIDER)) {
- provider = (String) stormConf.get(Config.TOPOLOGY_STATE_PROVIDER);
+ if (topoConf.containsKey(Config.TOPOLOGY_STATE_PROVIDER)) {
+ provider = (String) topoConf.get(Config.TOPOLOGY_STATE_PROVIDER);
} else {
provider = DEFAULT_PROVIDER;
}
Class<?> klazz = Class.forName(provider);
Object object = klazz.newInstance();
if (object instanceof StateProvider) {
- state = ((StateProvider) object).newState(namespace, stormConf, context);
+ state = ((StateProvider) object).newState(namespace, topoConf, context);
} else {
String msg = "Invalid state provider '" + provider +
"'. Should implement org.apache.storm.state.StateProvider";
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/state/StateProvider.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/state/StateProvider.java b/storm-client/src/jvm/org/apache/storm/state/StateProvider.java
index 8c09a0e..2b2aad2 100644
--- a/storm-client/src/jvm/org/apache/storm/state/StateProvider.java
+++ b/storm-client/src/jvm/org/apache/storm/state/StateProvider.java
@@ -30,9 +30,9 @@ public interface StateProvider {
* the componentid-task of the task, so that each task can have its own unique state.
*
* @param namespace a namespace of the state
- * @param stormConf the storm topology configuration
+ * @param topoConf the storm topology configuration
* @param context the {@link TopologyContext}
* @return a previously saved state if one exists otherwise a newly initialized state.
*/
- State newState(String namespace, Map stormConf, TopologyContext context);
+ State newState(String namespace, Map<String, Object> topoConf, TopologyContext context);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/streams/ProcessorBolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/streams/ProcessorBolt.java b/storm-client/src/jvm/org/apache/storm/streams/ProcessorBolt.java
index f1163ca..6f3853d 100644
--- a/storm-client/src/jvm/org/apache/storm/streams/ProcessorBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/streams/ProcessorBolt.java
@@ -39,8 +39,8 @@ class ProcessorBolt extends BaseRichBolt implements StreamBolt {
}
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
- delegate.prepare(stormConf, context, collector);
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
+ delegate.prepare(topoConf, context, collector);
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/streams/ProcessorBoltDelegate.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/streams/ProcessorBoltDelegate.java b/storm-client/src/jvm/org/apache/storm/streams/ProcessorBoltDelegate.java
index 3f3b5c1..1329bcf 100644
--- a/storm-client/src/jvm/org/apache/storm/streams/ProcessorBoltDelegate.java
+++ b/storm-client/src/jvm/org/apache/storm/streams/ProcessorBoltDelegate.java
@@ -53,7 +53,7 @@ class ProcessorBoltDelegate implements Serializable {
private final String id;
private final DirectedGraph<Node, Edge> graph;
private final List<ProcessorNode> nodes;
- private Map stormConf;
+ private Map<String, Object> topoConf;
private TopologyContext topologyContext;
private OutputCollector outputCollector;
private final List<ProcessorNode> outgoingProcessors = new ArrayList<>();
@@ -81,8 +81,8 @@ class ProcessorBoltDelegate implements Serializable {
return Collections.unmodifiableList(nodes);
}
- void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
- this.stormConf = stormConf;
+ void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
+ this.topoConf = topoConf;
topologyContext = context;
outputCollector = collector;
DirectedSubgraph<Node, Edge> subgraph = new DirectedSubgraph<>(graph, new HashSet<>(nodes), null);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/streams/StatefulProcessorBolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/streams/StatefulProcessorBolt.java b/storm-client/src/jvm/org/apache/storm/streams/StatefulProcessorBolt.java
index c123658..4e40292 100644
--- a/storm-client/src/jvm/org/apache/storm/streams/StatefulProcessorBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/streams/StatefulProcessorBolt.java
@@ -47,8 +47,8 @@ class StatefulProcessorBolt<K, V> extends BaseStatefulBolt<KeyValueState<K, V>>
}
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
- delegate.prepare(stormConf, context, collector);
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
+ delegate.prepare(topoConf, context, collector);
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/streams/StreamState.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/streams/StreamState.java b/storm-client/src/jvm/org/apache/storm/streams/StreamState.java
index a4633f7..814f400 100644
--- a/storm-client/src/jvm/org/apache/storm/streams/StreamState.java
+++ b/storm-client/src/jvm/org/apache/storm/streams/StreamState.java
@@ -40,4 +40,4 @@ public class StreamState<K, V> implements Serializable {
ProcessorNode getUpdateStateNode() {
return (ProcessorNode) stream.node;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/streams/WindowedProcessorBolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/streams/WindowedProcessorBolt.java b/storm-client/src/jvm/org/apache/storm/streams/WindowedProcessorBolt.java
index 6fc4e69..7207b12 100644
--- a/storm-client/src/jvm/org/apache/storm/streams/WindowedProcessorBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/streams/WindowedProcessorBolt.java
@@ -54,8 +54,8 @@ class WindowedProcessorBolt extends BaseWindowedBolt implements StreamBolt {
}
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
- delegate.prepare(stormConf, context, collector);
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
+ delegate.prepare(topoConf, context, collector);
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 9acd655..6614f94 100644
--- a/storm-client/src/jvm/org/apache/storm/task/GeneralTopologyContext.java
+++ b/storm-client/src/jvm/org/apache/storm/task/GeneralTopologyContext.java
@@ -41,14 +41,14 @@ public class GeneralTopologyContext implements JSONAware {
private Map<String, List<Integer>> _componentToTasks;
private Map<String, Map<String, Fields>> _componentToStreamToFields;
private String _stormId;
- protected Map _stormConf;
+ protected Map _topoConf;
// pass in componentToSortedTasks for the case of running tons of tasks in single executor
- public GeneralTopologyContext(StormTopology topology, Map stormConf,
+ public GeneralTopologyContext(StormTopology topology, Map<String, Object> topoConf,
Map<Integer, String> taskToComponent, Map<String, List<Integer>> componentToSortedTasks,
Map<String, Map<String, Fields>> componentToStreamToFields, String stormId) {
_topology = topology;
- _stormConf = stormConf;
+ _topoConf = topoConf;
_taskToComponent = taskToComponent;
_stormId = stormId;
_componentToTasks = componentToSortedTasks;
@@ -183,13 +183,13 @@ public class GeneralTopologyContext implements JSONAware {
}
public int maxTopologyMessageTimeout() {
- Integer max = ObjectReader.getInt(_stormConf.get(Config.TOPOLOGY_MESSAGE_TIMEOUT_SECS));
+ Integer max = ObjectReader.getInt(_topoConf.get(Config.TOPOLOGY_MESSAGE_TIMEOUT_SECS));
for(String spout: getRawTopology().get_spouts().keySet()) {
ComponentCommon common = getComponentCommon(spout);
String jsonConf = common.get_json_conf();
if(jsonConf!=null) {
try {
- Map conf = (Map) JSONValue.parseWithException(jsonConf);
+ Map<String, Object> conf = (Map) JSONValue.parseWithException(jsonConf);
Object comp = conf.get(Config.TOPOLOGY_MESSAGE_TIMEOUT_SECS);
max = Math.max(ObjectReader.getInt(comp, max), max);
} catch (ParseException e) {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/task/IBolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/task/IBolt.java b/storm-client/src/jvm/org/apache/storm/task/IBolt.java
index a2a026e..2268b6a 100644
--- a/storm-client/src/jvm/org/apache/storm/task/IBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/task/IBolt.java
@@ -48,11 +48,11 @@ public interface IBolt extends Serializable {
*
* This includes the:
*
- * @param stormConf The Storm configuration for this bolt. This is the configuration provided to the topology merged in with cluster configuration on this machine.
+ * @param topoConf The Storm configuration for this bolt. This is the configuration provided to the topology merged in with cluster configuration on this machine.
* @param context This object can be used to get information about this task's place within the topology, including the task id and component id of this task, input and output information, etc.
* @param collector The collector is used to emit tuples from this bolt. Tuples can be emitted at any time, including the prepare and cleanup methods. The collector is thread-safe and should be saved as an instance variable of this bolt object.
*/
- void prepare(Map stormConf, TopologyContext context, OutputCollector collector);
+ void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector);
/**
* Process a single tuple of input. The Tuple object contains metadata on it
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/task/ShellBolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/task/ShellBolt.java b/storm-client/src/jvm/org/apache/storm/task/ShellBolt.java
index 0acb409..82b06bc 100644
--- a/storm-client/src/jvm/org/apache/storm/task/ShellBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/task/ShellBolt.java
@@ -124,12 +124,12 @@ public class ShellBolt implements IBolt {
this.changeDirectory = changeDirectory;
}
- public void prepare(Map stormConf, TopologyContext context,
+ public void prepare(Map<String, Object> topoConf, TopologyContext context,
final OutputCollector collector) {
- if (ConfigUtils.isLocalMode(stormConf)) {
+ if (ConfigUtils.isLocalMode(topoConf)) {
_isLocalMode = true;
}
- Object maxPending = stormConf.get(Config.TOPOLOGY_SHELLBOLT_MAX_PENDING);
+ Object maxPending = topoConf.get(Config.TOPOLOGY_SHELLBOLT_MAX_PENDING);
if (maxPending != null) {
this._pendingWrites = new ShellBoltMessageQueue(((Number)maxPending).intValue());
}
@@ -139,10 +139,10 @@ public class ShellBolt implements IBolt {
_context = context;
- if (stormConf.containsKey(Config.TOPOLOGY_SUBPROCESS_TIMEOUT_SECS)) {
- workerTimeoutMills = 1000 * ObjectReader.getInt(stormConf.get(Config.TOPOLOGY_SUBPROCESS_TIMEOUT_SECS));
+ if (topoConf.containsKey(Config.TOPOLOGY_SUBPROCESS_TIMEOUT_SECS)) {
+ workerTimeoutMills = 1000 * ObjectReader.getInt(topoConf.get(Config.TOPOLOGY_SUBPROCESS_TIMEOUT_SECS));
} else {
- workerTimeoutMills = 1000 * ObjectReader.getInt(stormConf.get(Config.SUPERVISOR_WORKER_TIMEOUT_SECS));
+ workerTimeoutMills = 1000 * ObjectReader.getInt(topoConf.get(Config.SUPERVISOR_WORKER_TIMEOUT_SECS));
}
_process = new ShellProcess(_command);
@@ -151,7 +151,7 @@ public class ShellBolt implements IBolt {
}
//subprocesses must send their pid first thing
- Number subpid = _process.launch(stormConf, context, changeDirectory);
+ Number subpid = _process.launch(topoConf, context, changeDirectory);
LOG.info("Launched subprocess with pid " + subpid);
// reader
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/task/TopologyContext.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/task/TopologyContext.java b/storm-client/src/jvm/org/apache/storm/task/TopologyContext.java
index 5ac8347..4c226ef 100644
--- a/storm-client/src/jvm/org/apache/storm/task/TopologyContext.java
+++ b/storm-client/src/jvm/org/apache/storm/task/TopologyContext.java
@@ -60,7 +60,7 @@ public class TopologyContext extends WorkerTopologyContext implements IMetricsCo
public TopologyContext(StormTopology topology,
- Map stormConf,
+ Map<String, Object> topoConf,
Map<Integer, String> taskToComponent,
Map<String, List<Integer>> componentToSortedTasks,
Map<String, Map<String, Fields>> componentToStreamToFields,
@@ -75,7 +75,7 @@ public class TopologyContext extends WorkerTopologyContext implements IMetricsCo
Map<String, Object> executorData,
Map<Integer, Map<Integer, Map<String, IMetric>>> registeredMetrics,
AtomicBoolean openOrPrepareWasCalled) {
- super(topology, stormConf, taskToComponent, componentToSortedTasks,
+ super(topology, topoConf, taskToComponent, componentToSortedTasks,
componentToStreamToFields, stormId, codeDir, pidDir,
workerPort, workerTasks, defaultResources, userResources);
_taskId = taskId;
@@ -261,7 +261,7 @@ public class TopologyContext extends WorkerTopologyContext implements IMetricsCo
}
public void addTaskHook(ITaskHook hook) {
- hook.prepare(_stormConf, this);
+ hook.prepare(_topoConf, this);
_hooks.add(hook);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/task/WorkerTopologyContext.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/task/WorkerTopologyContext.java b/storm-client/src/jvm/org/apache/storm/task/WorkerTopologyContext.java
index 89ba72e..2817b65 100644
--- a/storm-client/src/jvm/org/apache/storm/task/WorkerTopologyContext.java
+++ b/storm-client/src/jvm/org/apache/storm/task/WorkerTopologyContext.java
@@ -37,7 +37,7 @@ public class WorkerTopologyContext extends GeneralTopologyContext {
public WorkerTopologyContext(
StormTopology topology,
- Map stormConf,
+ Map<String, Object> topoConf,
Map<Integer, String> taskToComponent,
Map<String, List<Integer>> componentToSortedTasks,
Map<String, Map<String, Fields>> componentToStreamToFields,
@@ -49,7 +49,7 @@ public class WorkerTopologyContext extends GeneralTopologyContext {
Map<String, Object> defaultResources,
Map<String, Object> userResources
) {
- super(topology, stormConf, taskToComponent, componentToSortedTasks, componentToStreamToFields, stormId);
+ super(topology, topoConf, taskToComponent, componentToSortedTasks, componentToStreamToFields, stormId);
_codeDir = codeDir;
_defaultResources = defaultResources;
_userResources = userResources;
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/testing/BatchNumberList.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/testing/BatchNumberList.java b/storm-client/src/jvm/org/apache/storm/testing/BatchNumberList.java
index b958243..6f7b83d 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/BatchNumberList.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/BatchNumberList.java
@@ -48,7 +48,7 @@ public class BatchNumberList extends BaseBatchBolt<Object> {
@Override
- public void prepare(Map conf, TopologyContext context, BatchOutputCollector collector, Object id) {
+ public void prepare(Map<String, Object> conf, TopologyContext context, BatchOutputCollector collector, Object id) {
_collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/testing/CountingBatchBolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/testing/CountingBatchBolt.java b/storm-client/src/jvm/org/apache/storm/testing/CountingBatchBolt.java
index 982eb87..f421aee 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/CountingBatchBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/CountingBatchBolt.java
@@ -32,7 +32,7 @@ public class CountingBatchBolt extends BaseBatchBolt<Object> {
int _count = 0;
@Override
- public void prepare(Map conf, TopologyContext context, BatchOutputCollector collector, Object id) {
+ public void prepare(Map<String, Object> conf, TopologyContext context, BatchOutputCollector collector, Object id) {
_collector = collector;
_id = id;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/testing/CountingCommitBolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/testing/CountingCommitBolt.java b/storm-client/src/jvm/org/apache/storm/testing/CountingCommitBolt.java
index 2e12a02..b76ca88 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/CountingCommitBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/CountingCommitBolt.java
@@ -34,7 +34,7 @@ public class CountingCommitBolt extends BaseTransactionalBolt implements ICommit
int _count = 0;
@Override
- public void prepare(Map conf, TopologyContext context, BatchOutputCollector collector, TransactionAttempt id) {
+ public void prepare(Map<String, Object> conf, TopologyContext context, BatchOutputCollector collector, TransactionAttempt id) {
_id = id;
_collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/testing/FeederSpout.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/testing/FeederSpout.java b/storm-client/src/jvm/org/apache/storm/testing/FeederSpout.java
index 7801ca0..cb6b0ff 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/FeederSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/FeederSpout.java
@@ -66,7 +66,7 @@ public class FeederSpout extends BaseRichSpout {
InprocMessaging.waitForReader(_id);
}
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
_collector = collector;
}
@@ -104,4 +104,4 @@ public class FeederSpout extends BaseRichSpout {
public Map<String, Object> getComponentConfiguration() {
return new HashMap<String, Object>();
}
-}
\ No newline at end of file
+}
[06/13] storm git commit: STORM-2477: Result of transforming the code
Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/testing/FixedTupleSpout.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/testing/FixedTupleSpout.java b/storm-client/src/jvm/org/apache/storm/testing/FixedTupleSpout.java
index 3341ba7..43caf42 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/FixedTupleSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/FixedTupleSpout.java
@@ -113,7 +113,7 @@ public class FixedTupleSpout implements IRichSpout, CompletableSpout {
}
}
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
_context = context;
List<Integer> tasks = context.getComponentTasks(context.getThisComponentId());
int startIndex;
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/testing/ForwardingMetricsConsumer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/testing/ForwardingMetricsConsumer.java b/storm-client/src/jvm/org/apache/storm/testing/ForwardingMetricsConsumer.java
index a4c5271..9f07f85 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/ForwardingMetricsConsumer.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/ForwardingMetricsConsumer.java
@@ -55,7 +55,7 @@ public class ForwardingMetricsConsumer implements IMetricsConsumer {
OutputStream out;
@Override
- public void prepare(Map stormConf, Object registrationArgument, TopologyContext context, IErrorReporter errorReporter) {
+ public void prepare(Map<String, Object> topoConf, Object registrationArgument, TopologyContext context, IErrorReporter errorReporter) {
String [] parts = ((String)registrationArgument).split(":",2);
host = parts[0];
port = Integer.valueOf(parts[1]);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/testing/KeyedCountingBatchBolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/testing/KeyedCountingBatchBolt.java b/storm-client/src/jvm/org/apache/storm/testing/KeyedCountingBatchBolt.java
index c345147..1a2b0a6 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/KeyedCountingBatchBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/KeyedCountingBatchBolt.java
@@ -35,7 +35,7 @@ public class KeyedCountingBatchBolt extends BaseBatchBolt<Object> {
Map<Object, Integer> _counts = new HashMap<Object, Integer>();
@Override
- public void prepare(Map conf, TopologyContext context, BatchOutputCollector collector, Object id) {
+ public void prepare(Map<String, Object> conf, TopologyContext context, BatchOutputCollector collector, Object id) {
_collector = collector;
_id = id;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/testing/KeyedSummingBatchBolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/testing/KeyedSummingBatchBolt.java b/storm-client/src/jvm/org/apache/storm/testing/KeyedSummingBatchBolt.java
index 2e26516..b78c995 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/KeyedSummingBatchBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/KeyedSummingBatchBolt.java
@@ -34,7 +34,7 @@ public class KeyedSummingBatchBolt extends BaseBatchBolt<Object> {
Map<Object, Number> _sums = new HashMap<Object, Number>();
@Override
- public void prepare(Map conf, TopologyContext context, BatchOutputCollector collector, Object id) {
+ public void prepare(Map<String, Object> conf, TopologyContext context, BatchOutputCollector collector, Object id) {
_collector = collector;
_id = id;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/testing/MemoryTransactionalSpout.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/testing/MemoryTransactionalSpout.java b/storm-client/src/jvm/org/apache/storm/testing/MemoryTransactionalSpout.java
index 9562f7f..2fe62c0 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/MemoryTransactionalSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/MemoryTransactionalSpout.java
@@ -84,7 +84,7 @@ public class MemoryTransactionalSpout implements IPartitionedTransactionalSpout<
Integer _maxSpoutPending;
Map<Integer, Integer> _emptyPartitions = new HashMap<>();
- public Emitter(Map conf) {
+ public Emitter(Map<String, Object> conf) {
Object c = conf.get(Config.TOPOLOGY_MAX_SPOUT_PENDING);
if(c==null) _maxSpoutPending = 1;
else _maxSpoutPending = ObjectReader.getInt(c);
@@ -138,12 +138,12 @@ public class MemoryTransactionalSpout implements IPartitionedTransactionalSpout<
}
@Override
- public IPartitionedTransactionalSpout.Coordinator getCoordinator(Map conf, TopologyContext context) {
+ public IPartitionedTransactionalSpout.Coordinator getCoordinator(Map<String, Object> conf, TopologyContext context) {
return new Coordinator();
}
@Override
- public IPartitionedTransactionalSpout.Emitter<MemoryTransactionalSpoutMeta> getEmitter(Map conf, TopologyContext context) {
+ public IPartitionedTransactionalSpout.Emitter<MemoryTransactionalSpoutMeta> getEmitter(Map<String, Object> conf, TopologyContext context) {
return new Emitter(conf);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 2842bca..4c04d84 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/NonRichBoltTracker.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/NonRichBoltTracker.java
@@ -35,8 +35,8 @@ public class NonRichBoltTracker implements IBolt {
_trackId = id;
}
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
- _delegate.prepare(stormConf, context, collector);
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
+ _delegate.prepare(topoConf, context, collector);
}
public void execute(Tuple input) {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/testing/OpaqueMemoryTransactionalSpout.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/testing/OpaqueMemoryTransactionalSpout.java b/storm-client/src/jvm/org/apache/storm/testing/OpaqueMemoryTransactionalSpout.java
index 2a4ad86..7e4e753 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/OpaqueMemoryTransactionalSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/OpaqueMemoryTransactionalSpout.java
@@ -74,12 +74,12 @@ public class OpaqueMemoryTransactionalSpout implements IOpaquePartitionedTransac
}
@Override
- public IOpaquePartitionedTransactionalSpout.Emitter<MemoryTransactionalSpoutMeta> getEmitter(Map conf, TopologyContext context) {
+ public IOpaquePartitionedTransactionalSpout.Emitter<MemoryTransactionalSpoutMeta> getEmitter(Map<String, Object> conf, TopologyContext context) {
return new Emitter(conf);
}
@Override
- public IOpaquePartitionedTransactionalSpout.Coordinator getCoordinator(Map conf, TopologyContext context) {
+ public IOpaquePartitionedTransactionalSpout.Coordinator getCoordinator(Map<String, Object> conf, TopologyContext context) {
return new Coordinator();
}
@@ -99,7 +99,7 @@ public class OpaqueMemoryTransactionalSpout implements IOpaquePartitionedTransac
Integer _maxSpoutPending;
Map<Integer, Integer> _emptyPartitions = new HashMap<>();
- public Emitter(Map conf) {
+ public Emitter(Map<String, Object> conf) {
Object c = conf.get(Config.TOPOLOGY_MAX_SPOUT_PENDING);
if(c==null) _maxSpoutPending = 1;
else _maxSpoutPending = ObjectReader.getInt(c);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/testing/PythonShellMetricsBolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/testing/PythonShellMetricsBolt.java b/storm-client/src/jvm/org/apache/storm/testing/PythonShellMetricsBolt.java
index 4beec48..95c28c1 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/PythonShellMetricsBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/PythonShellMetricsBolt.java
@@ -37,8 +37,8 @@ public class PythonShellMetricsBolt extends ShellBolt implements IRichBolt {
super(command, file);
}
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
- super.prepare(stormConf, context, collector);
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
+ super.prepare(topoConf, context, collector);
CountShellMetric cMetric = new CountShellMetric();
context.registerMetric("my-custom-shell-metric", cMetric, 5);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/testing/PythonShellMetricsSpout.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/testing/PythonShellMetricsSpout.java b/storm-client/src/jvm/org/apache/storm/testing/PythonShellMetricsSpout.java
index 657baa6..95dcb17 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/PythonShellMetricsSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/PythonShellMetricsSpout.java
@@ -39,7 +39,7 @@ public class PythonShellMetricsSpout extends ShellSpout implements IRichSpout {
}
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
super.open(conf, context, collector);
CountShellMetric cMetric = new CountShellMetric();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 3eae2b5..33d62ec 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/SpoutTracker.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/SpoutTracker.java
@@ -79,7 +79,7 @@ public class SpoutTracker extends BaseRichSpout {
_trackId = trackId;
}
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
_tracker = new SpoutTrackOutputCollector(collector);
_delegate.open(conf, context, new SpoutOutputCollector(_tracker));
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/testing/TestAggregatesCounter.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/testing/TestAggregatesCounter.java b/storm-client/src/jvm/org/apache/storm/testing/TestAggregatesCounter.java
index 8d008da..f8af63f 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/TestAggregatesCounter.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/TestAggregatesCounter.java
@@ -36,7 +36,7 @@ public class TestAggregatesCounter extends BaseRichBolt {
Map<String, Integer> _counts;
OutputCollector _collector;
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
_collector = collector;
_counts = new HashMap<String, Integer>();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/testing/TestConfBolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/testing/TestConfBolt.java b/storm-client/src/jvm/org/apache/storm/testing/TestConfBolt.java
index 638a010..560e0a4 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/TestConfBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/TestConfBolt.java
@@ -40,7 +40,7 @@ public class TestConfBolt extends BaseBasicBolt {
}
@Override
- public void prepare(Map conf, TopologyContext context) {
+ public void prepare(Map<String, Object> conf, TopologyContext context) {
_conf = conf;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/testing/TestEventLogSpout.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/testing/TestEventLogSpout.java b/storm-client/src/jvm/org/apache/storm/testing/TestEventLogSpout.java
index e4a5849..f8f9d0d 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/TestEventLogSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/TestEventLogSpout.java
@@ -72,7 +72,7 @@ public class TestEventLogSpout extends BaseRichSpout implements CompletableSpout
this.totalCount = totalCount;
}
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
_collector = collector;
this.source = context.getThisTaskId();
long taskCount = context.getComponentTasks(context.getThisComponentId()).size();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/testing/TestEventOrderCheckBolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/testing/TestEventOrderCheckBolt.java b/storm-client/src/jvm/org/apache/storm/testing/TestEventOrderCheckBolt.java
index 204837b..0cc9ecc 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/TestEventOrderCheckBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/TestEventOrderCheckBolt.java
@@ -41,7 +41,7 @@ public class TestEventOrderCheckBolt extends BaseRichBolt {
OutputCollector _collector;
Map<Integer, Long> recentEventId = new HashMap<Integer, Long>();
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
_collector = collector;
_count = 0;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/testing/TestGlobalCount.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/testing/TestGlobalCount.java b/storm-client/src/jvm/org/apache/storm/testing/TestGlobalCount.java
index a07bf89..c2a9bfb 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/TestGlobalCount.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/TestGlobalCount.java
@@ -35,7 +35,7 @@ public class TestGlobalCount extends BaseRichBolt {
private int _count;
OutputCollector _collector;
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
_collector = collector;
_count = 0;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/testing/TestPlannerBolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/testing/TestPlannerBolt.java b/storm-client/src/jvm/org/apache/storm/testing/TestPlannerBolt.java
index f93200c..feebb5c 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/TestPlannerBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/TestPlannerBolt.java
@@ -27,7 +27,7 @@ import org.apache.storm.topology.base.BaseRichBolt;
public class TestPlannerBolt extends BaseRichBolt {
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/testing/TestPlannerSpout.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/testing/TestPlannerSpout.java b/storm-client/src/jvm/org/apache/storm/testing/TestPlannerSpout.java
index 77a1056..538a34d 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/TestPlannerSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/TestPlannerSpout.java
@@ -51,7 +51,7 @@ public class TestPlannerSpout extends BaseRichSpout {
}
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/testing/TestWordCounter.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/testing/TestWordCounter.java b/storm-client/src/jvm/org/apache/storm/testing/TestWordCounter.java
index bb15322..7cc7222 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/TestWordCounter.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/TestWordCounter.java
@@ -35,7 +35,7 @@ public class TestWordCounter extends BaseBasicBolt {
Map<String, Integer> _counts;
- public void prepare(Map stormConf, TopologyContext context) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context) {
_counts = new HashMap<String, Integer>();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/testing/TestWordSpout.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/testing/TestWordSpout.java b/storm-client/src/jvm/org/apache/storm/testing/TestWordSpout.java
index 2c7fb23..945d4f7 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/TestWordSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/TestWordSpout.java
@@ -46,7 +46,7 @@ public class TestWordSpout extends BaseRichSpout {
_isDistributed = isDistributed;
}
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
_collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/testing/TmpPath.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/testing/TmpPath.java b/storm-client/src/jvm/org/apache/storm/testing/TmpPath.java
index ccb1b2f..5a55633 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/TmpPath.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/TmpPath.java
@@ -66,4 +66,4 @@ public class TmpPath implements AutoCloseable {
}
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/testing/TupleCaptureBolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/testing/TupleCaptureBolt.java b/storm-client/src/jvm/org/apache/storm/testing/TupleCaptureBolt.java
index e67f861..a4a7b64 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/TupleCaptureBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/TupleCaptureBolt.java
@@ -40,7 +40,7 @@ public class TupleCaptureBolt implements IRichBolt {
emitted_tuples.put(_name, new HashMap<String, List<FixedTuple>>());
}
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
_collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/topology/BasicBoltExecutor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/topology/BasicBoltExecutor.java b/storm-client/src/jvm/org/apache/storm/topology/BasicBoltExecutor.java
index 90f6d59..5f7b4f4 100644
--- a/storm-client/src/jvm/org/apache/storm/topology/BasicBoltExecutor.java
+++ b/storm-client/src/jvm/org/apache/storm/topology/BasicBoltExecutor.java
@@ -39,8 +39,8 @@ public class BasicBoltExecutor implements IRichBolt {
}
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
- _bolt.prepare(stormConf, context);
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
+ _bolt.prepare(topoConf, context);
_collector = new BasicOutputCollector(collector);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/topology/CheckpointTupleForwarder.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/topology/CheckpointTupleForwarder.java b/storm-client/src/jvm/org/apache/storm/topology/CheckpointTupleForwarder.java
index a510c0c..34af072 100644
--- a/storm-client/src/jvm/org/apache/storm/topology/CheckpointTupleForwarder.java
+++ b/storm-client/src/jvm/org/apache/storm/topology/CheckpointTupleForwarder.java
@@ -54,9 +54,9 @@ public class CheckpointTupleForwarder extends BaseStatefulBoltExecutor {
}
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector outputCollector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector outputCollector) {
init(context, new AnchoringOutputCollector(outputCollector));
- bolt.prepare(stormConf, context, collector);
+ bolt.prepare(topoConf, context, collector);
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/topology/IBasicBolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/topology/IBasicBolt.java b/storm-client/src/jvm/org/apache/storm/topology/IBasicBolt.java
index 6d5a86e..467e963 100644
--- a/storm-client/src/jvm/org/apache/storm/topology/IBasicBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/topology/IBasicBolt.java
@@ -22,7 +22,7 @@ import org.apache.storm.tuple.Tuple;
import java.util.Map;
public interface IBasicBolt extends IComponent {
- void prepare(Map stormConf, TopologyContext context);
+ void prepare(Map<String, Object> topoConf, TopologyContext context);
/**
* Process the input tuple and optionally emit new tuples based on the input tuple.
*
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/topology/IStatefulBolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/topology/IStatefulBolt.java b/storm-client/src/jvm/org/apache/storm/topology/IStatefulBolt.java
index ef6c837..e4f322d 100644
--- a/storm-client/src/jvm/org/apache/storm/topology/IStatefulBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/topology/IStatefulBolt.java
@@ -36,7 +36,7 @@ public interface IStatefulBolt<T extends State> extends IStatefulComponent<T> {
/**
* @see org.apache.storm.task.IBolt#prepare(Map, TopologyContext, OutputCollector)
*/
- void prepare(Map stormConf, TopologyContext context, OutputCollector collector);
+ void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector);
/**
* @see org.apache.storm.task.IBolt#execute(Tuple)
*/
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/topology/IWindowedBolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/topology/IWindowedBolt.java b/storm-client/src/jvm/org/apache/storm/topology/IWindowedBolt.java
index b0ff262..cfee68f 100644
--- a/storm-client/src/jvm/org/apache/storm/topology/IWindowedBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/topology/IWindowedBolt.java
@@ -32,7 +32,7 @@ public interface IWindowedBolt extends IComponent {
* This is similar to the {@link org.apache.storm.task.IBolt#prepare(Map, TopologyContext, OutputCollector)} except
* that while emitting, the tuples are automatically anchored to the tuples in the inputWindow.
*/
- void prepare(Map stormConf, TopologyContext context, OutputCollector collector);
+ void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector);
/**
* Process the tuple window and optionally emit new tuples based on the tuples in the input window.
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/topology/StatefulBoltExecutor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/topology/StatefulBoltExecutor.java b/storm-client/src/jvm/org/apache/storm/topology/StatefulBoltExecutor.java
index 01b04ab..9efb6c9 100644
--- a/storm-client/src/jvm/org/apache/storm/topology/StatefulBoltExecutor.java
+++ b/storm-client/src/jvm/org/apache/storm/topology/StatefulBoltExecutor.java
@@ -56,17 +56,17 @@ public class StatefulBoltExecutor<T extends State> extends BaseStatefulBoltExecu
}
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
// get the last successfully committed state from state store
String namespace = context.getThisComponentId() + "-" + context.getThisTaskId();
- prepare(stormConf, context, collector, StateFactory.getState(namespace, stormConf, context));
+ prepare(topoConf, context, collector, StateFactory.getState(namespace, topoConf, context));
}
// package access for unit tests
- void prepare(Map stormConf, TopologyContext context, OutputCollector collector, State state) {
+ void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector, State state) {
init(context, collector);
this.collector = new AckTrackingOutputCollector(collector);
- bolt.prepare(stormConf, context, this.collector);
+ bolt.prepare(topoConf, context, this.collector);
this.state = state;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/topology/StatefulWindowedBoltExecutor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/topology/StatefulWindowedBoltExecutor.java b/storm-client/src/jvm/org/apache/storm/topology/StatefulWindowedBoltExecutor.java
index 2fc6f8d..56873ba 100644
--- a/storm-client/src/jvm/org/apache/storm/topology/StatefulWindowedBoltExecutor.java
+++ b/storm-client/src/jvm/org/apache/storm/topology/StatefulWindowedBoltExecutor.java
@@ -58,21 +58,21 @@ public class StatefulWindowedBoltExecutor<T extends State> extends WindowedBoltE
}
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
- prepare(stormConf, context, collector, getWindowState(stormConf, context));
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
+ prepare(topoConf, context, collector, getWindowState(topoConf, context));
}
// package access for unit tests
- void prepare(Map stormConf, TopologyContext context, OutputCollector collector,
+ void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector,
KeyValueState<TaskStream, WindowState> windowState) {
- init(stormConf, context, collector, windowState);
- super.prepare(stormConf, context, collector);
+ init(topoConf, context, collector, windowState);
+ super.prepare(topoConf, context, collector);
}
- private void init(Map stormConf, TopologyContext context, OutputCollector collector,
+ private void init(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector,
KeyValueState<TaskStream, WindowState> windowState) {
- if (stormConf.containsKey(Config.TOPOLOGY_BOLTS_MESSAGE_ID_FIELD_NAME)) {
- msgIdFieldName = (String) stormConf.get(Config.TOPOLOGY_BOLTS_MESSAGE_ID_FIELD_NAME);
+ if (topoConf.containsKey(Config.TOPOLOGY_BOLTS_MESSAGE_ID_FIELD_NAME)) {
+ msgIdFieldName = (String) topoConf.get(Config.TOPOLOGY_BOLTS_MESSAGE_ID_FIELD_NAME);
} else {
throw new IllegalArgumentException(Config.TOPOLOGY_BOLTS_MESSAGE_ID_FIELD_NAME + " is not set");
}
@@ -279,9 +279,9 @@ public class StatefulWindowedBoltExecutor<T extends State> extends WindowedBoltE
return input.getLongByField(msgIdFieldName);
}
- private KeyValueState<TaskStream, WindowState> getWindowState(Map stormConf, TopologyContext context) {
+ private KeyValueState<TaskStream, WindowState> getWindowState(Map<String, Object> topoConf, TopologyContext context) {
String namespace = context.getThisComponentId() + "-" + context.getThisTaskId() + "-window";
- return (KeyValueState<TaskStream, WindowState>) StateFactory.getState(namespace, stormConf, context);
+ return (KeyValueState<TaskStream, WindowState>) StateFactory.getState(namespace, topoConf, context);
}
static class WindowState {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 d8d8711..6542c7e 100644
--- a/storm-client/src/jvm/org/apache/storm/topology/TopologyBuilder.java
+++ b/storm-client/src/jvm/org/apache/storm/topology/TopologyBuilder.java
@@ -68,7 +68,7 @@ import static org.apache.storm.spout.CheckpointSpout.CHECKPOINT_STREAM_ID;
* builder.setBolt("4", new TestGlobalCount())
* .globalGrouping("1");
*
- * Map conf = new HashMap();
+ * Map<String, Object> conf = new HashMap();
* conf.put(Config.TOPOLOGY_WORKERS, 4);
*
* StormSubmitter.submitTopology("mytopology", conf, builder.createTopology());
@@ -89,7 +89,7 @@ import static org.apache.storm.spout.CheckpointSpout.CHECKPOINT_STREAM_ID;
* builder.setBolt("4", new TestGlobalCount())
* .globalGrouping("1");
*
- * Map conf = new HashMap();
+ * Map<String, Object> conf = new HashMap();
* conf.put(Config.TOPOLOGY_WORKERS, 4);
* conf.put(Config.TOPOLOGY_DEBUG, true);
*
@@ -538,7 +538,7 @@ public class TopologyBuilder {
}
common.set_parallelism_hint(dop);
}
- Map conf = component.getComponentConfiguration();
+ Map<String, Object> conf = component.getComponentConfiguration();
if(conf!=null) common.set_json_conf(JSONValue.toJSONString(conf));
_commons.put(id, common);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/topology/WindowedBoltExecutor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/topology/WindowedBoltExecutor.java b/storm-client/src/jvm/org/apache/storm/topology/WindowedBoltExecutor.java
index bfbdb47..2ada9bf 100644
--- a/storm-client/src/jvm/org/apache/storm/topology/WindowedBoltExecutor.java
+++ b/storm-client/src/jvm/org/apache/storm/topology/WindowedBoltExecutor.java
@@ -80,24 +80,24 @@ public class WindowedBoltExecutor implements IRichBolt {
timestampExtractor = bolt.getTimestampExtractor();
}
- private int getTopologyTimeoutMillis(Map stormConf) {
- if (stormConf.get(Config.TOPOLOGY_ENABLE_MESSAGE_TIMEOUTS) != null) {
- boolean timeOutsEnabled = (boolean) stormConf.get(Config.TOPOLOGY_ENABLE_MESSAGE_TIMEOUTS);
+ private int getTopologyTimeoutMillis(Map<String, Object> topoConf) {
+ if (topoConf.get(Config.TOPOLOGY_ENABLE_MESSAGE_TIMEOUTS) != null) {
+ boolean timeOutsEnabled = (boolean) topoConf.get(Config.TOPOLOGY_ENABLE_MESSAGE_TIMEOUTS);
if (!timeOutsEnabled) {
return Integer.MAX_VALUE;
}
}
int timeout = 0;
- if (stormConf.get(Config.TOPOLOGY_MESSAGE_TIMEOUT_SECS) != null) {
- timeout = ((Number) stormConf.get(Config.TOPOLOGY_MESSAGE_TIMEOUT_SECS)).intValue();
+ if (topoConf.get(Config.TOPOLOGY_MESSAGE_TIMEOUT_SECS) != null) {
+ timeout = ((Number) topoConf.get(Config.TOPOLOGY_MESSAGE_TIMEOUT_SECS)).intValue();
}
return timeout * 1000;
}
- private int getMaxSpoutPending(Map stormConf) {
+ private int getMaxSpoutPending(Map<String, Object> topoConf) {
int maxPending = Integer.MAX_VALUE;
- if (stormConf.get(Config.TOPOLOGY_MAX_SPOUT_PENDING) != null) {
- maxPending = ((Number) stormConf.get(Config.TOPOLOGY_MAX_SPOUT_PENDING)).intValue();
+ if (topoConf.get(Config.TOPOLOGY_MAX_SPOUT_PENDING) != null) {
+ maxPending = ((Number) topoConf.get(Config.TOPOLOGY_MAX_SPOUT_PENDING)).intValue();
}
return maxPending;
}
@@ -118,11 +118,11 @@ public class WindowedBoltExecutor implements IRichBolt {
}
}
- private void validate(Map stormConf, Count windowLengthCount, Duration windowLengthDuration,
+ private void validate(Map<String, Object> topoConf, Count windowLengthCount, Duration windowLengthDuration,
Count slidingIntervalCount, Duration slidingIntervalDuration) {
- int topologyTimeout = getTopologyTimeoutMillis(stormConf);
- int maxSpoutPending = getMaxSpoutPending(stormConf);
+ int topologyTimeout = getTopologyTimeoutMillis(topoConf);
+ int maxSpoutPending = getMaxSpoutPending(topoConf);
if (windowLengthCount == null && windowLengthDuration == null) {
throw new IllegalArgumentException("Window length is not specified");
}
@@ -144,25 +144,25 @@ public class WindowedBoltExecutor implements IRichBolt {
}
}
- private WindowManager<Tuple> initWindowManager(WindowLifecycleListener<Tuple> lifecycleListener, Map stormConf,
+ private WindowManager<Tuple> initWindowManager(WindowLifecycleListener<Tuple> lifecycleListener, Map<String, Object> topoConf,
TopologyContext context) {
WindowManager<Tuple> manager = new WindowManager<>(lifecycleListener);
Count windowLengthCount = null;
Duration slidingIntervalDuration = null;
Count slidingIntervalCount = null;
// window length
- if (stormConf.containsKey(Config.TOPOLOGY_BOLTS_WINDOW_LENGTH_COUNT)) {
- windowLengthCount = new Count(((Number) stormConf.get(Config.TOPOLOGY_BOLTS_WINDOW_LENGTH_COUNT)).intValue());
- } else if (stormConf.containsKey(Config.TOPOLOGY_BOLTS_WINDOW_LENGTH_DURATION_MS)) {
+ if (topoConf.containsKey(Config.TOPOLOGY_BOLTS_WINDOW_LENGTH_COUNT)) {
+ windowLengthCount = new Count(((Number) topoConf.get(Config.TOPOLOGY_BOLTS_WINDOW_LENGTH_COUNT)).intValue());
+ } else if (topoConf.containsKey(Config.TOPOLOGY_BOLTS_WINDOW_LENGTH_DURATION_MS)) {
windowLengthDuration = new Duration(
- ((Number) stormConf.get(Config.TOPOLOGY_BOLTS_WINDOW_LENGTH_DURATION_MS)).intValue(),
+ ((Number) topoConf.get(Config.TOPOLOGY_BOLTS_WINDOW_LENGTH_DURATION_MS)).intValue(),
TimeUnit.MILLISECONDS);
}
// sliding interval
- if (stormConf.containsKey(Config.TOPOLOGY_BOLTS_SLIDING_INTERVAL_COUNT)) {
- slidingIntervalCount = new Count(((Number) stormConf.get(Config.TOPOLOGY_BOLTS_SLIDING_INTERVAL_COUNT)).intValue());
- } else if (stormConf.containsKey(Config.TOPOLOGY_BOLTS_SLIDING_INTERVAL_DURATION_MS)) {
- slidingIntervalDuration = new Duration(((Number) stormConf.get(Config.TOPOLOGY_BOLTS_SLIDING_INTERVAL_DURATION_MS)).intValue(), TimeUnit.MILLISECONDS);
+ if (topoConf.containsKey(Config.TOPOLOGY_BOLTS_SLIDING_INTERVAL_COUNT)) {
+ slidingIntervalCount = new Count(((Number) topoConf.get(Config.TOPOLOGY_BOLTS_SLIDING_INTERVAL_COUNT)).intValue());
+ } else if (topoConf.containsKey(Config.TOPOLOGY_BOLTS_SLIDING_INTERVAL_DURATION_MS)) {
+ slidingIntervalDuration = new Duration(((Number) topoConf.get(Config.TOPOLOGY_BOLTS_SLIDING_INTERVAL_DURATION_MS)).intValue(), TimeUnit.MILLISECONDS);
} else {
// default is a sliding window of count 1
slidingIntervalCount = new Count(1);
@@ -170,34 +170,34 @@ public class WindowedBoltExecutor implements IRichBolt {
// tuple ts
if (timestampExtractor != null) {
// late tuple stream
- lateTupleStream = (String) stormConf.get(Config.TOPOLOGY_BOLTS_LATE_TUPLE_STREAM);
+ lateTupleStream = (String) topoConf.get(Config.TOPOLOGY_BOLTS_LATE_TUPLE_STREAM);
if (lateTupleStream != null) {
if (!context.getThisStreams().contains(lateTupleStream)) {
throw new IllegalArgumentException("Stream for late tuples must be defined with the builder method withLateTupleStream");
}
}
// max lag
- if (stormConf.containsKey(Config.TOPOLOGY_BOLTS_TUPLE_TIMESTAMP_MAX_LAG_MS)) {
- maxLagMs = ((Number) stormConf.get(Config.TOPOLOGY_BOLTS_TUPLE_TIMESTAMP_MAX_LAG_MS)).intValue();
+ if (topoConf.containsKey(Config.TOPOLOGY_BOLTS_TUPLE_TIMESTAMP_MAX_LAG_MS)) {
+ maxLagMs = ((Number) topoConf.get(Config.TOPOLOGY_BOLTS_TUPLE_TIMESTAMP_MAX_LAG_MS)).intValue();
} else {
maxLagMs = DEFAULT_MAX_LAG_MS;
}
// watermark interval
int watermarkInterval;
- if (stormConf.containsKey(Config.TOPOLOGY_BOLTS_WATERMARK_EVENT_INTERVAL_MS)) {
- watermarkInterval = ((Number) stormConf.get(Config.TOPOLOGY_BOLTS_WATERMARK_EVENT_INTERVAL_MS)).intValue();
+ if (topoConf.containsKey(Config.TOPOLOGY_BOLTS_WATERMARK_EVENT_INTERVAL_MS)) {
+ watermarkInterval = ((Number) topoConf.get(Config.TOPOLOGY_BOLTS_WATERMARK_EVENT_INTERVAL_MS)).intValue();
} else {
watermarkInterval = DEFAULT_WATERMARK_EVENT_INTERVAL_MS;
}
waterMarkEventGenerator = new WaterMarkEventGenerator<>(manager, watermarkInterval,
maxLagMs, getComponentStreams(context));
} else {
- if (stormConf.containsKey(Config.TOPOLOGY_BOLTS_LATE_TUPLE_STREAM)) {
+ if (topoConf.containsKey(Config.TOPOLOGY_BOLTS_LATE_TUPLE_STREAM)) {
throw new IllegalArgumentException("Late tuple stream can be defined only when specifying a timestamp field");
}
}
// validate
- validate(stormConf, windowLengthCount, windowLengthDuration,
+ validate(topoConf, windowLengthCount, windowLengthDuration,
slidingIntervalCount, slidingIntervalDuration);
evictionPolicy = getEvictionPolicy(windowLengthCount, windowLengthDuration,
manager);
@@ -269,11 +269,11 @@ public class WindowedBoltExecutor implements IRichBolt {
}
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
this.windowedOutputCollector = new WindowedOutputCollector(collector);
- bolt.prepare(stormConf, context, windowedOutputCollector);
+ bolt.prepare(topoConf, context, windowedOutputCollector);
this.listener = newWindowLifecycleListener();
- this.windowManager = initWindowManager(listener, stormConf, context);
+ this.windowManager = initWindowManager(listener, topoConf, context);
start();
LOG.debug("Initialized window manager {} ", this.windowManager);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/topology/base/BaseBasicBolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/topology/base/BaseBasicBolt.java b/storm-client/src/jvm/org/apache/storm/topology/base/BaseBasicBolt.java
index 067d0fe..206cbd4 100644
--- a/storm-client/src/jvm/org/apache/storm/topology/base/BaseBasicBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/topology/base/BaseBasicBolt.java
@@ -24,7 +24,7 @@ import java.util.Map;
public abstract class BaseBasicBolt extends BaseComponent implements IBasicBolt {
@Override
- public void prepare(Map stormConf, TopologyContext context) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context) {
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/topology/base/BaseStatefulBolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/topology/base/BaseStatefulBolt.java b/storm-client/src/jvm/org/apache/storm/topology/base/BaseStatefulBolt.java
index d84d18b..c8d7fa3 100644
--- a/storm-client/src/jvm/org/apache/storm/topology/base/BaseStatefulBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/topology/base/BaseStatefulBolt.java
@@ -28,7 +28,7 @@ import java.util.Map;
public abstract class BaseStatefulBolt<T extends State> implements IStatefulBolt<T> {
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
// NOOP
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/topology/base/BaseWindowedBolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/topology/base/BaseWindowedBolt.java b/storm-client/src/jvm/org/apache/storm/topology/base/BaseWindowedBolt.java
index ba97c26..c445e9d 100644
--- a/storm-client/src/jvm/org/apache/storm/topology/base/BaseWindowedBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/topology/base/BaseWindowedBolt.java
@@ -344,7 +344,7 @@ public abstract class BaseWindowedBolt implements IWindowedBolt {
}
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
// NOOP
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/transactional/ICommitterTransactionalSpout.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/transactional/ICommitterTransactionalSpout.java b/storm-client/src/jvm/org/apache/storm/transactional/ICommitterTransactionalSpout.java
index 8f3d3e3..b28ba19 100644
--- a/storm-client/src/jvm/org/apache/storm/transactional/ICommitterTransactionalSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/transactional/ICommitterTransactionalSpout.java
@@ -27,5 +27,5 @@ public interface ICommitterTransactionalSpout<X> extends ITransactionalSpout<X>
}
@Override
- public Emitter getEmitter(Map conf, TopologyContext context);
+ public Emitter getEmitter(Map<String, Object> conf, TopologyContext context);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/transactional/ITransactionalSpout.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/transactional/ITransactionalSpout.java b/storm-client/src/jvm/org/apache/storm/transactional/ITransactionalSpout.java
index ff734d0..69c25e7 100644
--- a/storm-client/src/jvm/org/apache/storm/transactional/ITransactionalSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/transactional/ITransactionalSpout.java
@@ -83,12 +83,12 @@ public interface ITransactionalSpout<T> extends IComponent {
* of tuples should be emitted and when transactions should commit. The Coordinator that you provide
* in a TransactionalSpout provides metadata for each transaction so that the transactions can be replayed.
*/
- Coordinator<T> getCoordinator(Map conf, TopologyContext context);
+ Coordinator<T> getCoordinator(Map<String, Object> conf, TopologyContext context);
/**
* The emitter for a TransactionalSpout runs as many tasks across the cluster. Emitters are responsible for
* emitting batches of tuples for a transaction and must ensure that the same batch of tuples is always
* emitted for the same transaction id.
*/
- Emitter<T> getEmitter(Map conf, TopologyContext context);
+ Emitter<T> getEmitter(Map<String, Object> conf, TopologyContext context);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/transactional/TransactionalSpoutBatchExecutor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/transactional/TransactionalSpoutBatchExecutor.java b/storm-client/src/jvm/org/apache/storm/transactional/TransactionalSpoutBatchExecutor.java
index 9eec710..0fb337b 100644
--- a/storm-client/src/jvm/org/apache/storm/transactional/TransactionalSpoutBatchExecutor.java
+++ b/storm-client/src/jvm/org/apache/storm/transactional/TransactionalSpoutBatchExecutor.java
@@ -44,7 +44,7 @@ public class TransactionalSpoutBatchExecutor implements IRichBolt {
}
@Override
- public void prepare(Map conf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> conf, TopologyContext context, OutputCollector collector) {
_collector = new BatchOutputCollectorImpl(collector);
_emitter = _spout.getEmitter(conf, context);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/transactional/TransactionalSpoutCoordinator.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/transactional/TransactionalSpoutCoordinator.java b/storm-client/src/jvm/org/apache/storm/transactional/TransactionalSpoutCoordinator.java
index 2824373..e63a865 100644
--- a/storm-client/src/jvm/org/apache/storm/transactional/TransactionalSpoutCoordinator.java
+++ b/storm-client/src/jvm/org/apache/storm/transactional/TransactionalSpoutCoordinator.java
@@ -72,7 +72,7 @@ public class TransactionalSpoutCoordinator extends BaseRichSpout {
}
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
_rand = new Random(Utils.secureRandomLong());
_state = TransactionalState.newCoordinatorState(conf, (String) conf.get(Config.TOPOLOGY_TRANSACTIONAL_ID), _spout.getComponentConfiguration());
_coordinatorState = new RotatingTransactionalState(_state, META_DIR, true);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/transactional/TransactionalTopologyBuilder.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/transactional/TransactionalTopologyBuilder.java b/storm-client/src/jvm/org/apache/storm/transactional/TransactionalTopologyBuilder.java
index 10e727e..95bb230 100644
--- a/storm-client/src/jvm/org/apache/storm/transactional/TransactionalTopologyBuilder.java
+++ b/storm-client/src/jvm/org/apache/storm/transactional/TransactionalTopologyBuilder.java
@@ -164,7 +164,7 @@ public class TransactionalTopologyBuilder {
coordinatedArgs,
idSpec),
component.parallelism);
- for(Map conf: component.componentConfs) {
+ for(Map<String, Object> conf: component.componentConfs) {
input.addConfigurations(conf);
}
for(String c: componentBoltSubscriptions(component)) {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/transactional/partitioned/IOpaquePartitionedTransactionalSpout.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/transactional/partitioned/IOpaquePartitionedTransactionalSpout.java b/storm-client/src/jvm/org/apache/storm/transactional/partitioned/IOpaquePartitionedTransactionalSpout.java
index 35add25..c786a41 100644
--- a/storm-client/src/jvm/org/apache/storm/transactional/partitioned/IOpaquePartitionedTransactionalSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/transactional/partitioned/IOpaquePartitionedTransactionalSpout.java
@@ -51,6 +51,6 @@ public interface IOpaquePartitionedTransactionalSpout<T> extends IComponent {
void close();
}
- Emitter<T> getEmitter(Map conf, TopologyContext context);
- Coordinator getCoordinator(Map conf, TopologyContext context);
+ Emitter<T> getEmitter(Map<String, Object> conf, TopologyContext context);
+ Coordinator getCoordinator(Map<String, Object> conf, TopologyContext context);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/transactional/partitioned/IPartitionedTransactionalSpout.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/transactional/partitioned/IPartitionedTransactionalSpout.java b/storm-client/src/jvm/org/apache/storm/transactional/partitioned/IPartitionedTransactionalSpout.java
index b7e54c5..45c16f4 100644
--- a/storm-client/src/jvm/org/apache/storm/transactional/partitioned/IPartitionedTransactionalSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/transactional/partitioned/IPartitionedTransactionalSpout.java
@@ -64,6 +64,6 @@ public interface IPartitionedTransactionalSpout<T> extends IComponent {
void close();
}
- Coordinator getCoordinator(Map conf, TopologyContext context);
- Emitter<T> getEmitter(Map conf, TopologyContext context);
+ Coordinator getCoordinator(Map<String, Object> conf, TopologyContext context);
+ Emitter<T> getEmitter(Map<String, Object> conf, TopologyContext context);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/transactional/partitioned/OpaquePartitionedTransactionalSpoutExecutor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/transactional/partitioned/OpaquePartitionedTransactionalSpoutExecutor.java b/storm-client/src/jvm/org/apache/storm/transactional/partitioned/OpaquePartitionedTransactionalSpoutExecutor.java
index 03e8b31..c38f307 100644
--- a/storm-client/src/jvm/org/apache/storm/transactional/partitioned/OpaquePartitionedTransactionalSpoutExecutor.java
+++ b/storm-client/src/jvm/org/apache/storm/transactional/partitioned/OpaquePartitionedTransactionalSpoutExecutor.java
@@ -40,7 +40,7 @@ public class OpaquePartitionedTransactionalSpoutExecutor implements ICommitterTr
public class Coordinator implements ITransactionalSpout.Coordinator<Object> {
IOpaquePartitionedTransactionalSpout.Coordinator _coordinator;
- public Coordinator(Map conf, TopologyContext context) {
+ public Coordinator(Map<String, Object> conf, TopologyContext context) {
_coordinator = _spout.getCoordinator(conf, context);
}
@@ -68,7 +68,7 @@ public class OpaquePartitionedTransactionalSpoutExecutor implements ICommitterTr
int _index;
int _numTasks;
- public Emitter(Map conf, TopologyContext context) {
+ public Emitter(Map<String, Object> conf, TopologyContext context) {
_emitter = _spout.getEmitter(conf, context);
_index = context.getThisTaskIndex();
_numTasks = context.getComponentTasks(context.getThisComponentId()).size();
@@ -138,12 +138,12 @@ public class OpaquePartitionedTransactionalSpoutExecutor implements ICommitterTr
}
@Override
- public ITransactionalSpout.Coordinator<Object> getCoordinator(Map conf, TopologyContext context) {
+ public ITransactionalSpout.Coordinator<Object> getCoordinator(Map<String, Object> conf, TopologyContext context) {
return new Coordinator(conf, context);
}
@Override
- public ICommitterTransactionalSpout.Emitter getEmitter(Map conf, TopologyContext context) {
+ public ICommitterTransactionalSpout.Emitter getEmitter(Map<String, Object> conf, TopologyContext context) {
return new Emitter(conf, context);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/transactional/partitioned/PartitionedTransactionalSpoutExecutor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/transactional/partitioned/PartitionedTransactionalSpoutExecutor.java b/storm-client/src/jvm/org/apache/storm/transactional/partitioned/PartitionedTransactionalSpoutExecutor.java
index 952beaf..e159b75 100644
--- a/storm-client/src/jvm/org/apache/storm/transactional/partitioned/PartitionedTransactionalSpoutExecutor.java
+++ b/storm-client/src/jvm/org/apache/storm/transactional/partitioned/PartitionedTransactionalSpoutExecutor.java
@@ -44,7 +44,7 @@ public class PartitionedTransactionalSpoutExecutor implements ITransactionalSpou
class Coordinator implements ITransactionalSpout.Coordinator<Integer> {
private IPartitionedTransactionalSpout.Coordinator _coordinator;
- public Coordinator(Map conf, TopologyContext context) {
+ public Coordinator(Map<String, Object> conf, TopologyContext context) {
_coordinator = _spout.getCoordinator(conf, context);
}
@@ -71,7 +71,7 @@ public class PartitionedTransactionalSpoutExecutor implements ITransactionalSpou
private int _index;
private int _numTasks;
- public Emitter(Map conf, TopologyContext context) {
+ public Emitter(Map<String, Object> conf, TopologyContext context) {
_emitter = _spout.getEmitter(conf, context);
_state = TransactionalState.newUserState(conf, (String) conf.get(Config.TOPOLOGY_TRANSACTIONAL_ID), getComponentConfiguration());
_index = context.getThisTaskIndex();
@@ -120,12 +120,12 @@ public class PartitionedTransactionalSpoutExecutor implements ITransactionalSpou
}
@Override
- public ITransactionalSpout.Coordinator getCoordinator(Map conf, TopologyContext context) {
+ public ITransactionalSpout.Coordinator getCoordinator(Map<String, Object> conf, TopologyContext context) {
return new Coordinator(conf, context);
}
@Override
- public ITransactionalSpout.Emitter getEmitter(Map conf, TopologyContext context) {
+ public ITransactionalSpout.Emitter getEmitter(Map<String, Object> conf, TopologyContext context) {
return new Emitter(conf, context);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 da30f19..bf6b181 100644
--- a/storm-client/src/jvm/org/apache/storm/transactional/state/TestTransactionalState.java
+++ b/storm-client/src/jvm/org/apache/storm/transactional/state/TestTransactionalState.java
@@ -35,7 +35,7 @@ public class TestTransactionalState extends TransactionalState {
* Matching constructor in absence of a default constructor in the parent
* class.
*/
- protected TestTransactionalState(Map conf, String id, Map componentConf, String subroot) {
+ protected TestTransactionalState(Map<String, Object> conf, String id, Map componentConf, String subroot) {
super(conf, id, componentConf, subroot);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 eb50522..d7079f3 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,15 +43,15 @@ public class TransactionalState {
KryoValuesDeserializer _des;
List<ACL> _zkAcls = null;
- public static TransactionalState newUserState(Map conf, String id, Map componentConf) {
+ public static TransactionalState newUserState(Map<String, Object> conf, String id, Map componentConf) {
return new TransactionalState(conf, id, componentConf, "user");
}
- public static TransactionalState newCoordinatorState(Map conf, String id, Map componentConf) {
+ public static TransactionalState newCoordinatorState(Map<String, Object> conf, String id, Map componentConf) {
return new TransactionalState(conf, id, componentConf, "coordinator");
}
- protected TransactionalState(Map conf, String id, Map componentConf, String subroot) {
+ protected TransactionalState(Map<String, Object> conf, String id, Map componentConf, String subroot) {
try {
conf = new HashMap(conf);
// ensure that the serialization registrations are consistent with the declarations in this spout
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/JoinOutFieldsMode.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/JoinOutFieldsMode.java b/storm-client/src/jvm/org/apache/storm/trident/JoinOutFieldsMode.java
index f563390..cb8af00 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/JoinOutFieldsMode.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/JoinOutFieldsMode.java
@@ -30,4 +30,4 @@ package org.apache.storm.trident;
public enum JoinOutFieldsMode {
COMPACT,
PRESERVE
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 41e416e..d550080 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/TridentTopology.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/TridentTopology.java
@@ -792,7 +792,7 @@ public class TridentTopology {
for(Group g: groups) {
if(isSpoutGroup(g)) {
SpoutNode n = (SpoutNode) g.nodes.iterator().next();
- Map conf = getSpoutComponentConfig(n.spout);
+ Map<String, Object> conf = getSpoutComponentConfig(n.spout);
if(conf==null) conf = new HashMap();
Number maxP = (Number) conf.get(Config.TOPOLOGY_MAX_TASK_PARALLELISM);
if(maxP!=null) {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 a8b4fc9..617a42f 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
@@ -51,12 +51,12 @@ public class ReturnResultsReducer implements MultiReducer<ReturnResultsState> {
}
}
boolean local;
- Map conf;
+ Map<String, Object> conf;
Map<List, DRPCInvocationsClient> _clients = new HashMap<>();
@Override
- public void prepare(Map conf, TridentMultiReducerContext context) {
+ public void prepare(Map<String, Object> conf, TridentMultiReducerContext context) {
this.conf = conf;
local = conf.get(Config.STORM_CLUSTER_MODE).equals("local");
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/operation/BaseMultiReducer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/operation/BaseMultiReducer.java b/storm-client/src/jvm/org/apache/storm/trident/operation/BaseMultiReducer.java
index 87df6ef..7ff5e54 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/operation/BaseMultiReducer.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/operation/BaseMultiReducer.java
@@ -22,7 +22,7 @@ import java.util.Map;
public abstract class BaseMultiReducer<T> implements MultiReducer<T> {
@Override
- public void prepare(Map conf, TridentMultiReducerContext context) {
+ public void prepare(Map<String, Object> conf, TridentMultiReducerContext context) {
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/operation/BaseOperation.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/operation/BaseOperation.java b/storm-client/src/jvm/org/apache/storm/trident/operation/BaseOperation.java
index f1cf809..7e32fac 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/operation/BaseOperation.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/operation/BaseOperation.java
@@ -34,7 +34,7 @@ public class BaseOperation implements Operation {
* metrics.
*/
@Override
- public void prepare(Map conf, TridentOperationContext context) {
+ public void prepare(Map<String, Object> conf, TridentOperationContext context) {
}
/**
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/operation/DefaultResourceDeclarer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/operation/DefaultResourceDeclarer.java b/storm-client/src/jvm/org/apache/storm/trident/operation/DefaultResourceDeclarer.java
index d6ee339..efe2b93 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/operation/DefaultResourceDeclarer.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/operation/DefaultResourceDeclarer.java
@@ -30,7 +30,7 @@ import org.apache.storm.topology.ResourceDeclarer;
public class DefaultResourceDeclarer<T extends DefaultResourceDeclarer> implements ResourceDeclarer<T>, ITridentResource {
private Map<String, Number> resources = new HashMap<>();
- private static Map conf = Utils.readStormConfig();
+ private static Map<String, Object> conf = Utils.readStormConfig();
@Override
public T setMemoryLoad(Number onHeap) {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/operation/GroupedMultiReducer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/operation/GroupedMultiReducer.java b/storm-client/src/jvm/org/apache/storm/trident/operation/GroupedMultiReducer.java
index 7d3f834..303cae1 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/operation/GroupedMultiReducer.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/operation/GroupedMultiReducer.java
@@ -23,7 +23,7 @@ import org.apache.storm.trident.tuple.TridentTuple;
public interface GroupedMultiReducer<T> extends Serializable {
- void prepare(Map conf, TridentMultiReducerContext context);
+ void prepare(Map<String, Object> conf, TridentMultiReducerContext context);
T init(TridentCollector collector, TridentTuple group);
void execute(T state, int streamIndex, TridentTuple group, TridentTuple input, TridentCollector collector);
void complete(T state, TridentTuple group, TridentCollector collector);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/operation/MultiReducer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/operation/MultiReducer.java b/storm-client/src/jvm/org/apache/storm/trident/operation/MultiReducer.java
index 7e1494a..5c53fc3 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/operation/MultiReducer.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/operation/MultiReducer.java
@@ -23,7 +23,7 @@ import org.apache.storm.trident.tuple.TridentTuple;
public interface MultiReducer<T> extends Serializable {
- void prepare(Map conf, TridentMultiReducerContext context);
+ void prepare(Map<String, Object> conf, TridentMultiReducerContext context);
T init(TridentCollector collector);
void execute(T state, int streamIndex, TridentTuple input, TridentCollector collector);
void complete(T state, TridentCollector collector);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/operation/Operation.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/operation/Operation.java b/storm-client/src/jvm/org/apache/storm/trident/operation/Operation.java
index 878a5c2..46790da 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/operation/Operation.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/operation/Operation.java
@@ -37,7 +37,7 @@ public interface Operation extends Serializable {
* metrics.
* @see org.apache.storm.trident.operation.TridentOperationContext
*/
- void prepare(Map conf, TridentOperationContext context);
+ void prepare(Map<String, Object> conf, TridentOperationContext context);
/**
* When running in local mode, called when the local cluster is being shut down.
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/operation/builtin/Negate.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/operation/builtin/Negate.java b/storm-client/src/jvm/org/apache/storm/trident/operation/builtin/Negate.java
index 32888ad..80a02e6 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/operation/builtin/Negate.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/operation/builtin/Negate.java
@@ -64,7 +64,7 @@ public class Negate implements Filter {
}
@Override
- public void prepare(Map conf, TridentOperationContext context) {
+ public void prepare(Map<String, Object> conf, TridentOperationContext context) {
_delegate.prepare(conf, context);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/operation/impl/ChainedAggregatorImpl.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/ChainedAggregatorImpl.java b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/ChainedAggregatorImpl.java
index feb91d4..82a59d4 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/ChainedAggregatorImpl.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/ChainedAggregatorImpl.java
@@ -45,7 +45,7 @@ public class ChainedAggregatorImpl implements Aggregator<ChainedResult> {
}
}
- public void prepare(Map conf, TridentOperationContext context) {
+ public void prepare(Map<String, Object> conf, TridentOperationContext context) {
_inputFactories = new ProjectionFactory[_inputFields.length];
for(int i=0; i<_inputFields.length; i++) {
_inputFactories[i] = context.makeProjectionFactory(_inputFields[i]);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/operation/impl/CombinerAggStateUpdater.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/CombinerAggStateUpdater.java b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/CombinerAggStateUpdater.java
index 7dc6409..bc28264 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/CombinerAggStateUpdater.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/CombinerAggStateUpdater.java
@@ -46,7 +46,7 @@ public class CombinerAggStateUpdater implements StateUpdater<Snapshottable> {
}
@Override
- public void prepare(Map conf, TridentOperationContext context) {
+ public void prepare(Map<String, Object> conf, TridentOperationContext context) {
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/operation/impl/CombinerAggregatorCombineImpl.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/CombinerAggregatorCombineImpl.java b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/CombinerAggregatorCombineImpl.java
index e53e478..62ffe22 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/CombinerAggregatorCombineImpl.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/CombinerAggregatorCombineImpl.java
@@ -32,7 +32,7 @@ public class CombinerAggregatorCombineImpl implements Aggregator<Result> {
_agg = agg;
}
- public void prepare(Map conf, TridentOperationContext context) {
+ public void prepare(Map<String, Object> conf, TridentOperationContext context) {
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/operation/impl/CombinerAggregatorInitImpl.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/CombinerAggregatorInitImpl.java b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/CombinerAggregatorInitImpl.java
index c661111..9e2186d 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/CombinerAggregatorInitImpl.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/CombinerAggregatorInitImpl.java
@@ -39,7 +39,7 @@ public class CombinerAggregatorInitImpl implements Function {
}
@Override
- public void prepare(Map conf, TridentOperationContext context) {
+ public void prepare(Map<String, Object> conf, TridentOperationContext context) {
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/operation/impl/FilterExecutor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/FilterExecutor.java b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/FilterExecutor.java
index 1db44f9..15fea1a 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/FilterExecutor.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/FilterExecutor.java
@@ -41,7 +41,7 @@ public class FilterExecutor implements Function {
}
@Override
- public void prepare(Map conf, TridentOperationContext context) {
+ public void prepare(Map<String, Object> conf, TridentOperationContext context) {
_filter.prepare(conf, context);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/operation/impl/FlatMapFunctionExecutor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/FlatMapFunctionExecutor.java b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/FlatMapFunctionExecutor.java
index eb83e99..5a1f09a 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/FlatMapFunctionExecutor.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/FlatMapFunctionExecutor.java
@@ -36,7 +36,7 @@ public class FlatMapFunctionExecutor extends BaseOperation implements Function {
}
@Override
- public void prepare(Map conf, TridentOperationContext context) {
+ public void prepare(Map<String, Object> conf, TridentOperationContext context) {
// If FlatMapFunction is aware of prepare, let it handle preparation
if (function instanceof Operation) {
((Operation) function).prepare(conf, context);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/operation/impl/GroupedAggregator.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/GroupedAggregator.java b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/GroupedAggregator.java
index 86da9cb..1b03ecb 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/GroupedAggregator.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/GroupedAggregator.java
@@ -49,7 +49,7 @@ public class GroupedAggregator implements Aggregator<Object[]> {
}
@Override
- public void prepare(Map conf, TridentOperationContext context) {
+ public void prepare(Map<String, Object> conf, TridentOperationContext context) {
_inputFactory = context.makeProjectionFactory(_inFields);
_groupFactory = context.makeProjectionFactory(_groupFields);
_agg.prepare(conf, new TridentOperationContext(context, _inputFactory));
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/operation/impl/GroupedMultiReducerExecutor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/GroupedMultiReducerExecutor.java b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/GroupedMultiReducerExecutor.java
index a2cb5f6..4a12389 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/GroupedMultiReducerExecutor.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/GroupedMultiReducerExecutor.java
@@ -47,7 +47,7 @@ public class GroupedMultiReducerExecutor implements MultiReducer<Map<TridentTupl
}
@Override
- public void prepare(Map conf, TridentMultiReducerContext context) {
+ public void prepare(Map<String, Object> conf, TridentMultiReducerContext context) {
for(int i=0; i<_groupFields.size(); i++) {
_groupFactories.add(context.makeProjectionFactory(i, _groupFields.get(i)));
_inputFactories.add(context.makeProjectionFactory(i, _inputFields.get(i)));
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/operation/impl/IdentityMultiReducer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/IdentityMultiReducer.java b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/IdentityMultiReducer.java
index 0d5d129..92ef9d4 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/IdentityMultiReducer.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/IdentityMultiReducer.java
@@ -27,7 +27,7 @@ import org.apache.storm.trident.tuple.TridentTuple;
public class IdentityMultiReducer<T> implements MultiReducer<T> {
@Override
- public void prepare(Map conf, TridentMultiReducerContext context) {
+ public void prepare(Map<String, Object> conf, TridentMultiReducerContext context) {
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/operation/impl/JoinerMultiReducer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/JoinerMultiReducer.java b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/JoinerMultiReducer.java
index 3ed2e12..346b702 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/JoinerMultiReducer.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/JoinerMultiReducer.java
@@ -43,7 +43,7 @@ public class JoinerMultiReducer implements GroupedMultiReducer<JoinState> {
}
@Override
- public void prepare(Map conf, TridentMultiReducerContext context) {
+ public void prepare(Map<String, Object> conf, TridentMultiReducerContext context) {
int[] sizes = new int[_sideFields.size() + 1];
sizes[0] = _numGroupFields;
for (int i = 0; i < _sideFields.size(); i++) {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/operation/impl/MapFunctionExecutor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/MapFunctionExecutor.java b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/MapFunctionExecutor.java
index 1e0b7fb..b73b4f5 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/MapFunctionExecutor.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/MapFunctionExecutor.java
@@ -36,7 +36,7 @@ public class MapFunctionExecutor extends BaseOperation implements Function {
}
@Override
- public void prepare(Map conf, TridentOperationContext context) {
+ public void prepare(Map<String, Object> conf, TridentOperationContext context) {
// If MapFunction is aware of prepare, let it handle preparation
if (function instanceof Operation) {
((Operation) function).prepare(conf, context);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/operation/impl/PreservingFieldsOrderJoinerMultiReducer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/PreservingFieldsOrderJoinerMultiReducer.java b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/PreservingFieldsOrderJoinerMultiReducer.java
index 07ce0d8..3afcabe 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/PreservingFieldsOrderJoinerMultiReducer.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/PreservingFieldsOrderJoinerMultiReducer.java
@@ -50,7 +50,7 @@ public class PreservingFieldsOrderJoinerMultiReducer implements GroupedMultiRedu
}
@Override
- public void prepare(Map conf, TridentMultiReducerContext context) {
+ public void prepare(Map<String, Object> conf, TridentMultiReducerContext context) {
int[] sizes = new int[_originFields.size()];
for (int i = 0; i < _originFields.size(); i++) {
sizes[i] = _originFields.get(i).size();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/operation/impl/ReducerAggStateUpdater.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/ReducerAggStateUpdater.java b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/ReducerAggStateUpdater.java
index 2090b73..9df2703 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/ReducerAggStateUpdater.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/ReducerAggStateUpdater.java
@@ -43,7 +43,7 @@ public class ReducerAggStateUpdater implements StateUpdater<Snapshottable> {
}
@Override
- public void prepare(Map conf, TridentOperationContext context) {
+ public void prepare(Map<String, Object> conf, TridentOperationContext context) {
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/operation/impl/ReducerAggregatorImpl.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/ReducerAggregatorImpl.java b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/ReducerAggregatorImpl.java
index e361a37..72ec5f2 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/ReducerAggregatorImpl.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/ReducerAggregatorImpl.java
@@ -32,7 +32,7 @@ public class ReducerAggregatorImpl implements Aggregator<Result> {
_agg = agg;
}
- public void prepare(Map conf, TridentOperationContext context) {
+ public void prepare(Map<String, Object> conf, TridentOperationContext context) {
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/operation/impl/SingleEmitAggregator.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/SingleEmitAggregator.java b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/SingleEmitAggregator.java
index a73770f..526c7bf 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/SingleEmitAggregator.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/SingleEmitAggregator.java
@@ -80,7 +80,7 @@ public class SingleEmitAggregator implements Aggregator<SingleEmitState> {
int totalPartitions;
@Override
- public void prepare(Map conf, TridentOperationContext context) {
+ public void prepare(Map<String, Object> conf, TridentOperationContext context) {
_agg.prepare(conf, context);
this.myPartitionIndex = context.getPartitionIndex();
this.totalPartitions = context.numPartitions();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/operation/impl/TrueFilter.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/TrueFilter.java b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/TrueFilter.java
index 99b6e58..48b0341 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/TrueFilter.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/TrueFilter.java
@@ -30,7 +30,7 @@ public class TrueFilter implements Filter {
}
@Override
- public void prepare(Map conf, TridentOperationContext context) {
+ public void prepare(Map<String, Object> conf, TridentOperationContext context) {
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/planner/SubtopologyBolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/planner/SubtopologyBolt.java b/storm-client/src/jvm/org/apache/storm/trident/planner/SubtopologyBolt.java
index 780c01f..015f41a 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/planner/SubtopologyBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/planner/SubtopologyBolt.java
@@ -94,7 +94,7 @@ public class SubtopologyBolt implements ITridentBatchBolt {
}
@Override
- public void prepare(Map conf, TopologyContext context, BatchOutputCollector batchCollector) {
+ public void prepare(Map<String, Object> conf, TopologyContext context, BatchOutputCollector batchCollector) {
int thisComponentNumTasks = context.getComponentTasks(context.getThisComponentId()).size();
for(Node n: _nodes) {
if(n.stateInfo!=null) {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/planner/TridentProcessor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/planner/TridentProcessor.java b/storm-client/src/jvm/org/apache/storm/trident/planner/TridentProcessor.java
index 4f346c6..78c3675 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/planner/TridentProcessor.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/planner/TridentProcessor.java
@@ -29,7 +29,7 @@ public interface TridentProcessor extends Serializable, TupleReceiver {
// preparation is done, therefore, receivers won't be ready to receive tuples yet
// can't emit tuples from here anyway, since it's not within a batch context (which is only
// startBatch, execute, and finishBatch
- void prepare(Map conf, TopologyContext context, TridentContext tridentContext);
+ void prepare(Map<String, Object> conf, TopologyContext context, TridentContext tridentContext);
void cleanup();
void startBatch(ProcessorContext processorContext);
[11/13] storm git commit: STORM-2477: Result of transforming the code
Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/windowing/HBaseWindowsStore.java
----------------------------------------------------------------------
diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/windowing/HBaseWindowsStore.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/windowing/HBaseWindowsStore.java
index e319a55..702a790 100644
--- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/windowing/HBaseWindowsStore.java
+++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/windowing/HBaseWindowsStore.java
@@ -56,7 +56,7 @@ public class HBaseWindowsStore implements WindowsStore {
private final byte[] family;
private final byte[] qualifier;
- public HBaseWindowsStore(final Map stormConf, final Configuration config, final String tableName, byte[] family, byte[] qualifier) {
+ public HBaseWindowsStore(final Map<String, Object> topoConf, final Configuration config, final String tableName, byte[] family, byte[] qualifier) {
this.family = family;
this.qualifier = qualifier;
@@ -76,7 +76,7 @@ public class HBaseWindowsStore implements WindowsStore {
threadLocalWindowKryoSerializer = new ThreadLocal<WindowKryoSerializer>(){
@Override
protected WindowKryoSerializer initialValue() {
- return new WindowKryoSerializer(stormConf);
+ return new WindowKryoSerializer(topoConf);
}
};
@@ -268,4 +268,4 @@ public class HBaseWindowsStore implements WindowsStore {
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/windowing/HBaseWindowsStoreFactory.java
----------------------------------------------------------------------
diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/windowing/HBaseWindowsStoreFactory.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/windowing/HBaseWindowsStoreFactory.java
index a455924..f0c8805 100644
--- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/windowing/HBaseWindowsStoreFactory.java
+++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/windowing/HBaseWindowsStoreFactory.java
@@ -42,14 +42,14 @@ public class HBaseWindowsStoreFactory implements WindowsStoreFactory {
this.qualifier = qualifier;
}
- public WindowsStore create(Map stormConf) {
+ public WindowsStore create(Map<String, Object> topoConf) {
Configuration configuration = HBaseConfiguration.create();
for (Map.Entry<String, Object> entry : config.entrySet()) {
if (entry.getValue() != null) {
configuration.set(entry.getKey(), entry.getValue().toString());
}
}
- return new HBaseWindowsStore(stormConf, configuration, tableName, family, qualifier);
+ return new HBaseWindowsStore(topoConf, configuration, tableName, family, qualifier);
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/avro/ConfluentAvroSerializer.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/avro/ConfluentAvroSerializer.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/avro/ConfluentAvroSerializer.java
index 2008a3e..bb03a11 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/avro/ConfluentAvroSerializer.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/avro/ConfluentAvroSerializer.java
@@ -50,11 +50,11 @@ public class ConfluentAvroSerializer extends AbstractAvroSerializer {
* See Storm's SerializationFactory class for details
*
* @param k Unused but needs to be present for Serialization Factory to find this constructor
- * @param stormConf The global storm configuration. Must define "avro.schemaregistry.confluent" to locate the
+ * @param topoConf The global storm configuration. Must define "avro.schemaregistry.confluent" to locate the
* confluent schema registry. Should in the form of "http://HOST:PORT"
*/
- public ConfluentAvroSerializer(Kryo k, Map stormConf) {
- url = (String) stormConf.get("avro.schemaregistry.confluent");
+ public ConfluentAvroSerializer(Kryo k, Map<String, Object> topoConf) {
+ url = (String) topoConf.get("avro.schemaregistry.confluent");
this.theClient = new CachedSchemaRegistryClient(this.url, 10000);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/avro/GenericAvroSerializer.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/avro/GenericAvroSerializer.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/avro/GenericAvroSerializer.java
index ecf8c49..fedf698 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/avro/GenericAvroSerializer.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/avro/GenericAvroSerializer.java
@@ -33,4 +33,4 @@ public class GenericAvroSerializer extends AbstractAvroSerializer {
public Schema getSchema(String fingerPrint) {
return new Schema.Parser().parse(fingerPrint);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStore.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStore.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStore.java
index dadabe8..a0aa8dc 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStore.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStore.java
@@ -76,7 +76,7 @@ public class HdfsBlobStore extends BlobStore {
private BlobStoreAclHandler _aclHandler;
private HdfsBlobStoreImpl _hbs;
private Subject _localSubject;
- private Map conf;
+ private Map<String, Object> conf;
/**
* Get the subject from Hadoop so we can use it to validate the acls. There is no direct
@@ -112,7 +112,7 @@ public class HdfsBlobStore extends BlobStore {
}
@Override
- public void prepare(Map conf, String overrideBase, NimbusInfo nimbusInfo) {
+ public void prepare(Map<String, Object> conf, String overrideBase, NimbusInfo nimbusInfo) {
this.conf = conf;
prepareInternal(conf, overrideBase, null);
}
@@ -121,7 +121,7 @@ public class HdfsBlobStore extends BlobStore {
* Allow a Hadoop Configuration to be passed for testing. If it's null then the hadoop configs
* must be in your classpath.
*/
- protected void prepareInternal(Map conf, String overrideBase, Configuration hadoopConf) {
+ protected void prepareInternal(Map<String, Object> conf, String overrideBase, Configuration hadoopConf) {
this.conf = conf;
if (overrideBase == null) {
overrideBase = (String)conf.get(Config.BLOBSTORE_DIR);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsClientBlobStore.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsClientBlobStore.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsClientBlobStore.java
index d88211c..389dc71 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsClientBlobStore.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsClientBlobStore.java
@@ -48,7 +48,7 @@ public class HdfsClientBlobStore extends ClientBlobStore {
private NimbusClient client;
@Override
- public void prepare(Map conf) {
+ public void prepare(Map<String, Object> conf) {
this._conf = conf;
_blobStore = new HdfsBlobStore();
_blobStore.prepare(conf, null, null);
@@ -105,7 +105,7 @@ public class HdfsClientBlobStore extends ClientBlobStore {
}
@Override
- public boolean setClient(Map conf, NimbusClient client) {
+ public boolean setClient(Map<String, Object> conf, NimbusClient client) {
this.client = client;
return true;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java
index 395cced..6de2398 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java
@@ -99,7 +99,7 @@ public abstract class AbstractHdfsBolt extends BaseRichBolt {
* @param topologyContext
* @param collector
*/
- public final void prepare(Map conf, TopologyContext topologyContext, OutputCollector collector){
+ public final void prepare(Map<String, Object> conf, TopologyContext topologyContext, OutputCollector collector){
this.writeLock = new Object();
if (this.syncPolicy == null) throw new IllegalStateException("SyncPolicy must be specified.");
if (this.rotationPolicy == null) throw new IllegalStateException("RotationPolicy must be specified.");
@@ -302,7 +302,7 @@ public abstract class AbstractHdfsBolt extends BaseRichBolt {
this.fileNameFormat.getName(rotation, System.currentTimeMillis()));
}
- abstract protected void doPrepare(Map conf, TopologyContext topologyContext, OutputCollector collector) throws IOException;
+ abstract protected void doPrepare(Map<String, Object> conf, TopologyContext topologyContext, OutputCollector collector) throws IOException;
abstract protected String getWriterKey(Tuple tuple);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AvroGenericRecordBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AvroGenericRecordBolt.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AvroGenericRecordBolt.java
index e173d2a..9ab0e12 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AvroGenericRecordBolt.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AvroGenericRecordBolt.java
@@ -88,7 +88,7 @@ public class AvroGenericRecordBolt extends AbstractHdfsBolt{
}
@Override
- protected void doPrepare(Map conf, TopologyContext topologyContext, OutputCollector collector) throws IOException {
+ protected void doPrepare(Map<String, Object> conf, TopologyContext topologyContext, OutputCollector collector) throws IOException {
LOG.info("Preparing AvroGenericRecord Bolt...");
this.fs = FileSystem.get(URI.create(this.fsUrl), hdfsConfig);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/HdfsBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/HdfsBolt.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/HdfsBolt.java
index 614de6b..ba8b24e 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/HdfsBolt.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/HdfsBolt.java
@@ -101,7 +101,7 @@ public class HdfsBolt extends AbstractHdfsBolt{
}
@Override
- public void doPrepare(Map conf, TopologyContext topologyContext, OutputCollector collector) throws IOException {
+ public void doPrepare(Map<String, Object> conf, TopologyContext topologyContext, OutputCollector collector) throws IOException {
LOG.info("Preparing HDFS Bolt...");
this.fs = FileSystem.get(URI.create(this.fsUrl), hdfsConfig);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/SequenceFileBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/SequenceFileBolt.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/SequenceFileBolt.java
index 3c78075..b2120dc 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/SequenceFileBolt.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/SequenceFileBolt.java
@@ -118,7 +118,7 @@ public class SequenceFileBolt extends AbstractHdfsBolt {
}
@Override
- public void doPrepare(Map conf, TopologyContext topologyContext, OutputCollector collector) throws IOException {
+ public void doPrepare(Map<String, Object> conf, TopologyContext topologyContext, OutputCollector collector) throws IOException {
LOG.info("Preparing Sequence File Bolt...");
if (this.format == null) throw new IllegalStateException("SequenceFormat must be specified.");
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/DefaultFileNameFormat.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/DefaultFileNameFormat.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/DefaultFileNameFormat.java
index 3bc9904..a3afa18 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/DefaultFileNameFormat.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/DefaultFileNameFormat.java
@@ -70,7 +70,7 @@ public class DefaultFileNameFormat implements FileNameFormat {
}
@Override
- public void prepare(Map conf, TopologyContext topologyContext) {
+ public void prepare(Map<String, Object> conf, TopologyContext topologyContext) {
this.componentId = topologyContext.getThisComponentId();
this.taskId = topologyContext.getThisTaskId();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/FileNameFormat.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/FileNameFormat.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/FileNameFormat.java
index 90e99cb..9ef2851 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/FileNameFormat.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/FileNameFormat.java
@@ -28,7 +28,7 @@ import java.util.Map;
*/
public interface FileNameFormat extends Serializable {
- void prepare(Map conf, TopologyContext topologyContext);
+ void prepare(Map<String, Object> conf, TopologyContext topologyContext);
/**
* Returns the filename the HdfsBolt will create.
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/SimpleFileNameFormat.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/SimpleFileNameFormat.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/SimpleFileNameFormat.java
index 43273f6..cb37bdc 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/SimpleFileNameFormat.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/SimpleFileNameFormat.java
@@ -56,7 +56,7 @@ public class SimpleFileNameFormat implements FileNameFormat {
@SuppressWarnings("unchecked")
@Override
- public void prepare(Map conf, TopologyContext topologyContext) {
+ public void prepare(Map<String, Object> conf, TopologyContext topologyContext) {
this.componentId = topologyContext.getThisComponentId();
this.taskId = topologyContext.getThisTaskId();
try {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/FileOffset.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/FileOffset.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/FileOffset.java
index ad48779..78296b9 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/FileOffset.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/FileOffset.java
@@ -33,4 +33,4 @@ interface FileOffset extends Comparable<FileOffset>, Cloneable {
/** tests if rhs == currOffset+1 */
boolean isNextOffset(FileOffset rhs);
FileOffset clone();
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/HdfsSpout.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/HdfsSpout.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/HdfsSpout.java
index b956326..43face6 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/HdfsSpout.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/HdfsSpout.java
@@ -89,7 +89,7 @@ public class HdfsSpout extends BaseRichSpout {
private Configuration hdfsConfig;
- private Map conf = null;
+ private Map<String, Object> conf = null;
private FileLock lock;
private String spoutId = null;
@@ -365,7 +365,7 @@ public class HdfsSpout extends BaseRichSpout {
}
@SuppressWarnings("deprecation")
-public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
LOG.info("Opening HDFS Spout");
this.conf = conf;
this.commitTimer = new Timer();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/SequenceFileReader.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/SequenceFileReader.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/SequenceFileReader.java
index 7ed8639..64b6b7a 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/SequenceFileReader.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/SequenceFileReader.java
@@ -49,7 +49,7 @@ public class SequenceFileReader<Key extends Writable,Value extends Writable>
private final Value value;
- public SequenceFileReader(FileSystem fs, Path file, Map conf)
+ public SequenceFileReader(FileSystem fs, Path file, Map<String, Object> conf)
throws IOException {
super(fs, file);
int bufferSize = !conf.containsKey(BUFFER_SIZE) ? DEFAULT_BUFF_SIZE : Integer.parseInt( conf.get(BUFFER_SIZE).toString() );
@@ -59,7 +59,7 @@ public class SequenceFileReader<Key extends Writable,Value extends Writable>
this.offset = new SequenceFileReader.Offset(0,0,0);
}
- public SequenceFileReader(FileSystem fs, Path file, Map conf, String offset)
+ public SequenceFileReader(FileSystem fs, Path file, Map<String, Object> conf, String offset)
throws IOException {
super(fs, file);
int bufferSize = !conf.containsKey(BUFFER_SIZE) ? DEFAULT_BUFF_SIZE : Integer.parseInt( conf.get(BUFFER_SIZE).toString() );
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/TextFileReader.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/TextFileReader.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/TextFileReader.java
index 6da9860..a393238 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/TextFileReader.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/TextFileReader.java
@@ -43,15 +43,15 @@ public class TextFileReader extends AbstractFileReader {
private final Logger LOG = LoggerFactory.getLogger(TextFileReader.class);
private TextFileReader.Offset offset;
- public TextFileReader(FileSystem fs, Path file, Map conf) throws IOException {
+ public TextFileReader(FileSystem fs, Path file, Map<String, Object> conf) throws IOException {
this(fs, file, conf, new TextFileReader.Offset(0,0) );
}
- public TextFileReader(FileSystem fs, Path file, Map conf, String startOffset) throws IOException {
+ public TextFileReader(FileSystem fs, Path file, Map<String, Object> conf, String startOffset) throws IOException {
this(fs, file, conf, new TextFileReader.Offset(startOffset) );
}
- private TextFileReader(FileSystem fs, Path file, Map conf, TextFileReader.Offset startOffset)
+ private TextFileReader(FileSystem fs, Path file, Map<String, Object> conf, TextFileReader.Offset startOffset)
throws IOException {
super(fs, file);
offset = startOffset;
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/HdfsState.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/HdfsState.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/HdfsState.java
index a863643..07968f2 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/HdfsState.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/HdfsState.java
@@ -76,7 +76,7 @@ public class HdfsState implements State {
abstract void execute(List<TridentTuple> tuples) throws IOException;
- abstract void doPrepare(Map conf, int partitionIndex, int numPartitions) throws IOException;
+ abstract void doPrepare(Map<String, Object> conf, int partitionIndex, int numPartitions) throws IOException;
abstract long getCurrentOffset() throws IOException;
@@ -106,7 +106,7 @@ public class HdfsState implements State {
}
- void prepare(Map conf, int partitionIndex, int numPartitions) {
+ void prepare(Map<String, Object> conf, int partitionIndex, int numPartitions) {
if (this.rotationPolicy == null) {
throw new IllegalStateException("RotationPolicy must be specified.");
} else if (this.rotationPolicy instanceof FileSizeRotationPolicy) {
@@ -221,7 +221,7 @@ public class HdfsState implements State {
}
@Override
- void doPrepare(Map conf, int partitionIndex, int numPartitions) throws IOException {
+ void doPrepare(Map<String, Object> conf, int partitionIndex, int numPartitions) throws IOException {
LOG.info("Preparing HDFS File state...");
this.fs = FileSystem.get(URI.create(this.fsUrl), hdfsConfig);
}
@@ -333,7 +333,7 @@ public class HdfsState implements State {
}
@Override
- void doPrepare(Map conf, int partitionIndex, int numPartitions) throws IOException {
+ void doPrepare(Map<String, Object> conf, int partitionIndex, int numPartitions) throws IOException {
LOG.info("Preparing Sequence File State...");
if (this.format == null) throw new IllegalStateException("SequenceFormat must be specified.");
@@ -429,7 +429,7 @@ public class HdfsState implements State {
this.options = options;
}
- void prepare(Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
+ void prepare(Map<String, Object> conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
this.options.prepare(conf, partitionIndex, numPartitions);
initLastTxn(conf, partitionIndex);
}
@@ -476,7 +476,7 @@ public class HdfsState implements State {
return new TxnRecord(0, options.currentFile.toString(), 0);
}
- private void initLastTxn(Map conf, int partition) {
+ private void initLastTxn(Map<String, Object> conf, int partition) {
// include partition id in the file name so that index for different partitions are independent.
String indexFileName = String.format(".index.%s.%d", conf.get(Config.TOPOLOGY_NAME), partition);
this.indexFilePath = new Path(options.fileNameFormat.getPath(), indexFileName);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/HdfsStateFactory.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/HdfsStateFactory.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/HdfsStateFactory.java
index 3f4400b..e76ec22 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/HdfsStateFactory.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/HdfsStateFactory.java
@@ -37,7 +37,7 @@ public class HdfsStateFactory implements StateFactory {
}
@Override
- public State makeState(Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
+ public State makeState(Map<String, Object> conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
LOG.info("makeState(partitonIndex={}, numpartitions={}", partitionIndex, numPartitions);
HdfsState state = new HdfsState(this.options);
state.prepare(conf, metrics, partitionIndex, numPartitions);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/DefaultFileNameFormat.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/DefaultFileNameFormat.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/DefaultFileNameFormat.java
index 33871f5..a952b36 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/DefaultFileNameFormat.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/DefaultFileNameFormat.java
@@ -67,7 +67,7 @@ public class DefaultFileNameFormat implements FileNameFormat {
}
@Override
- public void prepare(Map conf, int partitionIndex, int numPartitions) {
+ public void prepare(Map<String, Object> conf, int partitionIndex, int numPartitions) {
this.partitionIndex = partitionIndex;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/FileNameFormat.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/FileNameFormat.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/FileNameFormat.java
index c246aea..c5b0698 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/FileNameFormat.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/FileNameFormat.java
@@ -26,7 +26,7 @@ import java.util.Map;
*/
public interface FileNameFormat extends Serializable {
- void prepare(Map conf, int partitionIndex, int numPartitions);
+ void prepare(Map<String, Object> conf, int partitionIndex, int numPartitions);
/**
* Returns the filename the HdfsBolt will create.
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/SimpleFileNameFormat.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/SimpleFileNameFormat.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/SimpleFileNameFormat.java
index 239c6ca..c676324 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/SimpleFileNameFormat.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/SimpleFileNameFormat.java
@@ -53,7 +53,7 @@ public class SimpleFileNameFormat implements FileNameFormat {
@SuppressWarnings("unchecked")
@Override
- public void prepare(Map conf, int partitionIndex, int numPartitions) {
+ public void prepare(Map<String, Object> conf, int partitionIndex, int numPartitions) {
this.partitionIndex = partitionIndex;
try {
this.host = Utils.localHostname();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/blobstore/BlobStoreTest.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/blobstore/BlobStoreTest.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/blobstore/BlobStoreTest.java
index f66c9b2..6c9cd55 100644
--- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/blobstore/BlobStoreTest.java
+++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/blobstore/BlobStoreTest.java
@@ -63,7 +63,7 @@ public class BlobStoreTest {
protected static Configuration hadoopConf = null;
URI base;
File baseFile;
- private static Map conf = new HashMap();
+ private static Map<String, Object> conf = new HashMap();
public static final int READ = 0x01;
public static final int WRITE = 0x02;
public static final int ADMIN = 0x04;
@@ -164,7 +164,7 @@ public class BlobStoreTest {
} catch (IOException e) {
LOG.error("error creating MiniDFSCluster");
}
- Map conf = new HashMap();
+ Map<String, Object> conf = new HashMap();
conf.put(Config.BLOBSTORE_DIR, dirName);
conf.put(Config.STORM_PRINCIPAL_TO_LOCAL_PLUGIN,"org.apache.storm.security.auth.DefaultPrincipalToLocal");
conf.put(Config.STORM_BLOBSTORE_REPLICATION_FACTOR, 3);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/blobstore/HdfsBlobStoreImplTest.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/blobstore/HdfsBlobStoreImplTest.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/blobstore/HdfsBlobStoreImplTest.java
index c49c44b..e34ec4a 100644
--- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/blobstore/HdfsBlobStoreImplTest.java
+++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/blobstore/HdfsBlobStoreImplTest.java
@@ -97,7 +97,7 @@ public class HdfsBlobStoreImplTest {
String validKey = "validkeyBasic";
FileSystem fs = dfscluster.getFileSystem();
- Map conf = new HashMap();
+ Map<String, Object> conf = new HashMap();
TestHdfsBlobStoreImpl hbs = new TestHdfsBlobStoreImpl(blobDir, conf, hadoopConf);
// should have created blobDir
@@ -215,7 +215,7 @@ public class HdfsBlobStoreImplTest {
@Test
public void testGetFileLength() throws IOException {
FileSystem fs = dfscluster.getFileSystem();
- Map conf = new HashMap();
+ Map<String, Object> conf = new HashMap();
String validKey = "validkeyBasic";
String testString = "testingblob";
TestHdfsBlobStoreImpl hbs = new TestHdfsBlobStoreImpl(blobDir, conf, hadoopConf);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 f60cbf3..f346aef 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
@@ -121,7 +121,7 @@ public class TestHdfsSpout {
spout.setCommitFrequencyCount(1);
spout.setCommitFrequencySec(1);
- Map conf = getCommonConfigs();
+ Map<String, Object> conf = getCommonConfigs();
openSpout(spout, 0, conf);
runSpout(spout,"r11");
@@ -143,7 +143,7 @@ public class TestHdfsSpout {
spout.setCommitFrequencyCount(1);
spout.setCommitFrequencySec(1);
- Map conf = getCommonConfigs();
+ Map<String, Object> conf = getCommonConfigs();
conf.put(Config.TOPOLOGY_ACKER_EXECUTORS, "1"); // enable ACKing
openSpout(spout, 0, conf);
@@ -176,7 +176,7 @@ public class TestHdfsSpout {
spout2.setCommitFrequencySec(1000); // effectively disable commits based on time
spout2.setLockTimeoutSec(lockExpirySec);
- Map conf = getCommonConfigs();
+ Map<String, Object> conf = getCommonConfigs();
openSpout(spout, 0, conf);
openSpout(spout2, 1, conf);
@@ -233,7 +233,7 @@ public class TestHdfsSpout {
spout2.setCommitFrequencySec(1000); // effectively disable commits based on time
spout2.setLockTimeoutSec(lockExpirySec);
- Map conf = getCommonConfigs();
+ Map<String, Object> conf = getCommonConfigs();
openSpout(spout, 0, conf);
openSpout(spout2, 1, conf);
@@ -348,7 +348,7 @@ public class TestHdfsSpout {
spout.setCommitFrequencyCount(1);
spout.setCommitFrequencySec(1);
- Map conf = getCommonConfigs();
+ Map<String, Object> conf = getCommonConfigs();
conf.put(Config.TOPOLOGY_ACKER_EXECUTORS, "1"); // enable ACKing
openSpout(spout, 0, conf);
@@ -427,7 +427,7 @@ public class TestHdfsSpout {
HdfsSpout spout = makeSpout(Configs.SEQ, SequenceFileReader.defaultFields);
- Map conf = getCommonConfigs();
+ Map<String, Object> conf = getCommonConfigs();
openSpout(spout, 0, conf);
// consume both files
@@ -455,7 +455,7 @@ public class TestHdfsSpout {
// 2) run spout
HdfsSpout spout = makeSpout(MockTextFailingReader.class.getName(), MockTextFailingReader.defaultFields);
- Map conf = getCommonConfigs();
+ Map<String, Object> conf = getCommonConfigs();
openSpout(spout, 0, conf);
List<String> res = runSpout(spout, "r11");
@@ -481,7 +481,7 @@ public class TestHdfsSpout {
spout.setCommitFrequencySec(1000); // effectively disable commits based on time
- Map conf = getCommonConfigs();
+ Map<String, Object> conf = getCommonConfigs();
openSpout(spout, 0, conf);
// 1) read initial lines in file, then check if lock exists
@@ -531,7 +531,7 @@ public class TestHdfsSpout {
spout.setCommitFrequencyCount(2); // 1 lock log entry every 2 tuples
spout.setCommitFrequencySec(1000); // Effectively disable commits based on time
- Map conf = getCommonConfigs();
+ Map<String, Object> conf = getCommonConfigs();
openSpout(spout, 0, conf);
// 1) read 5 lines in file,
@@ -558,7 +558,7 @@ public class TestHdfsSpout {
spout.setCommitFrequencyCount(0); // disable it
spout.setCommitFrequencySec(2); // log every 2 sec
- Map conf = getCommonConfigs();
+ Map<String, Object> conf = getCommonConfigs();
openSpout(spout, 0, conf);
// 1) read 5 lines in file
@@ -589,7 +589,7 @@ public class TestHdfsSpout {
private Map getCommonConfigs() {
- Map conf = new HashMap();
+ Map<String, Object> conf = new HashMap();
conf.put(Config.TOPOLOGY_ACKER_EXECUTORS, "0");
return conf;
}
@@ -605,7 +605,7 @@ public class TestHdfsSpout {
return spout;
}
- private void openSpout(HdfsSpout spout, int spoutId, Map conf) {
+ private void openSpout(HdfsSpout spout, int spoutId, Map<String, Object> conf) {
MockCollector collector = new MockCollector();
spout.open(conf, new MockTopologyContext(spoutId), collector);
}
@@ -725,7 +725,7 @@ public class TestHdfsSpout {
public static final String[] defaultFields = {"line"};
int readAttempts = 0;
- public MockTextFailingReader(FileSystem fs, Path file, Map conf) throws IOException {
+ public MockTextFailingReader(FileSystem fs, Path file, Map<String, Object> conf) throws IOException {
super(fs, file, conf);
}
@@ -745,7 +745,7 @@ public class TestHdfsSpout {
private final int componentId;
public MockTopologyContext(int componentId) {
- // StormTopology topology, Map stormConf, Map<Integer, String> taskToComponent, Map<String, List<Integer>> componentToSortedTasks, Map<String, Map<String, Fields>> componentToStreamToFields, String stormId, String codeDir, String pidDir, Integer taskId, Integer workerPort, List<Integer> workerTasks, Map<String, Object> defaultResources, Map<String, Object> userResources, Map<String, Object> executorData, Map<Integer, Map<Integer, Map<String, IMetric>>> registeredMetrics, Atom openOrPrepareWasCalled
+ // StormTopology topology, Map<String, Object> topoConf, Map<Integer, String> taskToComponent, Map<String, List<Integer>> componentToSortedTasks, Map<String, Map<String, Fields>> componentToStreamToFields, String stormId, String codeDir, String pidDir, Integer taskId, Integer workerPort, List<Integer> workerTasks, Map<String, Object> defaultResources, Map<String, Object> userResources, Map<String, Object> executorData, Map<Integer, Map<Integer, Map<String, IMetric>>> registeredMetrics, Atom openOrPrepareWasCalled
super(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
this.componentId = componentId;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/HdfsStateTest.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/HdfsStateTest.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/HdfsStateTest.java
index 4480441..e018016 100644
--- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/HdfsStateTest.java
+++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/HdfsStateTest.java
@@ -60,7 +60,7 @@ public class HdfsStateTest {
private String currentFileName = "";
@Override
- public void prepare(Map conf, int partitionIndex, int numPartitions) {
+ public void prepare(Map<String, Object> conf, int partitionIndex, int numPartitions) {
}
@@ -94,7 +94,7 @@ public class HdfsStateTest {
.withRotationPolicy(rotationPolicy)
.withFsUrl("file://" + TEST_OUT_DIR);
- Map<String, String> conf = new HashMap<>();
+ Map<String, Object> conf = new HashMap<>();
conf.put(Config.TOPOLOGY_NAME, TEST_TOPOLOGY_NAME);
HdfsState state = new HdfsState(options);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java b/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java
index 0215b32..d1019e7 100644
--- a/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java
+++ b/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java
@@ -68,7 +68,7 @@ public class HiveBolt extends BaseRichBolt {
}
@Override
- public void prepare(Map conf, TopologyContext topologyContext, OutputCollector collector) {
+ public void prepare(Map<String, Object> conf, TopologyContext topologyContext, OutputCollector collector) {
try {
tokenAuthEnabled = HiveUtils.isTokenAuthEnabled(conf);
try {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-hive/src/main/java/org/apache/storm/hive/common/HiveUtils.java
----------------------------------------------------------------------
diff --git a/external/storm-hive/src/main/java/org/apache/storm/hive/common/HiveUtils.java b/external/storm-hive/src/main/java/org/apache/storm/hive/common/HiveUtils.java
index 4222640..26beee0 100644
--- a/external/storm-hive/src/main/java/org/apache/storm/hive/common/HiveUtils.java
+++ b/external/storm-hive/src/main/java/org/apache/storm/hive/common/HiveUtils.java
@@ -103,7 +103,7 @@ public class HiveUtils {
}
}
- public static boolean isTokenAuthEnabled(Map conf) {
+ public static boolean isTokenAuthEnabled(Map<String, Object> conf) {
return conf.get(TOPOLOGY_AUTO_CREDENTIALS) != null && (((List) conf.get(TOPOLOGY_AUTO_CREDENTIALS)).contains(AutoHive.class.getName()));
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveState.java
----------------------------------------------------------------------
diff --git a/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveState.java b/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveState.java
index 10b3591..a7685f0 100644
--- a/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveState.java
+++ b/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveState.java
@@ -73,7 +73,7 @@ public class HiveState implements State {
public void commit(Long txId) {
}
- public void prepare(Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
+ public void prepare(Map<String, Object> conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
try {
tokenAuthEnabled = HiveUtils.isTokenAuthEnabled(conf);
try {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveStateFactory.java
----------------------------------------------------------------------
diff --git a/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveStateFactory.java b/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveStateFactory.java
index d6e3c71..6659825 100644
--- a/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveStateFactory.java
+++ b/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveStateFactory.java
@@ -40,7 +40,7 @@ public class HiveStateFactory implements StateFactory {
}
@Override
- public State makeState(Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
+ public State makeState(Map<String, Object> conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
LOG.info("makeState(partitonIndex={}, numpartitions={}", partitionIndex, numPartitions);
HiveState state = new HiveState(this.options);
state.prepare(conf, metrics, partitionIndex, numPartitions);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-jms/src/main/java/org/apache/storm/jms/bolt/JmsBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-jms/src/main/java/org/apache/storm/jms/bolt/JmsBolt.java b/external/storm-jms/src/main/java/org/apache/storm/jms/bolt/JmsBolt.java
index d691e75..9b3b614 100644
--- a/external/storm-jms/src/main/java/org/apache/storm/jms/bolt/JmsBolt.java
+++ b/external/storm-jms/src/main/java/org/apache/storm/jms/bolt/JmsBolt.java
@@ -196,7 +196,7 @@ public class JmsBolt extends BaseTickTupleAwareRichBolt {
* Initializes JMS resources.
*/
@Override
- public void prepare(Map stormConf, TopologyContext context,
+ public void prepare(Map<String, Object> topoConf, TopologyContext context,
OutputCollector collector) {
if (this.jmsProvider == null || this.producer == null) {
throw new IllegalStateException("JMS Provider and MessageProducer not set.");
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-jms/src/main/java/org/apache/storm/jms/spout/JmsSpout.java
----------------------------------------------------------------------
diff --git a/external/storm-jms/src/main/java/org/apache/storm/jms/spout/JmsSpout.java b/external/storm-jms/src/main/java/org/apache/storm/jms/spout/JmsSpout.java
index e69ff3a..042e643 100644
--- a/external/storm-jms/src/main/java/org/apache/storm/jms/spout/JmsSpout.java
+++ b/external/storm-jms/src/main/java/org/apache/storm/jms/spout/JmsSpout.java
@@ -164,7 +164,7 @@ public class JmsSpout extends BaseRichSpout implements MessageListener {
* topic/queue.
*/
@SuppressWarnings("rawtypes")
- public void open(Map conf, TopologyContext context,
+ public void open(Map<String, Object> conf, TopologyContext context,
SpoutOutputCollector collector) {
if (this.jmsProvider == null) {
throw new IllegalStateException("JMS provider has not been set.");
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 96e00ad..31f4d0d 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 conf, TopologyContext context) {
+ String txStateId, @SuppressWarnings("rawtypes") Map<String, Object> conf, TopologyContext context) {
return new JmsBatchCoordinator(name);
}
@Override
- public Emitter<JmsBatch> getEmitter(String txStateId, @SuppressWarnings("rawtypes") Map conf, TopologyContext context) {
+ public Emitter<JmsBatch> getEmitter(String txStateId, @SuppressWarnings("rawtypes") 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 conf) {
+ public JmsEmitter(String name, JmsProvider jmsProvider, JmsTupleProducer tupleProducer, int jmsAcknowledgeMode, @SuppressWarnings("rawtypes") Map<String, Object> conf) {
if (jmsProvider == null) {
throw new IllegalStateException("JMS provider has not been set.");
}
@@ -406,4 +406,4 @@ public class TridentJmsSpout implements ITridentSpout<JmsBatch> {
}
-
\ No newline at end of file
+
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/bolt/KafkaBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/bolt/KafkaBolt.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/bolt/KafkaBolt.java
index 30f97a0..1a401b2 100644
--- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/bolt/KafkaBolt.java
+++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/bolt/KafkaBolt.java
@@ -100,7 +100,7 @@ public class KafkaBolt<K, V> extends BaseTickTupleAwareRichBolt {
}
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
LOG.info("Preparing bolt with configuration {}", this);
//for backward compatibility.
if (mapper == null) {
@@ -110,10 +110,10 @@ public class KafkaBolt<K, V> extends BaseTickTupleAwareRichBolt {
//for backward compatibility.
if (topicSelector == null) {
- if (stormConf.containsKey(TOPIC)) {
+ if (topoConf.containsKey(TOPIC)) {
LOG.info("TopicSelector not specified. Using [{}] for topic [{}] specified in bolt configuration,",
- DefaultTopicSelector.class.getSimpleName(), stormConf.get(TOPIC));
- this.topicSelector = new DefaultTopicSelector((String) stormConf.get(TOPIC));
+ DefaultTopicSelector.class.getSimpleName(), topoConf.get(TOPIC));
+ this.topicSelector = new DefaultTopicSelector((String) topoConf.get(TOPIC));
} else {
throw new IllegalStateException("topic should be specified in bolt's configuration");
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
index 310902e..bb76535 100644
--- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
+++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
@@ -96,7 +96,7 @@ public class KafkaSpout<K, V> extends BaseRichSpout {
}
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
initialized = false;
this.context = context;
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/ManualPartitionNamedSubscription.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/ManualPartitionNamedSubscription.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/ManualPartitionNamedSubscription.java
index df3e800..079cadb 100644
--- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/ManualPartitionNamedSubscription.java
+++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/ManualPartitionNamedSubscription.java
@@ -75,4 +75,4 @@ public class ManualPartitionNamedSubscription extends NamedSubscription {
consumer.assign(currentAssignment);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/ManualPartitionPatternSubscription.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/ManualPartitionPatternSubscription.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/ManualPartitionPatternSubscription.java
index cf4dfcb..5f86605 100644
--- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/ManualPartitionPatternSubscription.java
+++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/ManualPartitionPatternSubscription.java
@@ -73,4 +73,4 @@ public class ManualPartitionPatternSubscription extends PatternSubscription {
consumer.assign(currentAssignment);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/internal/Timer.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/internal/Timer.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/internal/Timer.java
index 2a2e1cb..00c9d39 100644
--- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/internal/Timer.java
+++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/internal/Timer.java
@@ -72,4 +72,4 @@ public class Timer {
}
return expired;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutOpaque.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutOpaque.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutOpaque.java
index 0f7f0af..b8393ca 100644
--- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutOpaque.java
+++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutOpaque.java
@@ -46,12 +46,12 @@ public class KafkaTridentSpoutOpaque<K,V> implements IOpaquePartitionedTridentSp
}
@Override
- public Emitter<List<TopicPartition>, KafkaTridentSpoutTopicPartition, KafkaTridentSpoutBatchMetadata<K,V>> getEmitter(Map conf, TopologyContext context) {
+ public Emitter<List<TopicPartition>, KafkaTridentSpoutTopicPartition, KafkaTridentSpoutBatchMetadata<K,V>> getEmitter(Map<String, Object> conf, TopologyContext context) {
return new KafkaTridentSpoutEmitter<>(kafkaManager, context);
}
@Override
- public Coordinator<List<TopicPartition>> getCoordinator(Map conf, TopologyContext context) {
+ public Coordinator<List<TopicPartition>> getCoordinator(Map<String, Object> conf, TopologyContext context) {
return new KafkaTridentSpoutOpaqueCoordinator<>(kafkaManager);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutTransactional.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutTransactional.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutTransactional.java
index 49e3b07..8b05890 100644
--- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutTransactional.java
+++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutTransactional.java
@@ -28,12 +28,12 @@ import java.util.Map;
// TODO
public class KafkaTridentSpoutTransactional<Ps, P extends ISpoutPartition, T> implements IPartitionedTridentSpout<Ps, P, T> {
@Override
- public Coordinator<Ps> getCoordinator(Map conf, TopologyContext context) {
+ public Coordinator<Ps> getCoordinator(Map<String, Object> conf, TopologyContext context) {
return null;
}
@Override
- public Emitter<Ps, P, T> getEmitter(Map conf, TopologyContext context) {
+ public Emitter<Ps, P, T> getEmitter(Map<String, Object> conf, TopologyContext context) {
return null;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/trident/TridentKafkaStateFactory.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/trident/TridentKafkaStateFactory.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/trident/TridentKafkaStateFactory.java
index f564510..0bf21ab 100644
--- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/trident/TridentKafkaStateFactory.java
+++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/trident/TridentKafkaStateFactory.java
@@ -52,7 +52,7 @@ public class TridentKafkaStateFactory implements StateFactory {
}
@Override
- public State makeState(Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
+ public State makeState(Map<String, Object> conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
LOG.info("makeState(partitonIndex={}, numpartitions={}", partitionIndex, numPartitions);
TridentKafkaState state = new TridentKafkaState()
.withKafkaTopicSelector(this.topicSelector)
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/KafkaUnit.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/KafkaUnit.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/KafkaUnit.java
index 93b1040..004d62c 100644
--- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/KafkaUnit.java
+++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/KafkaUnit.java
@@ -111,4 +111,4 @@ public class KafkaUnit {
private void closeProducer() {
producer.close();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/KafkaUnitRule.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/KafkaUnitRule.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/KafkaUnitRule.java
index 6e90c9d..c755f41 100644
--- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/KafkaUnitRule.java
+++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/KafkaUnitRule.java
@@ -43,4 +43,4 @@ public class KafkaUnitRule extends ExternalResource {
public KafkaUnit getKafkaUnit() {
return this.kafkaUnit;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/test/KafkaSpoutTestBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/test/KafkaSpoutTestBolt.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/test/KafkaSpoutTestBolt.java
index 7a94a50..8d183ee 100644
--- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/test/KafkaSpoutTestBolt.java
+++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/test/KafkaSpoutTestBolt.java
@@ -33,7 +33,7 @@ public class KafkaSpoutTestBolt extends BaseRichBolt {
private OutputCollector collector;
@Override
- public void prepare(Map stormConf, 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/64e29f36/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicBrokersReader.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicBrokersReader.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicBrokersReader.java
index 13e676a..c203359 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicBrokersReader.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicBrokersReader.java
@@ -43,7 +43,7 @@ public class DynamicBrokersReader {
private String _topic;
private Boolean _isWildcardTopic;
- public DynamicBrokersReader(Map conf, String zkStr, String zkPath, String topic) {
+ public DynamicBrokersReader(Map<String, Object> conf, String zkStr, String zkPath, String topic) {
// Check required parameters
Preconditions.checkNotNull(conf, "conf cannot be null");
@@ -200,7 +200,7 @@ public class DynamicBrokersReader {
* Validate required parameters in the input configuration Map
* @param conf
*/
- private void validateConfig(final Map conf) {
+ private void validateConfig(final Map<String, Object> conf) {
Preconditions.checkNotNull(conf.get(Config.STORM_ZOOKEEPER_SESSION_TIMEOUT),
"%s cannot be null", Config.STORM_ZOOKEEPER_SESSION_TIMEOUT);
Preconditions.checkNotNull(conf.get(Config.STORM_ZOOKEEPER_CONNECTION_TIMEOUT),
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-kafka/src/jvm/org/apache/storm/kafka/ExponentialBackoffMsgRetryManager.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/ExponentialBackoffMsgRetryManager.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/ExponentialBackoffMsgRetryManager.java
index 90cf440..60654a5 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/ExponentialBackoffMsgRetryManager.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/ExponentialBackoffMsgRetryManager.java
@@ -40,7 +40,7 @@ public class ExponentialBackoffMsgRetryManager implements FailedMsgRetryManager
}
- public void prepare(SpoutConfig spoutConfig, Map stormConf) {
+ public void prepare(SpoutConfig spoutConfig, Map<String, Object> topoConf) {
this.retryInitialDelayMs = spoutConfig.retryInitialDelayMs;
this.retryDelayMultiplier = spoutConfig.retryDelayMultiplier;
this.retryDelayMaxMs = spoutConfig.retryDelayMaxMs;
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-kafka/src/jvm/org/apache/storm/kafka/FailedMsgRetryManager.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/FailedMsgRetryManager.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/FailedMsgRetryManager.java
index c1fb96e..c7a7a04 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/FailedMsgRetryManager.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/FailedMsgRetryManager.java
@@ -26,7 +26,7 @@ public interface FailedMsgRetryManager extends Serializable {
/**
* Initialization
*/
- void prepare(SpoutConfig spoutConfig, Map stormConf);
+ void prepare(SpoutConfig spoutConfig, Map<String, Object> topoConf);
/**
* Message corresponding to the offset failed in kafka spout.
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 01cc9b7..ead6057 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
@@ -58,7 +58,7 @@ public class KafkaSpout extends BaseRichSpout {
}
@Override
- public void open(Map conf, final TopologyContext context, final SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, final TopologyContext context, final SpoutOutputCollector collector) {
_collector = collector;
String topologyInstanceId = context.getStormId();
Map<String, Object> stateConf = new HashMap<>(conf);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaUtils.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaUtils.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaUtils.java
index 2072df3..604f1f3 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaUtils.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaUtils.java
@@ -61,11 +61,11 @@ public class KafkaUtils {
throw new AssertionError();
}
- public static IBrokerReader makeBrokerReader(Map stormConf, KafkaConfig conf) {
+ public static IBrokerReader makeBrokerReader(Map<String, Object> topoConf, KafkaConfig conf) {
if (conf.hosts instanceof StaticHosts) {
return new StaticBrokerReader(conf.topic, ((StaticHosts) conf.hosts).getPartitionInformation());
} else {
- return new ZkBrokerReader(stormConf, conf.topic, (ZkHosts) conf.hosts);
+ return new ZkBrokerReader(topoConf, conf.topic, (ZkHosts) conf.hosts);
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 f761d21..ad71bbe 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
@@ -64,18 +64,18 @@ public class PartitionManager {
SimpleConsumer _consumer;
DynamicPartitionConnections _connections;
ZkState _state;
- Map _stormConf;
+ Map _topoConf;
long numberFailed, numberAcked;
public PartitionManager(
DynamicPartitionConnections connections,
String topologyInstanceId,
ZkState state,
- Map stormConf,
+ Map<String, Object> topoConf,
SpoutConfig spoutConfig,
Partition id)
{
- this(connections, topologyInstanceId, state, stormConf, spoutConfig, id, null);
+ this(connections, topologyInstanceId, state, topoConf, spoutConfig, id, null);
}
/**
@@ -85,7 +85,7 @@ public class PartitionManager {
DynamicPartitionConnections connections,
String topologyInstanceId,
ZkState state,
- Map stormConf,
+ Map<String, Object> topoConf,
SpoutConfig spoutConfig,
Partition id,
PartitionManager previousManager) {
@@ -95,7 +95,7 @@ public class PartitionManager {
_topologyInstanceId = topologyInstanceId;
_consumer = connections.register(id.host, id.topic, id.partition);
_state = state;
- _stormConf = stormConf;
+ _topoConf = topoConf;
numberAcked = numberFailed = 0;
if (previousManager != null) {
@@ -110,7 +110,7 @@ public class PartitionManager {
} else {
try {
_failedMsgRetryManager = (FailedMsgRetryManager) Class.forName(spoutConfig.failedMsgRetryManagerClass).newInstance();
- _failedMsgRetryManager.prepare(spoutConfig, _stormConf);
+ _failedMsgRetryManager.prepare(spoutConfig, _topoConf);
} catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {
throw new IllegalArgumentException(String.format("Failed to create an instance of <%s> from: <%s>",
FailedMsgRetryManager.class,
@@ -336,7 +336,7 @@ public class PartitionManager {
LOG.debug("Writing last completed offset ({}) to ZK for {} for topology: {}", lastCompletedOffset, _partition, _topologyInstanceId);
Map<Object, Object> data = (Map<Object, Object>) ImmutableMap.builder()
.put("topology", ImmutableMap.of("id", _topologyInstanceId,
- "name", _stormConf.get(Config.TOPOLOGY_NAME)))
+ "name", _topoConf.get(Config.TOPOLOGY_NAME)))
.put("offset", lastCompletedOffset)
.put("partition", _partition.partition)
.put("broker", ImmutableMap.of("host", _partition.host.host,
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-kafka/src/jvm/org/apache/storm/kafka/StaticCoordinator.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/StaticCoordinator.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/StaticCoordinator.java
index 628bfc0..46cb7d9 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/StaticCoordinator.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/StaticCoordinator.java
@@ -26,13 +26,13 @@ public class StaticCoordinator implements PartitionCoordinator {
Map<Partition, PartitionManager> _managers = new HashMap<Partition, PartitionManager>();
List<PartitionManager> _allManagers = new ArrayList<>();
- public StaticCoordinator(DynamicPartitionConnections connections, Map stormConf, SpoutConfig config, ZkState state, int taskIndex, int totalTasks, String topologyInstanceId) {
+ public StaticCoordinator(DynamicPartitionConnections connections, Map<String, Object> topoConf, SpoutConfig config, ZkState state, int taskIndex, int totalTasks, String topologyInstanceId) {
StaticHosts hosts = (StaticHosts) config.hosts;
List<GlobalPartitionInformation> partitions = new ArrayList<GlobalPartitionInformation>();
partitions.add(hosts.getPartitionInformation());
List<Partition> myPartitions = KafkaUtils.calculatePartitionsForTask(partitions, totalTasks, taskIndex);
for (Partition myPartition : myPartitions) {
- _managers.put(myPartition, new PartitionManager(connections, topologyInstanceId, state, stormConf, config, myPartition));
+ _managers.put(myPartition, new PartitionManager(connections, topologyInstanceId, state, topoConf, config, myPartition));
}
_allManagers = new ArrayList<>(_managers.values());
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkCoordinator.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkCoordinator.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkCoordinator.java
index 14be584..e814157 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkCoordinator.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkCoordinator.java
@@ -39,28 +39,28 @@ public class ZkCoordinator implements PartitionCoordinator {
DynamicPartitionConnections _connections;
DynamicBrokersReader _reader;
ZkState _state;
- Map _stormConf;
+ Map _topoConf;
- public ZkCoordinator(DynamicPartitionConnections connections, Map stormConf, SpoutConfig spoutConfig, ZkState state, int taskIndex, int totalTasks, String topologyInstanceId) {
- this(connections, stormConf, spoutConfig, state, taskIndex, totalTasks, topologyInstanceId, buildReader(stormConf, spoutConfig));
+ public ZkCoordinator(DynamicPartitionConnections connections, Map<String, Object> topoConf, SpoutConfig spoutConfig, ZkState state, int taskIndex, int totalTasks, String topologyInstanceId) {
+ this(connections, topoConf, spoutConfig, state, taskIndex, totalTasks, topologyInstanceId, buildReader(topoConf, spoutConfig));
}
- public ZkCoordinator(DynamicPartitionConnections connections, Map stormConf, SpoutConfig spoutConfig, ZkState state, int taskIndex, int totalTasks, String topologyInstanceId, DynamicBrokersReader reader) {
+ public ZkCoordinator(DynamicPartitionConnections connections, Map<String, Object> topoConf, SpoutConfig spoutConfig, ZkState state, int taskIndex, int totalTasks, String topologyInstanceId, DynamicBrokersReader reader) {
_spoutConfig = spoutConfig;
_connections = connections;
_taskIndex = taskIndex;
_totalTasks = totalTasks;
_topologyInstanceId = topologyInstanceId;
- _stormConf = stormConf;
+ _topoConf = topoConf;
_state = state;
ZkHosts brokerConf = (ZkHosts) spoutConfig.hosts;
_refreshFreqMs = brokerConf.refreshFreqSecs * 1000;
_reader = reader;
}
- private static DynamicBrokersReader buildReader(Map stormConf, SpoutConfig spoutConfig) {
+ private static DynamicBrokersReader buildReader(Map<String, Object> topoConf, SpoutConfig spoutConfig) {
ZkHosts hosts = (ZkHosts) spoutConfig.hosts;
- return new DynamicBrokersReader(stormConf, hosts.brokerZkStr, hosts.brokerZkPath, spoutConfig.topic);
+ return new DynamicBrokersReader(topoConf, hosts.brokerZkStr, hosts.brokerZkPath, spoutConfig.topic);
}
@Override
@@ -102,7 +102,7 @@ public class ZkCoordinator implements PartitionCoordinator {
_connections,
_topologyInstanceId,
_state,
- _stormConf,
+ _topoConf,
_spoutConfig,
id,
deletedManagers.get(id.partition));
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-kafka/src/jvm/org/apache/storm/kafka/bolt/KafkaBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/bolt/KafkaBolt.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/bolt/KafkaBolt.java
index 0fff78a..5cb6129 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/bolt/KafkaBolt.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/bolt/KafkaBolt.java
@@ -93,7 +93,7 @@ public class KafkaBolt<K, V> extends BaseTickTupleAwareRichBolt {
}
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
//for backward compatibility.
if(mapper == null) {
this.mapper = new FieldNameBasedTupleToKafkaMapper<K,V>();
@@ -101,8 +101,8 @@ public class KafkaBolt<K, V> extends BaseTickTupleAwareRichBolt {
//for backward compatibility.
if(topicSelector == null) {
- if(stormConf.containsKey(TOPIC)) {
- this.topicSelector = new DefaultTopicSelector((String) stormConf.get(TOPIC));
+ if(topoConf.containsKey(TOPIC)) {
+ this.topicSelector = new DefaultTopicSelector((String) topoConf.get(TOPIC));
} else {
throw new IllegalArgumentException("topic should be specified in bolt's configuration");
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/Coordinator.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/Coordinator.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/Coordinator.java
index baec8cb..76baf62 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/Coordinator.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/Coordinator.java
@@ -29,7 +29,7 @@ class Coordinator implements IPartitionedTridentSpout.Coordinator<List<GlobalPar
private IBrokerReader reader;
private TridentKafkaConfig config;
- public Coordinator(Map conf, TridentKafkaConfig tridentKafkaConfig) {
+ public Coordinator(Map<String, Object> conf, TridentKafkaConfig tridentKafkaConfig) {
config = tridentKafkaConfig;
reader = KafkaUtils.makeBrokerReader(conf, config);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 71324f7..8a47ddc 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
@@ -36,13 +36,13 @@ public class OpaqueTridentKafkaSpout implements IOpaquePartitionedTridentSpout<L
}
@Override
- public IOpaquePartitionedTridentSpout.Emitter<List<GlobalPartitionInformation>, Partition, Map> getEmitter(Map conf, TopologyContext context) {
+ public IOpaquePartitionedTridentSpout.Emitter<List<GlobalPartitionInformation>, Partition, Map> getEmitter(Map<String, Object> conf, TopologyContext context) {
return new TridentKafkaEmitter(conf, context, _config, context
.getStormId()).asOpaqueEmitter();
}
@Override
- public IOpaquePartitionedTridentSpout.Coordinator getCoordinator(Map conf, TopologyContext tc) {
+ public IOpaquePartitionedTridentSpout.Coordinator getCoordinator(Map<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/64e29f36/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/TransactionalTridentKafkaSpout.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/TransactionalTridentKafkaSpout.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/TransactionalTridentKafkaSpout.java
index 7ce8d52..1042098 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/TransactionalTridentKafkaSpout.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/TransactionalTridentKafkaSpout.java
@@ -35,12 +35,12 @@ public class TransactionalTridentKafkaSpout implements IPartitionedTridentSpout<
@Override
- public IPartitionedTridentSpout.Coordinator getCoordinator(Map conf, TopologyContext context) {
+ public IPartitionedTridentSpout.Coordinator getCoordinator(Map<String, Object> conf, TopologyContext context) {
return new org.apache.storm.kafka.trident.Coordinator(conf, _config);
}
@Override
- public IPartitionedTridentSpout.Emitter getEmitter(Map conf, TopologyContext context) {
+ public IPartitionedTridentSpout.Emitter getEmitter(Map<String, Object> conf, TopologyContext context) {
return new TridentKafkaEmitter(conf, context, _config, context.getStormId()).asTransactionalEmitter();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 176a878..1339387 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
@@ -61,7 +61,7 @@ public class TridentKafkaEmitter {
private TridentKafkaConfig _config;
private String _topologyInstanceId;
- public TridentKafkaEmitter(Map conf, TopologyContext context, TridentKafkaConfig config, String topologyInstanceId) {
+ public TridentKafkaEmitter(Map<String, Object> conf, TopologyContext context, TridentKafkaConfig config, String topologyInstanceId) {
_config = config;
_topologyInstanceId = topologyInstanceId;
_connections = new DynamicPartitionConnections(_config, KafkaUtils.makeBrokerReader(conf, _config));
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/TridentKafkaStateFactory.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/TridentKafkaStateFactory.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/TridentKafkaStateFactory.java
index f564510..0bf21ab 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/TridentKafkaStateFactory.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/TridentKafkaStateFactory.java
@@ -52,7 +52,7 @@ public class TridentKafkaStateFactory implements StateFactory {
}
@Override
- public State makeState(Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
+ public State makeState(Map<String, Object> conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
LOG.info("makeState(partitonIndex={}, numpartitions={}", partitionIndex, numPartitions);
TridentKafkaState state = new TridentKafkaState()
.withKafkaTopicSelector(this.topicSelector)
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/ZkBrokerReader.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/ZkBrokerReader.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/ZkBrokerReader.java
index abc10db..00758a6 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/ZkBrokerReader.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/ZkBrokerReader.java
@@ -38,7 +38,7 @@ public class ZkBrokerReader implements IBrokerReader {
long refreshMillis;
- public ZkBrokerReader(Map conf, String topic, ZkHosts hosts) {
+ public ZkBrokerReader(Map<String, Object> conf, String topic, ZkHosts hosts) {
try {
reader = new DynamicBrokersReader(conf, hosts.brokerZkStr, hosts.brokerZkPath, topic);
cachedBrokers = reader.getBrokerInfo();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 b23d5bc..9778d15 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
@@ -44,7 +44,7 @@ public class ZkCoordinatorTest {
private KafkaTestBroker broker = new KafkaTestBroker();
private TestingServer server;
- private Map stormConf = new HashMap();
+ private Map<String, Object> topoConf = new HashMap();
private SpoutConfig spoutConfig;
private ZkState state;
private SimpleConsumer simpleConsumer;
@@ -57,14 +57,14 @@ public class ZkCoordinatorTest {
ZkHosts hosts = new ZkHosts(connectionString);
hosts.refreshFreqSecs = 1;
spoutConfig = new SpoutConfig(hosts, "topic", "/test", "id");
- Map conf = buildZookeeperConfig(server);
+ Map<String, Object> conf = buildZookeeperConfig(server);
state = new ZkState(conf);
simpleConsumer = new SimpleConsumer("localhost", broker.getPort(), 60000, 1024, "testClient");
when(dynamicPartitionConnections.register(any(Broker.class), any(String.class) ,anyInt())).thenReturn(simpleConsumer);
}
private Map buildZookeeperConfig(TestingServer server) {
- Map conf = new HashMap();
+ 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);
@@ -174,7 +174,7 @@ public class ZkCoordinatorTest {
private List<ZkCoordinator> buildCoordinators(int totalTasks) {
List<ZkCoordinator> coordinatorList = new ArrayList<ZkCoordinator>();
for (int i = 0; i < totalTasks; i++) {
- ZkCoordinator coordinator = new ZkCoordinator(dynamicPartitionConnections, stormConf, spoutConfig, state, i, totalTasks, "test-id", reader);
+ ZkCoordinator coordinator = new ZkCoordinator(dynamicPartitionConnections, topoConf, spoutConfig, state, i, totalTasks, "test-id", reader);
coordinatorList.add(coordinator);
}
return coordinatorList;
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-kinesis/src/main/java/org/apache/storm/kinesis/spout/KinesisSpout.java
----------------------------------------------------------------------
diff --git a/external/storm-kinesis/src/main/java/org/apache/storm/kinesis/spout/KinesisSpout.java b/external/storm-kinesis/src/main/java/org/apache/storm/kinesis/spout/KinesisSpout.java
index 500195b..da08a50 100644
--- a/external/storm-kinesis/src/main/java/org/apache/storm/kinesis/spout/KinesisSpout.java
+++ b/external/storm-kinesis/src/main/java/org/apache/storm/kinesis/spout/KinesisSpout.java
@@ -46,7 +46,7 @@ public class KinesisSpout 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;
kinesisRecordsManager = new KinesisRecordsManager(kinesisConfig);
kinesisRecordsManager.initialize(context.getThisTaskIndex(), context.getComponentTasks(context.getThisComponentId()).size());
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-kinesis/src/test/java/org/apache/storm/kinesis/spout/test/KinesisBoltTest.java
----------------------------------------------------------------------
diff --git a/external/storm-kinesis/src/test/java/org/apache/storm/kinesis/spout/test/KinesisBoltTest.java b/external/storm-kinesis/src/test/java/org/apache/storm/kinesis/spout/test/KinesisBoltTest.java
index a2adb9d..7701efd 100644
--- a/external/storm-kinesis/src/test/java/org/apache/storm/kinesis/spout/test/KinesisBoltTest.java
+++ b/external/storm-kinesis/src/test/java/org/apache/storm/kinesis/spout/test/KinesisBoltTest.java
@@ -32,7 +32,7 @@ public class KinesisBoltTest extends BaseRichBolt {
private transient OutputCollector collector;
@Override
- public void prepare(Map stormConf, 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/64e29f36/external/storm-mongodb/src/main/java/org/apache/storm/mongodb/bolt/AbstractMongoBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-mongodb/src/main/java/org/apache/storm/mongodb/bolt/AbstractMongoBolt.java b/external/storm-mongodb/src/main/java/org/apache/storm/mongodb/bolt/AbstractMongoBolt.java
index f730ec7..89d249e 100644
--- a/external/storm-mongodb/src/main/java/org/apache/storm/mongodb/bolt/AbstractMongoBolt.java
+++ b/external/storm-mongodb/src/main/java/org/apache/storm/mongodb/bolt/AbstractMongoBolt.java
@@ -42,7 +42,7 @@ public abstract class AbstractMongoBolt extends BaseRichBolt {
}
@Override
- public void prepare(Map stormConf, TopologyContext context,
+ public void prepare(Map<String, Object> topoConf, TopologyContext context,
OutputCollector collector) {
this.collector = collector;
this.mongoClient = new MongoDBClient(url, collectionName);
[05/13] storm git commit: STORM-2477: Result of transforming the code
Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/planner/processor/AggregateProcessor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/planner/processor/AggregateProcessor.java b/storm-client/src/jvm/org/apache/storm/trident/planner/processor/AggregateProcessor.java
index 3ff8989..b849418 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/planner/processor/AggregateProcessor.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/planner/processor/AggregateProcessor.java
@@ -43,7 +43,7 @@ public class AggregateProcessor implements TridentProcessor {
}
@Override
- public void prepare(Map conf, TopologyContext context, TridentContext tridentContext) {
+ public void prepare(Map<String, Object> conf, TopologyContext context, TridentContext tridentContext) {
List<Factory> parents = tridentContext.getParentTupleFactories();
if(parents.size()!=1) {
throw new RuntimeException("Aggregate operation can only have one parent");
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/planner/processor/EachProcessor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/planner/processor/EachProcessor.java b/storm-client/src/jvm/org/apache/storm/trident/planner/processor/EachProcessor.java
index 38c77a6..c9b4508 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/planner/processor/EachProcessor.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/planner/processor/EachProcessor.java
@@ -43,7 +43,7 @@ public class EachProcessor implements TridentProcessor {
}
@Override
- public void prepare(Map conf, TopologyContext context, TridentContext tridentContext) {
+ public void prepare(Map<String, Object> conf, TopologyContext context, TridentContext tridentContext) {
List<Factory> parents = tridentContext.getParentTupleFactories();
if(parents.size()!=1) {
throw new RuntimeException("Each operation can only have one parent");
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/planner/processor/MapProcessor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/planner/processor/MapProcessor.java b/storm-client/src/jvm/org/apache/storm/trident/planner/processor/MapProcessor.java
index f7151c9..110cdaf 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/planner/processor/MapProcessor.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/planner/processor/MapProcessor.java
@@ -48,7 +48,7 @@ public class MapProcessor implements TridentProcessor {
}
@Override
- public void prepare(Map conf, TopologyContext context, TridentContext tridentContext) {
+ public void prepare(Map<String, Object> conf, TopologyContext context, TridentContext tridentContext) {
List<TridentTuple.Factory> parents = tridentContext.getParentTupleFactories();
if(parents.size()!=1) {
throw new RuntimeException("Map operation can only have one parent");
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/planner/processor/MultiReducerProcessor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/planner/processor/MultiReducerProcessor.java b/storm-client/src/jvm/org/apache/storm/trident/planner/processor/MultiReducerProcessor.java
index d5bf8d7..77dead1 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/planner/processor/MultiReducerProcessor.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/planner/processor/MultiReducerProcessor.java
@@ -46,7 +46,7 @@ public class MultiReducerProcessor implements TridentProcessor {
}
@Override
- public void prepare(Map conf, TopologyContext context, TridentContext tridentContext) {
+ public void prepare(Map<String, Object> conf, TopologyContext context, TridentContext tridentContext) {
List<Factory> parents = tridentContext.getParentTupleFactories();
_context = tridentContext;
_streamToIndex = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/planner/processor/PartitionPersistProcessor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/planner/processor/PartitionPersistProcessor.java b/storm-client/src/jvm/org/apache/storm/trident/planner/processor/PartitionPersistProcessor.java
index 956255f..af4c8f6 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/planner/processor/PartitionPersistProcessor.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/planner/processor/PartitionPersistProcessor.java
@@ -49,7 +49,7 @@ public class PartitionPersistProcessor implements TridentProcessor {
}
@Override
- public void prepare(Map conf, TopologyContext context, TridentContext tridentContext) {
+ public void prepare(Map<String, Object> conf, TopologyContext context, TridentContext tridentContext) {
List<Factory> parents = tridentContext.getParentTupleFactories();
if(parents.size()!=1) {
throw new RuntimeException("Partition persist operation can only have one parent");
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/planner/processor/ProjectedProcessor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/planner/processor/ProjectedProcessor.java b/storm-client/src/jvm/org/apache/storm/trident/planner/processor/ProjectedProcessor.java
index 3eabdcb..4ecb251 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/planner/processor/ProjectedProcessor.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/planner/processor/ProjectedProcessor.java
@@ -38,7 +38,7 @@ public class ProjectedProcessor implements TridentProcessor {
}
@Override
- public void prepare(Map conf, TopologyContext context, TridentContext tridentContext) {
+ public void prepare(Map<String, Object> conf, TopologyContext context, TridentContext tridentContext) {
if(tridentContext.getParentTupleFactories().size()!=1) {
throw new RuntimeException("Projection processor can only have one parent");
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/planner/processor/StateQueryProcessor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/planner/processor/StateQueryProcessor.java b/storm-client/src/jvm/org/apache/storm/trident/planner/processor/StateQueryProcessor.java
index 372a47e..2d9ebc0 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/planner/processor/StateQueryProcessor.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/planner/processor/StateQueryProcessor.java
@@ -49,7 +49,7 @@ public class StateQueryProcessor implements TridentProcessor {
}
@Override
- public void prepare(Map conf, TopologyContext context, TridentContext tridentContext) {
+ public void prepare(Map<String, Object> conf, TopologyContext context, TridentContext tridentContext) {
List<Factory> parents = tridentContext.getParentTupleFactories();
if(parents.size()!=1) {
throw new RuntimeException("State query operation can only have one parent");
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/spout/BatchSpoutExecutor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/spout/BatchSpoutExecutor.java b/storm-client/src/jvm/org/apache/storm/trident/spout/BatchSpoutExecutor.java
index 0f1c066..eb44a63 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/spout/BatchSpoutExecutor.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/spout/BatchSpoutExecutor.java
@@ -69,12 +69,12 @@ public class BatchSpoutExecutor implements ITridentSpout<Object> {
}
@Override
- public BatchCoordinator<Object> getCoordinator(String txStateId, Map conf, TopologyContext context) {
+ public BatchCoordinator<Object> getCoordinator(String txStateId, Map<String, Object> conf, TopologyContext context) {
return new EmptyCoordinator();
}
@Override
- public Emitter<Object> getEmitter(String txStateId, Map conf, TopologyContext context) {
+ public Emitter<Object> getEmitter(String txStateId, Map<String, Object> conf, TopologyContext context) {
_spout.open(conf, context);
return new BatchSpoutEmitter();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/spout/IBatchSpout.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/spout/IBatchSpout.java b/storm-client/src/jvm/org/apache/storm/trident/spout/IBatchSpout.java
index d852d24..74ca4b1 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/spout/IBatchSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/spout/IBatchSpout.java
@@ -24,7 +24,7 @@ import java.util.Map;
import org.apache.storm.trident.operation.TridentCollector;
public interface IBatchSpout extends ITridentDataSource {
- void open(Map conf, TopologyContext context);
+ void open(Map<String, Object> conf, TopologyContext context);
void emitBatch(long batchId, TridentCollector collector);
void ack(long batchId);
void close();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/spout/ICommitterTridentSpout.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/spout/ICommitterTridentSpout.java b/storm-client/src/jvm/org/apache/storm/trident/spout/ICommitterTridentSpout.java
index e7f6781..115a166 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/spout/ICommitterTridentSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/spout/ICommitterTridentSpout.java
@@ -27,5 +27,5 @@ public interface ICommitterTridentSpout<X> extends ITridentSpout<X> {
}
@Override
- public Emitter getEmitter(String txStateId, Map conf, TopologyContext context);
+ public Emitter getEmitter(String txStateId, Map<String, Object> conf, TopologyContext context);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/spout/IOpaquePartitionedTridentSpout.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/spout/IOpaquePartitionedTridentSpout.java b/storm-client/src/jvm/org/apache/storm/trident/spout/IOpaquePartitionedTridentSpout.java
index b5f50bb..789b615 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/spout/IOpaquePartitionedTridentSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/spout/IOpaquePartitionedTridentSpout.java
@@ -77,9 +77,9 @@ public interface IOpaquePartitionedTridentSpout<Partitions, Partition extends IS
void close();
}
- Emitter<Partitions, Partition, M> getEmitter(Map conf, TopologyContext context);
+ Emitter<Partitions, Partition, M> getEmitter(Map<String, Object> conf, TopologyContext context);
- Coordinator getCoordinator(Map conf, TopologyContext context);
+ Coordinator getCoordinator(Map<String, Object> conf, TopologyContext context);
Map<String, Object> getComponentConfiguration();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/spout/IPartitionedTridentSpout.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/spout/IPartitionedTridentSpout.java b/storm-client/src/jvm/org/apache/storm/trident/spout/IPartitionedTridentSpout.java
index 82c4f74..61b0877 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/spout/IPartitionedTridentSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/spout/IPartitionedTridentSpout.java
@@ -69,8 +69,8 @@ public interface IPartitionedTridentSpout<Partitions, Partition extends ISpoutPa
void close();
}
- Coordinator<Partitions> getCoordinator(Map conf, TopologyContext context);
- Emitter<Partitions, Partition, T> getEmitter(Map conf, TopologyContext context);
+ Coordinator<Partitions> getCoordinator(Map<String, Object> conf, TopologyContext context);
+ Emitter<Partitions, Partition, T> getEmitter(Map<String, Object> conf, TopologyContext context);
Map<String, Object> getComponentConfiguration();
Fields getOutputFields();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/spout/ITridentSpout.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/spout/ITridentSpout.java b/storm-client/src/jvm/org/apache/storm/trident/spout/ITridentSpout.java
index a6f2d92..edeb199 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/spout/ITridentSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/spout/ITridentSpout.java
@@ -103,7 +103,7 @@ public interface ITridentSpout<T> extends ITridentDataSource {
* @param context topology context
* @return spout coordinator instance
*/
- BatchCoordinator<T> getCoordinator(String txStateId, Map conf, TopologyContext context);
+ BatchCoordinator<T> getCoordinator(String txStateId, Map<String, Object> conf, TopologyContext context);
/**
* The emitter for a TransactionalSpout runs as many tasks across the cluster. Emitters are responsible for
@@ -118,7 +118,7 @@ public interface ITridentSpout<T> extends ITridentDataSource {
* @param context topology context
* @return spout emitter
*/
- Emitter<T> getEmitter(String txStateId, Map conf, TopologyContext context);
+ Emitter<T> getEmitter(String txStateId, Map<String, Object> conf, TopologyContext context);
Map<String, Object> getComponentConfiguration();
Fields getOutputFields();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/spout/OpaquePartitionedTridentSpoutExecutor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/spout/OpaquePartitionedTridentSpoutExecutor.java b/storm-client/src/jvm/org/apache/storm/trident/spout/OpaquePartitionedTridentSpoutExecutor.java
index a6eeff0..e7bf70a 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/spout/OpaquePartitionedTridentSpoutExecutor.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/spout/OpaquePartitionedTridentSpoutExecutor.java
@@ -44,7 +44,7 @@ public class OpaquePartitionedTridentSpoutExecutor implements ICommitterTridentS
public class Coordinator implements ITridentSpout.BatchCoordinator<Object> {
IOpaquePartitionedTridentSpout.Coordinator _coordinator;
- public Coordinator(Map conf, TopologyContext context) {
+ public Coordinator(Map<String, Object> conf, TopologyContext context) {
_coordinator = _spout.getCoordinator(conf, context);
}
@@ -93,7 +93,7 @@ public class OpaquePartitionedTridentSpoutExecutor implements ICommitterTridentS
int _index;
int _numTasks;
- public Emitter(String txStateId, Map conf, TopologyContext context) {
+ public Emitter(String txStateId, Map<String, Object> conf, TopologyContext context) {
_emitter = _spout.getEmitter(conf, context);
_index = context.getThisTaskIndex();
_numTasks = context.getComponentTasks(context.getThisComponentId()).size();
@@ -212,12 +212,12 @@ public class OpaquePartitionedTridentSpoutExecutor implements ICommitterTridentS
}
@Override
- public ITridentSpout.BatchCoordinator<Object> getCoordinator(String txStateId, Map conf, TopologyContext context) {
+ public ITridentSpout.BatchCoordinator<Object> getCoordinator(String txStateId, Map<String, Object> conf, TopologyContext context) {
return new Coordinator(conf, context);
}
@Override
- public ICommitterTridentSpout.Emitter getEmitter(String txStateId, Map conf, TopologyContext context) {
+ public ICommitterTridentSpout.Emitter getEmitter(String txStateId, Map<String, Object> conf, TopologyContext context) {
return new Emitter(txStateId, conf, context);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/spout/PartitionedTridentSpoutExecutor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/spout/PartitionedTridentSpoutExecutor.java b/storm-client/src/jvm/org/apache/storm/trident/spout/PartitionedTridentSpoutExecutor.java
index a96dd1a..2b440bd 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/spout/PartitionedTridentSpoutExecutor.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/spout/PartitionedTridentSpoutExecutor.java
@@ -48,7 +48,7 @@ public class PartitionedTridentSpoutExecutor implements ITridentSpout<Object> {
class Coordinator implements ITridentSpout.BatchCoordinator<Object> {
private IPartitionedTridentSpout.Coordinator<Object> _coordinator;
- public Coordinator(Map conf, TopologyContext context) {
+ public Coordinator(Map<String, Object> conf, TopologyContext context) {
_coordinator = _spout.getCoordinator(conf, context);
}
@@ -101,7 +101,7 @@ public class PartitionedTridentSpoutExecutor implements ITridentSpout<Object> {
private int _index;
private int _numTasks;
- public Emitter(String txStateId, Map conf, TopologyContext context) {
+ public Emitter(String txStateId, Map<String, Object> conf, TopologyContext context) {
_emitter = _spout.getEmitter(conf, context);
_state = TransactionalState.newUserState(conf, txStateId);
_index = context.getThisTaskIndex();
@@ -167,12 +167,12 @@ public class PartitionedTridentSpoutExecutor implements ITridentSpout<Object> {
}
@Override
- public ITridentSpout.BatchCoordinator<Object> getCoordinator(String txStateId, Map conf, TopologyContext context) {
+ public ITridentSpout.BatchCoordinator<Object> getCoordinator(String txStateId, Map<String, Object> conf, TopologyContext context) {
return new Coordinator(conf, context);
}
@Override
- public ITridentSpout.Emitter<Object> getEmitter(String txStateId, Map conf, TopologyContext context) {
+ public ITridentSpout.Emitter<Object> getEmitter(String txStateId, Map<String, Object> conf, TopologyContext context) {
return new Emitter(txStateId, conf, context);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/spout/RichSpoutBatchExecutor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/spout/RichSpoutBatchExecutor.java b/storm-client/src/jvm/org/apache/storm/trident/spout/RichSpoutBatchExecutor.java
index 6980c81..dd950d3 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/spout/RichSpoutBatchExecutor.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/spout/RichSpoutBatchExecutor.java
@@ -52,12 +52,12 @@ public class RichSpoutBatchExecutor implements ITridentSpout<Object> {
}
@Override
- public BatchCoordinator<Object> getCoordinator(String txStateId, Map conf, TopologyContext context) {
+ public BatchCoordinator<Object> getCoordinator(String txStateId, Map<String, Object> conf, TopologyContext context) {
return new RichSpoutCoordinator();
}
@Override
- public Emitter<Object> getEmitter(String txStateId, Map conf, TopologyContext context) {
+ public Emitter<Object> getEmitter(String txStateId, Map<String, Object> conf, TopologyContext context) {
return new RichSpoutEmitter(conf, context);
}
@@ -71,7 +71,7 @@ public class RichSpoutBatchExecutor implements ITridentSpout<Object> {
long lastRotate = System.currentTimeMillis();
long rotateTime;
- public RichSpoutEmitter(Map conf, TopologyContext context) {
+ public RichSpoutEmitter(Map<String, Object> conf, TopologyContext context) {
_conf = conf;
_context = context;
Number batchSize = (Number) conf.get(MAX_BATCH_SIZE_CONF);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/spout/RichSpoutBatchTriggerer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/spout/RichSpoutBatchTriggerer.java b/storm-client/src/jvm/org/apache/storm/trident/spout/RichSpoutBatchTriggerer.java
index 3678ccd..af98465 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/spout/RichSpoutBatchTriggerer.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/spout/RichSpoutBatchTriggerer.java
@@ -55,7 +55,7 @@ public class RichSpoutBatchTriggerer implements IRichSpout {
}
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
_delegate.open(conf, context, new SpoutOutputCollector(new StreamOverrideCollector(collector)));
_outputTasks = new ArrayList<>();
for(String component: Utils.get(context.getThisTargets(),
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/spout/TridentSpoutCoordinator.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/spout/TridentSpoutCoordinator.java b/storm-client/src/jvm/org/apache/storm/trident/spout/TridentSpoutCoordinator.java
index 708d4f1..8816f7a 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/spout/TridentSpoutCoordinator.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/spout/TridentSpoutCoordinator.java
@@ -51,7 +51,7 @@ public class TridentSpoutCoordinator implements IBasicBolt {
}
@Override
- public void prepare(Map conf, TopologyContext context) {
+ public void prepare(Map<String, Object> conf, TopologyContext context) {
_coord = _spout.getCoordinator(_id, conf, context);
_underlyingState = TransactionalState.newCoordinatorState(conf, _id);
_state = new RotatingTransactionalState(_underlyingState, META_DIR);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/spout/TridentSpoutExecutor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/spout/TridentSpoutExecutor.java b/storm-client/src/jvm/org/apache/storm/trident/spout/TridentSpoutExecutor.java
index fc9b1cf..b60a7bd 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/spout/TridentSpoutExecutor.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/spout/TridentSpoutExecutor.java
@@ -56,7 +56,7 @@ public class TridentSpoutExecutor implements ITridentBatchBolt {
}
@Override
- public void prepare(Map conf, TopologyContext context, BatchOutputCollector collector) {
+ public void prepare(Map<String, Object> conf, TopologyContext context, BatchOutputCollector collector) {
_emitter = _spout.getEmitter(_txStateId, conf, context);
_collector = new AddIdCollector(_streamName, collector);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/state/StateFactory.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/state/StateFactory.java b/storm-client/src/jvm/org/apache/storm/trident/state/StateFactory.java
index 2421eb4..7448973 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/state/StateFactory.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/state/StateFactory.java
@@ -22,5 +22,5 @@ import java.io.Serializable;
import java.util.Map;
public interface StateFactory extends Serializable {
- State makeState(Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions);
+ State makeState(Map<String, Object> conf, IMetricsContext metrics, int partitionIndex, int numPartitions);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/state/map/MapCombinerAggStateUpdater.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/state/map/MapCombinerAggStateUpdater.java b/storm-client/src/jvm/org/apache/storm/trident/state/map/MapCombinerAggStateUpdater.java
index 7f0b60f..0382e1a 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/state/map/MapCombinerAggStateUpdater.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/state/map/MapCombinerAggStateUpdater.java
@@ -72,7 +72,7 @@ public class MapCombinerAggStateUpdater implements StateUpdater<MapState> {
}
@Override
- public void prepare(Map conf, TridentOperationContext context) {
+ public void prepare(Map<String, Object> conf, TridentOperationContext context) {
_groupFactory = context.makeProjectionFactory(_groupFields);
_inputFactory = context.makeProjectionFactory(_inputFields);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/state/map/MapReducerAggStateUpdater.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/state/map/MapReducerAggStateUpdater.java b/storm-client/src/jvm/org/apache/storm/trident/state/map/MapReducerAggStateUpdater.java
index 895dcb2..3579273 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/state/map/MapReducerAggStateUpdater.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/state/map/MapReducerAggStateUpdater.java
@@ -79,7 +79,7 @@ public class MapReducerAggStateUpdater implements StateUpdater<MapState> {
}
@Override
- public void prepare(Map conf, TridentOperationContext context) {
+ public void prepare(Map<String, Object> conf, TridentOperationContext context) {
_groupFactory = context.makeProjectionFactory(_groupFields);
_inputFactory = context.makeProjectionFactory(_inputFields);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/testing/FeederBatchSpout.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/testing/FeederBatchSpout.java b/storm-client/src/jvm/org/apache/storm/trident/testing/FeederBatchSpout.java
index 1f0859b..9b4ed28 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/testing/FeederBatchSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/testing/FeederBatchSpout.java
@@ -167,7 +167,7 @@ public class FeederBatchSpout implements ITridentSpout<Map<Integer, List<List<Ob
}
@Override
- public BatchCoordinator<Map<Integer, List<List<Object>>>> getCoordinator(String txStateId, Map conf, TopologyContext context) {
+ public BatchCoordinator<Map<Integer, List<List<Object>>>> getCoordinator(String txStateId, Map<String, Object> conf, TopologyContext context) {
int numTasks = context.getComponentTasks(
TridentTopologyBuilder.spoutIdFromCoordinatorId(
context.getThisComponentId()))
@@ -176,7 +176,7 @@ public class FeederBatchSpout implements ITridentSpout<Map<Integer, List<List<Ob
}
@Override
- public Emitter<Map<Integer, List<List<Object>>>> getEmitter(String txStateId, Map conf, TopologyContext context) {
+ public Emitter<Map<Integer, List<List<Object>>>> getEmitter(String txStateId, Map<String, Object> conf, TopologyContext context) {
return new FeederEmitter(context.getThisTaskIndex());
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/testing/FeederCommitterBatchSpout.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/testing/FeederCommitterBatchSpout.java b/storm-client/src/jvm/org/apache/storm/trident/testing/FeederCommitterBatchSpout.java
index 8609ed2..5811af0 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/testing/FeederCommitterBatchSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/testing/FeederCommitterBatchSpout.java
@@ -69,12 +69,12 @@ public class FeederCommitterBatchSpout implements ICommitterTridentSpout<Map<Int
}
@Override
- public Emitter getEmitter(String txStateId, Map conf, TopologyContext context) {
+ public Emitter getEmitter(String txStateId, Map<String, Object> conf, TopologyContext context) {
return new CommitterEmitter(_spout.getEmitter(txStateId, conf, context));
}
@Override
- public BatchCoordinator<Map<Integer, List<List<Object>>>> getCoordinator(String txStateId, Map conf, TopologyContext context) {
+ public BatchCoordinator<Map<Integer, List<List<Object>>>> getCoordinator(String txStateId, Map<String, Object> conf, TopologyContext context) {
return _spout.getCoordinator(txStateId, conf, context);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/testing/FixedBatchSpout.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/testing/FixedBatchSpout.java b/storm-client/src/jvm/org/apache/storm/trident/testing/FixedBatchSpout.java
index a7eba1a..5d677ec 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/testing/FixedBatchSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/testing/FixedBatchSpout.java
@@ -51,7 +51,7 @@ public class FixedBatchSpout implements IBatchSpout {
}
@Override
- public void open(Map conf, TopologyContext context) {
+ public void open(Map<String, Object> conf, TopologyContext context) {
index = 0;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/testing/LRUMemoryMapState.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/testing/LRUMemoryMapState.java b/storm-client/src/jvm/org/apache/storm/trident/testing/LRUMemoryMapState.java
index afd6b7d..076a67f 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/testing/LRUMemoryMapState.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/testing/LRUMemoryMapState.java
@@ -88,7 +88,7 @@ public class LRUMemoryMapState<T> implements Snapshottable<T>, ITupleCollection,
}
@Override
- public State makeState(Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
+ public State makeState(Map<String, Object> conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
return new LRUMemoryMapState(_maxSize, _id + partitionIndex);
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/testing/MemoryMapState.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/testing/MemoryMapState.java b/storm-client/src/jvm/org/apache/storm/trident/testing/MemoryMapState.java
index 35d7c61..4aec01c 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/testing/MemoryMapState.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/testing/MemoryMapState.java
@@ -104,7 +104,7 @@ public class MemoryMapState<T> implements Snapshottable<T>, ITupleCollection, Ma
}
@Override
- public State makeState(Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
+ public State makeState(Map<String, Object> conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
return new MemoryMapState(_id + partitionIndex);
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/topology/ITridentBatchBolt.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/topology/ITridentBatchBolt.java b/storm-client/src/jvm/org/apache/storm/trident/topology/ITridentBatchBolt.java
index df7c100..7bbe20e 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/topology/ITridentBatchBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/topology/ITridentBatchBolt.java
@@ -24,7 +24,7 @@ import org.apache.storm.tuple.Tuple;
import java.util.Map;
public interface ITridentBatchBolt extends IComponent {
- void prepare(Map conf, TopologyContext context, BatchOutputCollector collector);
+ void prepare(Map<String, Object> conf, TopologyContext context, BatchOutputCollector collector);
void execute(BatchInfo batchInfo, Tuple tuple);
void finishBatch(BatchInfo batchInfo);
Object initBatchState(String batchGroup, Object batchId);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/topology/MasterBatchCoordinator.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/topology/MasterBatchCoordinator.java b/storm-client/src/jvm/org/apache/storm/trident/topology/MasterBatchCoordinator.java
index c10af43..e54d0e2 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/topology/MasterBatchCoordinator.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/topology/MasterBatchCoordinator.java
@@ -92,7 +92,7 @@ public class MasterBatchCoordinator extends BaseRichSpout {
}
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
_throttler = new WindowedTimeThrottler((Number)conf.get(Config.TOPOLOGY_TRIDENT_BATCH_EMIT_INTERVAL_MILLIS), 1);
for(String spoutId: _managedSpoutIds) {
_states.add(TransactionalState.newCoordinatorState(conf, spoutId));
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/topology/TridentBoltExecutor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/topology/TridentBoltExecutor.java b/storm-client/src/jvm/org/apache/storm/trident/topology/TridentBoltExecutor.java
index 1b90581..88d222c 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/topology/TridentBoltExecutor.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/topology/TridentBoltExecutor.java
@@ -208,7 +208,7 @@ public class TridentBoltExecutor implements IRichBolt {
TopologyContext _context;
@Override
- public void prepare(Map conf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> conf, TopologyContext context, OutputCollector collector) {
_messageTimeoutMs = context.maxTopologyMessageTimeout() * 1000L;
_lastRotate = System.currentTimeMillis();
_batches = new RotatingMap<>(2);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/topology/state/TestTransactionalState.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/topology/state/TestTransactionalState.java b/storm-client/src/jvm/org/apache/storm/trident/topology/state/TestTransactionalState.java
index 98b587a..7a59527 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/topology/state/TestTransactionalState.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/topology/state/TestTransactionalState.java
@@ -35,7 +35,7 @@ public class TestTransactionalState extends TransactionalState {
* Matching constructor in absence of a default constructor in the parent
* class.
*/
- protected TestTransactionalState(Map conf, String id, String subroot) {
+ protected TestTransactionalState(Map<String, Object> conf, String id, String subroot) {
super(conf, id, subroot);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 7a3bf19..ce81334 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
@@ -48,15 +48,15 @@ public class TransactionalState {
CuratorFramework _curator;
List<ACL> _zkAcls = null;
- public static TransactionalState newUserState(Map conf, String id) {
+ public static TransactionalState newUserState(Map<String, Object> conf, String id) {
return new TransactionalState(conf, id, "user");
}
- public static TransactionalState newCoordinatorState(Map conf, String id) {
+ public static TransactionalState newCoordinatorState(Map<String, Object> conf, String id) {
return new TransactionalState(conf, id, "coordinator");
}
- protected TransactionalState(Map conf, String id, String subroot) {
+ protected TransactionalState(Map<String, Object> conf, String id, String subroot) {
try {
conf = new HashMap(conf);
String transactionalRoot = (String)conf.get(Config.TRANSACTIONAL_ZOOKEEPER_ROOT);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/windowing/InMemoryTridentWindowManager.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/windowing/InMemoryTridentWindowManager.java b/storm-client/src/jvm/org/apache/storm/trident/windowing/InMemoryTridentWindowManager.java
index 69eb39e..517a5c5 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/windowing/InMemoryTridentWindowManager.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/windowing/InMemoryTridentWindowManager.java
@@ -69,4 +69,4 @@ public class InMemoryTridentWindowManager extends AbstractTridentWindowManager<T
return ((IBatchID) batchId).getId().toString();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/windowing/InMemoryWindowsStoreFactory.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/windowing/InMemoryWindowsStoreFactory.java b/storm-client/src/jvm/org/apache/storm/trident/windowing/InMemoryWindowsStoreFactory.java
index f7e114d..91a6ab9 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/windowing/InMemoryWindowsStoreFactory.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/windowing/InMemoryWindowsStoreFactory.java
@@ -35,7 +35,7 @@ public class InMemoryWindowsStoreFactory implements WindowsStoreFactory {
private InMemoryWindowsStore inMemoryWindowsStore;
@Override
- public WindowsStore create(Map stormConf) {
+ public WindowsStore create(Map<String, Object> topoConf) {
if(inMemoryWindowsStore == null) {
inMemoryWindowsStore = new InMemoryWindowsStore();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowKryoSerializer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowKryoSerializer.java b/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowKryoSerializer.java
index b105180..19c147a 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowKryoSerializer.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowKryoSerializer.java
@@ -37,8 +37,8 @@ public class WindowKryoSerializer {
private final Output output;
private final Input input;
- public WindowKryoSerializer(Map stormConf) {
- kryo = SerializationFactory.getKryo(stormConf);
+ public WindowKryoSerializer(Map<String, Object> topoConf) {
+ kryo = SerializationFactory.getKryo(topoConf);
output = new Output(2000, 2_000_000_000);
input = new Input();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowTridentProcessor.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowTridentProcessor.java b/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowTridentProcessor.java
index 59110e6..721063a 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowTridentProcessor.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowTridentProcessor.java
@@ -84,20 +84,20 @@ public class WindowTridentProcessor implements TridentProcessor {
}
@Override
- public void prepare(Map stormConf, TopologyContext context, TridentContext tridentContext) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, TridentContext tridentContext) {
this.topologyContext = context;
List<TridentTuple.Factory> parents = tridentContext.getParentTupleFactories();
if (parents.size() != 1) {
throw new RuntimeException("Aggregation related operation can only have one parent");
}
- Long maxTuplesCacheSize = getWindowTuplesCacheSize(stormConf);
+ Long maxTuplesCacheSize = getWindowTuplesCacheSize(topoConf);
this.tridentContext = tridentContext;
collector = new FreshCollector(tridentContext);
projection = new TridentTupleView.ProjectionFactory(parents.get(0), inputFields);
- windowStore = windowStoreFactory.create(stormConf);
+ windowStore = windowStoreFactory.create(topoConf);
windowTaskId = windowId + WindowsStore.KEY_SEPARATOR + topologyContext.getThisTaskId() + WindowsStore.KEY_SEPARATOR;
windowTriggerInprocessId = getWindowTriggerInprocessIdPrefix(windowTaskId);
@@ -116,7 +116,7 @@ public class WindowTridentProcessor implements TridentProcessor {
return TRIGGER_PREFIX + windowTaskId;
}
- private Long getWindowTuplesCacheSize(Map conf) {
+ private Long getWindowTuplesCacheSize(Map<String, Object> conf) {
if (conf.containsKey(Config.TOPOLOGY_TRIDENT_WINDOWING_INMEMORY_CACHE_LIMIT)) {
return ((Number) conf.get(Config.TOPOLOGY_TRIDENT_WINDOWING_INMEMORY_CACHE_LIMIT)).longValue();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowsStateFactory.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowsStateFactory.java b/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowsStateFactory.java
index 28893c7..b6cda68 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowsStateFactory.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowsStateFactory.java
@@ -34,7 +34,7 @@ public class WindowsStateFactory implements StateFactory {
}
@Override
- public State makeState(Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
+ public State makeState(Map<String, Object> conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
return new WindowsState();
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowsStateUpdater.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowsStateUpdater.java b/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowsStateUpdater.java
index 8042e93..ece093c 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowsStateUpdater.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowsStateUpdater.java
@@ -70,7 +70,7 @@ public class WindowsStateUpdater implements StateUpdater<WindowsState> {
}
@Override
- public void prepare(Map conf, TridentOperationContext context) {
+ public void prepare(Map<String, Object> conf, TridentOperationContext context) {
windowsStore = windowStoreFactory.create(conf);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowsStoreFactory.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowsStoreFactory.java b/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowsStoreFactory.java
index edd0cb2..4be33f2 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowsStoreFactory.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowsStoreFactory.java
@@ -33,8 +33,8 @@ public interface WindowsStoreFactory extends Serializable {
/**
* Creates a window store
*
- * @param stormConf storm topology configuration passed in {@link org.apache.storm.trident.planner.TridentProcessor#prepare(Map, TopologyContext, TridentContext)}
+ * @param topoConf storm topology configuration passed in {@link org.apache.storm.trident.planner.TridentProcessor#prepare(Map, TopologyContext, TridentContext)}
*
*/
- public WindowsStore create(Map stormConf);
+ public WindowsStore create(Map<String, Object> topoConf);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 43d2d46..0101bbf 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/ConfigUtils.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/ConfigUtils.java
@@ -68,21 +68,21 @@ public class ConfigUtils {
}
// we use this "weird" wrapper pattern temporarily for mocking in clojure test
- public static String workerArtifactsRoot(Map conf) {
+ public static String workerArtifactsRoot(Map<String, Object> conf) {
return _instance.workerArtifactsRootImpl(conf);
}
- public static String workerArtifactsRoot(Map conf, String id) {
+ public static String workerArtifactsRoot(Map<String, Object> conf, String id) {
return (workerArtifactsRoot(conf) + FILE_SEPARATOR + id);
}
- public static String workerArtifactsRoot(Map conf, String id, Integer port) {
+ public static String workerArtifactsRoot(Map<String, Object> conf, String id, Integer port) {
return (workerArtifactsRoot(conf, id) + FILE_SEPARATOR + port);
}
public static String getLogDir() {
String dir;
- Map conf;
+ Map<String, Object> conf;
if (System.getProperty("storm.log.dir") != null) {
dir = System.getProperty("storm.log.dir");
} else if ((conf = readStormConfig()).get("storm.log.dir") != null) {
@@ -104,7 +104,7 @@ public class ConfigUtils {
return _instance.readStormConfigImpl();
}
- public static int samplingRate(Map conf) {
+ public static int samplingRate(Map<String, Object> conf) {
double rate = ObjectReader.getDouble(conf.get(Config.TOPOLOGY_STATS_SAMPLE_RATE));
if (rate != 0) {
return (int) (1 / rate);
@@ -112,7 +112,7 @@ public class ConfigUtils {
throw new IllegalArgumentException("Illegal topology.stats.sample.rate in conf: " + rate);
}
- public static Callable<Boolean> mkStatsSampler(Map conf) {
+ public static Callable<Boolean> mkStatsSampler(Map<String, Object> conf) {
return evenSampler(samplingRate(conf));
}
@@ -135,7 +135,7 @@ public class ConfigUtils {
};
}
- public static StormTopology readSupervisorTopology(Map conf, String stormId, AdvancedFSOps ops) throws IOException {
+ public static StormTopology readSupervisorTopology(Map<String, Object> conf, String stormId, AdvancedFSOps ops) throws IOException {
return _instance.readSupervisorTopologyImpl(conf, stormId, ops);
}
@@ -153,12 +153,12 @@ public class ConfigUtils {
}
// we use this "weird" wrapper pattern temporarily for mocking in clojure test
- public static String supervisorStormDistRoot(Map conf) throws IOException {
+ public static String supervisorStormDistRoot(Map<String, Object> conf) throws IOException {
return ConfigUtils._instance.supervisorStormDistRootImpl(conf);
}
// we use this "weird" wrapper pattern temporarily for mocking in clojure test
- public static String supervisorStormDistRoot(Map conf, String stormId) throws IOException {
+ public static String supervisorStormDistRoot(Map<String, Object> conf, String stormId) throws IOException {
return _instance.supervisorStormDistRootImpl(conf, stormId);
}
@@ -170,7 +170,7 @@ public class ConfigUtils {
return (concatIfNotNull(stormRoot) + FILE_SEPARATOR + "stormconf.ser");
}
- public static String absoluteStormLocalDir(Map conf) {
+ public static String absoluteStormLocalDir(Map<String, Object> conf) {
String stormHome = System.getProperty("storm.home");
String localDir = (String) conf.get(Config.STORM_LOCAL_DIR);
if (localDir == null) {
@@ -193,23 +193,23 @@ public class ConfigUtils {
}
// we use this "weird" wrapper pattern temporarily for mocking in clojure test
- public static String workerRoot(Map conf) {
+ public static String workerRoot(Map<String, Object> conf) {
return _instance.workerRootImpl(conf);
}
- public static String workerRoot(Map conf, String id) {
+ public static String workerRoot(Map<String, Object> conf, String id) {
return (workerRoot(conf) + FILE_SEPARATOR + id);
}
- public static String workerPidsRoot(Map conf, String id) {
+ public static String workerPidsRoot(Map<String, Object> conf, String id) {
return (workerRoot(conf, id) + FILE_SEPARATOR + "pids");
}
- public static String workerPidPath(Map conf, String id, String pid) {
+ public static String workerPidPath(Map<String, Object> conf, String id, String pid) {
return (workerPidsRoot(conf, id) + FILE_SEPARATOR + pid);
}
- public static String workerArtifactsPidPath(Map conf, String id, Integer port) {
+ public static String workerArtifactsPidPath(Map<String, Object> conf, String id, Integer port) {
return (workerArtifactsRoot(conf, id, port) + FILE_SEPARATOR + "worker.pid");
}
@@ -218,13 +218,13 @@ public class ConfigUtils {
return _instance.readSupervisorStormConfImpl(conf, stormId);
}
- public static Map<String, Object> readSupervisorStormConfGivenPath(Map<String, Object> conf, String stormConfPath) throws IOException {
+ public static Map<String, Object> readSupervisorStormConfGivenPath(Map<String, Object> conf, String topoConfPath) throws IOException {
Map<String, Object> ret = new HashMap<>(conf);
- ret.putAll(Utils.fromCompressedJsonConf(FileUtils.readFileToByteArray(new File(stormConfPath))));
+ ret.putAll(Utils.fromCompressedJsonConf(FileUtils.readFileToByteArray(new File(topoConfPath))));
return ret;
}
- public static Map overrideLoginConfigWithSystemProperty(Map conf) { // note that we delete the return value
+ public static Map 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);
@@ -232,11 +232,11 @@ public class ConfigUtils {
return conf;
}
- public static String workerHeartbeatsRoot(Map conf, String id) {
+ public static String workerHeartbeatsRoot(Map<String, Object> conf, String id) {
return (workerRoot(conf, id) + FILE_SEPARATOR + "heartbeats");
}
- public static LocalState workerState(Map conf, String id) throws IOException {
+ public static LocalState workerState(Map<String, Object> conf, String id) throws IOException {
return new LocalState(workerHeartbeatsRoot(conf, id));
}
@@ -289,19 +289,19 @@ public class ConfigUtils {
}
// we use this "weird" wrapper pattern temporarily for mocking in clojure test
- public static String supervisorLocalDir(Map conf) throws IOException {
+ public static String supervisorLocalDir(Map<String, Object> conf) throws IOException {
return _instance.supervisorLocalDirImpl(conf);
}
- public static String workerTmpRoot(Map conf, String id) {
+ public static String workerTmpRoot(Map<String, Object> conf, String id) {
return (workerRoot(conf, id) + FILE_SEPARATOR + "tmp");
}
- public static String workerUserRoot(Map conf) {
+ public static String workerUserRoot(Map<String, Object> conf) {
return (absoluteStormLocalDir(conf) + FILE_SEPARATOR + "workers-users");
}
- public static String workerUserFile(Map conf, String workerId) {
+ public static String workerUserFile(Map<String, Object> conf, String workerId) {
return (workerUserRoot(conf) + FILE_SEPARATOR + workerId);
}
@@ -313,7 +313,7 @@ public class ConfigUtils {
return new File((logRoot + FILE_SEPARATOR + id + FILE_SEPARATOR + port));
}
- public StormTopology readSupervisorTopologyImpl(Map conf, String stormId, AdvancedFSOps ops) throws IOException {
+ public StormTopology readSupervisorTopologyImpl(Map<String, Object> conf, String stormId, AdvancedFSOps ops) throws IOException {
String stormRoot = supervisorStormDistRoot(conf, stormId);
String topologyPath = supervisorStormCodePath(stormRoot);
return readSupervisorStormCodeGivenPath(topologyPath, ops);
@@ -325,7 +325,7 @@ public class ConfigUtils {
return conf;
}
- public String workerArtifactsRootImpl(Map conf) {
+ public String workerArtifactsRootImpl(Map<String, Object> conf) {
String artifactsDir = (String)conf.get(Config.STORM_WORKERS_ARTIFACTS_DIR);
if (artifactsDir == null) {
return (getLogDir() + FILE_SEPARATOR + "workers-artifacts");
@@ -338,11 +338,11 @@ public class ConfigUtils {
}
}
- public String supervisorStormDistRootImpl(Map conf, String stormId) throws IOException {
+ public String supervisorStormDistRootImpl(Map<String, Object> conf, String stormId) throws IOException {
return supervisorStormDistRoot(conf) + FILE_SEPARATOR + URLEncoder.encode(stormId, "UTF-8");
}
- public String workerRootImpl(Map conf) {
+ public String workerRootImpl(Map<String, Object> conf) {
return (absoluteStormLocalDir(conf) + FILE_SEPARATOR + "workers");
}
@@ -352,11 +352,11 @@ public class ConfigUtils {
return readSupervisorStormConfGivenPath(conf, confPath);
}
- public String supervisorStormDistRootImpl(Map conf) throws IOException {
+ public String supervisorStormDistRootImpl(Map<String, Object> conf) throws IOException {
return stormDistPath(supervisorLocalDir(conf));
}
- public String supervisorLocalDirImpl(Map conf) throws IOException {
+ public String supervisorLocalDirImpl(Map<String, Object> conf) throws IOException {
String ret = ConfigUtils.absoluteStormLocalDir(conf) + FILE_SEPARATOR + "supervisor";
FileUtils.forceMkdir(new File(ret));
return ret;
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/utils/CuratorUtils.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/utils/CuratorUtils.java b/storm-client/src/jvm/org/apache/storm/utils/CuratorUtils.java
index 38109ba..f36003d 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/CuratorUtils.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/CuratorUtils.java
@@ -36,15 +36,15 @@ import java.util.Map;
public class CuratorUtils {
public static final Logger LOG = LoggerFactory.getLogger(CuratorUtils.class);
- public static CuratorFramework newCurator(Map conf, List<String> servers, Object port, String root) {
+ public static CuratorFramework newCurator(Map<String, Object> conf, List<String> servers, Object port, String root) {
return newCurator(conf, servers, port, root, null);
}
- public static CuratorFramework newCurator(Map conf, List<String> servers, Object port, ZookeeperAuthInfo auth) {
+ public static CuratorFramework newCurator(Map<String, Object> conf, List<String> servers, Object port, ZookeeperAuthInfo auth) {
return newCurator(conf, servers, port, "", auth);
}
- public static CuratorFramework newCurator(Map conf, List<String> servers, Object port, String root, ZookeeperAuthInfo auth) {
+ public static CuratorFramework newCurator(Map<String, Object> conf, List<String> servers, Object port, String root, ZookeeperAuthInfo auth) {
List<String> serverPorts = new ArrayList<String>();
for (String zkServer : servers) {
serverPorts.add(zkServer + ":" + ObjectReader.getInt(port));
@@ -57,7 +57,7 @@ public class CuratorUtils {
return builder.build();
}
- protected static void setupBuilder(CuratorFrameworkFactory.Builder builder, final String zkStr, Map conf, ZookeeperAuthInfo auth)
+ protected static void setupBuilder(CuratorFrameworkFactory.Builder builder, final String zkStr, Map<String, Object> conf, ZookeeperAuthInfo auth)
{
List<String> exhibitorServers = ObjectReader.getStrings(conf.get(Config.STORM_EXHIBITOR_SERVERS));
if (!exhibitorServers.isEmpty()) {
@@ -94,19 +94,19 @@ public class CuratorUtils {
}
public static void testSetupBuilder(CuratorFrameworkFactory.Builder
- builder, String zkStr, Map conf, ZookeeperAuthInfo auth)
+ builder, String zkStr, Map<String, Object> conf, ZookeeperAuthInfo auth)
{
setupBuilder(builder, zkStr, conf, auth);
}
- public static CuratorFramework newCuratorStarted(Map conf, List<String> servers, Object port, String root, ZookeeperAuthInfo auth) {
+ public static CuratorFramework newCuratorStarted(Map<String, Object> conf, List<String> servers, Object port, String root, ZookeeperAuthInfo auth) {
CuratorFramework ret = newCurator(conf, servers, port, root, auth);
LOG.info("Starting Utils Curator...");
ret.start();
return ret;
}
- public static CuratorFramework newCuratorStarted(Map conf, List<String> servers, Object port, ZookeeperAuthInfo auth) {
+ public static CuratorFramework newCuratorStarted(Map<String, Object> conf, List<String> servers, Object port, ZookeeperAuthInfo auth) {
CuratorFramework ret = newCurator(conf, servers, port, auth);
LOG.info("Starting Utils Curator (2)...");
ret.start();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/utils/DRPCClient.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/utils/DRPCClient.java b/storm-client/src/jvm/org/apache/storm/utils/DRPCClient.java
index 1338231..d18dde3 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/DRPCClient.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/DRPCClient.java
@@ -61,7 +61,7 @@ public class DRPCClient extends ThriftClient implements DistributedRPC.Iface {
return _localOverrideClient.getServiceId();
}
- public static DRPCClient getConfiguredClient(Map conf) throws TTransportException {
+ public static DRPCClient getConfiguredClient(Map<String, Object> conf) throws TTransportException {
DistributedRPC.Iface override = _localOverrideClient;
if (override != null) {
return new DRPCClient(override);
@@ -86,12 +86,12 @@ public class DRPCClient extends ThriftClient implements DistributedRPC.Iface {
this.client = override;
}
- public DRPCClient(Map conf, String host, int port) throws TTransportException {
+ public DRPCClient(Map<String, Object> conf, String host, int port) throws TTransportException {
this(conf, host, port, null);
_retryForever = true;
}
- public DRPCClient(Map conf, String host, int port, Integer timeout) throws TTransportException {
+ public DRPCClient(Map<String, Object> conf, String host, int port, Integer timeout) throws TTransportException {
super(conf, _localOverrideClient != null ? ThriftConnectionType.LOCAL_FAKE : ThriftConnectionType.DRPC,
host, port, timeout, null);
this.host = host;
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 cb2e1af..57cf590 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/NimbusClient.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/NimbusClient.java
@@ -70,7 +70,7 @@ public class NimbusClient extends ThriftClient {
withConfiguredClient(cb, ConfigUtils.readStormConfig());
}
- public static void withConfiguredClient(WithNimbus cb, Map conf) throws Exception {
+ public static void withConfiguredClient(WithNimbus cb, Map<String, Object> conf) throws Exception {
ReqContext context = ReqContext.context();
Principal principal = context.principal();
String user = principal == null ? null : principal.getName();
@@ -79,11 +79,11 @@ public class NimbusClient extends ThriftClient {
}
}
- public static NimbusClient getConfiguredClient(Map conf) {
+ public static NimbusClient getConfiguredClient(Map<String, Object> conf) {
return getConfiguredClientAs(conf, null);
}
- public static NimbusClient getConfiguredClientAs(Map conf, String asUser) {
+ public static NimbusClient getConfiguredClientAs(Map<String, Object> conf, String asUser) {
Nimbus.Iface override = _localOverrideClient;
if (override != null) {
return new NimbusClient(override);
@@ -144,23 +144,23 @@ public class NimbusClient extends ThriftClient {
Config.NIMBUS_SEEDS + "?");
}
- public NimbusClient(Map conf, String host, int port) throws TTransportException {
+ public NimbusClient(Map<String, Object> conf, String host, int port) throws TTransportException {
this(conf, host, port, null, null);
}
- public NimbusClient(Map conf, String host, int port, Integer timeout) throws TTransportException {
+ public NimbusClient(Map<String, Object> conf, String host, int port, Integer timeout) throws TTransportException {
super(conf, ThriftConnectionType.NIMBUS, host, port, timeout, null);
_client = new Nimbus.Client(_protocol);
_isLocal = false;
}
- public NimbusClient(Map conf, String host, Integer port, Integer timeout, String asUser) throws TTransportException {
+ public NimbusClient(Map<String, Object> conf, String host, Integer port, Integer timeout, String asUser) throws TTransportException {
super(conf, ThriftConnectionType.NIMBUS, host, port, timeout, asUser);
_client = new Nimbus.Client(_protocol);
_isLocal = false;
}
- public NimbusClient(Map conf, String host) throws TTransportException {
+ public NimbusClient(Map<String, Object> conf, String host) throws TTransportException {
super(conf, ThriftConnectionType.NIMBUS, host, null, null, null);
_client = new Nimbus.Client(_protocol);
_isLocal = false;
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/utils/ShellProcess.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/utils/ShellProcess.java b/storm-client/src/jvm/org/apache/storm/utils/ShellProcess.java
index 352333c..7fbc834 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/ShellProcess.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/ShellProcess.java
@@ -64,11 +64,11 @@ public class ShellProcess implements Serializable {
}
}
- public Number launch(Map conf, TopologyContext context) {
+ public Number launch(Map<String, Object> conf, TopologyContext context) {
return launch(conf, context, true);
}
- public Number launch(Map conf, TopologyContext context, boolean changeDirectory) {
+ public Number launch(Map<String, Object> conf, TopologyContext context, boolean changeDirectory) {
ProcessBuilder builder = new ProcessBuilder(command);
if (!env.isEmpty()) {
Map<String, String> buildEnv = builder.environment();
@@ -98,7 +98,7 @@ public class ShellProcess implements Serializable {
return this.pid;
}
- private ISerializer getSerializer(Map conf) {
+ private ISerializer getSerializer(Map<String, Object> conf) {
//get factory class name
String serializer_className = (String)conf.get(Config.TOPOLOGY_MULTILANG_SERIALIZER);
LOG.info("Storm multilang serializer: " + serializer_className);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 fad8235..498edcb 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/Utils.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/Utils.java
@@ -493,7 +493,7 @@ public class Utils {
return ret.toString();
}
- public static List<ACL> getWorkerACL(Map conf) {
+ public static List<ACL> getWorkerACL(Map<String, Object> conf) {
//This is a work around to an issue with ZK where a sasl super user is not super unless there is an open SASL ACL so we are trying to give the correct perms
if (!isZkAuthenticationConfiguredTopology(conf)) {
return null;
@@ -516,7 +516,7 @@ public class Utils {
* @param conf the topology configuration
* @return true if ZK is configured else false
*/
- public static boolean isZkAuthenticationConfiguredTopology(Map conf) {
+ public static boolean isZkAuthenticationConfiguredTopology(Map<String, Object> conf) {
return (conf != null
&& conf.get(Config.STORM_ZOOKEEPER_TOPOLOGY_AUTH_SCHEME) != null
&& !((String)conf.get(Config.STORM_ZOOKEEPER_TOPOLOGY_AUTH_SCHEME)).isEmpty());
@@ -689,11 +689,11 @@ public class Utils {
/**
* Creates an instance of the pluggable SerializationDelegate or falls back to
* DefaultSerializationDelegate if something goes wrong.
- * @param stormConf The config from which to pull the name of the pluggable class.
+ * @param topoConf The config from which to pull the name of the pluggable class.
* @return an instance of the class specified by storm.meta.serialization.delegate
*/
- private static SerializationDelegate getSerializationDelegate(Map stormConf) {
- String delegateClassName = (String)stormConf.get(Config.STORM_META_SERIALIZATION_DELEGATE);
+ private static SerializationDelegate getSerializationDelegate(Map<String, Object> topoConf) {
+ String delegateClassName = (String)topoConf.get(Config.STORM_META_SERIALIZATION_DELEGATE);
SerializationDelegate delegate;
try {
Class delegateClass = Class.forName(delegateClassName);
@@ -702,7 +702,7 @@ public class Utils {
LOG.error("Failed to construct serialization delegate, falling back to default", e);
delegate = new DefaultSerializationDelegate();
}
- delegate.prepare(stormConf);
+ delegate.prepare(topoConf);
return delegate;
}
@@ -926,7 +926,7 @@ public class Utils {
}
}
- public static ClientBlobStore getClientBlobStore(Map conf) {
+ public static ClientBlobStore getClientBlobStore(Map<String, Object> conf) {
ClientBlobStore store = (ClientBlobStore) ReflectionUtils.newInstance((String) conf.get(Config.CLIENT_BLOBSTORE));
store.prepare(conf);
return store;
@@ -963,12 +963,12 @@ public class Utils {
return ret;
}
- public static boolean isValidConf(Map<String, Object> stormConf) {
- return normalizeConf(stormConf).equals(normalizeConf((Map<String, Object>) JSONValue.parse(JSONValue.toJSONString(stormConf))));
+ public static boolean isValidConf(Map<String, Object> topoConf) {
+ return normalizeConf(topoConf).equals(normalizeConf((Map<String, Object>) JSONValue.parse(JSONValue.toJSONString(topoConf))));
}
- public static TopologyInfo getTopologyInfo(String name, String asUser, Map stormConf) {
- try (NimbusClient client = NimbusClient.getConfiguredClientAs(stormConf, asUser)) {
+ public static TopologyInfo getTopologyInfo(String name, String asUser, Map<String, Object> topoConf) {
+ try (NimbusClient client = NimbusClient.getConfiguredClientAs(topoConf, asUser)) {
String topologyId = getTopologyId(name, client.getClient());
if (null != topologyId) {
return client.getClient().getTopologyInfo(topologyId);
@@ -993,9 +993,9 @@ public class Utils {
return null;
}
- public static void validateTopologyBlobStoreMap(Map<String, ?> stormConf, Set<String> blobStoreKeys) throws InvalidTopologyException {
+ public static void validateTopologyBlobStoreMap(Map<String, Object> topoConf, Set<String> blobStoreKeys) throws InvalidTopologyException {
@SuppressWarnings("unchecked")
- Map<String, Object> blobStoreMap = (Map<String, Object>) stormConf.get(Config.TOPOLOGY_BLOBSTORE_MAP);
+ Map<String, Object> blobStoreMap = (Map<String, Object>) topoConf.get(Config.TOPOLOGY_BLOBSTORE_MAP);
if (blobStoreMap != null) {
Set<String> mapKeys = blobStoreMap.keySet();
Set<String> missingKeys = new HashSet<>();
@@ -1052,7 +1052,7 @@ public class Utils {
* @param configKey The key pointing to the pluggable class
* @return an instance of the class or null if it is not specified.
*/
- public static Object getConfiguredClass(Map conf, Object configKey) {
+ public static Object getConfiguredClass(Map<String, Object> conf, Object configKey) {
if (conf.containsKey(configKey)) {
return ReflectionUtils.newInstance((String)conf.get(configKey));
}
@@ -1065,18 +1065,18 @@ public class Utils {
* @param conf the storm configuration, not the topology configuration
* @return true if it is configured else false.
*/
- public static boolean isZkAuthenticationConfiguredStormServer(Map conf) {
+ public static boolean isZkAuthenticationConfiguredStormServer(Map<String, Object> conf) {
return null != System.getProperty("java.security.auth.login.config")
|| (conf != null
&& conf.get(Config.STORM_ZOOKEEPER_AUTH_SCHEME) != null
&& !((String)conf.get(Config.STORM_ZOOKEEPER_AUTH_SCHEME)).isEmpty());
}
- public static byte[] toCompressedJsonConf(Map<String, Object> stormConf) {
+ public static byte[] toCompressedJsonConf(Map<String, Object> topoConf) {
try {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
OutputStreamWriter out = new OutputStreamWriter(new GZIPOutputStream(bos));
- JSONValue.writeJSONString(stormConf, out);
+ JSONValue.writeJSONString(topoConf, out);
out.close();
return bos.toByteArray();
} catch (IOException e) {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/utils/ZookeeperAuthInfo.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/utils/ZookeeperAuthInfo.java b/storm-client/src/jvm/org/apache/storm/utils/ZookeeperAuthInfo.java
index 7191b5e..25cedb9 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/ZookeeperAuthInfo.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/ZookeeperAuthInfo.java
@@ -26,7 +26,7 @@ public class ZookeeperAuthInfo {
public String scheme;
public byte[] payload = null;
- public ZookeeperAuthInfo(Map conf) {
+ public ZookeeperAuthInfo(Map<String, Object> conf) {
String scheme = (String) conf.get(Config.STORM_ZOOKEEPER_TOPOLOGY_AUTH_SCHEME);
String payload = (String) conf.get(Config.STORM_ZOOKEEPER_TOPOLOGY_AUTH_PAYLOAD);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 a742a0f..d2d862b 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 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 authConf) {
return _instance.mkClientImpl(conf, servers, port, root, watcher, authConf);
}
@@ -305,23 +305,23 @@ public class ClientZookeeper {
*
* @return
*/
- public CuratorFramework mkClientImpl(Map conf, List<String> servers, Object port, String root, final WatcherCallBack watcher) {
+ public CuratorFramework mkClientImpl(Map<String, Object> conf, List<String> servers, Object port, String root, final WatcherCallBack watcher) {
return mkClientImpl(conf, servers, port, root, watcher, null);
}
- public CuratorFramework mkClientImpl(Map conf, List<String> servers, Object port, String root) {
+ public CuratorFramework mkClientImpl(Map<String, Object> conf, List<String> servers, Object port, String root) {
return mkClientImpl(conf, servers, port, root, new DefaultWatcherCallBack());
}
- public CuratorFramework mkClientImpl(Map conf, List<String> servers, Object port, Map authConf) {
+ public CuratorFramework mkClientImpl(Map<String, Object> conf, List<String> servers, Object port, Map authConf) {
return mkClientImpl(conf, servers, port, "", new DefaultWatcherCallBack(), authConf);
}
- public CuratorFramework mkClientImpl(Map 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 authConf) {
return mkClientImpl(conf, servers, port, root, new DefaultWatcherCallBack(), authConf);
}
- public CuratorFramework mkClientImpl(Map 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 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/64e29f36/storm-client/test/jvm/org/apache/storm/TestConfigValidate.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/TestConfigValidate.java b/storm-client/test/jvm/org/apache/storm/TestConfigValidate.java
index 63f2cd9..74ed71e 100644
--- a/storm-client/test/jvm/org/apache/storm/TestConfigValidate.java
+++ b/storm-client/test/jvm/org/apache/storm/TestConfigValidate.java
@@ -86,22 +86,22 @@ public class TestConfigValidate {
@Test(expected = InvalidTopologyException.class)
public void testValidateTopologyBlobStoreMap() throws InvalidTopologyException {
- Map<String, Object> stormConf = new HashMap<>();
+ Map<String, Object> topoConf = new HashMap<>();
Map<String,Map> topologyMap = new HashMap<>();
topologyMap.put("key1", new HashMap<String,String>());
topologyMap.put("key2", new HashMap<String,String>());
- stormConf.put(Config.TOPOLOGY_BLOBSTORE_MAP, topologyMap);
+ topoConf.put(Config.TOPOLOGY_BLOBSTORE_MAP, topologyMap);
HashSet<String> keySet = new HashSet<>();
keySet.add("key1");
keySet.add("key2");
- Utils.validateTopologyBlobStoreMap(stormConf, keySet);
+ Utils.validateTopologyBlobStoreMap(topoConf, keySet);
keySet.remove("key2");
- Utils.validateTopologyBlobStoreMap(stormConf, keySet);
+ Utils.validateTopologyBlobStoreMap(topoConf, keySet);
}
@Test
public void defaultYamlTest() throws InvocationTargetException, NoSuchMethodException, NoSuchFieldException, InstantiationException, IllegalAccessException {
- Map conf = Utils.readStormConfig();
+ Map<String, Object> conf = Utils.readStormConfig();
ConfigValidation.validateFields(conf);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/test/jvm/org/apache/storm/blobstore/ClientBlobStoreTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/blobstore/ClientBlobStoreTest.java b/storm-client/test/jvm/org/apache/storm/blobstore/ClientBlobStoreTest.java
index 448a381..9dd34b0 100644
--- a/storm-client/test/jvm/org/apache/storm/blobstore/ClientBlobStoreTest.java
+++ b/storm-client/test/jvm/org/apache/storm/blobstore/ClientBlobStoreTest.java
@@ -41,7 +41,7 @@ public class ClientBlobStoreTest {
private Map<String, SettableBlobMeta> allBlobs;
@Override
- public void prepare(Map conf) {
+ public void prepare(Map<String, Object> conf) {
this.conf = conf;
allBlobs = new HashMap<String, SettableBlobMeta>();
}
@@ -100,7 +100,7 @@ public class ClientBlobStoreTest {
}
@Override
- public boolean setClient(Map conf, NimbusClient client) {
+ public boolean setClient(Map<String, Object> conf, NimbusClient client) {
return false;
}
@@ -113,7 +113,7 @@ public class ClientBlobStoreTest {
public void setUp() throws Exception {
client = new TestClientBlobStore();
- Map conf = new HashMap<String,String>();
+ Map<String, Object> conf = new HashMap<>();
client.prepare(conf);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/test/jvm/org/apache/storm/dependency/DependencyPropertiesParserTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/dependency/DependencyPropertiesParserTest.java b/storm-client/test/jvm/org/apache/storm/dependency/DependencyPropertiesParserTest.java
index 1ac6468..7b488b3 100644
--- a/storm-client/test/jvm/org/apache/storm/dependency/DependencyPropertiesParserTest.java
+++ b/storm-client/test/jvm/org/apache/storm/dependency/DependencyPropertiesParserTest.java
@@ -69,4 +69,4 @@ public class DependencyPropertiesParserTest {
sut.parseArtifactsProperties("{\"group:artifact:version\": \"a.jar\"");
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/test/jvm/org/apache/storm/dependency/DependencyUploaderTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/dependency/DependencyUploaderTest.java b/storm-client/test/jvm/org/apache/storm/dependency/DependencyUploaderTest.java
index 90d6d4d..dc32a6e 100644
--- a/storm-client/test/jvm/org/apache/storm/dependency/DependencyUploaderTest.java
+++ b/storm-client/test/jvm/org/apache/storm/dependency/DependencyUploaderTest.java
@@ -307,4 +307,4 @@ public class DependencyUploaderTest {
return tempFile;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/test/jvm/org/apache/storm/grouping/ShuffleGroupingTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/grouping/ShuffleGroupingTest.java b/storm-client/test/jvm/org/apache/storm/grouping/ShuffleGroupingTest.java
index 1f628b9..a6d0943 100644
--- a/storm-client/test/jvm/org/apache/storm/grouping/ShuffleGroupingTest.java
+++ b/storm-client/test/jvm/org/apache/storm/grouping/ShuffleGroupingTest.java
@@ -144,4 +144,4 @@ public class ShuffleGroupingTest {
assertEquals(numThreads * groupingExecutionsPerThread / numTasks, taskIdTotals[i]);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/test/jvm/org/apache/storm/metric/filter/FilterByMetricNameTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/metric/filter/FilterByMetricNameTest.java b/storm-client/test/jvm/org/apache/storm/metric/filter/FilterByMetricNameTest.java
index d2f11d6..e938fb4 100644
--- a/storm-client/test/jvm/org/apache/storm/metric/filter/FilterByMetricNameTest.java
+++ b/storm-client/test/jvm/org/apache/storm/metric/filter/FilterByMetricNameTest.java
@@ -92,4 +92,4 @@ public class FilterByMetricNameTest {
testEntry.getValue(), sut.apply(new IMetricsConsumer.DataPoint(testEntry.getKey(), 1)));
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/test/jvm/org/apache/storm/metric/util/DataPointExpanderTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/metric/util/DataPointExpanderTest.java b/storm-client/test/jvm/org/apache/storm/metric/util/DataPointExpanderTest.java
index dd74f40..b507616 100644
--- a/storm-client/test/jvm/org/apache/storm/metric/util/DataPointExpanderTest.java
+++ b/storm-client/test/jvm/org/apache/storm/metric/util/DataPointExpanderTest.java
@@ -106,4 +106,4 @@ public class DataPointExpanderTest {
return value;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/test/jvm/org/apache/storm/security/auth/AuthUtilsTestMock.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/security/auth/AuthUtilsTestMock.java b/storm-client/test/jvm/org/apache/storm/security/auth/AuthUtilsTestMock.java
index 7a5946c..dbff9f2 100644
--- a/storm-client/test/jvm/org/apache/storm/security/auth/AuthUtilsTestMock.java
+++ b/storm-client/test/jvm/org/apache/storm/security/auth/AuthUtilsTestMock.java
@@ -41,7 +41,7 @@ public class AuthUtilsTestMock implements IAutoCredentials,
// IPrincipalToLocal
// IGroupMappingServiceProvider
@Override
- public void prepare(Map conf) {}
+ public void prepare(Map<String, Object> conf) {}
// IHttpCredentialsPlugin
@Override
@@ -69,7 +69,7 @@ public class AuthUtilsTestMock implements IAutoCredentials,
// ICredentialsRenewer
@Override
- public void renew(Map<String, String> credentials, Map topologyConf) {}
+ public void renew(Map<String, String> credentials, Map<String, Object> topologyConf) {}
// IAutoCredentials
@Override
@@ -85,7 +85,7 @@ public class AuthUtilsTestMock implements IAutoCredentials,
// INimbusCredentialPlugin
@Override
- public void populateCredentials(Map<String,String> credentials, Map conf) {}
+ public void populateCredentials(Map<String,String> credentials, Map<String, Object> conf) {}
// Shutdownable via INimbusCredentailPlugin
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 18b76d2..272ca60 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
@@ -51,7 +51,7 @@ public class AutoSSLTest {
}
@Override
- protected String getSSLWriteDirFromConf(Map conf) {
+ protected String getSSLWriteDirFromConf(Map<String, Object> conf) {
return baseDir;
}
}
@@ -59,7 +59,7 @@ public class AutoSSLTest {
@Test
public void testgetSSLFilesFromConf() throws Exception {
AutoSSL assl = new AutoSSL();
- Map 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,7 +74,7 @@ public class AutoSSLTest {
@Test
public void testgetSSLFilesFromConfMultipleComma() throws Exception {
AutoSSL assl = new AutoSSL();
- Map 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);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/test/jvm/org/apache/storm/security/auth/ThriftClientTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/security/auth/ThriftClientTest.java b/storm-client/test/jvm/org/apache/storm/security/auth/ThriftClientTest.java
index ddaddcc..b109967 100644
--- a/storm-client/test/jvm/org/apache/storm/security/auth/ThriftClientTest.java
+++ b/storm-client/test/jvm/org/apache/storm/security/auth/ThriftClientTest.java
@@ -31,7 +31,7 @@ import java.util.Map;
public class ThriftClientTest {
private int NIMBUS_TIMEOUT = 3 * 1000;
- private Map conf;
+ private Map<String, Object> conf;
@Before
public void setup() {
[04/13] storm git commit: STORM-2477: Result of transforming the code
Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/test/jvm/org/apache/storm/security/auth/authorizer/DRPCSimpleACLAuthorizerTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/security/auth/authorizer/DRPCSimpleACLAuthorizerTest.java b/storm-client/test/jvm/org/apache/storm/security/auth/authorizer/DRPCSimpleACLAuthorizerTest.java
index dce065d..54e75f9 100644
--- a/storm-client/test/jvm/org/apache/storm/security/auth/authorizer/DRPCSimpleACLAuthorizerTest.java
+++ b/storm-client/test/jvm/org/apache/storm/security/auth/authorizer/DRPCSimpleACLAuthorizerTest.java
@@ -156,7 +156,7 @@ public class DRPCSimpleACLAuthorizerTest {
}
private boolean isPermitted(IAuthorizer authorizer, ReqContext context, String operation, String function) {
- Map config = new HashMap();
+ Map<String, Object> config = new HashMap();
config.put(DRPCSimpleACLAuthorizer.FUNCTION_KEY, function);
return authorizer.permit(context, operation, config);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/test/jvm/org/apache/storm/security/serialization/BlowfishTupleSerializerTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/security/serialization/BlowfishTupleSerializerTest.java b/storm-client/test/jvm/org/apache/storm/security/serialization/BlowfishTupleSerializerTest.java
index 08ada9f..730e6aa 100644
--- a/storm-client/test/jvm/org/apache/storm/security/serialization/BlowfishTupleSerializerTest.java
+++ b/storm-client/test/jvm/org/apache/storm/security/serialization/BlowfishTupleSerializerTest.java
@@ -68,9 +68,9 @@ public class BlowfishTupleSerializerTest {
" mollusks, their natural prey.";
Kryo kryo = new Kryo();
String arbitraryKey = "7dd6fb3203878381b08f9c89d25ed105";
- Map stormConf = ImmutableMap.of(BlowfishTupleSerializer.SECRET_KEY, arbitraryKey);
- BlowfishTupleSerializer writerBTS = new BlowfishTupleSerializer(kryo, stormConf);
- BlowfishTupleSerializer readerBTS = new BlowfishTupleSerializer(kryo, stormConf);
+ Map<String, Object> topoConf = ImmutableMap.of(BlowfishTupleSerializer.SECRET_KEY, arbitraryKey);
+ BlowfishTupleSerializer writerBTS = new BlowfishTupleSerializer(kryo, topoConf);
+ BlowfishTupleSerializer readerBTS = new BlowfishTupleSerializer(kryo, topoConf);
int bufferSize = 1024;
Output output = new Output(bufferSize, bufferSize);
Input input = new Input(bufferSize);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/test/jvm/org/apache/storm/serialization/SerializationFactoryTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/serialization/SerializationFactoryTest.java b/storm-client/test/jvm/org/apache/storm/serialization/SerializationFactoryTest.java
index 5b209e9..901d387 100644
--- a/storm-client/test/jvm/org/apache/storm/serialization/SerializationFactoryTest.java
+++ b/storm-client/test/jvm/org/apache/storm/serialization/SerializationFactoryTest.java
@@ -32,7 +32,7 @@ public class SerializationFactoryTest {
@Test
public void test_registers_default_when_not_in_conf() throws ClassNotFoundException {
- Map conf = Utils.readDefaultConfig();
+ Map<String, Object> conf = Utils.readDefaultConfig();
String className = (String) conf.get(Config.TOPOLOGY_TUPLE_SERIALIZER);
Class configuredClass = Class.forName(className);
Kryo kryo = SerializationFactory.getKryo(conf);
@@ -41,7 +41,7 @@ public class SerializationFactoryTest {
@Test(expected = RuntimeException.class)
public void test_throws_runtimeexception_when_no_such_class() {
- Map conf = Utils.readDefaultConfig();
+ Map<String, Object> conf = Utils.readDefaultConfig();
conf.put(Config.TOPOLOGY_TUPLE_SERIALIZER, "null.this.class.does.not.exist");
SerializationFactory.getKryo(conf);
}
@@ -50,7 +50,7 @@ public class SerializationFactoryTest {
public void test_registers_when_valid_class_name() {
Class arbitraryClass = BlowfishTupleSerializer.class;
String secretKey = "0123456789abcdef";
- Map conf = Utils.readDefaultConfig();
+ Map<String, Object> conf = Utils.readDefaultConfig();
conf.put(Config.TOPOLOGY_TUPLE_SERIALIZER, arbitraryClass.getName());
conf.put(BlowfishTupleSerializer.SECRET_KEY, secretKey);
Kryo kryo = SerializationFactory.getKryo(conf);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/test/jvm/org/apache/storm/spout/CheckpointSpoutTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/spout/CheckpointSpoutTest.java b/storm-client/test/jvm/org/apache/storm/spout/CheckpointSpoutTest.java
index d86f7f3..48c4651 100644
--- a/storm-client/test/jvm/org/apache/storm/spout/CheckpointSpoutTest.java
+++ b/storm-client/test/jvm/org/apache/storm/spout/CheckpointSpoutTest.java
@@ -104,9 +104,9 @@ public class CheckpointSpoutTest {
@Test
public void testPrepareWithFail() throws Exception {
- Map<String, Object> stormConf = new HashMap<>();
+ Map<String, Object> topoConf = new HashMap<>();
KeyValueState<String, CheckPointState> state =
- (KeyValueState<String, CheckPointState>) StateFactory.getState("__state", stormConf, mockTopologyContext);
+ (KeyValueState<String, CheckPointState>) StateFactory.getState("__state", topoConf, mockTopologyContext);
CheckPointState txState = new CheckPointState(-1, COMMITTED);
state.put("__state", txState);
@@ -150,9 +150,9 @@ public class CheckpointSpoutTest {
@Test
public void testCommit() throws Exception {
- Map<String, Object> stormConf = new HashMap();
- stormConf.put(Config.TOPOLOGY_STATE_CHECKPOINT_INTERVAL, 0);
- spout.open(stormConf, mockTopologyContext, mockOutputCollector);
+ Map<String, Object> topoConf = new HashMap();
+ topoConf.put(Config.TOPOLOGY_STATE_CHECKPOINT_INTERVAL, 0);
+ spout.open(topoConf, mockTopologyContext, mockOutputCollector);
ArgumentCaptor<String> stream = ArgumentCaptor.forClass(String.class);
ArgumentCaptor<Values> values = ArgumentCaptor.forClass(Values.class);
ArgumentCaptor<Object> msgId = ArgumentCaptor.forClass(Object.class);
@@ -179,10 +179,10 @@ public class CheckpointSpoutTest {
@Test
public void testRecoveryRollback() throws Exception {
- Map<String, Object> stormConf = new HashMap();
+ Map<String, Object> topoConf = new HashMap();
KeyValueState<String, CheckPointState> state =
- (KeyValueState<String, CheckPointState>) StateFactory.getState("test-1", stormConf, mockTopologyContext);
+ (KeyValueState<String, CheckPointState>) StateFactory.getState("test-1", topoConf, mockTopologyContext);
CheckPointState checkPointState = new CheckPointState(100, CheckPointState.State.PREPARING);
state.put("__state", checkPointState);
@@ -205,10 +205,10 @@ public class CheckpointSpoutTest {
@Test
public void testRecoveryRollbackAck() throws Exception {
- Map<String, Object> stormConf = new HashMap();
+ Map<String, Object> topoConf = new HashMap();
KeyValueState<String, CheckPointState> state =
- (KeyValueState<String, CheckPointState>) StateFactory.getState("test-1", stormConf, mockTopologyContext);
+ (KeyValueState<String, CheckPointState>) StateFactory.getState("test-1", topoConf, mockTopologyContext);
CheckPointState checkPointState = new CheckPointState(100, CheckPointState.State.PREPARING);
state.put("__state", checkPointState);
@@ -235,10 +235,10 @@ public class CheckpointSpoutTest {
@Test
public void testRecoveryCommit() throws Exception {
- Map<String, Object> stormConf = new HashMap();
+ Map<String, Object> topoConf = new HashMap();
KeyValueState<String, CheckPointState> state =
- (KeyValueState<String, CheckPointState>) StateFactory.getState("test-1", stormConf, mockTopologyContext);
+ (KeyValueState<String, CheckPointState>) StateFactory.getState("test-1", topoConf, mockTopologyContext);
CheckPointState checkPointState = new CheckPointState(100, CheckPointState.State.COMMITTING);
state.put("__state", checkPointState);
@@ -259,4 +259,4 @@ public class CheckpointSpoutTest {
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/test/jvm/org/apache/storm/state/InMemoryKeyValueStateTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/state/InMemoryKeyValueStateTest.java b/storm-client/test/jvm/org/apache/storm/state/InMemoryKeyValueStateTest.java
index d215627..2d73548 100644
--- a/storm-client/test/jvm/org/apache/storm/state/InMemoryKeyValueStateTest.java
+++ b/storm-client/test/jvm/org/apache/storm/state/InMemoryKeyValueStateTest.java
@@ -96,4 +96,4 @@ public class InMemoryKeyValueStateTest {
keyValueState.get("c")
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/test/jvm/org/apache/storm/streams/StreamBuilderTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/streams/StreamBuilderTest.java b/storm-client/test/jvm/org/apache/storm/streams/StreamBuilderTest.java
index c88fe34..228e197 100644
--- a/storm-client/test/jvm/org/apache/storm/streams/StreamBuilderTest.java
+++ b/storm-client/test/jvm/org/apache/storm/streams/StreamBuilderTest.java
@@ -235,7 +235,7 @@ public class StreamBuilderTest {
}
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
}
@@ -255,7 +255,7 @@ public class StreamBuilderTest {
}
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
}
@@ -265,4 +265,4 @@ public class StreamBuilderTest {
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/test/jvm/org/apache/storm/streams/processors/JoinProcessorTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/streams/processors/JoinProcessorTest.java b/storm-client/test/jvm/org/apache/storm/streams/processors/JoinProcessorTest.java
index 08a6c7d..7d27341 100644
--- a/storm-client/test/jvm/org/apache/storm/streams/processors/JoinProcessorTest.java
+++ b/storm-client/test/jvm/org/apache/storm/streams/processors/JoinProcessorTest.java
@@ -122,4 +122,4 @@ public class JoinProcessorTest {
joinProcessor.finish();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/test/jvm/org/apache/storm/topology/StatefulBoltExecutorTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/topology/StatefulBoltExecutorTest.java b/storm-client/test/jvm/org/apache/storm/topology/StatefulBoltExecutorTest.java
index 6606491..26b5594 100644
--- a/storm-client/test/jvm/org/apache/storm/topology/StatefulBoltExecutorTest.java
+++ b/storm-client/test/jvm/org/apache/storm/topology/StatefulBoltExecutorTest.java
@@ -175,4 +175,4 @@ public class StatefulBoltExecutorTest {
Mockito.verify(mockBolt, Mockito.times(2)).execute(mockTuple);
Mockito.verify(mockOutputCollector, Mockito.times(1)).ack(mockTuple);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/test/jvm/org/apache/storm/topology/StatefulWindowedBoltExecutorTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/topology/StatefulWindowedBoltExecutorTest.java b/storm-client/test/jvm/org/apache/storm/topology/StatefulWindowedBoltExecutorTest.java
index 4946163..4e06dc0 100644
--- a/storm-client/test/jvm/org/apache/storm/topology/StatefulWindowedBoltExecutorTest.java
+++ b/storm-client/test/jvm/org/apache/storm/topology/StatefulWindowedBoltExecutorTest.java
@@ -128,4 +128,4 @@ public class StatefulWindowedBoltExecutorTest {
}
return mockTuples;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/test/jvm/org/apache/storm/topology/TopologyBuilderTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/topology/TopologyBuilderTest.java b/storm-client/test/jvm/org/apache/storm/topology/TopologyBuilderTest.java
index 56e6f99..cc55b18 100644
--- a/storm-client/test/jvm/org/apache/storm/topology/TopologyBuilderTest.java
+++ b/storm-client/test/jvm/org/apache/storm/topology/TopologyBuilderTest.java
@@ -99,7 +99,7 @@ public class TopologyBuilderTest {
@Override
public void declareOutputFields(OutputFieldsDeclarer declarer) {}
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {}
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {}
@Override
public void nextTuple() {}
private void writeObject(java.io.ObjectOutputStream stream) {}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/test/jvm/org/apache/storm/trident/TridentWindowingTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/trident/TridentWindowingTest.java b/storm-client/test/jvm/org/apache/storm/trident/TridentWindowingTest.java
index 4b82b89..4287013 100644
--- a/storm-client/test/jvm/org/apache/storm/trident/TridentWindowingTest.java
+++ b/storm-client/test/jvm/org/apache/storm/trident/TridentWindowingTest.java
@@ -102,4 +102,4 @@ public class TridentWindowingTest {
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 15f0920..8024820 100644
--- a/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java
+++ b/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java
@@ -89,7 +89,7 @@ public class UtilsTest {
}
public void getConfiguredClientThrowsRuntimeExceptionOnBadArgsTest () throws TTransportException {
- Map config = ConfigUtils.readStormConfig();
+ Map<String, Object> config = ConfigUtils.readStormConfig();
config.put(Config.STORM_NIMBUS_RETRY_TIMES, 0);
try {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-clojure/src/main/java/org/apache/storm/clojure/ClojureBolt.java
----------------------------------------------------------------------
diff --git a/storm-clojure/src/main/java/org/apache/storm/clojure/ClojureBolt.java b/storm-clojure/src/main/java/org/apache/storm/clojure/ClojureBolt.java
index 1e9b8ba..af371a2 100644
--- a/storm-clojure/src/main/java/org/apache/storm/clojure/ClojureBolt.java
+++ b/storm-clojure/src/main/java/org/apache/storm/clojure/ClojureBolt.java
@@ -53,7 +53,7 @@ public class ClojureBolt implements IRichBolt, FinishedCallback {
}
@Override
- public void prepare(final Map stormConf, final TopologyContext context, final OutputCollector collector) {
+ public void prepare(final Map<String, Object> topoConf, final TopologyContext context, final OutputCollector collector) {
IFn hof = ClojureUtil.loadClojureFn(_fnSpec.get(0), _fnSpec.get(1));
try {
IFn preparer = (IFn) hof.applyTo(RT.seq(_params));
@@ -61,7 +61,7 @@ public class ClojureBolt implements IRichBolt, FinishedCallback {
Keyword.intern(Symbol.create("output-collector")), collector,
Keyword.intern(Symbol.create("context")), context});
List<Object> args = new ArrayList<Object>() {{
- add(stormConf);
+ add(topoConf);
add(context);
add(collectorMap);
}};
@@ -69,7 +69,7 @@ public class ClojureBolt implements IRichBolt, FinishedCallback {
_bolt = (IBolt) preparer.applyTo(RT.seq(args));
//this is kind of unnecessary for clojure
try {
- _bolt.prepare(stormConf, context, collector);
+ _bolt.prepare(topoConf, context, collector);
} catch(AbstractMethodError ame) {
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-clojure/src/main/java/org/apache/storm/clojure/ClojureSpout.java
----------------------------------------------------------------------
diff --git a/storm-clojure/src/main/java/org/apache/storm/clojure/ClojureSpout.java b/storm-clojure/src/main/java/org/apache/storm/clojure/ClojureSpout.java
index efa3dd6..17399db 100644
--- a/storm-clojure/src/main/java/org/apache/storm/clojure/ClojureSpout.java
+++ b/storm-clojure/src/main/java/org/apache/storm/clojure/ClojureSpout.java
@@ -52,7 +52,7 @@ public class ClojureSpout implements IRichSpout {
@Override
- public void open(final Map conf, final TopologyContext context, final SpoutOutputCollector collector) {
+ public void open(final Map<String, Object> conf, final TopologyContext context, final SpoutOutputCollector collector) {
IFn hof = ClojureUtil.loadClojureFn(_fnSpec.get(0), _fnSpec.get(1));
try {
IFn preparer = (IFn) hof.applyTo(RT.seq(_params));
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-core/src/jvm/org/apache/storm/command/HealthCheck.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/command/HealthCheck.java b/storm-core/src/jvm/org/apache/storm/command/HealthCheck.java
index dc7c18c..6cfde2c 100644
--- a/storm-core/src/jvm/org/apache/storm/command/HealthCheck.java
+++ b/storm-core/src/jvm/org/apache/storm/command/HealthCheck.java
@@ -29,4 +29,4 @@ public class HealthCheck {
System.exit(HealthChecker.healthCheck(conf));
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-core/src/jvm/org/apache/storm/testing/MockLeaderElector.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/testing/MockLeaderElector.java b/storm-core/src/jvm/org/apache/storm/testing/MockLeaderElector.java
index ade29a9..4710f10 100644
--- a/storm-core/src/jvm/org/apache/storm/testing/MockLeaderElector.java
+++ b/storm-core/src/jvm/org/apache/storm/testing/MockLeaderElector.java
@@ -43,7 +43,7 @@ public class MockLeaderElector implements ILeaderElector {
}
@Override
- public void prepare(Map conf) {
+ public void prepare(Map<String, Object> conf) {
//NOOP
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-core/src/jvm/org/apache/storm/utils/TopologySpoutLag.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/utils/TopologySpoutLag.java b/storm-core/src/jvm/org/apache/storm/utils/TopologySpoutLag.java
index e392ad3..07573c9 100644
--- a/storm-core/src/jvm/org/apache/storm/utils/TopologySpoutLag.java
+++ b/storm-core/src/jvm/org/apache/storm/utils/TopologySpoutLag.java
@@ -44,7 +44,7 @@ public class TopologySpoutLag {
private static final String ERROR_INFO = "errorInfo";
private final static Logger logger = LoggerFactory.getLogger(TopologySpoutLag.class);
- public static Map<String, Map<String, Object>> lag (StormTopology stormTopology, Map topologyConf) {
+ public static Map<String, Map<String, Object>> lag (StormTopology stormTopology, Map<String, Object> topologyConf) {
Map<String, Map<String, Object>> result = new HashMap<>();
Map<String, SpoutSpec> spouts = stormTopology.get_spouts();
String className = null;
@@ -101,7 +101,7 @@ public class TopologySpoutLag {
return commands;
}
- private static List<String> getCommandLineOptionsForOldKafkaSpout (Map<String, Object> jsonConf, Map topologyConf) {
+ private static List<String> getCommandLineOptionsForOldKafkaSpout (Map<String, Object> jsonConf, Map<String, Object> topologyConf) {
logger.debug("json configuration: {}", jsonConf);
List<String> commands = new ArrayList<>();
@@ -138,7 +138,7 @@ public class TopologySpoutLag {
return commands;
}
- private static Map<String, Object> getLagResultForKafka (String spoutId, SpoutSpec spoutSpec, Map topologyConf, boolean old) throws IOException {
+ private static Map<String, Object> getLagResultForKafka (String spoutId, SpoutSpec spoutSpec, Map<String, Object> topologyConf, boolean old) throws IOException {
ComponentCommon componentCommon = spoutSpec.get_common();
String json = componentCommon.get_json_conf();
Map<String, Object> result = null;
@@ -187,11 +187,11 @@ public class TopologySpoutLag {
return kafkaSpoutLagInfo;
}
- private static Map<String, Object> getLagResultForNewKafkaSpout (String spoutId, SpoutSpec spoutSpec, Map topologyConf) throws IOException {
+ private static Map<String, Object> getLagResultForNewKafkaSpout (String spoutId, SpoutSpec spoutSpec, Map<String, Object> topologyConf) throws IOException {
return getLagResultForKafka(spoutId, spoutSpec, topologyConf, false);
}
- private static Map<String, Object> getLagResultForOldKafkaSpout (String spoutId, SpoutSpec spoutSpec, Map topologyConf) throws IOException {
+ private static Map<String, Object> getLagResultForOldKafkaSpout (String spoutId, SpoutSpec spoutSpec, Map<String, Object> topologyConf) throws IOException {
return getLagResultForKafka(spoutId, spoutSpec, topologyConf, true);
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-core/test/jvm/org/apache/storm/MockAutoCred.java
----------------------------------------------------------------------
diff --git a/storm-core/test/jvm/org/apache/storm/MockAutoCred.java b/storm-core/test/jvm/org/apache/storm/MockAutoCred.java
index 2bcf973..457ac50 100644
--- a/storm-core/test/jvm/org/apache/storm/MockAutoCred.java
+++ b/storm-core/test/jvm/org/apache/storm/MockAutoCred.java
@@ -42,7 +42,7 @@ public class MockAutoCred implements INimbusCredentialPlugin, IAutoCredentials,
}
@Override
- public void populateCredentials(Map<String, String> credentials, Map conf) {
+ public void populateCredentials(Map<String, String> credentials, Map<String, Object> conf) {
credentials.put(NIMBUS_CRED_KEY, NIMBUS_CRED_VAL);
}
@@ -58,13 +58,13 @@ public class MockAutoCred implements INimbusCredentialPlugin, IAutoCredentials,
}
@Override
- public void renew(Map<String, String> credentials, Map topologyConf) {
+ public void renew(Map<String, String> credentials, Map<String, Object> topologyConf) {
credentials.put(NIMBUS_CRED_KEY, NIMBUS_CRED_RENEW_VAL);
credentials.put(GATEWAY_CRED_KEY, GATEWAY_CRED_RENEW_VAL);
}
@Override
- public void prepare(Map conf) {
+ public void prepare(Map<String, Object> conf) {
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-core/test/jvm/org/apache/storm/metric/FakeMetricConsumer.java
----------------------------------------------------------------------
diff --git a/storm-core/test/jvm/org/apache/storm/metric/FakeMetricConsumer.java b/storm-core/test/jvm/org/apache/storm/metric/FakeMetricConsumer.java
index a6dc391..64ea8ac 100644
--- a/storm-core/test/jvm/org/apache/storm/metric/FakeMetricConsumer.java
+++ b/storm-core/test/jvm/org/apache/storm/metric/FakeMetricConsumer.java
@@ -35,7 +35,7 @@ public class FakeMetricConsumer implements IMetricsConsumer {
public static final Table<String, String, Multimap<Integer, Object>> buffer = HashBasedTable.create();
@Override
- public void prepare(Map stormConf, Object registrationArgument, TopologyContext context, IErrorReporter errorReporter) {
+ public void prepare(Map<String, Object> topoConf, Object registrationArgument, TopologyContext context, IErrorReporter errorReporter) {
synchronized (buffer) {
buffer.clear();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 7664c0a..9ed57af 100644
--- a/storm-core/test/jvm/org/apache/storm/serialization/SerializationTest.java
+++ b/storm-core/test/jvm/org/apache/storm/serialization/SerializationTest.java
@@ -79,17 +79,17 @@ public class SerializationTest {
}
private Map mkConf(Map extra) {
- Map config = Utils.readDefaultConfig();
+ Map<String, Object> config = Utils.readDefaultConfig();
config.putAll(extra);
return config;
}
- private byte[] serialize(List vals, Map conf) throws IOException {
+ private byte[] serialize(List vals, Map<String, Object> conf) throws IOException {
KryoValuesSerializer serializer = new KryoValuesSerializer(mkConf(conf));
return serializer.serialize(vals);
}
- private List deserialize(byte[] bytes, Map conf) throws IOException {
+ private List deserialize(byte[] bytes, Map<String, Object> conf) throws IOException {
KryoValuesDeserializer deserializer = new KryoValuesDeserializer(mkConf(conf));
return deserializer.deserialize(bytes);
}
@@ -98,7 +98,7 @@ public class SerializationTest {
return roundtrip(vals, new HashMap());
}
- private List roundtrip(List vals, Map conf) throws IOException {
+ private List roundtrip(List vals, Map<String, Object> conf) throws IOException {
return deserialize(serialize(vals, conf), conf);
}
@@ -113,4 +113,4 @@ public class SerializationTest {
public void isRoundtrip(List vals) throws IOException {
Assert.assertEquals(vals, roundtrip(vals));
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-core/test/jvm/org/apache/storm/utils/staticmocking/ConfigUtilsInstaller.java
----------------------------------------------------------------------
diff --git a/storm-core/test/jvm/org/apache/storm/utils/staticmocking/ConfigUtilsInstaller.java b/storm-core/test/jvm/org/apache/storm/utils/staticmocking/ConfigUtilsInstaller.java
index f2b2312..bd39637 100644
--- a/storm-core/test/jvm/org/apache/storm/utils/staticmocking/ConfigUtilsInstaller.java
+++ b/storm-core/test/jvm/org/apache/storm/utils/staticmocking/ConfigUtilsInstaller.java
@@ -38,4 +38,4 @@ public class ConfigUtilsInstaller implements AutoCloseable {
"Instances of this resource must be closed in reverse order of opening.");
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-core/test/jvm/org/apache/storm/utils/staticmocking/ReflectionUtilsInstaller.java
----------------------------------------------------------------------
diff --git a/storm-core/test/jvm/org/apache/storm/utils/staticmocking/ReflectionUtilsInstaller.java b/storm-core/test/jvm/org/apache/storm/utils/staticmocking/ReflectionUtilsInstaller.java
index 6134e8c..21f80bd 100644
--- a/storm-core/test/jvm/org/apache/storm/utils/staticmocking/ReflectionUtilsInstaller.java
+++ b/storm-core/test/jvm/org/apache/storm/utils/staticmocking/ReflectionUtilsInstaller.java
@@ -36,4 +36,4 @@ public class ReflectionUtilsInstaller implements AutoCloseable {
"Instances of this resource must be closed in reverse order of opening.");
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-core/test/jvm/org/apache/storm/utils/staticmocking/ServerConfigUtilsInstaller.java
----------------------------------------------------------------------
diff --git a/storm-core/test/jvm/org/apache/storm/utils/staticmocking/ServerConfigUtilsInstaller.java b/storm-core/test/jvm/org/apache/storm/utils/staticmocking/ServerConfigUtilsInstaller.java
index 5c2688a..eb81bc4 100644
--- a/storm-core/test/jvm/org/apache/storm/utils/staticmocking/ServerConfigUtilsInstaller.java
+++ b/storm-core/test/jvm/org/apache/storm/utils/staticmocking/ServerConfigUtilsInstaller.java
@@ -38,4 +38,4 @@ public class ServerConfigUtilsInstaller implements AutoCloseable {
"Instances of this resource must be closed in reverse order of opening.");
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-core/test/jvm/org/apache/storm/utils/staticmocking/UtilsInstaller.java
----------------------------------------------------------------------
diff --git a/storm-core/test/jvm/org/apache/storm/utils/staticmocking/UtilsInstaller.java b/storm-core/test/jvm/org/apache/storm/utils/staticmocking/UtilsInstaller.java
index a181a81..f700bd9 100644
--- a/storm-core/test/jvm/org/apache/storm/utils/staticmocking/UtilsInstaller.java
+++ b/storm-core/test/jvm/org/apache/storm/utils/staticmocking/UtilsInstaller.java
@@ -36,4 +36,4 @@ public class UtilsInstaller implements AutoCloseable {
"Instances of this resource must be closed in reverse order of opening.");
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/DaemonConfig.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/DaemonConfig.java b/storm-server/src/main/java/org/apache/storm/DaemonConfig.java
index 356a347..7bc90b6 100644
--- a/storm-server/src/main/java/org/apache/storm/DaemonConfig.java
+++ b/storm-server/src/main/java/org/apache/storm/DaemonConfig.java
@@ -894,15 +894,15 @@ public class DaemonConfig implements Validated {
@isPositiveNumber
public static String STORM_CGROUP_MEMORY_LIMIT_TOLERANCE_MARGIN_MB = "storm.cgroup.memory.limit.tolerance.margin.mb";
- public static String getCgroupRootDir(Map conf) {
+ public static String getCgroupRootDir(Map<String, Object> conf) {
return (String) conf.get(STORM_SUPERVISOR_CGROUP_ROOTDIR);
}
- public static String getCgroupStormHierarchyDir(Map conf) {
+ public static String getCgroupStormHierarchyDir(Map<String, Object> conf) {
return (String) conf.get(Config.STORM_CGROUP_HIERARCHY_DIR);
}
- public static ArrayList<String> getCgroupStormResources(Map conf) {
+ public static ArrayList<String> getCgroupStormResources(Map<String, Object> conf) {
ArrayList<String> ret = new ArrayList<String>();
for (String entry : ((Iterable<String>) conf.get(DaemonConfig.STORM_CGROUP_RESOURCES))) {
ret.add(entry);
@@ -910,7 +910,7 @@ public class DaemonConfig implements Validated {
return ret;
}
- public static String getCgroupStormHierarchyName(Map conf) {
+ public static String getCgroupStormHierarchyName(Map<String, Object> conf) {
return (String) conf.get(DaemonConfig.STORM_CGROUP_HIERARCHY_NAME);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/blobstore/BlobSynchronizer.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/blobstore/BlobSynchronizer.java b/storm-server/src/main/java/org/apache/storm/blobstore/BlobSynchronizer.java
index 907318c..62233a2 100644
--- a/storm-server/src/main/java/org/apache/storm/blobstore/BlobSynchronizer.java
+++ b/storm-server/src/main/java/org/apache/storm/blobstore/BlobSynchronizer.java
@@ -35,13 +35,13 @@ import java.util.Set;
public class BlobSynchronizer {
private static final Logger LOG = LoggerFactory.getLogger(BlobSynchronizer.class);
private CuratorFramework zkClient;
- private Map conf;
+ private Map<String, Object> conf;
private BlobStore blobStore;
private Set<String> blobStoreKeySet = new HashSet<String>();
private Set<String> zookeeperKeySet = new HashSet<String>();
private NimbusInfo nimbusInfo;
- public BlobSynchronizer(BlobStore blobStore, Map conf) {
+ public BlobSynchronizer(BlobStore blobStore, Map<String, Object> conf) {
this.blobStore = blobStore;
this.conf = conf;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/blobstore/KeySequenceNumber.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/blobstore/KeySequenceNumber.java b/storm-server/src/main/java/org/apache/storm/blobstore/KeySequenceNumber.java
index 82b3d70..4c202be 100644
--- a/storm-server/src/main/java/org/apache/storm/blobstore/KeySequenceNumber.java
+++ b/storm-server/src/main/java/org/apache/storm/blobstore/KeySequenceNumber.java
@@ -131,7 +131,7 @@ public class KeySequenceNumber {
this.nimbusInfo = nimbusInfo;
}
- public synchronized int getKeySequenceNumber(Map conf) throws KeyNotFoundException {
+ public synchronized int getKeySequenceNumber(Map<String, Object> conf) throws KeyNotFoundException {
TreeSet<Integer> sequenceNumbers = new TreeSet<Integer>();
CuratorFramework zkClient = BlobStoreUtils.createZKClient(conf);
try {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/blobstore/LocalFsBlobStore.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/blobstore/LocalFsBlobStore.java b/storm-server/src/main/java/org/apache/storm/blobstore/LocalFsBlobStore.java
index d1d68b6..8568f1a 100644
--- a/storm-server/src/main/java/org/apache/storm/blobstore/LocalFsBlobStore.java
+++ b/storm-server/src/main/java/org/apache/storm/blobstore/LocalFsBlobStore.java
@@ -74,11 +74,11 @@ public class LocalFsBlobStore extends BlobStore {
private NimbusInfo nimbusInfo;
private FileBlobStoreImpl fbs;
private final int allPermissions = READ | WRITE | ADMIN;
- private Map conf;
+ private Map<String, Object> conf;
private CuratorFramework zkClient;
@Override
- public void prepare(Map conf, String overrideBase, NimbusInfo nimbusInfo) {
+ public void prepare(Map<String, Object> conf, String overrideBase, NimbusInfo nimbusInfo) {
this.conf = conf;
this.nimbusInfo = nimbusInfo;
zkClient = BlobStoreUtils.createZKClient(conf);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/daemon/metrics/MetricsUtils.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/metrics/MetricsUtils.java b/storm-server/src/main/java/org/apache/storm/daemon/metrics/MetricsUtils.java
index 7c9b924..b5bd8bc 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/metrics/MetricsUtils.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/metrics/MetricsUtils.java
@@ -36,8 +36,8 @@ import java.util.concurrent.TimeUnit;
public class MetricsUtils {
private final static Logger LOG = LoggerFactory.getLogger(MetricsUtils.class);
- public static List<PreparableReporter> getPreparableReporters(Map stormConf) {
- List<String> clazzes = (List<String>) stormConf.get(DaemonConfig.STORM_DAEMON_METRICS_REPORTER_PLUGINS);
+ public static List<PreparableReporter> getPreparableReporters(Map<String, Object> topoConf) {
+ List<String> clazzes = (List<String>) topoConf.get(DaemonConfig.STORM_DAEMON_METRICS_REPORTER_PLUGINS);
List<PreparableReporter> reporterList = new ArrayList<>();
if (clazzes != null) {
@@ -60,34 +60,34 @@ public class MetricsUtils {
return reporter;
}
- public static Locale getMetricsReporterLocale(Map stormConf) {
- String languageTag = ObjectReader.getString(stormConf.get(DaemonConfig.STORM_DAEMON_METRICS_REPORTER_PLUGIN_LOCALE), null);
+ public static Locale getMetricsReporterLocale(Map<String, Object> topoConf) {
+ String languageTag = ObjectReader.getString(topoConf.get(DaemonConfig.STORM_DAEMON_METRICS_REPORTER_PLUGIN_LOCALE), null);
if (languageTag != null) {
return Locale.forLanguageTag(languageTag);
}
return null;
}
- public static TimeUnit getMetricsRateUnit(Map stormConf) {
- return getTimeUnitForCofig(stormConf, DaemonConfig.STORM_DAEMON_METRICS_REPORTER_PLUGIN_RATE_UNIT);
+ public static TimeUnit getMetricsRateUnit(Map<String, Object> topoConf) {
+ return getTimeUnitForCofig(topoConf, DaemonConfig.STORM_DAEMON_METRICS_REPORTER_PLUGIN_RATE_UNIT);
}
- public static TimeUnit getMetricsDurationUnit(Map stormConf) {
- return getTimeUnitForCofig(stormConf, DaemonConfig.STORM_DAEMON_METRICS_REPORTER_PLUGIN_DURATION_UNIT);
+ public static TimeUnit getMetricsDurationUnit(Map<String, Object> topoConf) {
+ return getTimeUnitForCofig(topoConf, DaemonConfig.STORM_DAEMON_METRICS_REPORTER_PLUGIN_DURATION_UNIT);
}
- private static TimeUnit getTimeUnitForCofig(Map stormConf, String configName) {
- String rateUnitString = ObjectReader.getString(stormConf.get(configName), null);
+ private static TimeUnit getTimeUnitForCofig(Map<String, Object> topoConf, String configName) {
+ String rateUnitString = ObjectReader.getString(topoConf.get(configName), null);
if (rateUnitString != null) {
return TimeUnit.valueOf(rateUnitString);
}
return null;
}
- public static File getCsvLogDir(Map stormConf) {
- String csvMetricsLogDirectory = ObjectReader.getString(stormConf.get(DaemonConfig.STORM_DAEMON_METRICS_REPORTER_CSV_LOG_DIR), null);
+ public static File getCsvLogDir(Map<String, Object> topoConf) {
+ String csvMetricsLogDirectory = ObjectReader.getString(topoConf.get(DaemonConfig.STORM_DAEMON_METRICS_REPORTER_CSV_LOG_DIR), null);
if (csvMetricsLogDirectory == null) {
- csvMetricsLogDirectory = ConfigUtils.absoluteStormLocalDir(stormConf);
+ csvMetricsLogDirectory = ConfigUtils.absoluteStormLocalDir(topoConf);
csvMetricsLogDirectory = csvMetricsLogDirectory + ConfigUtils.FILE_SEPARATOR + "csvmetrics";
}
File csvMetricsDir = new File(csvMetricsLogDirectory);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/daemon/metrics/reporters/ConsolePreparableReporter.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/metrics/reporters/ConsolePreparableReporter.java b/storm-server/src/main/java/org/apache/storm/daemon/metrics/reporters/ConsolePreparableReporter.java
index 1eacb63..bc34b4b 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/metrics/reporters/ConsolePreparableReporter.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/metrics/reporters/ConsolePreparableReporter.java
@@ -32,22 +32,22 @@ public class ConsolePreparableReporter implements PreparableReporter<ConsoleRepo
ConsoleReporter reporter = null;
@Override
- public void prepare(MetricRegistry metricsRegistry, Map stormConf) {
+ public void prepare(MetricRegistry metricsRegistry, Map<String, Object> topoConf) {
LOG.debug("Preparing...");
ConsoleReporter.Builder builder = ConsoleReporter.forRegistry(metricsRegistry);
builder.outputTo(System.out);
- Locale locale = MetricsUtils.getMetricsReporterLocale(stormConf);
+ Locale locale = MetricsUtils.getMetricsReporterLocale(topoConf);
if (locale != null) {
builder.formattedFor(locale);
}
- TimeUnit rateUnit = MetricsUtils.getMetricsRateUnit(stormConf);
+ TimeUnit rateUnit = MetricsUtils.getMetricsRateUnit(topoConf);
if (rateUnit != null) {
builder.convertRatesTo(rateUnit);
}
- TimeUnit durationUnit = MetricsUtils.getMetricsDurationUnit(stormConf);
+ TimeUnit durationUnit = MetricsUtils.getMetricsDurationUnit(topoConf);
if (durationUnit != null) {
builder.convertDurationsTo(durationUnit);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/daemon/metrics/reporters/CsvPreparableReporter.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/metrics/reporters/CsvPreparableReporter.java b/storm-server/src/main/java/org/apache/storm/daemon/metrics/reporters/CsvPreparableReporter.java
index 605f389..b67cc65 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/metrics/reporters/CsvPreparableReporter.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/metrics/reporters/CsvPreparableReporter.java
@@ -33,26 +33,26 @@ public class CsvPreparableReporter implements PreparableReporter<CsvReporter> {
CsvReporter reporter = null;
@Override
- public void prepare(MetricRegistry metricsRegistry, Map stormConf) {
+ public void prepare(MetricRegistry metricsRegistry, Map<String, Object> topoConf) {
LOG.debug("Preparing...");
CsvReporter.Builder builder = CsvReporter.forRegistry(metricsRegistry);
- Locale locale = MetricsUtils.getMetricsReporterLocale(stormConf);
+ Locale locale = MetricsUtils.getMetricsReporterLocale(topoConf);
if (locale != null) {
builder.formatFor(locale);
}
- TimeUnit rateUnit = MetricsUtils.getMetricsRateUnit(stormConf);
+ TimeUnit rateUnit = MetricsUtils.getMetricsRateUnit(topoConf);
if (rateUnit != null) {
builder.convertRatesTo(rateUnit);
}
- TimeUnit durationUnit = MetricsUtils.getMetricsDurationUnit(stormConf);
+ TimeUnit durationUnit = MetricsUtils.getMetricsDurationUnit(topoConf);
if (durationUnit != null) {
builder.convertDurationsTo(durationUnit);
}
- File csvMetricsDir = MetricsUtils.getCsvLogDir(stormConf);
+ File csvMetricsDir = MetricsUtils.getCsvLogDir(topoConf);
reporter = builder.build(csvMetricsDir);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/daemon/metrics/reporters/JmxPreparableReporter.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/metrics/reporters/JmxPreparableReporter.java b/storm-server/src/main/java/org/apache/storm/daemon/metrics/reporters/JmxPreparableReporter.java
index ce74687..48eef02 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/metrics/reporters/JmxPreparableReporter.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/metrics/reporters/JmxPreparableReporter.java
@@ -34,14 +34,14 @@ public class JmxPreparableReporter implements PreparableReporter<JmxReporter> {
JmxReporter reporter = null;
@Override
- public void prepare(MetricRegistry metricsRegistry, Map stormConf) {
+ public void prepare(MetricRegistry metricsRegistry, Map<String, Object> topoConf) {
LOG.info("Preparing...");
JmxReporter.Builder builder = JmxReporter.forRegistry(metricsRegistry);
- String domain = ObjectReader.getString(stormConf.get(DaemonConfig.STORM_DAEMON_METRICS_REPORTER_PLUGIN_DOMAIN), null);
+ String domain = ObjectReader.getString(topoConf.get(DaemonConfig.STORM_DAEMON_METRICS_REPORTER_PLUGIN_DOMAIN), null);
if (domain != null) {
builder.inDomain(domain);
}
- TimeUnit rateUnit = MetricsUtils.getMetricsRateUnit(stormConf);
+ TimeUnit rateUnit = MetricsUtils.getMetricsRateUnit(topoConf);
if (rateUnit != null) {
builder.convertRatesTo(rateUnit);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/daemon/metrics/reporters/PreparableReporter.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/metrics/reporters/PreparableReporter.java b/storm-server/src/main/java/org/apache/storm/daemon/metrics/reporters/PreparableReporter.java
index 2968bfb..958a01d 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/metrics/reporters/PreparableReporter.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/metrics/reporters/PreparableReporter.java
@@ -25,7 +25,7 @@ import java.util.Map;
public interface PreparableReporter<T extends Reporter & Closeable> {
- void prepare(MetricRegistry metricsRegistry, Map stormConf);
+ void prepare(MetricRegistry metricsRegistry, Map<String, Object> topoConf);
void start();
void stop();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 f00c7d5..c665895 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
@@ -379,7 +379,7 @@ public class Nimbus implements Iface, Shutdownable, DaemonCommon {
public static class StandaloneINimbus implements INimbus {
@Override
- public void prepare(@SuppressWarnings("rawtypes") Map stormConf, String schedulerLocalDir) {
+ public void prepare(@SuppressWarnings("rawtypes") Map<String, Object> topoConf, String schedulerLocalDir) {
//NOOP
}
@@ -3478,7 +3478,7 @@ public class Nimbus implements Iface, Shutdownable, DaemonCommon {
topoPageInfo.set_name(topoName);
topoPageInfo.set_status(extractStatusStr(base));
topoPageInfo.set_uptime_secs(Time.deltaSecs(launchTimeSecs));
- topoPageInfo.set_topology_conf(JSONValue.toJSONString(topoConf));
+ topoPageInfo.set_topoConf(JSONValue.toJSONString(topoConf));
topoPageInfo.set_replication_count(getBlobReplicationCount(ConfigUtils.masterStormCodeKey(topoId)));
if (base.is_set_component_debug()) {
DebugOptions debug = base.get_component_debug().get(topoId);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/daemon/nimbus/TopologyResources.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/TopologyResources.java b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/TopologyResources.java
index ab9b212..0b87052 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/TopologyResources.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/TopologyResources.java
@@ -60,4 +60,4 @@ public final class TopologyResources {
public Double getAssignedCpu() {
return assignedCpu;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/daemon/supervisor/BasicContainer.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/BasicContainer.java b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/BasicContainer.java
index d97eea8..cd9ca97 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/BasicContainer.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/BasicContainer.java
@@ -346,7 +346,7 @@ public class BasicContainer extends Container {
protected List<String> frameworkClasspath() {
File stormWorkerLibDir = new File(_stormHome, "lib-worker");
- String stormConfDir =
+ String topoConfDir =
System.getenv("STORM_CONF_DIR") != null ?
System.getenv("STORM_CONF_DIR") :
new File(_stormHome, "conf").getAbsolutePath();
@@ -356,7 +356,7 @@ public class BasicContainer extends Container {
pathElements.add(getWildcardDir(stormWorkerLibDir));
pathElements.add(getWildcardDir(stormExtlibDir));
pathElements.add(extcp);
- pathElements.add(stormConfDir);
+ pathElements.add(topoConfDir);
return pathElements;
}
@@ -634,7 +634,7 @@ public class BasicContainer extends Container {
final String jlp) throws IOException {
final String javaCmd = javaCmd("java");
final String stormOptions = ConfigUtils.concatIfNotNull(System.getProperty("storm.options"));
- final String stormConfFile = ConfigUtils.concatIfNotNull(System.getProperty("storm.conf.file"));
+ final String topoConfFile = ConfigUtils.concatIfNotNull(System.getProperty("storm.conf.file"));
final String workerTmpDir = ConfigUtils.workerTmpRoot(_conf, _workerId);
List<String> classPathParams = getClassPathParams(stormRoot);
@@ -659,7 +659,7 @@ public class BasicContainer extends Container {
_conf.get(Config.WORKER_GC_CHILDOPTS)), memOnheap));
commandList.addAll(getWorkerProfilerChildOpts(memOnheap));
commandList.add("-Djava.library.path=" + jlp);
- commandList.add("-Dstorm.conf.file=" + stormConfFile);
+ commandList.add("-Dstorm.conf.file=" + topoConfFile);
commandList.add("-Dstorm.options=" + stormOptions);
commandList.add("-Djava.io.tmpdir=" + workerTmpDir);
commandList.addAll(classPathParams);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/daemon/supervisor/EventManagerPushCallback.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/EventManagerPushCallback.java b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/EventManagerPushCallback.java
index 177bf67..79df800 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/EventManagerPushCallback.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/EventManagerPushCallback.java
@@ -34,4 +34,4 @@ public class EventManagerPushCallback implements Runnable {
public void run() {
eventManager.add(cb);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/daemon/supervisor/StandaloneSupervisor.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/StandaloneSupervisor.java b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/StandaloneSupervisor.java
index 974399c..1332a21 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/StandaloneSupervisor.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/StandaloneSupervisor.java
@@ -30,10 +30,10 @@ import java.util.Map;
public class StandaloneSupervisor implements ISupervisor {
private String supervisorId;
- private Map conf;
+ private Map<String, Object> conf;
@Override
- public void prepare(Map stormConf, String schedulerLocalDir) {
+ public void prepare(Map<String, Object> topoConf, String schedulerLocalDir) {
try {
LocalState localState = new LocalState(schedulerLocalDir);
String supervisorId = localState.getSupervisorId();
@@ -41,7 +41,7 @@ public class StandaloneSupervisor implements ISupervisor {
supervisorId = generateSupervisorId();
localState.setSupervisorId(supervisorId);
}
- this.conf = stormConf;
+ this.conf = topoConf;
this.supervisorId = supervisorId;
} catch (IOException e) {
throw new RuntimeException(e);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/daemon/supervisor/SupervisorUtils.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/SupervisorUtils.java b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/SupervisorUtils.java
index 716534d..da8591a 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/SupervisorUtils.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/SupervisorUtils.java
@@ -102,10 +102,10 @@ public class SupervisorUtils {
* @param conf
*/
static void addBlobReferences(Localizer localizer, String stormId, Map<String, Object> conf) throws IOException {
- Map<String, Object> stormConf = ConfigUtils.readSupervisorStormConf(conf, stormId);
- Map<String, Map<String, Object>> blobstoreMap = (Map<String, Map<String, Object>>) stormConf.get(Config.TOPOLOGY_BLOBSTORE_MAP);
- String user = (String) stormConf.get(Config.TOPOLOGY_SUBMITTER_USER);
- String topoName = (String) stormConf.get(Config.TOPOLOGY_NAME);
+ Map<String, Object> topoConf = ConfigUtils.readSupervisorStormConf(conf, stormId);
+ Map<String, Map<String, Object>> blobstoreMap = (Map<String, Map<String, Object>>) topoConf.get(Config.TOPOLOGY_BLOBSTORE_MAP);
+ String user = (String) topoConf.get(Config.TOPOLOGY_SUBMITTER_USER);
+ String topoName = (String) topoConf.get(Config.TOPOLOGY_NAME);
List<LocalResource> localresources = SupervisorUtils.blobstoreMapToLocalresources(blobstoreMap);
if (blobstoreMap != null) {
localizer.addReferences(localresources, user, topoName);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/daemon/supervisor/timer/SupervisorHeartbeat.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/timer/SupervisorHeartbeat.java b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/timer/SupervisorHeartbeat.java
index 872be5d..c49f50b 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/timer/SupervisorHeartbeat.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/timer/SupervisorHeartbeat.java
@@ -71,7 +71,7 @@ public class SupervisorHeartbeat implements Runnable {
return supervisorInfo;
}
- private Map<String, Double> mkSupervisorCapacities(Map conf) {
+ private Map<String, Double> mkSupervisorCapacities(Map<String, Object> conf) {
Map<String, Double> ret = new HashMap<String, Double>();
Double mem = ObjectReader.getDouble(conf.get(Config.SUPERVISOR_MEMORY_CAPACITY_MB), 4096.0);
ret.put(Config.SUPERVISOR_MEMORY_CAPACITY_MB, mem);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/daemon/supervisor/timer/UpdateBlobs.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/timer/UpdateBlobs.java b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/timer/UpdateBlobs.java
index e882e6f..af864e8 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/timer/UpdateBlobs.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/timer/UpdateBlobs.java
@@ -89,10 +89,10 @@ public class UpdateBlobs implements Runnable {
* @param localizer
* @throws IOException
*/
- private void updateBlobsForTopology(Map conf, String stormId, Localizer localizer) throws IOException {
- Map stormConf = ConfigUtils.readSupervisorStormConf(conf, stormId);
- Map<String, Map<String, Object>> blobstoreMap = (Map<String, Map<String, Object>>) stormConf.get(Config.TOPOLOGY_BLOBSTORE_MAP);
- String user = (String) stormConf.get(Config.TOPOLOGY_SUBMITTER_USER);
+ private void updateBlobsForTopology(Map<String, Object> conf, String stormId, Localizer localizer) throws IOException {
+ Map<String, Object> topoConf = ConfigUtils.readSupervisorStormConf(conf, stormId);
+ Map<String, Map<String, Object>> blobstoreMap = (Map<String, Map<String, Object>>) topoConf.get(Config.TOPOLOGY_BLOBSTORE_MAP);
+ String user = (String) topoConf.get(Config.TOPOLOGY_SUBMITTER_USER);
List<LocalResource> localresources = SupervisorUtils.blobstoreMapToLocalresources(blobstoreMap);
try {
localizer.updateBlobs(localresources, user);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/healthcheck/HealthChecker.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/healthcheck/HealthChecker.java b/storm-server/src/main/java/org/apache/storm/healthcheck/HealthChecker.java
index cc69795..9e535b3 100644
--- a/storm-server/src/main/java/org/apache/storm/healthcheck/HealthChecker.java
+++ b/storm-server/src/main/java/org/apache/storm/healthcheck/HealthChecker.java
@@ -40,7 +40,7 @@ public class HealthChecker {
private static final String TIMEOUT = "timeout";
private static final String FAILED_WITH_EXIT_CODE = "failed_with_exit_code";
- public static int healthCheck(Map conf) {
+ public static int healthCheck(Map<String, Object> conf) {
String healthDir = ServerConfigUtils.absoluteHealthCheckDir(conf);
List<String> results = new ArrayList<>();
if (healthDir != null) {
@@ -72,7 +72,7 @@ public class HealthChecker {
}
- public static String processScript(Map conf, String script) {
+ public static String processScript(Map<String, Object> conf, String script) {
Thread interruptThread = null;
try {
Process process = Runtime.getRuntime().exec(script);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/localizer/AsyncLocalizer.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/localizer/AsyncLocalizer.java b/storm-server/src/main/java/org/apache/storm/localizer/AsyncLocalizer.java
index c4a9692..038114a 100644
--- a/storm-server/src/main/java/org/apache/storm/localizer/AsyncLocalizer.java
+++ b/storm-server/src/main/java/org/apache/storm/localizer/AsyncLocalizer.java
@@ -110,7 +110,7 @@ public class AsyncLocalizer implements ILocalizer, Shutdownable {
protected void downloadBaseBlobs(File tmproot) throws Exception {
String stormJarKey = ConfigUtils.masterStormJarKey(_topologyId);
String stormCodeKey = ConfigUtils.masterStormCodeKey(_topologyId);
- String stormConfKey = ConfigUtils.masterStormConfKey(_topologyId);
+ String topoConfKey = ConfigUtils.masterStormConfKey(_topologyId);
String jarPath = ConfigUtils.supervisorStormJarPath(tmproot.getAbsolutePath());
String codePath = ConfigUtils.supervisorStormCodePath(tmproot.getAbsolutePath());
String confPath = ConfigUtils.supervisorStormConfPath(tmproot.getAbsolutePath());
@@ -120,7 +120,7 @@ public class AsyncLocalizer implements ILocalizer, Shutdownable {
try {
ServerUtils.downloadResourcesAsSupervisor(stormJarKey, jarPath, blobStore);
ServerUtils.downloadResourcesAsSupervisor(stormCodeKey, codePath, blobStore);
- ServerUtils.downloadResourcesAsSupervisor(stormConfKey, confPath, blobStore);
+ ServerUtils.downloadResourcesAsSupervisor(topoConfKey, confPath, blobStore);
} finally {
blobStore.shutdown();
}
@@ -172,7 +172,7 @@ public class AsyncLocalizer implements ILocalizer, Shutdownable {
protected void downloadBaseBlobs(File tmproot) throws Exception {
_fsOps.forceMkdir(tmproot);
String stormCodeKey = ConfigUtils.masterStormCodeKey(_topologyId);
- String stormConfKey = ConfigUtils.masterStormConfKey(_topologyId);
+ String topoConfKey = ConfigUtils.masterStormConfKey(_topologyId);
File codePath = new File(ConfigUtils.supervisorStormCodePath(tmproot.getAbsolutePath()));
File confPath = new File(ConfigUtils.supervisorStormConfPath(tmproot.getAbsolutePath()));
BlobStore blobStore = ServerUtils.getNimbusBlobStore(_conf, null);
@@ -181,7 +181,7 @@ public class AsyncLocalizer implements ILocalizer, Shutdownable {
blobStore.readBlobTo(stormCodeKey, codeOutStream, null);
}
try (OutputStream confOutStream = _fsOps.getOutputStream(confPath)) {
- blobStore.readBlobTo(stormConfKey, confOutStream, null);
+ blobStore.readBlobTo(topoConfKey, confOutStream, null);
}
} finally {
blobStore.shutdown();
@@ -218,12 +218,12 @@ public class AsyncLocalizer implements ILocalizer, Shutdownable {
public Void call() throws Exception {
try {
String stormroot = ConfigUtils.supervisorStormDistRoot(_conf, _topologyId);
- Map<String, Object> stormConf = ConfigUtils.readSupervisorStormConf(_conf, _topologyId);
+ Map<String, Object> topoConf = ConfigUtils.readSupervisorStormConf(_conf, _topologyId);
@SuppressWarnings("unchecked")
- Map<String, Map<String, Object>> blobstoreMap = (Map<String, Map<String, Object>>) stormConf.get(Config.TOPOLOGY_BLOBSTORE_MAP);
- String user = (String) stormConf.get(Config.TOPOLOGY_SUBMITTER_USER);
- String topoName = (String) stormConf.get(Config.TOPOLOGY_NAME);
+ Map<String, Map<String, Object>> blobstoreMap = (Map<String, Map<String, Object>>) topoConf.get(Config.TOPOLOGY_BLOBSTORE_MAP);
+ String user = (String) topoConf.get(Config.TOPOLOGY_SUBMITTER_USER);
+ String topoName = (String) topoConf.get(Config.TOPOLOGY_NAME);
List<LocalResource> localResourceList = new ArrayList<>();
if (blobstoreMap != null) {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/localizer/LocalDownloadedResource.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/localizer/LocalDownloadedResource.java b/storm-server/src/main/java/org/apache/storm/localizer/LocalDownloadedResource.java
index 9e91a93..570c951 100644
--- a/storm-server/src/main/java/org/apache/storm/localizer/LocalDownloadedResource.java
+++ b/storm-server/src/main/java/org/apache/storm/localizer/LocalDownloadedResource.java
@@ -143,4 +143,4 @@ public class LocalDownloadedResource {
public String toString() {
return _references.toString();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/localizer/Localizer.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/localizer/Localizer.java b/storm-server/src/main/java/org/apache/storm/localizer/Localizer.java
index 5558af7..be794d5 100644
--- a/storm-server/src/main/java/org/apache/storm/localizer/Localizer.java
+++ b/storm-server/src/main/java/org/apache/storm/localizer/Localizer.java
@@ -489,7 +489,7 @@ public class Localizer {
private boolean _uncompress;
private boolean _isUpdate;
- public DownloadBlob(Localizer localizer, Map conf, String key, File localFile,
+ public DownloadBlob(Localizer localizer, Map<String, Object> conf, String key, File localFile,
String user, boolean uncompress, boolean update) {
_localizer = localizer;
_conf = conf;
@@ -508,7 +508,7 @@ public class Localizer {
}
}
- private LocalizedResource downloadBlob(Map conf, String key, File localFile,
+ private LocalizedResource downloadBlob(Map<String, Object> conf, String key, File localFile,
String user, boolean uncompress, boolean isUpdate)
throws AuthorizationException, KeyNotFoundException, IOException {
ClientBlobStore blobstore = null;
@@ -645,7 +645,7 @@ public class Localizer {
}
}
- public void setBlobPermissions(Map conf, String user, String path)
+ public void setBlobPermissions(Map<String, Object> conf, String user, String path)
throws IOException {
if (!ObjectReader.getBoolean(conf.get(Config.SUPERVISOR_RUN_WORKER_AS_USER), false)) {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/metric/ClusterMetricsConsumerExecutor.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/metric/ClusterMetricsConsumerExecutor.java b/storm-server/src/main/java/org/apache/storm/metric/ClusterMetricsConsumerExecutor.java
index 2bf31c4..2ee8db5 100644
--- a/storm-server/src/main/java/org/apache/storm/metric/ClusterMetricsConsumerExecutor.java
+++ b/storm-server/src/main/java/org/apache/storm/metric/ClusterMetricsConsumerExecutor.java
@@ -86,4 +86,4 @@ public class ClusterMetricsConsumerExecutor {
metricsConsumer.cleanup();
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/metric/LoggingClusterMetricsConsumer.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/metric/LoggingClusterMetricsConsumer.java b/storm-server/src/main/java/org/apache/storm/metric/LoggingClusterMetricsConsumer.java
index ac2b743..db47d84 100644
--- a/storm-server/src/main/java/org/apache/storm/metric/LoggingClusterMetricsConsumer.java
+++ b/storm-server/src/main/java/org/apache/storm/metric/LoggingClusterMetricsConsumer.java
@@ -83,4 +83,4 @@ public class LoggingClusterMetricsConsumer implements IClusterMetricsConsumer {
LOG.info(sb.toString());
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/metric/StormMetricsRegistry.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/metric/StormMetricsRegistry.java b/storm-server/src/main/java/org/apache/storm/metric/StormMetricsRegistry.java
index d433920..c1e6121 100644
--- a/storm-server/src/main/java/org/apache/storm/metric/StormMetricsRegistry.java
+++ b/storm-server/src/main/java/org/apache/storm/metric/StormMetricsRegistry.java
@@ -58,14 +58,14 @@ public class StormMetricsRegistry {
return register(name, histogram);
}
- public static void startMetricsReporters(Map stormConf) {
- for (PreparableReporter reporter : MetricsUtils.getPreparableReporters(stormConf)) {
- startMetricsReporter(reporter, stormConf);
+ public static void startMetricsReporters(Map<String, Object> topoConf) {
+ for (PreparableReporter reporter : MetricsUtils.getPreparableReporters(topoConf)) {
+ startMetricsReporter(reporter, topoConf);
}
}
- private static void startMetricsReporter(PreparableReporter reporter, Map stormConf) {
- reporter.prepare(StormMetricsRegistry.DEFAULT_REGISTRY, stormConf);
+ private static void startMetricsReporter(PreparableReporter reporter, Map<String, Object> topoConf) {
+ reporter.prepare(StormMetricsRegistry.DEFAULT_REGISTRY, topoConf);
reporter.start();
LOG.info("Started statistics report plugin...");
}
@@ -85,4 +85,4 @@ public class StormMetricsRegistry {
}
return ret;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/metric/api/DataPoint.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/metric/api/DataPoint.java b/storm-server/src/main/java/org/apache/storm/metric/api/DataPoint.java
index 45e077a..615dd5b 100644
--- a/storm-server/src/main/java/org/apache/storm/metric/api/DataPoint.java
+++ b/storm-server/src/main/java/org/apache/storm/metric/api/DataPoint.java
@@ -40,4 +40,4 @@ public class DataPoint {
public Object getValue() {
return value;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/metric/api/IClusterMetricsConsumer.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/metric/api/IClusterMetricsConsumer.java b/storm-server/src/main/java/org/apache/storm/metric/api/IClusterMetricsConsumer.java
index d18aa04..39d60f3 100644
--- a/storm-server/src/main/java/org/apache/storm/metric/api/IClusterMetricsConsumer.java
+++ b/storm-server/src/main/java/org/apache/storm/metric/api/IClusterMetricsConsumer.java
@@ -60,4 +60,4 @@ public interface IClusterMetricsConsumer {
void handleDataPoints(ClusterInfo clusterInfo, Collection<DataPoint> dataPoints);
void handleDataPoints(SupervisorInfo supervisorInfo, Collection<DataPoint> dataPoints);
void cleanup();
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 0626cb6..40fd109 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
@@ -26,6 +26,6 @@ public class DefaultTopologyValidator implements ITopologyValidator {
public void prepare(Map StormConf){
}
@Override
- public void validate(String topologyName, Map topologyConf, StormTopology topology) throws InvalidTopologyException {
+ public void validate(String topologyName, Map<String, Object> topologyConf, StormTopology topology) throws InvalidTopologyException {
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/nimbus/ILeaderElector.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/nimbus/ILeaderElector.java b/storm-server/src/main/java/org/apache/storm/nimbus/ILeaderElector.java
index e8789df..c4a0f64 100644
--- a/storm-server/src/main/java/org/apache/storm/nimbus/ILeaderElector.java
+++ b/storm-server/src/main/java/org/apache/storm/nimbus/ILeaderElector.java
@@ -30,7 +30,7 @@ public interface ILeaderElector extends Closeable {
* Method guaranteed to be called as part of initialization of leader elector instance.
* @param conf configuration
*/
- void prepare(Map conf);
+ void prepare(Map<String, Object> conf);
/**
* queue up for leadership lock. The call returns immediately and the caller must
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 125610d..7d44a8e 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
@@ -23,6 +23,6 @@ import java.util.Map;
public interface ITopologyValidator {
void prepare(Map StormConf);
- void validate(String topologyName, Map topologyConf, StormTopology topology)
+ void validate(String topologyName, Map<String, Object> topologyConf, StormTopology topology)
throws InvalidTopologyException;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/pacemaker/Pacemaker.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/pacemaker/Pacemaker.java b/storm-server/src/main/java/org/apache/storm/pacemaker/Pacemaker.java
index 2701636..095982b 100644
--- a/storm-server/src/main/java/org/apache/storm/pacemaker/Pacemaker.java
+++ b/storm-server/src/main/java/org/apache/storm/pacemaker/Pacemaker.java
@@ -47,7 +47,7 @@ public class Pacemaker implements IServerMessageHandler {
private static final Logger LOG = LoggerFactory.getLogger(Pacemaker.class);
private Map<String, byte[]> heartbeats;
- private Map conf;
+ private Map<String, Object> conf;
private final static Meter meterSendPulseCount = StormMetricsRegistry.registerMeter("pacemaker:send-pulse-count");
private final static Meter meterTotalReceivedSize = StormMetricsRegistry.registerMeter("pacemaker:total-receive-size");
@@ -56,7 +56,7 @@ public class Pacemaker implements IServerMessageHandler {
private final static Histogram histogramHeartbeatSize = StormMetricsRegistry.registerHistogram("pacemaker:heartbeat-size", new ExponentiallyDecayingReservoir());
- public Pacemaker(Map conf) {
+ public Pacemaker(Map<String, Object> conf) {
heartbeats = new ConcurrentHashMap();
this.conf = conf;
StormMetricsRegistry.registerGauge("pacemaker:size-total-keys",
@@ -211,7 +211,7 @@ public class Pacemaker implements IServerMessageHandler {
public static void main(String[] args) {
SysOutOverSLF4J.sendSystemOutAndErrToSLF4J();
- Map conf = ConfigUtils.overrideLoginConfigWithSystemProperty(Utils.readStormConfig());
+ Map<String, Object> conf = ConfigUtils.overrideLoginConfigWithSystemProperty(Utils.readStormConfig());
final Pacemaker serverHandler = new Pacemaker(conf);
serverHandler.launchServer();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/pacemaker/PacemakerServer.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/pacemaker/PacemakerServer.java b/storm-server/src/main/java/org/apache/storm/pacemaker/PacemakerServer.java
index 13fb336..315d0ac 100644
--- a/storm-server/src/main/java/org/apache/storm/pacemaker/PacemakerServer.java
+++ b/storm-server/src/main/java/org/apache/storm/pacemaker/PacemakerServer.java
@@ -55,7 +55,7 @@ class PacemakerServer implements ISaslServer {
private ConcurrentSkipListSet<Channel> authenticated_channels = new ConcurrentSkipListSet<Channel>();
private ThriftNettyServerCodec.AuthMethod authMethod;
- public PacemakerServer(IServerMessageHandler handler, Map config){
+ public PacemakerServer(IServerMessageHandler handler, Map<String, Object> config){
int maxWorkers = (int)config.get(DaemonConfig.PACEMAKER_MAX_THREADS);
this.port = (int)config.get(Config.PACEMAKER_PORT);
this.handler = handler;
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/pacemaker/codec/ThriftNettyServerCodec.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/pacemaker/codec/ThriftNettyServerCodec.java b/storm-server/src/main/java/org/apache/storm/pacemaker/codec/ThriftNettyServerCodec.java
index f29e021..8b0de60 100644
--- a/storm-server/src/main/java/org/apache/storm/pacemaker/codec/ThriftNettyServerCodec.java
+++ b/storm-server/src/main/java/org/apache/storm/pacemaker/codec/ThriftNettyServerCodec.java
@@ -47,15 +47,15 @@ public class ThriftNettyServerCodec {
private IServer server;
private AuthMethod authMethod;
- private Map storm_conf;
+ private Map<String, Object> topoConf;
private static final Logger LOG = LoggerFactory
.getLogger(ThriftNettyServerCodec.class);
- public ThriftNettyServerCodec(IServer server, Map storm_conf, AuthMethod authMethod) {
+ public ThriftNettyServerCodec(IServer server, Map<String, Object> topoConf, AuthMethod authMethod) {
this.server = server;
this.authMethod = authMethod;
- this.storm_conf = storm_conf;
+ this.topoConf = topoConf;
}
public ChannelPipelineFactory pipelineFactory() {
@@ -78,9 +78,9 @@ public class ThriftNettyServerCodec {
try {
LOG.debug("Adding KerberosSaslServerHandler to pacemaker server pipeline.");
ArrayList<String> authorizedUsers = new ArrayList(1);
- authorizedUsers.add((String)storm_conf.get(DaemonConfig.NIMBUS_DAEMON_USER));
+ authorizedUsers.add((String)topoConf.get(DaemonConfig.NIMBUS_DAEMON_USER));
pipeline.addLast(KERBEROS_HANDLER, new KerberosSaslServerHandler((ISaslServer)server,
- storm_conf,
+ topoConf,
AuthUtils.LOGIN_CONTEXT_PACEMAKER_SERVER,
authorizedUsers));
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 ec2d668..1b1ea85 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
@@ -99,7 +99,7 @@ public class DefaultScheduler implements IScheduler {
}
@Override
- public void prepare(Map conf) {
+ public void prepare(Map<String, Object> conf) {
//noop
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 79ff2f1..0a985ae 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
@@ -160,7 +160,7 @@ public class EvenScheduler implements IScheduler {
}
@Override
- public void prepare(Map conf) {
+ public void prepare(Map<String, Object> conf) {
//noop
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 a281827..e821cf6 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
@@ -51,7 +51,7 @@ public class IsolationScheduler implements IScheduler {
private Map<String, Number> isoMachines;
@Override
- public void prepare(Map conf) {
+ public void prepare(Map<String, Object> conf) {
this.isoMachines = (Map<String, Number>) conf.get(DaemonConfig.ISOLATION_SCHEDULER_MACHINES);
Validate.notEmpty(isoMachines);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 8caf7bb..5bbf8de 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
@@ -38,7 +38,7 @@ public class MultitenantScheduler implements IScheduler {
private Map _conf;
@Override
- public void prepare(@SuppressWarnings("rawtypes") Map conf) {
+ public void prepare(@SuppressWarnings("rawtypes") Map<String, Object> conf) {
_conf = conf;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 2836e58..0b9e800 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
@@ -47,13 +47,13 @@ public class ResourceAwareScheduler implements IScheduler {
private SchedulingState schedulingState;
@SuppressWarnings("rawtypes")
- private Map conf;
+ private Map<String, Object> conf;
private static final Logger LOG = LoggerFactory
.getLogger(ResourceAwareScheduler.class);
@Override
- public void prepare(Map conf) {
+ public void prepare(Map<String, Object> conf) {
this.conf = conf;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/testing/CompleteTopologyParam.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/testing/CompleteTopologyParam.java b/storm-server/src/main/java/org/apache/storm/testing/CompleteTopologyParam.java
index 00d0e57..861e21a 100644
--- a/storm-server/src/main/java/org/apache/storm/testing/CompleteTopologyParam.java
+++ b/storm-server/src/main/java/org/apache/storm/testing/CompleteTopologyParam.java
@@ -33,7 +33,7 @@ public class CompleteTopologyParam {
/**
* the config for the topology when it was submitted to the cluster
*/
- private Map<String, Object> stormConf = new Config();
+ private Map<String, Object> topoConf = new Config();
/**
* whether cleanup the state?
*/
@@ -61,14 +61,14 @@ public class CompleteTopologyParam {
}
public Map<String, Object> getStormConf() {
- return stormConf;
+ return topoConf;
}
- public void setStormConf(Map<String, Object> stormConf) {
- if (stormConf == null) {
- stormConf = new Config();
+ public void setStormConf(Map<String, Object> topoConf) {
+ if (topoConf == null) {
+ topoConf = new Config();
}
- this.stormConf = stormConf;
+ this.topoConf = topoConf;
}
public boolean getCleanupState() {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/testing/InProcessZookeeper.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/testing/InProcessZookeeper.java b/storm-server/src/main/java/org/apache/storm/testing/InProcessZookeeper.java
index dafde30..032f09c 100644
--- a/storm-server/src/main/java/org/apache/storm/testing/InProcessZookeeper.java
+++ b/storm-server/src/main/java/org/apache/storm/testing/InProcessZookeeper.java
@@ -56,4 +56,4 @@ public class InProcessZookeeper implements AutoCloseable {
zkTmp.close();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 fd01d14..0690dfe 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,11 +132,11 @@ public class ServerUtils {
return null;
}
- public static BlobStore getNimbusBlobStore(Map conf, NimbusInfo nimbusInfo) {
+ public static BlobStore getNimbusBlobStore(Map<String, Object> conf, NimbusInfo nimbusInfo) {
return getNimbusBlobStore(conf, null, nimbusInfo);
}
- public static BlobStore getNimbusBlobStore(Map conf, String baseDir, NimbusInfo nimbusInfo) {
+ public static BlobStore getNimbusBlobStore(Map<String, Object> conf, String baseDir, NimbusInfo nimbusInfo) {
String type = (String)conf.get(DaemonConfig.NIMBUS_BLOBSTORE);
if (type == null) {
type = LocalFsBlobStore.class.getName();
@@ -243,7 +243,7 @@ public class ServerUtils {
return fileName + "." + version;
}
- public static ClientBlobStore getClientBlobStoreForSupervisor(Map conf) {
+ public static ClientBlobStore getClientBlobStoreForSupervisor(Map<String, Object> conf) {
ClientBlobStore store = (ClientBlobStore) ReflectionUtils.newInstance(
(String) conf.get(DaemonConfig.SUPERVISOR_BLOBSTORE));
store.prepare(conf);
@@ -325,7 +325,7 @@ public class ServerUtils {
return ret;
}
- public static Localizer createLocalizer(Map conf, String baseDir) {
+ public static Localizer createLocalizer(Map<String, Object> conf, String baseDir) {
return new Localizer(conf, baseDir);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/utils/StormCommonInstaller.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/utils/StormCommonInstaller.java b/storm-server/src/main/java/org/apache/storm/utils/StormCommonInstaller.java
index c9a0add..a1b5596 100644
--- a/storm-server/src/main/java/org/apache/storm/utils/StormCommonInstaller.java
+++ b/storm-server/src/main/java/org/apache/storm/utils/StormCommonInstaller.java
@@ -40,4 +40,4 @@ public class StormCommonInstaller implements AutoCloseable {
"Instances of this resource must be closed in reverse order of opening.");
}
}
-}
\ No newline at end of file
+}
[12/13] storm git commit: STORM-2477: Result of transforming the code
Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 57fcd5d..8e9dcc8 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
@@ -38,7 +38,7 @@ public class ResourceAwareExampleTopology {
OutputCollector _collector;
@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/64e29f36/examples/storm-starter/src/jvm/org/apache/storm/starter/SlidingWindowTopology.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/SlidingWindowTopology.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/SlidingWindowTopology.java
index f00dac9..1aa086b 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/SlidingWindowTopology.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/SlidingWindowTopology.java
@@ -53,7 +53,7 @@ public class SlidingWindowTopology {
private OutputCollector collector;
@Override
- public void prepare(Map stormConf, 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/64e29f36/examples/storm-starter/src/jvm/org/apache/storm/starter/StatefulTopology.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/StatefulTopology.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/StatefulTopology.java
index 36495fd..3372f91 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/StatefulTopology.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/StatefulTopology.java
@@ -77,7 +77,7 @@ public class StatefulTopology {
}
@Override
- public void prepare(Map stormConf, 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/64e29f36/examples/storm-starter/src/jvm/org/apache/storm/starter/StatefulWindowingTopology.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/StatefulWindowingTopology.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/StatefulWindowingTopology.java
index 8cce057..3cf8ffe 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/StatefulWindowingTopology.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/StatefulWindowingTopology.java
@@ -58,7 +58,7 @@ public class StatefulWindowingTopology {
private OutputCollector collector;
@Override
- public void prepare(Map stormConf, 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/64e29f36/examples/storm-starter/src/jvm/org/apache/storm/starter/ThroughputVsLatency.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/ThroughputVsLatency.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/ThroughputVsLatency.java
index f541cb9..1af5844 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/ThroughputVsLatency.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/ThroughputVsLatency.java
@@ -89,7 +89,7 @@ public class ThroughputVsLatency {
}
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
_collector = collector;
_rand = ThreadLocalRandom.current();
_nextEmitTime = System.nanoTime();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-starter/src/jvm/org/apache/storm/starter/TransactionalGlobalCount.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/TransactionalGlobalCount.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/TransactionalGlobalCount.java
index 03e779b..363fc2c 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/TransactionalGlobalCount.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/TransactionalGlobalCount.java
@@ -90,7 +90,7 @@ public class TransactionalGlobalCount {
int _count = 0;
@Override
- public void prepare(Map conf, TopologyContext context, BatchOutputCollector collector, Object id) {
+ public void prepare(Map<String, Object> conf, TopologyContext context, BatchOutputCollector collector, Object id) {
_collector = collector;
_id = id;
}
@@ -118,7 +118,7 @@ public class TransactionalGlobalCount {
int _sum = 0;
@Override
- public void prepare(Map conf, TopologyContext context, BatchOutputCollector collector, TransactionAttempt attempt) {
+ public void prepare(Map<String, Object> conf, TopologyContext context, BatchOutputCollector collector, TransactionAttempt attempt) {
_collector = collector;
_attempt = attempt;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-starter/src/jvm/org/apache/storm/starter/TransactionalWords.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/TransactionalWords.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/TransactionalWords.java
index e922bab..7d19267 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/TransactionalWords.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/TransactionalWords.java
@@ -106,7 +106,7 @@ public class TransactionalWords {
int _count = 0;
@Override
- public void prepare(Map conf, TopologyContext context, BatchOutputCollector collector, TransactionAttempt id) {
+ public void prepare(Map<String, Object> conf, TopologyContext context, BatchOutputCollector collector, TransactionAttempt id) {
_collector = collector;
_id = id;
}
@@ -184,7 +184,7 @@ public class TransactionalWords {
int _count = 0;
@Override
- public void prepare(Map conf, TopologyContext context, BatchOutputCollector collector, TransactionAttempt attempt) {
+ public void prepare(Map<String, Object> conf, TopologyContext context, BatchOutputCollector collector, TransactionAttempt attempt) {
_collector = collector;
_attempt = attempt;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 45300de..e292308 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
@@ -46,7 +46,7 @@ public class RollingCountAggBolt extends BaseRichBolt {
@SuppressWarnings("rawtypes")
@Override
- public void prepare(Map stormConf, 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/64e29f36/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 730f156..e7e72b1 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
@@ -87,7 +87,7 @@ public class RollingCountBolt extends BaseRichBolt {
@SuppressWarnings("rawtypes")
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
this.collector = collector;
lastModifiedTracker = new NthLastModifiedTimeTracker(deriveNumWindowChunksFrom(this.windowLengthInSeconds,
this.emitFrequencyInSeconds));
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-starter/src/jvm/org/apache/storm/starter/bolt/SingleJoinBolt.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/bolt/SingleJoinBolt.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/bolt/SingleJoinBolt.java
index edc742a..aaed340 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/bolt/SingleJoinBolt.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/bolt/SingleJoinBolt.java
@@ -46,7 +46,7 @@ public class SingleJoinBolt extends BaseRichBolt {
}
@Override
- public void prepare(Map conf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> conf, TopologyContext context, OutputCollector collector) {
_fieldLocations = new HashMap<String, GlobalStreamId>();
_collector = collector;
int timeout = ((Number) conf.get(Config.TOPOLOGY_MESSAGE_TIMEOUT_SECS)).intValue();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-starter/src/jvm/org/apache/storm/starter/bolt/SlidingWindowSumBolt.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/bolt/SlidingWindowSumBolt.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/bolt/SlidingWindowSumBolt.java
index cd58380..cf9801f 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/bolt/SlidingWindowSumBolt.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/bolt/SlidingWindowSumBolt.java
@@ -41,7 +41,7 @@ public class SlidingWindowSumBolt extends BaseWindowedBolt {
private OutputCollector collector;
@Override
- public void prepare(Map stormConf, 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/64e29f36/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/RandomIntegerSpout.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/RandomIntegerSpout.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/RandomIntegerSpout.java
index e031f6e..37b2ec4 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/RandomIntegerSpout.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/RandomIntegerSpout.java
@@ -46,7 +46,7 @@ public class RandomIntegerSpout 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;
this.rand = new Random();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/RandomNumberGeneratorSpout.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/RandomNumberGeneratorSpout.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/RandomNumberGeneratorSpout.java
index 1d1b082..866cc80 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/RandomNumberGeneratorSpout.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/RandomNumberGeneratorSpout.java
@@ -47,7 +47,7 @@ public class RandomNumberGeneratorSpout implements IBatchSpout {
}
@Override
- public void open(Map conf, TopologyContext context) {
+ public void open(Map<String, Object> conf, TopologyContext context) {
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/RandomSentenceSpout.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/RandomSentenceSpout.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/RandomSentenceSpout.java
index 0fe28e2..733c9d9 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/RandomSentenceSpout.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/RandomSentenceSpout.java
@@ -40,7 +40,7 @@ public class RandomSentenceSpout extends BaseRichSpout {
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
_collector = collector;
_rand = new Random();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-starter/src/jvm/org/apache/storm/starter/streams/GroupByKeyAndWindowExample.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/streams/GroupByKeyAndWindowExample.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/streams/GroupByKeyAndWindowExample.java
index d989433..1e154b7 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/streams/GroupByKeyAndWindowExample.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/streams/GroupByKeyAndWindowExample.java
@@ -89,7 +89,7 @@ public class GroupByKeyAndWindowExample {
private int index = 0;
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-starter/src/jvm/org/apache/storm/starter/streams/JoinExample.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/streams/JoinExample.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/streams/JoinExample.java
index ae8be3d..020239d 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/streams/JoinExample.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/streams/JoinExample.java
@@ -83,7 +83,7 @@ public class JoinExample {
}
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-starter/src/jvm/org/apache/storm/starter/streams/StateQueryExample.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/streams/StateQueryExample.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/streams/StateQueryExample.java
index d7eb16b..3cd1199 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/streams/StateQueryExample.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/streams/StateQueryExample.java
@@ -91,7 +91,7 @@ public class StateQueryExample {
private final String[] words = {"nathan", "mike"};
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-starter/src/jvm/org/apache/storm/starter/trident/DebugMemoryMapState.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/trident/DebugMemoryMapState.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/trident/DebugMemoryMapState.java
index 834052b..5bb23f7 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/trident/DebugMemoryMapState.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/trident/DebugMemoryMapState.java
@@ -66,7 +66,7 @@ public class DebugMemoryMapState<T> extends MemoryMapState<T> {
}
@Override
- public State makeState(Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
+ public State makeState(Map<String, Object> conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
return new DebugMemoryMapState(_id + partitionIndex);
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-starter/src/jvm/org/apache/storm/starter/trident/TridentReach.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/trident/TridentReach.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/trident/TridentReach.java
index 7294091..8e5229d 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/trident/TridentReach.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/trident/TridentReach.java
@@ -69,7 +69,7 @@ public class TridentReach {
}
@Override
- public State makeState(Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
+ public State makeState(Map<String, Object> conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
return new StaticSingleKeyMapState(_map);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-starter/test/jvm/org/apache/storm/starter/bolt/RollingCountBoltTest.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/test/jvm/org/apache/storm/starter/bolt/RollingCountBoltTest.java b/examples/storm-starter/test/jvm/org/apache/storm/starter/bolt/RollingCountBoltTest.java
index d068e59..e58c356 100644
--- a/examples/storm-starter/test/jvm/org/apache/storm/starter/bolt/RollingCountBoltTest.java
+++ b/examples/storm-starter/test/jvm/org/apache/storm/starter/bolt/RollingCountBoltTest.java
@@ -50,7 +50,7 @@ public class RollingCountBoltTest {
// given
Tuple tickTuple = MockTupleHelpers.mockTickTuple();
RollingCountBolt bolt = new RollingCountBolt();
- Map conf = mock(Map.class);
+ Map<String, Object> conf = mock(Map.class);
TopologyContext context = mock(TopologyContext.class);
OutputCollector collector = mock(OutputCollector.class);
bolt.prepare(conf, context, collector);
@@ -70,7 +70,7 @@ public class RollingCountBoltTest {
Tuple tickTuple = MockTupleHelpers.mockTickTuple();
RollingCountBolt bolt = new RollingCountBolt();
- Map conf = mock(Map.class);
+ Map<String, Object> conf = mock(Map.class);
TopologyContext context = mock(TopologyContext.class);
OutputCollector collector = mock(OutputCollector.class);
bolt.prepare(conf, context, collector);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractAutoCreds.java
----------------------------------------------------------------------
diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractAutoCreds.java b/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractAutoCreds.java
index 1506638..409d2fa 100644
--- a/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractAutoCreds.java
+++ b/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractAutoCreds.java
@@ -56,7 +56,7 @@ public abstract class AbstractAutoCreds implements IAutoCredentials, ICredential
private Map<String, Map<String, Object>> configMap = new HashMap<>();
@Override
- public void prepare(Map conf) {
+ public void prepare(Map<String, Object> conf) {
doPrepare(conf);
loadConfigKeys(conf);
for (String key : configKeys) {
@@ -69,7 +69,7 @@ public abstract class AbstractAutoCreds implements IAutoCredentials, ICredential
}
@Override
- public void populateCredentials(Map<String, String> credentials, Map conf) {
+ public void populateCredentials(Map<String, String> credentials, Map<String, Object> conf) {
try {
loadConfigKeys(conf);
if (!configKeys.isEmpty()) {
@@ -88,7 +88,7 @@ public abstract class AbstractAutoCreds implements IAutoCredentials, ICredential
}
}
- private Map<String, Object> updateConfigs(Map topologyConf) {
+ private Map<String, Object> updateConfigs(Map<String, Object> topologyConf) {
Map<String, Object> res = new HashMap<>(topologyConf);
for (String configKey : configKeys) {
if (!res.containsKey(configKey) && configMap.containsKey(configKey)) {
@@ -99,7 +99,7 @@ public abstract class AbstractAutoCreds implements IAutoCredentials, ICredential
}
@Override
- public void renew(Map<String, String> credentials, Map topologyConf) {
+ public void renew(Map<String, String> credentials, Map<String, Object> topologyConf) {
doRenew(credentials, updateConfigs(topologyConf));
}
@@ -146,7 +146,7 @@ public abstract class AbstractAutoCreds implements IAutoCredentials, ICredential
return res;
}
- protected void fillHadoopConfiguration(Map topoConf, String configKey, Configuration configuration) {
+ protected void fillHadoopConfiguration(Map<String, Object> topoConf, String configKey, Configuration configuration) {
Map<String, Object> config = (Map<String, Object>) topoConf.get(configKey);
LOG.info("TopoConf {}, got config {}, for configKey {}", topoConf, config, configKey);
if (config != null) {
@@ -173,7 +173,7 @@ public abstract class AbstractAutoCreds implements IAutoCredentials, ICredential
*
* @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
@@ -187,11 +187,11 @@ public abstract class AbstractAutoCreds implements IAutoCredentials, ICredential
*/
protected abstract String getCredentialKey(String configKey);
- protected abstract byte[] getHadoopCredentials(Map conf, String configKey);
+ protected abstract byte[] getHadoopCredentials(Map<String, Object> conf, String configKey);
- protected abstract byte[] getHadoopCredentials(Map conf);
+ protected abstract byte[] getHadoopCredentials(Map<String, Object> conf);
- protected abstract void doRenew(Map<String, String> credentials, Map topologyConf);
+ protected abstract void doRenew(Map<String, String> credentials, Map<String, Object> topologyConf);
@SuppressWarnings("unchecked")
private void addCredentialToSubject(Subject subject, Map<String, String> credentials) {
@@ -243,7 +243,7 @@ public abstract class AbstractAutoCreds implements IAutoCredentials, ICredential
}
- private void loadConfigKeys(Map conf) {
+ private void loadConfigKeys(Map<String, Object> conf) {
List<String> keys;
String configKeyString = getConfigKeyString();
if ((keys = (List<String>) conf.get(configKeyString)) != null) {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 fcbb463..947d9b0 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
@@ -60,7 +60,7 @@ public class AutoHBase extends AbstractAutoCreds {
public String hbasePrincipal;
@Override
- public void doPrepare(Map conf) {
+ public void doPrepare(Map<String, Object> conf) {
if(conf.containsKey(HBASE_KEYTAB_FILE_KEY) && conf.containsKey(HBASE_PRINCIPAL_KEY)) {
hbaseKeytab = (String) conf.get(HBASE_KEYTAB_FILE_KEY);
hbasePrincipal = (String) conf.get(HBASE_PRINCIPAL_KEY);
@@ -79,24 +79,24 @@ public class AutoHBase extends AbstractAutoCreds {
}
@Override
- protected byte[] getHadoopCredentials(Map conf, String configKey) {
+ protected byte[] getHadoopCredentials(Map<String, Object> conf, String configKey) {
Configuration configuration = getHadoopConfiguration(conf, configKey);
return getHadoopCredentials(conf, configuration);
}
@Override
- protected byte[] getHadoopCredentials(Map conf) {
+ protected byte[] getHadoopCredentials(Map<String, Object> conf) {
return getHadoopCredentials(conf, HBaseConfiguration.create());
}
- 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) {
+ protected byte[] getHadoopCredentials(Map<String, Object> conf, Configuration hbaseConf) {
try {
if(UserGroupInformation.isSecurityEnabled()) {
final String topologySubmitterUser = (String) conf.get(Config.TOPOLOGY_SUBMITTER_PRINCIPAL);
@@ -143,7 +143,7 @@ public class AutoHBase extends AbstractAutoCreds {
}
@Override
- public void doRenew(Map<String, String> credentials, Map topologyConf) {
+ public void doRenew(Map<String, String> credentials, Map<String, Object> topologyConf) {
//HBASE tokens are not renewable so we always have to get new ones.
populateCredentials(credentials, topologyConf);
}
@@ -156,7 +156,7 @@ public class AutoHBase extends AbstractAutoCreds {
@SuppressWarnings("unchecked")
public static void main(String[] args) throws Exception {
- Map conf = new HashMap();
+ Map<String, Object> conf = new HashMap();
conf.put(Config.TOPOLOGY_SUBMITTER_PRINCIPAL, args[0]); //with realm e.g. storm@WITZEND.COM
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/64e29f36/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/HBaseSecurityUtil.java
----------------------------------------------------------------------
diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/HBaseSecurityUtil.java b/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/HBaseSecurityUtil.java
index 4e0dcab..32339a6 100644
--- a/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/HBaseSecurityUtil.java
+++ b/external/storm-autocreds/src/main/java/org/apache/storm/hbase/security/HBaseSecurityUtil.java
@@ -42,7 +42,7 @@ public class HBaseSecurityUtil {
public static final String HBASE_CREDENTIALS_CONFIG_KEYS = "hbaseCredentialsConfigKeys";
private static UserProvider legacyProvider = null;
- public static UserProvider login(Map conf, Configuration hbaseConfig) throws IOException {
+ public static UserProvider login(Map<String, Object> conf, Configuration hbaseConfig) throws IOException {
//Allowing keytab based login for backward compatibility.
if (UserGroupInformation.isSecurityEnabled() && (conf.get(TOPOLOGY_AUTO_CREDENTIALS) == null ||
!(((List) conf.get(TOPOLOGY_AUTO_CREDENTIALS)).contains(AutoHBase.class.getName())))) {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 95de41b..eb5be81 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
@@ -57,7 +57,7 @@ public class AutoHDFS extends AbstractAutoCreds {
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);
@@ -75,24 +75,24 @@ public class AutoHDFS extends AbstractAutoCreds {
}
@Override
- protected byte[] getHadoopCredentials(Map conf, String configKey) {
+ protected byte[] getHadoopCredentials(Map<String, Object> conf, String configKey) {
Configuration configuration = getHadoopConfiguration(conf, configKey);
return getHadoopCredentials(conf, configuration);
}
@Override
- protected byte[] getHadoopCredentials(Map conf) {
+ protected byte[] getHadoopCredentials(Map<String, Object> conf) {
return getHadoopCredentials(conf, new Configuration());
}
- 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) {
+ private byte[] getHadoopCredentials(Map<String, Object> conf, final Configuration configuration) {
try {
if(UserGroupInformation.isSecurityEnabled()) {
login(configuration);
@@ -148,7 +148,7 @@ public class AutoHDFS extends AbstractAutoCreds {
*/
@Override
@SuppressWarnings("unchecked")
- public void doRenew(Map<String, String> credentials, Map topologyConf) {
+ public void doRenew(Map<String, String> credentials, Map<String, Object> topologyConf) {
for (Pair<String, Credentials> cred : getCredentials(credentials)) {
try {
Configuration configuration = getHadoopConfiguration(topologyConf, cred.getFirst());
@@ -192,7 +192,7 @@ public class AutoHDFS extends AbstractAutoCreds {
@SuppressWarnings("unchecked")
public static void main(String[] args) throws Exception {
- Map conf = new HashMap();
+ Map<String, Object> conf = new HashMap();
conf.put(Config.TOPOLOGY_SUBMITTER_PRINCIPAL, args[0]); //with realm e.g. storm@WITZEND.COM
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/64e29f36/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 94ea811..8e8ae95 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
@@ -43,7 +43,7 @@ public class HdfsSecurityUtil {
private static final Logger LOG = LoggerFactory.getLogger(HdfsSecurityUtil.class);
private static AtomicBoolean isLoggedIn = new AtomicBoolean();
- 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/64e29f36/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 da2997e..73108bc 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
@@ -61,7 +61,7 @@ public class AutoHive extends AbstractAutoCreds {
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);
@@ -80,18 +80,18 @@ public class AutoHive extends AbstractAutoCreds {
}
@Override
- protected byte[] getHadoopCredentials(Map conf, String configKey) {
+ protected byte[] getHadoopCredentials(Map<String, Object> conf, String configKey) {
Configuration configuration = getHadoopConfiguration(conf, configKey);
return getHadoopCredentials(conf, configuration);
}
@Override
- protected byte[] getHadoopCredentials(Map conf) {
+ protected byte[] getHadoopCredentials(Map<String, Object> conf) {
Configuration configuration = new Configuration();
return getHadoopCredentials(conf, configuration);
}
- 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;
@@ -108,7 +108,7 @@ public class AutoHive extends AbstractAutoCreds {
}
@SuppressWarnings("unchecked")
- protected byte[] getHadoopCredentials(Map conf, final Configuration configuration) {
+ protected byte[] getHadoopCredentials(Map<String, Object> conf, final Configuration configuration) {
try {
if (UserGroupInformation.isSecurityEnabled()) {
String topologySubmitterUser = (String) conf.get(Config.TOPOLOGY_SUBMITTER_PRINCIPAL);
@@ -194,7 +194,7 @@ public class AutoHive extends AbstractAutoCreds {
}
@Override
- public void doRenew(Map<String, String> credentials, Map topologyConf) {
+ public void doRenew(Map<String, String> credentials, Map<String, Object> topologyConf) {
for (Pair<String, Credentials> cred : getCredentials(credentials)) {
try {
Configuration configuration = getHadoopConfiguration(topologyConf, cred.getFirst());
@@ -254,7 +254,7 @@ public class AutoHive extends AbstractAutoCreds {
@SuppressWarnings("unchecked")
public static void main(String[] args) throws Exception {
- Map conf = new HashMap();
+ Map<String, Object> conf = new HashMap();
conf.put(Config.TOPOLOGY_SUBMITTER_PRINCIPAL, args[0]); //with realm e.g. storm@WITZEND.COM
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
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/CassandraContext.java
----------------------------------------------------------------------
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/CassandraContext.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/CassandraContext.java
index 3081b0d..9e06a53 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/CassandraContext.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/CassandraContext.java
@@ -64,8 +64,8 @@ public class CassandraContext extends WorkerCtx implements SimpleClientProvider
* {@inheritDoc}
*/
@Override
- protected CassandraConf make(Map<String, Object> stormConf) {
- return new CassandraConf(stormConf);
+ protected CassandraConf make(Map<String, Object> topoConf) {
+ return new CassandraConf(topoConf);
}
}
@@ -79,13 +79,13 @@ public class CassandraContext extends WorkerCtx implements SimpleClientProvider
* {@inheritDoc}
*/
@Override
- protected SimpleClient make(Map<String, Object> stormConf) {
- Cluster cluster = this.context.getWorkerBean(Cluster.class, stormConf);
+ protected SimpleClient make(Map<String, Object> topoConf) {
+ Cluster cluster = this.context.getWorkerBean(Cluster.class, topoConf);
if( cluster.isClosed() ) {
LOG.warn("Cluster is closed - trigger new initialization!");
- cluster = this.context.getWorkerBean(Cluster.class, stormConf, true);
+ cluster = this.context.getWorkerBean(Cluster.class, topoConf, true);
}
- CassandraConf config = this.context.getWorkerBean(CassandraConf.class, stormConf);
+ CassandraConf config = this.context.getWorkerBean(CassandraConf.class, topoConf);
return new DefaultClient(cluster, config.getKeyspace());
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/BaseCassandraBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/BaseCassandraBolt.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/BaseCassandraBolt.java
index 7d34b16..32b041f 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/BaseCassandraBolt.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/BaseCassandraBolt.java
@@ -59,7 +59,7 @@ public abstract class BaseCassandraBolt<T> extends BaseTickTupleAwareRichBolt {
protected SimpleClientProvider clientProvider;
protected SimpleClient client;
protected Session session;
- protected Map stormConfig;
+ protected Map<String, Object> topoConfig;
protected CassandraConf cassandraConf;
@@ -89,11 +89,11 @@ public abstract class BaseCassandraBolt<T> extends BaseTickTupleAwareRichBolt {
* {@inheritDoc}
*/
@Override
- public void prepare(Map stormConfig, TopologyContext topologyContext, OutputCollector outputCollector) {
+ public void prepare(Map<String, Object> topoConfig, TopologyContext topologyContext, OutputCollector outputCollector) {
this.outputCollector = outputCollector;
- this.stormConfig = stormConfig;
+ this.topoConfig = topoConfig;
- Map<String, Object> cassandraClientConfig = cassandraConfig != null ? cassandraConfig : stormConfig;
+ Map<String, Object> cassandraClientConfig = cassandraConfig != null ? cassandraConfig : topoConfig;
this.cassandraConf = new CassandraConf(cassandraClientConfig);
this.client = clientProvider.getClient(cassandraClientConfig);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/BatchCassandraWriterBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/BatchCassandraWriterBolt.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/BatchCassandraWriterBolt.java
index e3a7e53..292f36d 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/BatchCassandraWriterBolt.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/BatchCassandraWriterBolt.java
@@ -76,8 +76,8 @@ public class BatchCassandraWriterBolt extends BaseCassandraBolt<List<Tuple>> {
* {@inheritDoc}
*/
@Override
- public void prepare(Map stormConfig, TopologyContext topologyContext, OutputCollector outputCollector) {
- super.prepare(stormConfig, topologyContext, outputCollector);
+ public void prepare(Map<String, Object> topoConfig, TopologyContext topologyContext, OutputCollector outputCollector) {
+ super.prepare(topoConfig, topologyContext, outputCollector);
this.componentID = topologyContext.getThisComponentId();
this.queue = new LinkedBlockingQueue<>(batchMaxSize);
this.lastModifiedTimesMillis = now();
@@ -148,7 +148,7 @@ public class BatchCassandraWriterBolt extends BaseCassandraBolt<List<Tuple>> {
List<PairStatementTuple> stmts = new ArrayList<>(inputs.size());
for(Tuple t : inputs) {
- List<Statement> sl = getMapper().map(stormConfig, session, t);
+ List<Statement> sl = getMapper().map(topoConfig, session, t);
for(Statement s : sl)
stmts.add(new PairStatementTuple(t, s) );
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/CassandraWriterBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/CassandraWriterBolt.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/CassandraWriterBolt.java
index f2eef9c..876f6f5 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/CassandraWriterBolt.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/CassandraWriterBolt.java
@@ -55,7 +55,7 @@ public class CassandraWriterBolt extends BaseCassandraBolt<Tuple> {
*/
@Override
protected void process(Tuple input) {
- List<Statement> statements = getMapper().map(stormConfig, session, input);
+ List<Statement> statements = getMapper().map(topoConfig, session, input);
if (statements.size() == 1) getAsyncExecutor().execAsync(statements.get(0), input);
else getAsyncExecutor().execAsync(statements, input);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/client/ClusterFactory.java
----------------------------------------------------------------------
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/client/ClusterFactory.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/client/ClusterFactory.java
index c00bfd7..d48a773 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/client/ClusterFactory.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/client/ClusterFactory.java
@@ -38,12 +38,12 @@ public class ClusterFactory extends BaseBeanFactory<Cluster> {
/**
* Creates a new Cluster based on the specified configuration.
- * @param stormConf the storm configuration.
+ * @param topoConf the storm configuration.
* @return a new a new {@link com.datastax.driver.core.Cluster} instance.
*/
@Override
- protected Cluster make(Map<String, Object> stormConf) {
- CassandraConf cassandraConf = new CassandraConf(stormConf);
+ protected Cluster make(Map<String, Object> topoConf) {
+ CassandraConf cassandraConf = new CassandraConf(topoConf);
Cluster.Builder cluster = Cluster.builder()
.withoutJMXReporting()
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/BaseBeanFactory.java
----------------------------------------------------------------------
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/BaseBeanFactory.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/BaseBeanFactory.java
index 1ce6bac..b528223 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/BaseBeanFactory.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/BaseBeanFactory.java
@@ -40,14 +40,14 @@ public abstract class BaseBeanFactory<T> implements BeanFactory<T> {
* {@inheritDoc}
*/
@Override
- public synchronized T get(Map<String, Object> stormConf) {
+ public synchronized T get(Map<String, Object> topoConf) {
if( instance != null) return instance;
- return instance = make(stormConf);
+ return instance = make(topoConf);
}
/**
* Return a new instance of T.
*/
- protected abstract T make(final Map<String, Object> stormConf);
+ protected abstract T make(final Map<String, Object> topoConf);
/**
* {@inheritDoc}
*/
@@ -62,4 +62,4 @@ public abstract class BaseBeanFactory<T> implements BeanFactory<T> {
throw new RuntimeException("Cannot create a new instance of " + clazz.getSimpleName(), e);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/BeanFactory.java
----------------------------------------------------------------------
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/BeanFactory.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/BeanFactory.java
index df00530..b573b51 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/BeanFactory.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/BeanFactory.java
@@ -34,10 +34,10 @@ public interface BeanFactory<T> extends Serializable {
/**
* Return an instance, which may be shared or independent, of the specified type.
- * @param stormConf The storm configuration
+ * @param topoConf The storm configuration
* @return
*/
- T get(Map<String, Object> stormConf);
+ T get(Map<String, Object> topoConf);
/**
@@ -45,4 +45,4 @@ public interface BeanFactory<T> extends Serializable {
* @return a new {@link BeanFactory} instance.
*/
public BeanFactory<T> newInstance();
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/WorkerCtx.java
----------------------------------------------------------------------
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/WorkerCtx.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/WorkerCtx.java
index 384d84c..15668d1 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/WorkerCtx.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/WorkerCtx.java
@@ -63,20 +63,20 @@ public class WorkerCtx implements Serializable {
* Return an instance, which is shared (within a Worker), of the specified type.
* @return
*/
- public <T, K, V> T getWorkerBean(Class<T> clazz, Map<K, V> stormConf) {
- return getWorkerBean(clazz, stormConf,false);
+ public <T, K, V> T getWorkerBean(Class<T> clazz, Map<K, V> topoConf) {
+ return getWorkerBean(clazz, topoConf,false);
}
/**
* Return an instance, which is shared (within a Worker), of the specified type.
*
* @param clazz the class of the bean.
- * @param stormConf the storm configuration
+ * @param topoConf the storm configuration
* @param force if <code>true</code>= create a new instance even if one already exist.
*
* @return a instance of type {@link T}.
*/
- public <T, K, V> T getWorkerBean(Class<T> clazz, Map<K, V> stormConf, boolean force) {
+ public <T, K, V> T getWorkerBean(Class<T> clazz, Map<K, V> topoConf, boolean force) {
if( force ) workerCtx.remove(clazz);
BeanFactory<T> factory = (BeanFactory<T>) this.workerCtx.get(clazz);
if( factory == null) {
@@ -84,6 +84,6 @@ public class WorkerCtx implements Serializable {
workerCtx.putIfAbsent(clazz, instance);
factory = (BeanFactory<T>) this.workerCtx.get(clazz);
}
- return factory.get((Map<String, Object>)stormConf);
+ return factory.get((Map<String, Object>)topoConf);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/BaseCQLStatementTupleMapper.java
----------------------------------------------------------------------
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/BaseCQLStatementTupleMapper.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/BaseCQLStatementTupleMapper.java
index 3bc0f08..2a8135d 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/BaseCQLStatementTupleMapper.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/BaseCQLStatementTupleMapper.java
@@ -37,7 +37,7 @@ public abstract class BaseCQLStatementTupleMapper implements CQLStatementTupleMa
* {@inheritDoc}
*/
@Override
- public List<Statement> map(Map conf, Session session, ITuple tuple) {
+ public List<Statement> map(Map<String, Object> conf, Session session, ITuple tuple) {
return Arrays.asList(map(tuple));
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CQLStatementTupleMapper.java
----------------------------------------------------------------------
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CQLStatementTupleMapper.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CQLStatementTupleMapper.java
index d82f8a2..1048591 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CQLStatementTupleMapper.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CQLStatementTupleMapper.java
@@ -40,7 +40,7 @@ public interface CQLStatementTupleMapper extends Serializable {
* @param tuple the incoming tuple to map.
* @return a list of {@link com.datastax.driver.core.Statement}.
*/
- List<Statement> map(Map conf, Session session, ITuple tuple);
+ List<Statement> map(Map<String, Object> conf, Session session, ITuple tuple);
public static class DynamicCQLStatementTupleMapper implements CQLStatementTupleMapper {
private List<CQLStatementBuilder> builders;
@@ -50,7 +50,7 @@ public interface CQLStatementTupleMapper extends Serializable {
}
@Override
- public List<Statement> map(Map conf, Session session, ITuple tuple) {
+ public List<Statement> map(Map<String, Object> conf, Session session, ITuple tuple) {
List<Statement> statements = new LinkedList<>();
for(CQLStatementBuilder b : builders) {
statements.addAll(b.build().map(conf, session, tuple));
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/ContextQuery.java
----------------------------------------------------------------------
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/ContextQuery.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/ContextQuery.java
index 58f0213..58c7984 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/ContextQuery.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/ContextQuery.java
@@ -38,7 +38,7 @@ public interface ContextQuery extends Serializable {
*
* @return a string bound query.
*/
- public String resolves(Map config, ITuple tuple);
+ public String resolves(Map<String, Object> config, ITuple tuple);
/**
* Static implementation of {@link ContextQuery} interface.
@@ -55,7 +55,7 @@ public interface ContextQuery extends Serializable {
}
@Override
- public String resolves(Map config, ITuple tuple) {
+ public String resolves(Map<String, Object> config, ITuple tuple) {
return value;
}
}
@@ -72,7 +72,7 @@ public interface ContextQuery extends Serializable {
}
@Override
- public String resolves(Map config, ITuple tuple) {
+ public String resolves(Map<String, Object> config, ITuple tuple) {
if (config.containsKey(key)) return (String) config.get(key);
throw new IllegalArgumentException("Bound query '" + key + "' does not exist in configuration");
@@ -92,7 +92,7 @@ public interface ContextQuery extends Serializable {
}
@Override
- public String resolves(Map config, ITuple tuple) {
+ public String resolves(Map<String, Object> config, ITuple tuple) {
String name = tuple.getStringByField(fieldName);
if (config.containsKey(name)) return (String) config.get(name);
throw new IllegalArgumentException("Bound query '" + name + "' does not exist in configuration");
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/BatchCQLStatementTupleMapper.java
----------------------------------------------------------------------
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/BatchCQLStatementTupleMapper.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/BatchCQLStatementTupleMapper.java
index 43077e2..132981f 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/BatchCQLStatementTupleMapper.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/BatchCQLStatementTupleMapper.java
@@ -49,7 +49,7 @@ public class BatchCQLStatementTupleMapper implements CQLStatementTupleMapper {
* {@inheritDoc}
*/
@Override
- public List<Statement> map(Map conf, Session session, ITuple tuple) {
+ public List<Statement> map(Map<String, Object> conf, Session session, ITuple tuple) {
final BatchStatement batch = new BatchStatement(this.type);
for(CQLStatementTupleMapper m : mappers)
batch.addAll(m.map(conf, session, tuple));
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/BoundCQLStatementTupleMapper.java
----------------------------------------------------------------------
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/BoundCQLStatementTupleMapper.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/BoundCQLStatementTupleMapper.java
index dbef606..04933f2 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/BoundCQLStatementTupleMapper.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/BoundCQLStatementTupleMapper.java
@@ -68,7 +68,7 @@ public class BoundCQLStatementTupleMapper implements CQLStatementTupleMapper {
* {@inheritDoc}
*/
@Override
- public List<Statement> map(Map config, Session session, ITuple tuple) {
+ public List<Statement> map(Map<String, Object> config, Session session, ITuple tuple) {
final List<Column> columns = mapper.map(tuple);
final String query = contextQuery.resolves(config, tuple);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/SimpleCQLStatementMapper.java
----------------------------------------------------------------------
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/SimpleCQLStatementMapper.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/SimpleCQLStatementMapper.java
index 2825c0a..532bf6d 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/SimpleCQLStatementMapper.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/SimpleCQLStatementMapper.java
@@ -67,7 +67,7 @@ public class SimpleCQLStatementMapper implements CQLStatementTupleMapper {
* {@inheritDoc}.
*/
@Override
- public List<Statement> map(Map conf, Session session, ITuple tuple) {
+ public List<Statement> map(Map<String, Object> conf, Session session, ITuple tuple) {
List<Column> columns = mapper.map(tuple);
SimpleStatement statement = new SimpleStatement(queryString, Column.getVals(columns));
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraBackingMap.java
----------------------------------------------------------------------
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraBackingMap.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraBackingMap.java
index 82f3b9c..029710e 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraBackingMap.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraBackingMap.java
@@ -71,7 +71,7 @@ public class CassandraBackingMap<T> implements IBackingMap<T> {
private static final Logger LOG = LoggerFactory.getLogger(CassandraBackingMap.class);
- private final Map conf;
+ private final Map<String, Object> conf;
private final Options<T> options;
private final Fields allFields;
@@ -82,7 +82,7 @@ public class CassandraBackingMap<T> implements IBackingMap<T> {
private Semaphore throttle;
- protected CassandraBackingMap(Map conf, Options<T> options) {
+ protected CassandraBackingMap(Map<String, Object> conf, Options<T> options) {
this.conf = conf;
this.options = options;
List<String> allFields = options.keyFields.toList();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 abd9477..ad05060 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
@@ -72,7 +72,7 @@ public class CassandraMapStateFactory implements StateFactory {
@Override
@SuppressWarnings("unchecked")
- public State makeState(Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
+ public State makeState(Map<String, Object> conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
CassandraBackingMap cassandraBackingMap = new CassandraBackingMap(cassandraConfig, options);
cassandraBackingMap.prepare();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraState.java
----------------------------------------------------------------------
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraState.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraState.java
index 937b8c9..7635ea5 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraState.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraState.java
@@ -46,13 +46,13 @@ public class CassandraState implements State {
private static final Logger LOG = LoggerFactory.getLogger(CassandraState.class);
- private final Map conf;
+ private final Map<String, Object> conf;
private final Options options;
private Session session;
private SimpleClient client;
- protected CassandraState(Map conf, Options options) {
+ protected CassandraState(Map<String, Object> conf, Options options) {
this.conf = conf;
this.options = options;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraStateFactory.java
----------------------------------------------------------------------
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraStateFactory.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraStateFactory.java
index 697f15f..a7f9e9c 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraStateFactory.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraStateFactory.java
@@ -42,7 +42,7 @@ public class CassandraStateFactory implements StateFactory {
}
@Override
- public State makeState(Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
+ public State makeState(Map<String, Object> conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
CassandraState cassandraState = new CassandraState(conf, options);
cassandraState.prepare();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/SimpleTuple.java
----------------------------------------------------------------------
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/SimpleTuple.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/SimpleTuple.java
index d78f6d7..6424bc0 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/SimpleTuple.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/SimpleTuple.java
@@ -210,4 +210,4 @@ public class SimpleTuple implements ITuple, Serializable {
return Collections.unmodifiableList(keys);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/testtools/EmbeddedCassandraResource.java
----------------------------------------------------------------------
diff --git a/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/testtools/EmbeddedCassandraResource.java b/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/testtools/EmbeddedCassandraResource.java
index 3b5ce5d..0f02bb4 100644
--- a/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/testtools/EmbeddedCassandraResource.java
+++ b/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/testtools/EmbeddedCassandraResource.java
@@ -190,4 +190,4 @@ public class EmbeddedCassandraResource extends ExternalResource {
public String getHost() {
return host;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/trident/MapStateTest.java
----------------------------------------------------------------------
diff --git a/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/trident/MapStateTest.java b/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/trident/MapStateTest.java
index d4067ef..3c10dd9 100644
--- a/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/trident/MapStateTest.java
+++ b/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/trident/MapStateTest.java
@@ -76,7 +76,7 @@ public class MapStateTest {
@Test
public void transactionalStateTest() throws Exception {
- Map config = new HashMap();
+ Map<String, Object> config = new HashMap();
StateFactory factory = MapStateFactoryBuilder.transactional(getCassandraConfig())
.withTable("words_ks", "words_table")
.withKeys("word")
@@ -89,7 +89,7 @@ public class MapStateTest {
@Test
public void opaqueStateTest() throws Exception {
- Map config = new HashMap();
+ Map<String, Object> config = new HashMap();
StateFactory factory = MapStateFactoryBuilder.opaque(getCassandraConfig())
.withTable("words_ks", "words_table")
.withKeys("word")
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/trident/WeatherBatchSpout.java
----------------------------------------------------------------------
diff --git a/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/trident/WeatherBatchSpout.java b/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/trident/WeatherBatchSpout.java
index 622a28f..6aaed56 100644
--- a/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/trident/WeatherBatchSpout.java
+++ b/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/trident/WeatherBatchSpout.java
@@ -50,7 +50,7 @@ public class WeatherBatchSpout implements IBatchSpout {
}
@Override
- public void open(Map conf, TopologyContext context) {
+ public void open(Map<String, Object> conf, TopologyContext context) {
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-druid/src/main/java/org/apache/storm/druid/bolt/DruidBeamBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-druid/src/main/java/org/apache/storm/druid/bolt/DruidBeamBolt.java b/external/storm-druid/src/main/java/org/apache/storm/druid/bolt/DruidBeamBolt.java
index 86b724f..c2feb18 100644
--- a/external/storm-druid/src/main/java/org/apache/storm/druid/bolt/DruidBeamBolt.java
+++ b/external/storm-druid/src/main/java/org/apache/storm/druid/bolt/DruidBeamBolt.java
@@ -65,14 +65,14 @@ public class DruidBeamBolt<E> extends BaseTickTupleAwareRichBolt {
}
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
this.collector = collector;
tranquilizer = Tranquilizer.builder()
.maxBatchSize(druidConfig.getMaxBatchSize())
.maxPendingBatches(druidConfig.getMaxPendingBatches())
.lingerMillis(druidConfig.getLingerMillis())
.blockOnFull(druidConfig.isBlockOnFull())
- .build(beamFactory.makeBeam(stormConf, context));
+ .build(beamFactory.makeBeam(topoConf, context));
this.tranquilizer.start();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-druid/src/main/java/org/apache/storm/druid/trident/DruidBeamStateFactory.java
----------------------------------------------------------------------
diff --git a/external/storm-druid/src/main/java/org/apache/storm/druid/trident/DruidBeamStateFactory.java b/external/storm-druid/src/main/java/org/apache/storm/druid/trident/DruidBeamStateFactory.java
index b745cdd..bb61005 100644
--- a/external/storm-druid/src/main/java/org/apache/storm/druid/trident/DruidBeamStateFactory.java
+++ b/external/storm-druid/src/main/java/org/apache/storm/druid/trident/DruidBeamStateFactory.java
@@ -36,7 +36,7 @@ public class DruidBeamStateFactory<E> implements StateFactory {
}
@Override
- public State makeState(Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
+ public State makeState(Map<String, Object> conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
return new DruidBeamState(beamFactory.makeBeam(conf , metrics), druidEventMapper);
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-druid/src/test/java/org/apache/storm/druid/SampleDruidBeamFactoryImpl.java
----------------------------------------------------------------------
diff --git a/external/storm-druid/src/test/java/org/apache/storm/druid/SampleDruidBeamFactoryImpl.java b/external/storm-druid/src/test/java/org/apache/storm/druid/SampleDruidBeamFactoryImpl.java
index 5c1b4ed..179b4f4 100644
--- a/external/storm-druid/src/test/java/org/apache/storm/druid/SampleDruidBeamFactoryImpl.java
+++ b/external/storm-druid/src/test/java/org/apache/storm/druid/SampleDruidBeamFactoryImpl.java
@@ -119,4 +119,4 @@ public class SampleDruidBeamFactoryImpl implements DruidBeamFactory<Map<String,
return beam;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-druid/src/test/java/org/apache/storm/druid/SimpleBatchSpout.java
----------------------------------------------------------------------
diff --git a/external/storm-druid/src/test/java/org/apache/storm/druid/SimpleBatchSpout.java b/external/storm-druid/src/test/java/org/apache/storm/druid/SimpleBatchSpout.java
index cb30b7c..2511ac8 100644
--- a/external/storm-druid/src/test/java/org/apache/storm/druid/SimpleBatchSpout.java
+++ b/external/storm-druid/src/test/java/org/apache/storm/druid/SimpleBatchSpout.java
@@ -44,7 +44,7 @@ public class SimpleBatchSpout implements IBatchSpout {
}
@Override
- public void open(Map conf, TopologyContext context) {
+ public void open(Map<String, Object> conf, TopologyContext context) {
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-druid/src/test/java/org/apache/storm/druid/SimpleSpout.java
----------------------------------------------------------------------
diff --git a/external/storm-druid/src/test/java/org/apache/storm/druid/SimpleSpout.java b/external/storm-druid/src/test/java/org/apache/storm/druid/SimpleSpout.java
index ec0f0bf..d2010e9 100644
--- a/external/storm-druid/src/test/java/org/apache/storm/druid/SimpleSpout.java
+++ b/external/storm-druid/src/test/java/org/apache/storm/druid/SimpleSpout.java
@@ -37,7 +37,7 @@ public class SimpleSpout extends BaseRichSpout {
public static final Fields DEFAULT_FIELDS = new Fields(TupleDruidEventMapper.DEFAULT_FIELD_NAME);
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
_collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/doc/Shards.java
----------------------------------------------------------------------
diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/doc/Shards.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/doc/Shards.java
index 87c7ad5..98cc702 100644
--- a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/doc/Shards.java
+++ b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/doc/Shards.java
@@ -60,4 +60,4 @@ public class Shards {
public void setFailures(List<Object> failures) {
this.failures = failures;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/trident/EsStateFactory.java
----------------------------------------------------------------------
diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/trident/EsStateFactory.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/trident/EsStateFactory.java
index 84e3cea..8d7a6aa 100644
--- a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/trident/EsStateFactory.java
+++ b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/trident/EsStateFactory.java
@@ -46,7 +46,7 @@ public class EsStateFactory implements StateFactory {
}
@Override
- public State makeState(Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
+ public State makeState(Map<String, Object> conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
EsState esState = new EsState(esConfig, tupleMapper);
esState.prepare();
return esState;
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/bolt/EventHubBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/bolt/EventHubBolt.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/bolt/EventHubBolt.java
index 7503db3..bede4a3 100755
--- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/bolt/EventHubBolt.java
+++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/bolt/EventHubBolt.java
@@ -65,7 +65,7 @@ public class EventHubBolt extends BaseRichBolt {
}
@Override
- public void prepare(Map config, TopologyContext context,
+ public void prepare(Map<String, Object> config, TopologyContext context,
OutputCollector collector) {
this.collector = collector;
String myPartitionId = null;
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubException.java
----------------------------------------------------------------------
diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubException.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubException.java
index f81197a..6c7824b 100644
--- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubException.java
+++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubException.java
@@ -38,4 +38,4 @@ public class EventHubException extends Exception {
super(message, cause);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 23a7453..a7013ad 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
@@ -101,7 +101,7 @@ public class EventHubSpout extends BaseRichSpout {
* @param collector
* @throws Exception
*/
- public void preparePartitions(Map config, int totalTasks, int taskIndex, SpoutOutputCollector collector) throws Exception {
+ public void preparePartitions(Map<String, Object> config, int totalTasks, int taskIndex, SpoutOutputCollector collector) throws Exception {
this.collector = collector;
if(stateStore == null) {
String zkEndpointAddress = eventHubConfig.getZkConnectionString();
@@ -135,7 +135,7 @@ public class EventHubSpout extends BaseRichSpout {
}
@Override
- public void open(Map config, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> config, TopologyContext context, SpoutOutputCollector collector) {
logger.info("begin:start open()");
String topologyName = (String) config.get(Config.TOPOLOGY_NAME);
eventHubConfig.setTopologyName(topologyName);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/OpaqueTridentEventHubSpout.java
----------------------------------------------------------------------
diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/OpaqueTridentEventHubSpout.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/OpaqueTridentEventHubSpout.java
index 559571f..f50ffb4 100755
--- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/OpaqueTridentEventHubSpout.java
+++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/OpaqueTridentEventHubSpout.java
@@ -46,13 +46,13 @@ public class OpaqueTridentEventHubSpout implements IOpaquePartitionedTridentSpou
@Override
public IOpaquePartitionedTridentSpout.Coordinator<Partitions> getCoordinator(
- Map conf, TopologyContext context) {
+ Map<String, Object> conf, TopologyContext context) {
return new org.apache.storm.eventhubs.trident.Coordinator(spoutConfig);
}
@Override
public IOpaquePartitionedTridentSpout.Emitter<Partitions, Partition, Map> getEmitter(
- Map conf, TopologyContext context) {
+ Map<String, Object> conf, TopologyContext context) {
return new OpaqueTridentEventHubEmitter(spoutConfig);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 12b94b4..450fb3f 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
@@ -48,13 +48,13 @@ public class TransactionalTridentEventHubSpout implements
@Override
public IPartitionedTridentSpout.Coordinator<Partitions> getCoordinator(
- Map conf, TopologyContext context) {
+ Map<String, Object> conf, TopologyContext context) {
return new org.apache.storm.eventhubs.trident.Coordinator(spoutConfig);
}
@Override
public IPartitionedTridentSpout.Emitter<Partitions, Partition, Map> getEmitter(
- Map conf, TopologyContext context) {
+ Map<String, Object> conf, TopologyContext context) {
return new TransactionalTridentEventHubEmitter(spoutConfig);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 bc9219e..285736e 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
@@ -45,7 +45,7 @@ public class GlobalCountBolt extends BaseBasicBolt {
private long throughput;
@Override
- public void prepare(Map config, TopologyContext context) {
+ public void prepare(Map<String, Object> config, TopologyContext context) {
globalCount = 0;
globalCountDiff = 0;
lastMetricsTime = System.nanoTime();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/samples/bolt/PartialCountBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/samples/bolt/PartialCountBolt.java b/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/samples/bolt/PartialCountBolt.java
index eaf2b65..544b6c8 100755
--- a/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/samples/bolt/PartialCountBolt.java
+++ b/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/samples/bolt/PartialCountBolt.java
@@ -43,7 +43,7 @@ public class PartialCountBolt extends BaseBasicBolt {
private int partialCount;
@Override
- public void prepare(Map stormConf, TopologyContext context) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context) {
partialCount = 0;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/AbstractHBaseBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/AbstractHBaseBolt.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/AbstractHBaseBolt.java
index 8bab550..9cf1935 100644
--- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/AbstractHBaseBolt.java
+++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/AbstractHBaseBolt.java
@@ -51,7 +51,7 @@ public abstract class AbstractHBaseBolt extends BaseRichBolt {
}
@Override
- public void prepare(Map topoConf, TopologyContext topologyContext, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext topologyContext, OutputCollector collector) {
this.collector = collector;
final Configuration hbConfig = HBaseConfiguration.create();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 60faf7c..0212646 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
@@ -73,7 +73,7 @@ public class HBaseLookupBolt extends AbstractHBaseBolt {
@SuppressWarnings({ "unchecked", "rawtypes" })
@Override
- public void prepare(Map config, TopologyContext topologyContext, OutputCollector collector) {
+ public void prepare(Map<String, Object> config, TopologyContext topologyContext, OutputCollector collector) {
super.prepare(config, topologyContext, collector);
cacheEnabled = Boolean.parseBoolean(config.getOrDefault("hbase.cache.enable", "false").toString());
int cacheTTL = Integer.parseInt(config.getOrDefault("hbase.cache.ttl.seconds", "300").toString());
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 541fa86..43c5bf0 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
@@ -162,7 +162,7 @@ public class HBaseMapState<T> implements IBackingMap<T> {
}
@SuppressWarnings({"rawtypes", "unchecked"})
- public State makeState(Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
+ public State makeState(Map<String, Object> conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
LOG.info("Preparing HBase State for partition {} of {}.", partitionIndex + 1, numPartitions);
IBackingMap state = new HBaseMapState(options, conf, partitionIndex);
[10/13] storm git commit: STORM-2477: Result of transforming the code
Posted by bo...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-mongodb/src/main/java/org/apache/storm/mongodb/bolt/MongoInsertBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-mongodb/src/main/java/org/apache/storm/mongodb/bolt/MongoInsertBolt.java b/external/storm-mongodb/src/main/java/org/apache/storm/mongodb/bolt/MongoInsertBolt.java
index 9bfd722..2c0c519 100644
--- a/external/storm-mongodb/src/main/java/org/apache/storm/mongodb/bolt/MongoInsertBolt.java
+++ b/external/storm-mongodb/src/main/java/org/apache/storm/mongodb/bolt/MongoInsertBolt.java
@@ -105,9 +105,9 @@ public class MongoInsertBolt extends AbstractMongoBolt {
}
@Override
- public void prepare(Map stormConf, TopologyContext context,
+ public void prepare(Map<String, Object> topoConf, TopologyContext context,
OutputCollector collector) {
- super.prepare(stormConf, context, collector);
+ super.prepare(topoConf, context, collector);
this.batchHelper = new BatchHelper(batchSize, collector);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 878d002..9e65ffd 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
@@ -131,7 +131,7 @@ public class MongoMapState<T> implements IBackingMap<T> {
}
@SuppressWarnings({"rawtypes", "unchecked"})
- public State makeState(Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
+ public State makeState(Map<String, Object> conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
IBackingMap state = new MongoMapState(conf, options);
if(options.cacheSize > 0) {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-mongodb/src/main/java/org/apache/storm/mongodb/trident/state/MongoStateFactory.java
----------------------------------------------------------------------
diff --git a/external/storm-mongodb/src/main/java/org/apache/storm/mongodb/trident/state/MongoStateFactory.java b/external/storm-mongodb/src/main/java/org/apache/storm/mongodb/trident/state/MongoStateFactory.java
index d6cd3a5..473787a 100644
--- a/external/storm-mongodb/src/main/java/org/apache/storm/mongodb/trident/state/MongoStateFactory.java
+++ b/external/storm-mongodb/src/main/java/org/apache/storm/mongodb/trident/state/MongoStateFactory.java
@@ -32,7 +32,7 @@ public class MongoStateFactory implements StateFactory {
}
@Override
- public State makeState(Map conf, IMetricsContext metrics,
+ public State makeState(Map<String, Object> conf, IMetricsContext metrics,
int partitionIndex, int numPartitions) {
MongoState state = new MongoState(conf, options);
state.prepare();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/bolt/MqttBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/bolt/MqttBolt.java b/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/bolt/MqttBolt.java
index f6ca1bf..b8f5068 100644
--- a/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/bolt/MqttBolt.java
+++ b/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/bolt/MqttBolt.java
@@ -72,7 +72,7 @@ public class MqttBolt extends BaseTickTupleAwareRichBolt {
}
@Override
- public void prepare(Map conf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> conf, TopologyContext context, OutputCollector collector) {
this.collector = collector;
this.topologyName = (String)conf.get(Config.TOPOLOGY_NAME);
this.publisher = new MqttPublisher(this.options, this.keyStoreLoader, this.retain);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/spout/AckableMessage.java
----------------------------------------------------------------------
diff --git a/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/spout/AckableMessage.java b/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/spout/AckableMessage.java
index 08348c9..5c3867e 100644
--- a/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/spout/AckableMessage.java
+++ b/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/spout/AckableMessage.java
@@ -68,4 +68,4 @@ class AckableMessage {
Runnable ack(){
return this.ack;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/spout/MqttSpout.java
----------------------------------------------------------------------
diff --git a/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/spout/MqttSpout.java b/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/spout/MqttSpout.java
index 7f10cc5..df6c6fd 100644
--- a/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/spout/MqttSpout.java
+++ b/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/spout/MqttSpout.java
@@ -55,7 +55,7 @@ public class MqttSpout implements IRichSpout, Listener {
protected transient TopologyContext context;
protected transient LinkedBlockingQueue<AckableMessage> incoming;
protected transient HashMap<Long, AckableMessage> pending;
- private transient Map conf;
+ private transient Map<String, Object> conf;
protected MqttMessageMapper type;
protected MqttOptions options;
protected KeyStoreLoader keyStoreLoader;
@@ -95,7 +95,7 @@ public class MqttSpout implements IRichSpout, Listener {
return null;
}
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
this.topologyName = (String)conf.get(Config.TOPOLOGY_NAME);
this.collector = collector;
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/trident/MqttPublishFunction.java
----------------------------------------------------------------------
diff --git a/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/trident/MqttPublishFunction.java b/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/trident/MqttPublishFunction.java
index e53c983..5a821c6 100644
--- a/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/trident/MqttPublishFunction.java
+++ b/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/trident/MqttPublishFunction.java
@@ -60,7 +60,7 @@ public class MqttPublishFunction extends BaseFunction {
@Override
- public void prepare(Map conf, TridentOperationContext context) {
+ public void prepare(Map<String, Object> conf, TridentOperationContext context) {
this.topologyName = (String)conf.get(Config.TOPOLOGY_NAME);
this.publisher = new MqttPublisher(this.options, this.keyStoreLoader, this.retain);
try {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/bolt/OpenTsdbBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/bolt/OpenTsdbBolt.java b/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/bolt/OpenTsdbBolt.java
index cb4b50d..906bed5 100644
--- a/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/bolt/OpenTsdbBolt.java
+++ b/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/bolt/OpenTsdbBolt.java
@@ -101,7 +101,7 @@ public class OpenTsdbBolt extends BaseRichBolt {
}
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
this.collector = collector;
batchHelper = new BatchHelper(batchSize, collector);
openTsdbClient = openTsdbClientBuilder.build();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/trident/OpenTsdbState.java
----------------------------------------------------------------------
diff --git a/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/trident/OpenTsdbState.java b/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/trident/OpenTsdbState.java
index 30a6dcc..9ea63e8 100644
--- a/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/trident/OpenTsdbState.java
+++ b/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/trident/OpenTsdbState.java
@@ -39,12 +39,12 @@ import java.util.Map;
public class OpenTsdbState implements State {
private static final Logger LOG = LoggerFactory.getLogger(OpenTsdbState.class);
- private final Map conf;
+ private final Map<String, Object> conf;
private final OpenTsdbClient.Builder openTsdbClientBuilder;
private final Iterable<? extends ITupleOpenTsdbDatapointMapper> tupleMetricPointMappers;
private OpenTsdbClient openTsdbClient;
- public OpenTsdbState(Map conf, OpenTsdbClient.Builder openTsdbClientBuilder, Iterable<? extends ITupleOpenTsdbDatapointMapper> tupleMetricPointMappers) {
+ public OpenTsdbState(Map<String, Object> conf, OpenTsdbClient.Builder openTsdbClientBuilder, Iterable<? extends ITupleOpenTsdbDatapointMapper> tupleMetricPointMappers) {
this.conf = conf;
this.openTsdbClientBuilder = openTsdbClientBuilder;
this.tupleMetricPointMappers = tupleMetricPointMappers;
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/trident/OpenTsdbStateFactory.java
----------------------------------------------------------------------
diff --git a/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/trident/OpenTsdbStateFactory.java b/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/trident/OpenTsdbStateFactory.java
index 8eff54b..436f7e1 100644
--- a/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/trident/OpenTsdbStateFactory.java
+++ b/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/trident/OpenTsdbStateFactory.java
@@ -42,7 +42,7 @@ public class OpenTsdbStateFactory implements StateFactory {
}
@Override
- public State makeState(Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
+ public State makeState(Map<String, Object> conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
final OpenTsdbState openTsdbState = new OpenTsdbState(conf, builder, tridentTupleOpenTsdbDatapointMappers);
openTsdbState.prepare();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-pmml/src/main/java/org/apache/storm/pmml/PMMLPredictorBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-pmml/src/main/java/org/apache/storm/pmml/PMMLPredictorBolt.java b/external/storm-pmml/src/main/java/org/apache/storm/pmml/PMMLPredictorBolt.java
index 2c681b4..e7825c0 100644
--- a/external/storm-pmml/src/main/java/org/apache/storm/pmml/PMMLPredictorBolt.java
+++ b/external/storm-pmml/src/main/java/org/apache/storm/pmml/PMMLPredictorBolt.java
@@ -61,7 +61,7 @@ public class PMMLPredictorBolt extends BaseTickTupleAwareRichBolt {
}
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
this.runner = runnerFactory.newModelRunner();
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-pmml/src/main/java/org/apache/storm/pmml/model/jpmml/JpmmlModelOutputs.java
----------------------------------------------------------------------
diff --git a/external/storm-pmml/src/main/java/org/apache/storm/pmml/model/jpmml/JpmmlModelOutputs.java b/external/storm-pmml/src/main/java/org/apache/storm/pmml/model/jpmml/JpmmlModelOutputs.java
index c07db1a..47ea66c 100644
--- a/external/storm-pmml/src/main/java/org/apache/storm/pmml/model/jpmml/JpmmlModelOutputs.java
+++ b/external/storm-pmml/src/main/java/org/apache/storm/pmml/model/jpmml/JpmmlModelOutputs.java
@@ -87,7 +87,7 @@ public class JpmmlModelOutputs implements ModelOutputs {
return toDefaultStream(blobKey, Utils.readStormConfig());
}
- public static ModelOutputs toDefaultStream(String blobKey, Map config) {
+ public static ModelOutputs toDefaultStream(String blobKey, Map<String, Object> config) {
try {
return toDefaultStream(JpmmlFactory.newPmml(blobKey, config));
} catch (Exception e) {
@@ -126,7 +126,7 @@ public class JpmmlModelOutputs implements ModelOutputs {
return toStreams(blobKey, Utils.readStormConfig(), streams);
}
- public static ModelOutputs toStreams(String blobKey, Map config, List<String> streams) {
+ public static ModelOutputs toStreams(String blobKey, Map<String, Object> config, List<String> streams) {
try {
return toStreams(JpmmlFactory.newPmml(blobKey, config), streams);
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-pmml/src/main/java/org/apache/storm/pmml/runner/jpmml/JpmmlFactory.java
----------------------------------------------------------------------
diff --git a/external/storm-pmml/src/main/java/org/apache/storm/pmml/runner/jpmml/JpmmlFactory.java b/external/storm-pmml/src/main/java/org/apache/storm/pmml/runner/jpmml/JpmmlFactory.java
index dfbce6b..8170e12 100644
--- a/external/storm-pmml/src/main/java/org/apache/storm/pmml/runner/jpmml/JpmmlFactory.java
+++ b/external/storm-pmml/src/main/java/org/apache/storm/pmml/runner/jpmml/JpmmlFactory.java
@@ -71,7 +71,7 @@ public class JpmmlFactory {
* Creates a new {@link PMML} object representing the PMML model uploaded to the Blobstore with key specified as argument.
* Uses the specified configuration to get the Blobstore client
*/
- public static PMML newPmml(String blobKey, Map config) throws JAXBException, SAXException, IOException {
+ public static PMML newPmml(String blobKey, Map<String, Object> config) throws JAXBException, SAXException, IOException {
Objects.requireNonNull(blobKey);
Objects.requireNonNull(config);
return newPmml(getPmmlModelBlob(blobKey, config));
@@ -92,7 +92,7 @@ public class JpmmlFactory {
* @param blobKey key of PMML model in Blobstore
* @param config Configuration to use to get Blobstore client
*/
- public static InputStream getPmmlModelBlob(String blobKey, Map config) {
+ public static InputStream getPmmlModelBlob(String blobKey, Map<String, Object> config) {
Objects.requireNonNull(blobKey);
Objects.requireNonNull(config);
try {
@@ -142,7 +142,7 @@ public class JpmmlFactory {
* Creates a new {@link Evaluator} object representing the PMML model uploaded to the Blobstore using the blob key specified as argument.
* Uses the specified configuration to get the Blobstore client
*/
- public static Evaluator newEvaluator(String blobKey, Map config) throws IOException, JAXBException, SAXException {
+ public static Evaluator newEvaluator(String blobKey, Map<String, Object> config) throws IOException, JAXBException, SAXException {
Objects.requireNonNull(blobKey);
Objects.requireNonNull(config);
return newEvaluator(newPmml(blobKey, config));
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 8c9310c..49638e2 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
@@ -80,7 +80,7 @@ public abstract class AbstractRedisBolt extends BaseTickTupleAwareRichBolt {
*/
@Override
public void prepare(Map map, TopologyContext topologyContext, OutputCollector collector) {
- // FIXME: stores map (stormConf), topologyContext and expose these to derived classes
+ // FIXME: stores map (topoConf), topologyContext and expose these to derived classes
this.collector = collector;
if (jedisPoolConfig != null) {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueStateProvider.java
----------------------------------------------------------------------
diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueStateProvider.java b/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueStateProvider.java
index 68a11d8..7fcb9c6 100644
--- a/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueStateProvider.java
+++ b/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueStateProvider.java
@@ -41,22 +41,22 @@ public class RedisKeyValueStateProvider implements StateProvider {
private static final Logger LOG = LoggerFactory.getLogger(RedisKeyValueStateProvider.class);
@Override
- public State newState(String namespace, Map stormConf, TopologyContext context) {
+ public State newState(String namespace, Map<String, Object> topoConf, TopologyContext context) {
try {
- return getRedisKeyValueState(namespace, getStateConfig(stormConf));
+ return getRedisKeyValueState(namespace, getStateConfig(topoConf));
} catch (Exception ex) {
- LOG.error("Error loading config from storm conf {}", stormConf);
+ LOG.error("Error loading config from storm conf {}", topoConf);
throw new RuntimeException(ex);
}
}
- StateConfig getStateConfig(Map stormConf) throws Exception {
+ StateConfig getStateConfig(Map<String, Object> topoConf) throws Exception {
StateConfig stateConfig = null;
String providerConfig = null;
ObjectMapper mapper = new ObjectMapper();
mapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY);
- if (stormConf.containsKey(org.apache.storm.Config.TOPOLOGY_STATE_PROVIDER_CONFIG)) {
- providerConfig = (String) stormConf.get(org.apache.storm.Config.TOPOLOGY_STATE_PROVIDER_CONFIG);
+ if (topoConf.containsKey(org.apache.storm.Config.TOPOLOGY_STATE_PROVIDER_CONFIG)) {
+ providerConfig = (String) topoConf.get(org.apache.storm.Config.TOPOLOGY_STATE_PROVIDER_CONFIG);
stateConfig = mapper.readValue(providerConfig, StateConfig.class);
} else {
stateConfig = new StateConfig();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 54e9aea..5eafd1d 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
@@ -229,7 +229,7 @@ public class RedisClusterMapState<T> extends AbstractRedisMapState<T> {
* {@inheritDoc}
*/
@Override
- public State makeState(@SuppressWarnings("rawtypes") Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
+ public State makeState(@SuppressWarnings("rawtypes") Map<String, Object> conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
JedisCluster jedisCluster = new JedisCluster(jedisClusterConfig.getNodes(),
jedisClusterConfig.getTimeout(),
jedisClusterConfig.getMaxRedirections(),
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 c773c1a..760038e 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
@@ -68,7 +68,7 @@ public class RedisClusterState implements State {
* {@inheritDoc}
*/
@Override
- public State makeState(@SuppressWarnings("rawtypes") Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
+ public State makeState(@SuppressWarnings("rawtypes") Map<String, Object> conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
JedisCluster jedisCluster = new JedisCluster(jedisClusterConfig.getNodes(),
jedisClusterConfig.getTimeout(),
jedisClusterConfig.getMaxRedirections(),
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterStateQuerier.java
----------------------------------------------------------------------
diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterStateQuerier.java b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterStateQuerier.java
index b692bd8..f2f644f 100644
--- a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterStateQuerier.java
+++ b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterStateQuerier.java
@@ -68,4 +68,4 @@ public class RedisClusterStateQuerier extends AbstractRedisStateQuerier<RedisClu
}
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 b379fc1..21a40bd 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 conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
+ public State makeState(@SuppressWarnings("rawtypes") 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/64e29f36/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 a93b348..c6a6da3 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 conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
+ public State makeState(@SuppressWarnings("rawtypes") 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/64e29f36/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisStateQuerier.java
----------------------------------------------------------------------
diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisStateQuerier.java b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisStateQuerier.java
index f924e85..d76fec2 100644
--- a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisStateQuerier.java
+++ b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisStateQuerier.java
@@ -66,4 +66,4 @@ public class RedisStateQuerier extends AbstractRedisStateQuerier<RedisState> {
}
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-redis/src/test/java/org/apache/storm/redis/state/DefaultStateSerializerTest.java
----------------------------------------------------------------------
diff --git a/external/storm-redis/src/test/java/org/apache/storm/redis/state/DefaultStateSerializerTest.java b/external/storm-redis/src/test/java/org/apache/storm/redis/state/DefaultStateSerializerTest.java
index 7346989..5ecca06 100644
--- a/external/storm-redis/src/test/java/org/apache/storm/redis/state/DefaultStateSerializerTest.java
+++ b/external/storm-redis/src/test/java/org/apache/storm/redis/state/DefaultStateSerializerTest.java
@@ -53,4 +53,4 @@ public class DefaultStateSerializerTest {
assertEquals(cs, (CheckPointState) s2.deserialize(bytes));
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-redis/src/test/java/org/apache/storm/redis/state/RedisKeyValueStateProviderTest.java
----------------------------------------------------------------------
diff --git a/external/storm-redis/src/test/java/org/apache/storm/redis/state/RedisKeyValueStateProviderTest.java b/external/storm-redis/src/test/java/org/apache/storm/redis/state/RedisKeyValueStateProviderTest.java
index ec6507a..92e76ec 100644
--- a/external/storm-redis/src/test/java/org/apache/storm/redis/state/RedisKeyValueStateProviderTest.java
+++ b/external/storm-redis/src/test/java/org/apache/storm/redis/state/RedisKeyValueStateProviderTest.java
@@ -37,9 +37,9 @@ public class RedisKeyValueStateProviderTest {
public void testgetDefaultConfig() throws Exception {
RedisKeyValueStateProvider provider = new RedisKeyValueStateProvider();
- Map<String, String> stormConf = new HashMap<>();
- //stormConf.put(Config.TOPOLOGY_STATE_PROVIDER_CONFIG, "{\"keyClass\":\"String\"}");
- RedisKeyValueStateProvider.StateConfig config = provider.getStateConfig(stormConf);
+ Map<String, Object> topoConf = new HashMap<>();
+ //topoConf.put(Config.TOPOLOGY_STATE_PROVIDER_CONFIG, "{\"keyClass\":\"String\"}");
+ RedisKeyValueStateProvider.StateConfig config = provider.getStateConfig(topoConf);
assertNotNull(config);
}
@@ -47,16 +47,16 @@ public class RedisKeyValueStateProviderTest {
@Test
public void testgetConfigWithProviderConfig() throws Exception {
RedisKeyValueStateProvider provider = new RedisKeyValueStateProvider();
- Map<String, String> stormConf = new HashMap<>();
- stormConf.put(Config.TOPOLOGY_STATE_PROVIDER_CONFIG, "{\"keyClass\":\"String\", \"valueClass\":\"String\"," +
+ Map<String, Object> topoConf = new HashMap<>();
+ topoConf.put(Config.TOPOLOGY_STATE_PROVIDER_CONFIG, "{\"keyClass\":\"String\", \"valueClass\":\"String\"," +
" \"jedisPoolConfig\":" +
"{\"host\":\"localhost\", \"port\":1000}}");
- RedisKeyValueStateProvider.StateConfig config = provider.getStateConfig(stormConf);
+ RedisKeyValueStateProvider.StateConfig config = provider.getStateConfig(topoConf);
//System.out.println(config);
assertEquals("String", config.keyClass);
assertEquals("String", config.valueClass);
assertEquals("localhost", config.jedisPoolConfig.getHost());
assertEquals(1000, config.jedisPoolConfig.getPort());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-redis/src/test/java/org/apache/storm/redis/state/RedisKeyValueStateTest.java
----------------------------------------------------------------------
diff --git a/external/storm-redis/src/test/java/org/apache/storm/redis/state/RedisKeyValueStateTest.java b/external/storm-redis/src/test/java/org/apache/storm/redis/state/RedisKeyValueStateTest.java
index e40885d..5a68f6e 100644
--- a/external/storm-redis/src/test/java/org/apache/storm/redis/state/RedisKeyValueStateTest.java
+++ b/external/storm-redis/src/test/java/org/apache/storm/redis/state/RedisKeyValueStateTest.java
@@ -204,4 +204,4 @@ public class RedisKeyValueStateTest {
return count;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-rocketmq/src/main/java/org/apache/storm/rocketmq/bolt/RocketMQBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-rocketmq/src/main/java/org/apache/storm/rocketmq/bolt/RocketMQBolt.java b/external/storm-rocketmq/src/main/java/org/apache/storm/rocketmq/bolt/RocketMQBolt.java
index 3f04d07..3932381 100644
--- a/external/storm-rocketmq/src/main/java/org/apache/storm/rocketmq/bolt/RocketMQBolt.java
+++ b/external/storm-rocketmq/src/main/java/org/apache/storm/rocketmq/bolt/RocketMQBolt.java
@@ -49,7 +49,7 @@ public class RocketMQBolt implements IRichBolt {
private Properties properties;
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
Validate.notEmpty(properties, "Producer properties can not be empty");
// Since RocketMQ Producer is thread-safe, RocketMQBolt uses a single
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-rocketmq/src/main/java/org/apache/storm/rocketmq/spout/RocketMQSpout.java
----------------------------------------------------------------------
diff --git a/external/storm-rocketmq/src/main/java/org/apache/storm/rocketmq/spout/RocketMQSpout.java b/external/storm-rocketmq/src/main/java/org/apache/storm/rocketmq/spout/RocketMQSpout.java
index 58dc2bf..d4dfc61 100644
--- a/external/storm-rocketmq/src/main/java/org/apache/storm/rocketmq/spout/RocketMQSpout.java
+++ b/external/storm-rocketmq/src/main/java/org/apache/storm/rocketmq/spout/RocketMQSpout.java
@@ -75,7 +75,7 @@ public class RocketMQSpout implements IRichSpout {
}
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
// Since RocketMQ Consumer is thread-safe, RocketMQSpout uses a single
// consumer instance across threads to improve the performance.
synchronized (RocketMQSpout.class) {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-rocketmq/src/main/java/org/apache/storm/rocketmq/trident/state/RocketMQStateFactory.java
----------------------------------------------------------------------
diff --git a/external/storm-rocketmq/src/main/java/org/apache/storm/rocketmq/trident/state/RocketMQStateFactory.java b/external/storm-rocketmq/src/main/java/org/apache/storm/rocketmq/trident/state/RocketMQStateFactory.java
index 82eb013..2b4cc37 100644
--- a/external/storm-rocketmq/src/main/java/org/apache/storm/rocketmq/trident/state/RocketMQStateFactory.java
+++ b/external/storm-rocketmq/src/main/java/org/apache/storm/rocketmq/trident/state/RocketMQStateFactory.java
@@ -32,7 +32,7 @@ public class RocketMQStateFactory implements StateFactory {
}
@Override
- public State makeState(Map conf, IMetricsContext metrics,
+ public State makeState(Map<String, Object> conf, IMetricsContext metrics,
int partitionIndex, int numPartitions) {
RocketMQState state = new RocketMQState(conf, options);
state.prepare();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java b/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
index 4feaaf5..da898ff 100644
--- a/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
+++ b/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
@@ -72,7 +72,7 @@ public class SolrUpdateBolt extends BaseTickTupleAwareRichBolt {
}
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
this.collector = collector;
this.solrClient = new CloudSolrClient(solrConfig.getZkHostString());
this.toCommitTuples = new ArrayList<>(capacity());
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 5534888..cc3ef38 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
@@ -35,7 +35,7 @@ public class StatefulWordCounter extends BaseStatefulBolt<KeyValueState<String,
@SuppressWarnings("rawtypes")
@Override
- public void prepare(Map stormConf, 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/64e29f36/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/TestWindowBolt.java
----------------------------------------------------------------------
diff --git a/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/TestWindowBolt.java b/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/TestWindowBolt.java
index 8c904d9..f8c140b 100644
--- a/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/TestWindowBolt.java
+++ b/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/TestWindowBolt.java
@@ -31,7 +31,7 @@ public class TestWindowBolt extends BaseWindowedBolt {
private OutputCollector collector;
@Override
- public void prepare(Map stormConf, 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/64e29f36/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 5599561..94f65ba 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,7 @@ public class WordCounter extends BaseBasicBolt {
@SuppressWarnings("rawtypes")
- public void prepare(Map stormConf, TopologyContext context) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context) {
}
/*
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/integration-test/src/main/java/org/apache/storm/ExclamationTopology.java
----------------------------------------------------------------------
diff --git a/integration-test/src/main/java/org/apache/storm/ExclamationTopology.java b/integration-test/src/main/java/org/apache/storm/ExclamationTopology.java
index 372ee56..98d4eba 100644
--- a/integration-test/src/main/java/org/apache/storm/ExclamationTopology.java
+++ b/integration-test/src/main/java/org/apache/storm/ExclamationTopology.java
@@ -44,7 +44,7 @@ public class ExclamationTopology {
OutputCollector _collector;
@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/64e29f36/integration-test/src/main/java/org/apache/storm/st/topology/window/SlidingTimeCorrectness.java
----------------------------------------------------------------------
diff --git a/integration-test/src/main/java/org/apache/storm/st/topology/window/SlidingTimeCorrectness.java b/integration-test/src/main/java/org/apache/storm/st/topology/window/SlidingTimeCorrectness.java
index 430449b..be00ffc 100644
--- a/integration-test/src/main/java/org/apache/storm/st/topology/window/SlidingTimeCorrectness.java
+++ b/integration-test/src/main/java/org/apache/storm/st/topology/window/SlidingTimeCorrectness.java
@@ -107,7 +107,7 @@ public class SlidingTimeCorrectness implements TestableTopology {
}
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
componentId = context.getThisComponentId();
this.collector = collector;
}
@@ -138,7 +138,7 @@ public class SlidingTimeCorrectness implements TestableTopology {
private String componentId;
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
componentId = context.getThisComponentId();
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/integration-test/src/main/java/org/apache/storm/st/topology/window/SlidingWindowCorrectness.java
----------------------------------------------------------------------
diff --git a/integration-test/src/main/java/org/apache/storm/st/topology/window/SlidingWindowCorrectness.java b/integration-test/src/main/java/org/apache/storm/st/topology/window/SlidingWindowCorrectness.java
index 33ee004..5d1b53b 100644
--- a/integration-test/src/main/java/org/apache/storm/st/topology/window/SlidingWindowCorrectness.java
+++ b/integration-test/src/main/java/org/apache/storm/st/topology/window/SlidingWindowCorrectness.java
@@ -102,7 +102,7 @@ public class SlidingWindowCorrectness implements TestableTopology {
}
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
componentId = context.getThisComponentId();
this.collector = collector;
}
@@ -133,7 +133,7 @@ public class SlidingWindowCorrectness implements TestableTopology {
private String componentId;
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
componentId = context.getThisComponentId();
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/integration-test/src/main/java/org/apache/storm/st/topology/window/TumblingTimeCorrectness.java
----------------------------------------------------------------------
diff --git a/integration-test/src/main/java/org/apache/storm/st/topology/window/TumblingTimeCorrectness.java b/integration-test/src/main/java/org/apache/storm/st/topology/window/TumblingTimeCorrectness.java
index a77836f..d7fbbca 100644
--- a/integration-test/src/main/java/org/apache/storm/st/topology/window/TumblingTimeCorrectness.java
+++ b/integration-test/src/main/java/org/apache/storm/st/topology/window/TumblingTimeCorrectness.java
@@ -104,7 +104,7 @@ public class TumblingTimeCorrectness implements TestableTopology {
}
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
componentId = context.getThisComponentId();
this.collector = collector;
}
@@ -135,7 +135,7 @@ public class TumblingTimeCorrectness implements TestableTopology {
private String componentId;
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
componentId = context.getThisComponentId();
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/integration-test/src/main/java/org/apache/storm/st/topology/window/TumblingWindowCorrectness.java
----------------------------------------------------------------------
diff --git a/integration-test/src/main/java/org/apache/storm/st/topology/window/TumblingWindowCorrectness.java b/integration-test/src/main/java/org/apache/storm/st/topology/window/TumblingWindowCorrectness.java
index 22c6d75..110c982 100644
--- a/integration-test/src/main/java/org/apache/storm/st/topology/window/TumblingWindowCorrectness.java
+++ b/integration-test/src/main/java/org/apache/storm/st/topology/window/TumblingWindowCorrectness.java
@@ -99,7 +99,7 @@ public class TumblingWindowCorrectness implements TestableTopology {
}
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
componentId = context.getThisComponentId();
this.collector = collector;
}
@@ -130,7 +130,7 @@ public class TumblingWindowCorrectness implements TestableTopology {
private String componentId;
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
componentId = context.getThisComponentId();
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 6d6f940..5e1eb97 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
@@ -44,7 +44,7 @@ public class StormCluster {
private final Nimbus.Iface client;
public StormCluster() {
- Map conf = getConfig();
+ Map<String, Object> conf = getConfig();
this.client = NimbusClient.getConfiguredClient(conf).getClient();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSql.java
----------------------------------------------------------------------
diff --git a/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSql.java b/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSql.java
index 5dec4af..3fbc463 100644
--- a/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSql.java
+++ b/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSql.java
@@ -43,7 +43,7 @@ public abstract class StormSql {
* Submit the SQL statements to Nimbus and run it as a topology.
*/
public abstract void submit(
- String name, Iterable<String> statements, Map<String, ?> stormConf, SubmitOptions opts,
+ String name, Iterable<String> statements, Map<String, Object> topoConf, SubmitOptions opts,
StormSubmitter.ProgressListener progressListener, String asUser)
throws Exception;
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSqlImpl.java
----------------------------------------------------------------------
diff --git a/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSqlImpl.java b/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSqlImpl.java
index 007daa7..1c83ac8 100644
--- a/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSqlImpl.java
+++ b/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSqlImpl.java
@@ -108,7 +108,7 @@ class StormSqlImpl extends StormSql {
@Override
public void submit(
- String name, Iterable<String> statements, Map<String, ?> stormConf, SubmitOptions opts,
+ String name, Iterable<String> statements, Map<String, Object> topoConf, SubmitOptions opts,
StormSubmitter.ProgressListener progressListener, String asUser)
throws Exception {
Map<String, ISqlTridentDataSource> dataSources = new HashMap<>();
@@ -133,7 +133,7 @@ class StormSqlImpl extends StormSql {
jarPath = Files.createTempFile("storm-sql", ".jar");
System.setProperty("storm.jar", jarPath.toString());
packageTopology(jarPath, processor);
- StormSubmitter.submitTopologyAs(name, stormConf, topo.build(), opts, progressListener, asUser);
+ StormSubmitter.submitTopologyAs(name, topoConf, topo.build(), opts, progressListener, asUser);
} finally {
if (jarPath != null) {
Files.delete(jarPath);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSqlRunner.java
----------------------------------------------------------------------
diff --git a/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSqlRunner.java b/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSqlRunner.java
index 5618647..62dabe2 100644
--- a/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSqlRunner.java
+++ b/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSqlRunner.java
@@ -53,7 +53,7 @@ public class StormSqlRunner {
List<String> stmts = Files.readAllLines(Paths.get(filePath), StandardCharsets.UTF_8);
StormSql sql = StormSql.construct();
@SuppressWarnings("unchecked")
- Map<String, ?> conf = Utils.readStormConfig();
+ Map<String, Object> conf = Utils.readStormConfig();
if (commandLine.hasOption(OPTION_SQL_EXPLAIN_LONG)) {
sql.explain(stmts);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/sql/storm-sql-core/src/jvm/org/apache/storm/sql/compiler/RexNodeToJavaCodeCompiler.java
----------------------------------------------------------------------
diff --git a/sql/storm-sql-core/src/jvm/org/apache/storm/sql/compiler/RexNodeToJavaCodeCompiler.java b/sql/storm-sql-core/src/jvm/org/apache/storm/sql/compiler/RexNodeToJavaCodeCompiler.java
index 5ac95e0..8d21c88 100644
--- a/sql/storm-sql-core/src/jvm/org/apache/storm/sql/compiler/RexNodeToJavaCodeCompiler.java
+++ b/sql/storm-sql-core/src/jvm/org/apache/storm/sql/compiler/RexNodeToJavaCodeCompiler.java
@@ -228,4 +228,4 @@ public class RexNodeToJavaCodeCompiler {
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/sql/storm-sql-core/src/jvm/org/apache/storm/sql/javac/CompilingClassLoader.java
----------------------------------------------------------------------
diff --git a/sql/storm-sql-core/src/jvm/org/apache/storm/sql/javac/CompilingClassLoader.java b/sql/storm-sql-core/src/jvm/org/apache/storm/sql/javac/CompilingClassLoader.java
index 0b7c053..21a219f 100644
--- a/sql/storm-sql-core/src/jvm/org/apache/storm/sql/javac/CompilingClassLoader.java
+++ b/sql/storm-sql-core/src/jvm/org/apache/storm/sql/javac/CompilingClassLoader.java
@@ -222,4 +222,4 @@ public class CompilingClassLoader extends ClassLoader {
return sourceCode;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/sql/storm-sql-core/src/test/org/apache/storm/sql/compiler/backends/standalone/TestCompilerUtils.java
----------------------------------------------------------------------
diff --git a/sql/storm-sql-core/src/test/org/apache/storm/sql/compiler/backends/standalone/TestCompilerUtils.java b/sql/storm-sql-core/src/test/org/apache/storm/sql/compiler/backends/standalone/TestCompilerUtils.java
index 8e64e9c..9dfc931 100644
--- a/sql/storm-sql-core/src/test/org/apache/storm/sql/compiler/backends/standalone/TestCompilerUtils.java
+++ b/sql/storm-sql-core/src/test/org/apache/storm/sql/compiler/backends/standalone/TestCompilerUtils.java
@@ -180,4 +180,4 @@ public class TestCompilerUtils {
return tree;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/sql/storm-sql-core/src/test/org/apache/storm/sql/compiler/backends/trident/TestCompilerUtils.java
----------------------------------------------------------------------
diff --git a/sql/storm-sql-core/src/test/org/apache/storm/sql/compiler/backends/trident/TestCompilerUtils.java b/sql/storm-sql-core/src/test/org/apache/storm/sql/compiler/backends/trident/TestCompilerUtils.java
index f6ef1ca..afdc9c7 100644
--- a/sql/storm-sql-core/src/test/org/apache/storm/sql/compiler/backends/trident/TestCompilerUtils.java
+++ b/sql/storm-sql-core/src/test/org/apache/storm/sql/compiler/backends/trident/TestCompilerUtils.java
@@ -205,4 +205,4 @@ public class TestCompilerUtils {
return tree;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/sql/storm-sql-core/src/test/org/apache/storm/sql/compiler/backends/trident/TestPlanCompiler.java
----------------------------------------------------------------------
diff --git a/sql/storm-sql-core/src/test/org/apache/storm/sql/compiler/backends/trident/TestPlanCompiler.java b/sql/storm-sql-core/src/test/org/apache/storm/sql/compiler/backends/trident/TestPlanCompiler.java
index d3f30b9..9c365ae 100644
--- a/sql/storm-sql-core/src/test/org/apache/storm/sql/compiler/backends/trident/TestPlanCompiler.java
+++ b/sql/storm-sql-core/src/test/org/apache/storm/sql/compiler/backends/trident/TestPlanCompiler.java
@@ -229,4 +229,4 @@ public class TestPlanCompiler {
Thread.sleep(100);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/sql/storm-sql-core/src/test/org/apache/storm/sql/parser/TestSqlParser.java
----------------------------------------------------------------------
diff --git a/sql/storm-sql-core/src/test/org/apache/storm/sql/parser/TestSqlParser.java b/sql/storm-sql-core/src/test/org/apache/storm/sql/parser/TestSqlParser.java
index 68054d8..bff92e7 100644
--- a/sql/storm-sql-core/src/test/org/apache/storm/sql/parser/TestSqlParser.java
+++ b/sql/storm-sql-core/src/test/org/apache/storm/sql/parser/TestSqlParser.java
@@ -51,4 +51,4 @@ public class TestSqlParser {
StormParser parser = new StormParser(sql);
return parser.impl().parseSqlStmtEof();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/datasource/socket/trident/SocketState.java
----------------------------------------------------------------------
diff --git a/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/datasource/socket/trident/SocketState.java b/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/datasource/socket/trident/SocketState.java
index 3f85756..c12f8bd 100644
--- a/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/datasource/socket/trident/SocketState.java
+++ b/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/datasource/socket/trident/SocketState.java
@@ -58,7 +58,7 @@ public class SocketState implements State {
}
@Override
- public State makeState(Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
+ public State makeState(Map<String, Object> conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
BufferedWriter out;
try {
Socket socket = new Socket(host, port);
@@ -86,4 +86,4 @@ public class SocketState implements State {
public void flush() throws IOException {
out.flush();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/datasource/socket/trident/TridentSocketSpout.java
----------------------------------------------------------------------
diff --git a/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/datasource/socket/trident/TridentSocketSpout.java b/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/datasource/socket/trident/TridentSocketSpout.java
index 97f63a7..1bd9251 100644
--- a/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/datasource/socket/trident/TridentSocketSpout.java
+++ b/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/datasource/socket/trident/TridentSocketSpout.java
@@ -68,7 +68,7 @@ public class TridentSocketSpout implements IBatchSpout {
}
@Override
- public void open(Map conf, TopologyContext context) {
+ public void open(Map<String, Object> conf, TopologyContext context) {
this.queue = new LinkedBlockingDeque<>();
this.objectMapper = new ObjectMapper();
this.batches = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/serde/avro/CachedSchemas.java
----------------------------------------------------------------------
diff --git a/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/serde/avro/CachedSchemas.java b/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/serde/avro/CachedSchemas.java
index 4f0e747..fae917b 100644
--- a/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/serde/avro/CachedSchemas.java
+++ b/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/serde/avro/CachedSchemas.java
@@ -38,4 +38,4 @@ public class CachedSchemas implements Serializable{
return schema;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/trident/functions/EvaluationCalc.java
----------------------------------------------------------------------
diff --git a/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/trident/functions/EvaluationCalc.java b/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/trident/functions/EvaluationCalc.java
index 6c76481..0318455 100644
--- a/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/trident/functions/EvaluationCalc.java
+++ b/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/trident/functions/EvaluationCalc.java
@@ -49,7 +49,7 @@ public class EvaluationCalc implements OperationAwareFlatMapFunction {
}
@Override
- public void prepare(Map conf, TridentOperationContext context) {
+ public void prepare(Map<String, Object> conf, TridentOperationContext context) {
if (projectionInstance != null && projectionInstance instanceof DebuggableExecutableExpression) {
LOG.info("Expression code for projection: \n{}", ((DebuggableExecutableExpression) projectionInstance).getDelegateCode());
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/trident/functions/EvaluationFilter.java
----------------------------------------------------------------------
diff --git a/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/trident/functions/EvaluationFilter.java b/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/trident/functions/EvaluationFilter.java
index 9314852..81e81aa 100644
--- a/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/trident/functions/EvaluationFilter.java
+++ b/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/trident/functions/EvaluationFilter.java
@@ -45,7 +45,7 @@ public class EvaluationFilter extends BaseFilter {
}
@Override
- public void prepare(Map conf, TridentOperationContext context) {
+ public void prepare(Map<String, Object> conf, TridentOperationContext context) {
if (filterInstance != null && filterInstance instanceof DebuggableExecutableExpression) {
LOG.info("Expression code for filter: \n{}", ((DebuggableExecutableExpression) filterInstance).getDelegateCode());
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/trident/functions/EvaluationFunction.java
----------------------------------------------------------------------
diff --git a/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/trident/functions/EvaluationFunction.java b/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/trident/functions/EvaluationFunction.java
index 2608104..728d75e 100644
--- a/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/trident/functions/EvaluationFunction.java
+++ b/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/trident/functions/EvaluationFunction.java
@@ -46,7 +46,7 @@ public class EvaluationFunction implements OperationAwareMapFunction {
}
@Override
- public void prepare(Map conf, TridentOperationContext context) {
+ public void prepare(Map<String, Object> conf, TridentOperationContext context) {
if (projectionInstance instanceof DebuggableExecutableExpression) {
LOG.info("Expression code: {}", ((DebuggableExecutableExpression) projectionInstance).getDelegateCode());
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/sql/storm-sql-runtime/src/test/org/apache/storm/sql/TestUtils.java
----------------------------------------------------------------------
diff --git a/sql/storm-sql-runtime/src/test/org/apache/storm/sql/TestUtils.java b/sql/storm-sql-runtime/src/test/org/apache/storm/sql/TestUtils.java
index 0a3bac6..05587ba 100644
--- a/sql/storm-sql-runtime/src/test/org/apache/storm/sql/TestUtils.java
+++ b/sql/storm-sql-runtime/src/test/org/apache/storm/sql/TestUtils.java
@@ -221,7 +221,7 @@ public class TestUtils {
public static class MockStateFactory implements StateFactory {
@Override
- public State makeState(Map conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
+ public State makeState(Map<String, Object> conf, IMetricsContext metrics, int partitionIndex, int numPartitions) {
return new MockState();
}
}
@@ -234,7 +234,7 @@ public class TestUtils {
}
@Override
- public void prepare(Map conf, TridentOperationContext context) {
+ public void prepare(Map<String, Object> conf, TridentOperationContext context) {
// NOOP
}
@@ -270,7 +270,7 @@ public class TestUtils {
private boolean emitted = false;
@Override
- public void open(Map conf, TopologyContext context) {
+ public void open(Map<String, Object> conf, TopologyContext context) {
}
@Override
@@ -329,7 +329,7 @@ public class TestUtils {
private boolean emitted = false;
@Override
- public void open(Map conf, TopologyContext context) {
+ public void open(Map<String, Object> conf, TopologyContext context) {
}
@Override
@@ -391,7 +391,7 @@ public class TestUtils {
private boolean emitted = false;
@Override
- public void open(Map conf, TopologyContext context) {
+ public void open(Map<String, Object> conf, TopologyContext context) {
}
@Override
@@ -450,7 +450,7 @@ public class TestUtils {
private boolean emitted = false;
@Override
- public void open(Map conf, TopologyContext context) {
+ public void open(Map<String, Object> conf, TopologyContext context) {
}
@Override
@@ -515,7 +515,7 @@ public class TestUtils {
private boolean emitted = false;
@Override
- public void open(Map conf, TopologyContext context) {
+ public void open(Map<String, Object> conf, TopologyContext context) {
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/sql/storm-sql-runtime/src/test/org/apache/storm/sql/runtime/datasource/socket/TestSocketDataSourceProvider.java
----------------------------------------------------------------------
diff --git a/sql/storm-sql-runtime/src/test/org/apache/storm/sql/runtime/datasource/socket/TestSocketDataSourceProvider.java b/sql/storm-sql-runtime/src/test/org/apache/storm/sql/runtime/datasource/socket/TestSocketDataSourceProvider.java
index 1e8edee..6720c4b 100644
--- a/sql/storm-sql-runtime/src/test/org/apache/storm/sql/runtime/datasource/socket/TestSocketDataSourceProvider.java
+++ b/sql/storm-sql-runtime/src/test/org/apache/storm/sql/runtime/datasource/socket/TestSocketDataSourceProvider.java
@@ -91,4 +91,4 @@ public class TestSocketDataSourceProvider {
tupleList.add(t1);
return tupleList;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client-misc/src/main/java/org/apache/storm/misc/metric/HttpForwardingMetricsConsumer.java
----------------------------------------------------------------------
diff --git a/storm-client-misc/src/main/java/org/apache/storm/misc/metric/HttpForwardingMetricsConsumer.java b/storm-client-misc/src/main/java/org/apache/storm/misc/metric/HttpForwardingMetricsConsumer.java
index fd732da..aa4579c 100644
--- a/storm-client-misc/src/main/java/org/apache/storm/misc/metric/HttpForwardingMetricsConsumer.java
+++ b/storm-client-misc/src/main/java/org/apache/storm/misc/metric/HttpForwardingMetricsConsumer.java
@@ -53,11 +53,11 @@ public class HttpForwardingMetricsConsumer implements IMetricsConsumer {
private transient KryoValuesSerializer _serializer;
@Override
- public void prepare(Map stormConf, Object registrationArgument, TopologyContext context, IErrorReporter errorReporter) {
+ public void prepare(Map<String, Object> topoConf, Object registrationArgument, TopologyContext context, IErrorReporter errorReporter) {
try {
_url = new URL((String)registrationArgument);
_errorReporter = errorReporter;
- _serializer = new KryoValuesSerializer(stormConf);
+ _serializer = new KryoValuesSerializer(topoConf);
} catch (Exception e) {
throw new RuntimeException(e);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client-misc/src/main/java/org/apache/storm/misc/metric/HttpForwardingMetricsServer.java
----------------------------------------------------------------------
diff --git a/storm-client-misc/src/main/java/org/apache/storm/misc/metric/HttpForwardingMetricsServer.java b/storm-client-misc/src/main/java/org/apache/storm/misc/metric/HttpForwardingMetricsServer.java
index 783d0ba..ef2769a 100644
--- a/storm-client-misc/src/main/java/org/apache/storm/misc/metric/HttpForwardingMetricsServer.java
+++ b/storm-client-misc/src/main/java/org/apache/storm/misc/metric/HttpForwardingMetricsServer.java
@@ -67,7 +67,7 @@ public abstract class HttpForwardingMetricsServer {
}
}
- public HttpForwardingMetricsServer(Map conf) {
+ public HttpForwardingMetricsServer(Map<String, Object> conf) {
_conf = Utils.readStormConfig();
if (conf != null) {
_conf.putAll(conf);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/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 78468e0..e85841c 100644
--- a/storm-client/src/jvm/org/apache/storm/Config.java
+++ b/storm-client/src/jvm/org/apache/storm/Config.java
@@ -1481,7 +1481,7 @@ public class Config extends HashMap<String, Object> {
@isPositiveNumber
public static final String NUM_STAT_BUCKETS = "num.stat.buckets";
- public static void setClasspath(Map conf, String cp) {
+ public static void setClasspath(Map<String, Object> conf, String cp) {
conf.put(Config.TOPOLOGY_CLASSPATH, cp);
}
@@ -1489,7 +1489,7 @@ public class Config extends HashMap<String, Object> {
setClasspath(this, cp);
}
- public static void setEnvironment(Map conf, Map env) {
+ public static void setEnvironment(Map<String, Object> conf, Map env) {
conf.put(Config.TOPOLOGY_ENVIRONMENT, env);
}
@@ -1497,7 +1497,7 @@ public class Config extends HashMap<String, Object> {
setEnvironment(this, env);
}
- public static void setDebug(Map conf, boolean isOn) {
+ public static void setDebug(Map<String, Object> conf, boolean isOn) {
conf.put(Config.TOPOLOGY_DEBUG, isOn);
}
@@ -1505,7 +1505,7 @@ public class Config extends HashMap<String, Object> {
setDebug(this, isOn);
}
- public static void setNumWorkers(Map conf, int workers) {
+ public static void setNumWorkers(Map<String, Object> conf, int workers) {
conf.put(Config.TOPOLOGY_WORKERS, workers);
}
@@ -1513,7 +1513,7 @@ public class Config extends HashMap<String, Object> {
setNumWorkers(this, workers);
}
- public static void setNumAckers(Map conf, int numExecutors) {
+ public static void setNumAckers(Map<String, Object> conf, int numExecutors) {
conf.put(Config.TOPOLOGY_ACKER_EXECUTORS, numExecutors);
}
@@ -1521,7 +1521,7 @@ public class Config extends HashMap<String, Object> {
setNumAckers(this, numExecutors);
}
- public static void setNumEventLoggers(Map conf, int numExecutors) {
+ public static void setNumEventLoggers(Map<String, Object> conf, int numExecutors) {
conf.put(Config.TOPOLOGY_EVENTLOGGER_EXECUTORS, numExecutors);
}
@@ -1530,7 +1530,7 @@ public class Config extends HashMap<String, Object> {
}
- public static void setMessageTimeoutSecs(Map conf, int secs) {
+ public static void setMessageTimeoutSecs(Map<String, Object> conf, int secs) {
conf.put(Config.TOPOLOGY_MESSAGE_TIMEOUT_SECS, secs);
}
@@ -1538,7 +1538,7 @@ public class Config extends HashMap<String, Object> {
setMessageTimeoutSecs(this, secs);
}
- public static void registerSerialization(Map conf, Class klass) {
+ public static void registerSerialization(Map<String, Object> conf, Class klass) {
getRegisteredSerializations(conf).add(klass.getName());
}
@@ -1546,7 +1546,7 @@ public class Config extends HashMap<String, Object> {
registerSerialization(this, klass);
}
- public static void registerSerialization(Map conf, Class klass, Class<? extends Serializer> serializerClass) {
+ public static void registerSerialization(Map<String, Object> conf, Class klass, Class<? extends Serializer> serializerClass) {
Map<String, String> register = new HashMap<String, String>();
register.put(klass.getName(), serializerClass.getName());
getRegisteredSerializations(conf).add(register);
@@ -1556,7 +1556,7 @@ public class Config extends HashMap<String, Object> {
registerSerialization(this, klass, serializerClass);
}
- public static void registerMetricsConsumer(Map conf, Class klass, Object argument, long parallelismHint) {
+ public static void registerMetricsConsumer(Map<String, Object> conf, Class klass, Object argument, long parallelismHint) {
HashMap m = new HashMap();
m.put("class", klass.getCanonicalName());
m.put("parallelism.hint", parallelismHint);
@@ -1572,7 +1572,7 @@ public class Config extends HashMap<String, Object> {
registerMetricsConsumer(this, klass, argument, parallelismHint);
}
- public static void registerMetricsConsumer(Map conf, Class klass, long parallelismHint) {
+ public static void registerMetricsConsumer(Map<String, Object> conf, Class klass, long parallelismHint) {
registerMetricsConsumer(conf, klass, null, parallelismHint);
}
@@ -1580,7 +1580,7 @@ public class Config extends HashMap<String, Object> {
registerMetricsConsumer(this, klass, parallelismHint);
}
- public static void registerMetricsConsumer(Map conf, Class klass) {
+ public static void registerMetricsConsumer(Map<String, Object> conf, Class klass) {
registerMetricsConsumer(conf, klass, null, 1L);
}
@@ -1588,7 +1588,7 @@ public class Config extends HashMap<String, Object> {
registerMetricsConsumer(this, klass);
}
- public static void registerDecorator(Map conf, Class<? extends IKryoDecorator> klass) {
+ public static void registerDecorator(Map<String, Object> conf, Class<? extends IKryoDecorator> klass) {
getRegisteredDecorators(conf).add(klass.getName());
}
@@ -1596,7 +1596,7 @@ public class Config extends HashMap<String, Object> {
registerDecorator(this, klass);
}
- public static void setKryoFactory(Map conf, Class<? extends IKryoFactory> klass) {
+ public static void setKryoFactory(Map<String, Object> conf, Class<? extends IKryoFactory> klass) {
conf.put(Config.TOPOLOGY_KRYO_FACTORY, klass.getName());
}
@@ -1604,7 +1604,7 @@ public class Config extends HashMap<String, Object> {
setKryoFactory(this, klass);
}
- public static void setSkipMissingKryoRegistrations(Map conf, boolean skip) {
+ public static void setSkipMissingKryoRegistrations(Map<String, Object> conf, boolean skip) {
conf.put(Config.TOPOLOGY_SKIP_MISSING_KRYO_REGISTRATIONS, skip);
}
@@ -1612,7 +1612,7 @@ public class Config extends HashMap<String, Object> {
setSkipMissingKryoRegistrations(this, skip);
}
- public static void setMaxTaskParallelism(Map conf, int max) {
+ public static void setMaxTaskParallelism(Map<String, Object> conf, int max) {
conf.put(Config.TOPOLOGY_MAX_TASK_PARALLELISM, max);
}
@@ -1620,7 +1620,7 @@ public class Config extends HashMap<String, Object> {
setMaxTaskParallelism(this, max);
}
- public static void setMaxSpoutPending(Map conf, int max) {
+ public static void setMaxSpoutPending(Map<String, Object> conf, int max) {
conf.put(Config.TOPOLOGY_MAX_SPOUT_PENDING, max);
}
@@ -1628,7 +1628,7 @@ public class Config extends HashMap<String, Object> {
setMaxSpoutPending(this, max);
}
- public static void setStatsSampleRate(Map conf, double rate) {
+ public static void setStatsSampleRate(Map<String, Object> conf, double rate) {
conf.put(Config.TOPOLOGY_STATS_SAMPLE_RATE, rate);
}
@@ -1636,7 +1636,7 @@ public class Config extends HashMap<String, Object> {
setStatsSampleRate(this, rate);
}
- public static void setFallBackOnJavaSerialization(Map conf, boolean fallback) {
+ public static void setFallBackOnJavaSerialization(Map<String, Object> conf, boolean fallback) {
conf.put(Config.TOPOLOGY_FALL_BACK_ON_JAVA_SERIALIZATION, fallback);
}
@@ -1644,7 +1644,7 @@ public class Config extends HashMap<String, Object> {
setFallBackOnJavaSerialization(this, fallback);
}
- private static List getRegisteredSerializations(Map conf) {
+ private static List getRegisteredSerializations(Map<String, Object> conf) {
List ret;
if(!conf.containsKey(Config.TOPOLOGY_KRYO_REGISTER)) {
ret = new ArrayList();
@@ -1655,7 +1655,7 @@ public class Config extends HashMap<String, Object> {
return ret;
}
- private static List getRegisteredDecorators(Map conf) {
+ private static List getRegisteredDecorators(Map<String, Object> conf) {
List ret;
if(!conf.containsKey(Config.TOPOLOGY_KRYO_DECORATORS)) {
ret = new ArrayList();
@@ -1694,4 +1694,4 @@ public class Config extends HashMap<String, Object> {
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-client/src/jvm/org/apache/storm/ISubmitterHook.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/ISubmitterHook.java b/storm-client/src/jvm/org/apache/storm/ISubmitterHook.java
index ac80788..9bf42bc 100644
--- a/storm-client/src/jvm/org/apache/storm/ISubmitterHook.java
+++ b/storm-client/src/jvm/org/apache/storm/ISubmitterHook.java
@@ -27,5 +27,5 @@ import java.util.Map;
* that class's notify method will be invoked when a topology is successfully submitted via StormSubmitter class.
*/
public interface ISubmitterHook {
- public void notify(TopologyInfo topologyInfo, Map stormConf, StormTopology topology) throws IllegalAccessException;
+ public void notify(TopologyInfo topologyInfo, Map<String, Object> topoConf, StormTopology topology) throws IllegalAccessException;
}
[02/13] storm git commit: Merge branch 'STORM-2477' of
https://github.com/revans2/incubator-storm into STORM-2477
Posted by bo...@apache.org.
Merge branch 'STORM-2477' of https://github.com/revans2/incubator-storm into STORM-2477
STORM-2477: Add generics to Config types
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b7cb2d56
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b7cb2d56
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b7cb2d56
Branch: refs/heads/master
Commit: b7cb2d563eab9349bbbfaa9a6ce823bc2e291748
Parents: a1c1ecf 4e00e48
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Thu May 18 08:49:18 2017 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Thu May 18 08:49:18 2017 -0500
----------------------------------------------------------------------
.travis.yml | 1 +
.../org/apache/storm/starter/ReachTopology.java | 4 +-
.../storm/starter/TransactionalGlobalCount.java | 2 +-
external/storm-eventhubs/pom.xml | 2 +-
external/storm-hbase/pom.xml | 4 +-
.../storm/hbase/bolt/AbstractHBaseBolt.java | 6 +--
external/storm-hdfs/pom.xml | 2 +-
.../apache/storm/jms/spout/JmsSpoutTest.java | 2 +-
external/storm-kafka-client/pom.xml | 2 +-
.../trident/KafkaTridentSpoutTransactional.java | 7 ++--
external/storm-redis/pom.xml | 2 +-
.../kerberos/KerberosSaslTransportPlugin.java | 8 ++--
.../jvm/org/apache/storm/stats/StatsUtil.java | 4 +-
.../apache/storm/testing/BatchNumberList.java | 2 +-
.../apache/storm/testing/CountingBatchBolt.java | 2 +-
.../storm/testing/KeyedCountingBatchBolt.java | 2 +-
.../storm/testing/KeyedSummingBatchBolt.java | 2 +-
.../operation/impl/IdentityMultiReducer.java | 8 ++--
.../storm/trident/spout/BatchSpoutExecutor.java | 10 ++---
.../trident/spout/RichSpoutBatchExecutor.java | 8 ++--
.../storm/trident/testing/FeederBatchSpout.java | 6 +--
.../testing/FeederCommitterBatchSpout.java | 4 +-
.../src/jvm/org/apache/storm/utils/Utils.java | 41 ++++++++++++--------
.../org/apache/storm/TestConfigValidate.java | 2 +-
.../storm/security/auth/AuthUtilsTest.java | 25 ++++++------
.../storm/security/auth/AuthUtilsTestMock.java | 17 ++++++--
.../java/org/apache/storm/daemon/drpc/DRPC.java | 2 +-
transform.sh | 34 ++++++++++++++++
28 files changed, 131 insertions(+), 80 deletions(-)
----------------------------------------------------------------------