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:39 UTC
[12/13] storm git commit: STORM-2477: Result of transforming the code
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);