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:31 UTC
[04/13] storm git commit: STORM-2477: Result of transforming the code
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
+}