You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2015/09/19 02:52:32 UTC
[1/3] storm git commit: Add generics to the map returned by component
configuration to specify the structure of the configuration
Repository: storm
Updated Branches:
refs/heads/master 87b9b3ab0 -> fc398c6a2
Add generics to the map returned by component configuration to specify the structure of the configuration
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f55f7a7e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f55f7a7e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f55f7a7e
Branch: refs/heads/master
Commit: f55f7a7e57f382b91a700daeeb292580fcf9da7d
Parents: 895ba42
Author: ddebree <dd...@gmail.com>
Authored: Sun Sep 6 16:27:29 2015 +0200
Committer: ddebree <dd...@gmail.com>
Committed: Sun Sep 6 16:27:29 2015 +0200
----------------------------------------------------------------------
docs/documentation/Tutorial.md | 2 +-
.../elasticsearch/trident/TridentEsTopology.java | 2 +-
.../trident/OpaqueTridentEventHubSpout.java | 2 +-
.../TransactionalTridentEventHubSpout.java | 2 +-
.../storm/hdfs/trident/FixedBatchSpout.java | 2 +-
.../storm/hive/trident/TridentHiveTopology.java | 2 +-
.../coordination/BatchSubtopologyBuilder.java | 4 ++--
.../storm/drpc/LinearDRPCTopologyBuilder.java | 7 +++----
.../storm/topology/BaseConfigurationDeclarer.java | 2 +-
.../topology/ComponentConfigurationDeclarer.java | 2 +-
.../backtype/storm/topology/TopologyBuilder.java | 2 +-
.../TransactionalTopologyBuilder.java | 10 +++++-----
.../storm/trident/spout/BatchSpoutExecutor.java | 2 +-
.../src/jvm/storm/trident/spout/IBatchSpout.java | 2 +-
.../spout/IOpaquePartitionedTridentSpout.java | 2 +-
.../trident/spout/IPartitionedTridentSpout.java | 2 +-
.../jvm/storm/trident/spout/ITridentSpout.java | 2 +-
.../trident/spout/RichSpoutBatchExecutor.java | 2 +-
.../storm/trident/testing/FeederBatchSpout.java | 2 +-
.../testing/FeederCommitterBatchSpout.java | 2 +-
.../storm/trident/testing/FixedBatchSpout.java | 2 +-
.../trident/topology/TridentTopologyBuilder.java | 18 +++++++++---------
22 files changed, 37 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/f55f7a7e/docs/documentation/Tutorial.md
----------------------------------------------------------------------
diff --git a/docs/documentation/Tutorial.md b/docs/documentation/Tutorial.md
index cba50b7..0d44177 100644
--- a/docs/documentation/Tutorial.md
+++ b/docs/documentation/Tutorial.md
@@ -160,7 +160,7 @@ public static class ExclamationBolt implements IRichBolt {
}
@Override
- public Map getComponentConfiguration() {
+ public Map<String, Object> getComponentConfiguration() {
return null;
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/f55f7a7e/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/trident/TridentEsTopology.java
----------------------------------------------------------------------
diff --git a/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/trident/TridentEsTopology.java b/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/trident/TridentEsTopology.java
index 45d86f8..7b525a5 100644
--- a/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/trident/TridentEsTopology.java
+++ b/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/trident/TridentEsTopology.java
@@ -126,7 +126,7 @@ public class TridentEsTopology {
}
@Override
- public Map getComponentConfiguration() {
+ public Map<String, Object> getComponentConfiguration() {
Config conf = new Config();
conf.setMaxTaskParallelism(1);
return conf;
http://git-wip-us.apache.org/repos/asf/storm/blob/f55f7a7e/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 46084ef..17c8da2 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
@@ -40,7 +40,7 @@ public class OpaqueTridentEventHubSpout implements IOpaquePartitionedTridentSpou
}
@Override
- public Map getComponentConfiguration() {
+ public Map<String, Object> getComponentConfiguration() {
return null;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/f55f7a7e/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 66ad425..8a01052 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
@@ -42,7 +42,7 @@ public class TransactionalTridentEventHubSpout implements
}
@Override
- public Map getComponentConfiguration() {
+ public Map<String, Object> getComponentConfiguration() {
return null;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/f55f7a7e/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/FixedBatchSpout.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/FixedBatchSpout.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/FixedBatchSpout.java
index 5a03592..1c9a336 100644
--- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/FixedBatchSpout.java
+++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/FixedBatchSpout.java
@@ -84,7 +84,7 @@ public class FixedBatchSpout implements IBatchSpout {
}
@Override
- public Map getComponentConfiguration() {
+ public Map<String, Object> getComponentConfiguration() {
Config conf = new Config();
conf.setMaxTaskParallelism(1);
return conf;
http://git-wip-us.apache.org/repos/asf/storm/blob/f55f7a7e/external/storm-hive/src/test/java/org/apache/storm/hive/trident/TridentHiveTopology.java
----------------------------------------------------------------------
diff --git a/external/storm-hive/src/test/java/org/apache/storm/hive/trident/TridentHiveTopology.java b/external/storm-hive/src/test/java/org/apache/storm/hive/trident/TridentHiveTopology.java
index bc607f3..a208502 100644
--- a/external/storm-hive/src/test/java/org/apache/storm/hive/trident/TridentHiveTopology.java
+++ b/external/storm-hive/src/test/java/org/apache/storm/hive/trident/TridentHiveTopology.java
@@ -179,7 +179,7 @@ public class TridentHiveTopology {
}
@Override
- public Map getComponentConfiguration() {
+ public Map<String, Object> getComponentConfiguration() {
Config conf = new Config();
conf.setMaxTaskParallelism(1);
return conf;
http://git-wip-us.apache.org/repos/asf/storm/blob/f55f7a7e/storm-core/src/jvm/backtype/storm/coordination/BatchSubtopologyBuilder.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/coordination/BatchSubtopologyBuilder.java b/storm-core/src/jvm/backtype/storm/coordination/BatchSubtopologyBuilder.java
index 4ec84a7..1dd1c9f 100644
--- a/storm-core/src/jvm/backtype/storm/coordination/BatchSubtopologyBuilder.java
+++ b/storm-core/src/jvm/backtype/storm/coordination/BatchSubtopologyBuilder.java
@@ -132,7 +132,7 @@ public class BatchSubtopologyBuilder {
public IRichBolt bolt;
public Integer parallelism;
public List<InputDeclaration> declarations = new ArrayList<InputDeclaration>();
- public List<Map> componentConfs = new ArrayList<Map>();
+ public List<Map<String, Object>> componentConfs = new ArrayList<>();
public Component(IRichBolt bolt, Integer parallelism) {
this.bolt = bolt;
@@ -439,7 +439,7 @@ public class BatchSubtopologyBuilder {
}
@Override
- public BoltDeclarer addConfigurations(Map conf) {
+ public BoltDeclarer addConfigurations(Map<String, Object> conf) {
_component.componentConfs.add(conf);
return this;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/f55f7a7e/storm-core/src/jvm/backtype/storm/drpc/LinearDRPCTopologyBuilder.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/drpc/LinearDRPCTopologyBuilder.java b/storm-core/src/jvm/backtype/storm/drpc/LinearDRPCTopologyBuilder.java
index 096ba2a..ee82091 100644
--- a/storm-core/src/jvm/backtype/storm/drpc/LinearDRPCTopologyBuilder.java
+++ b/storm-core/src/jvm/backtype/storm/drpc/LinearDRPCTopologyBuilder.java
@@ -120,7 +120,7 @@ public class LinearDRPCTopologyBuilder {
new CoordinatedBolt(component.bolt, source, idSpec),
component.parallelism);
- for(Map conf: component.componentConfs) {
+ for(Map<String, Object> conf: component.componentConfs) {
declarer.addConfigurations(conf);
}
@@ -174,13 +174,12 @@ public class LinearDRPCTopologyBuilder {
private static class Component {
public IRichBolt bolt;
public int parallelism;
- public List<Map> componentConfs;
+ public List<Map<String, Object>> componentConfs = new ArrayList<>();
public List<InputDeclaration> declarations = new ArrayList<InputDeclaration>();
public Component(IRichBolt bolt, int parallelism) {
this.bolt = bolt;
this.parallelism = parallelism;
- this.componentConfs = new ArrayList();
}
}
@@ -386,7 +385,7 @@ public class LinearDRPCTopologyBuilder {
}
@Override
- public LinearDRPCInputDeclarer addConfigurations(Map conf) {
+ public LinearDRPCInputDeclarer addConfigurations(Map<String, Object> conf) {
_component.componentConfs.add(conf);
return this;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/f55f7a7e/storm-core/src/jvm/backtype/storm/topology/BaseConfigurationDeclarer.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/topology/BaseConfigurationDeclarer.java b/storm-core/src/jvm/backtype/storm/topology/BaseConfigurationDeclarer.java
index 0c67324..465f04d 100644
--- a/storm-core/src/jvm/backtype/storm/topology/BaseConfigurationDeclarer.java
+++ b/storm-core/src/jvm/backtype/storm/topology/BaseConfigurationDeclarer.java
@@ -24,7 +24,7 @@ import java.util.Map;
public abstract class BaseConfigurationDeclarer<T extends ComponentConfigurationDeclarer> implements ComponentConfigurationDeclarer<T> {
@Override
public T addConfiguration(String config, Object value) {
- Map configMap = new HashMap();
+ Map<String, Object> configMap = new HashMap<>();
configMap.put(config, value);
return addConfigurations(configMap);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/f55f7a7e/storm-core/src/jvm/backtype/storm/topology/ComponentConfigurationDeclarer.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/topology/ComponentConfigurationDeclarer.java b/storm-core/src/jvm/backtype/storm/topology/ComponentConfigurationDeclarer.java
index d05dda0..3a433b9 100644
--- a/storm-core/src/jvm/backtype/storm/topology/ComponentConfigurationDeclarer.java
+++ b/storm-core/src/jvm/backtype/storm/topology/ComponentConfigurationDeclarer.java
@@ -20,7 +20,7 @@ package backtype.storm.topology;
import java.util.Map;
public interface ComponentConfigurationDeclarer<T extends ComponentConfigurationDeclarer> {
- T addConfigurations(Map conf);
+ T addConfigurations(Map<String, Object> conf);
T addConfiguration(String config, Object value);
T setDebug(boolean debug);
T setMaxTaskParallelism(Number val);
http://git-wip-us.apache.org/repos/asf/storm/blob/f55f7a7e/storm-core/src/jvm/backtype/storm/topology/TopologyBuilder.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/topology/TopologyBuilder.java b/storm-core/src/jvm/backtype/storm/topology/TopologyBuilder.java
index 806549a..7c514d5 100644
--- a/storm-core/src/jvm/backtype/storm/topology/TopologyBuilder.java
+++ b/storm-core/src/jvm/backtype/storm/topology/TopologyBuilder.java
@@ -246,7 +246,7 @@ public class TopologyBuilder {
}
@Override
- public T addConfigurations(Map conf) {
+ public T addConfigurations(Map<String, Object> conf) {
if(conf!=null && conf.containsKey(Config.TOPOLOGY_KRYO_REGISTER)) {
throw new IllegalArgumentException("Cannot set serializations for a component using fluent API");
}
http://git-wip-us.apache.org/repos/asf/storm/blob/f55f7a7e/storm-core/src/jvm/backtype/storm/transactional/TransactionalTopologyBuilder.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/transactional/TransactionalTopologyBuilder.java b/storm-core/src/jvm/backtype/storm/transactional/TransactionalTopologyBuilder.java
index 59c2a80..a6c9e34 100644
--- a/storm-core/src/jvm/backtype/storm/transactional/TransactionalTopologyBuilder.java
+++ b/storm-core/src/jvm/backtype/storm/transactional/TransactionalTopologyBuilder.java
@@ -61,7 +61,7 @@ public class TransactionalTopologyBuilder {
ITransactionalSpout _spout;
Map<String, Component> _bolts = new HashMap<String, Component>();
Integer _spoutParallelism;
- List<Map> _spoutConfs = new ArrayList();
+ List<Map<String, Object>> _spoutConfs = new ArrayList<>();
// id is used to store the state of this transactionalspout in zookeeper
// it would be very dangerous to have 2 topologies active with the same id in the same cluster
@@ -132,7 +132,7 @@ public class TransactionalTopologyBuilder {
String coordinator = _spoutId + "/coordinator";
TopologyBuilder builder = new TopologyBuilder();
SpoutDeclarer declarer = builder.setSpout(coordinator, new TransactionalSpoutCoordinator(_spout));
- for(Map conf: _spoutConfs) {
+ for(Map<String, Object> conf: _spoutConfs) {
declarer.addConfigurations(conf);
}
declarer.addConfiguration(Config.TOPOLOGY_TRANSACTIONAL_ID, _id);
@@ -196,7 +196,7 @@ public class TransactionalTopologyBuilder {
public IRichBolt bolt;
public Integer parallelism;
public List<InputDeclaration> declarations = new ArrayList<InputDeclaration>();
- public List<Map> componentConfs = new ArrayList<Map>();
+ public List<Map<String, Object>> componentConfs = new ArrayList<>();
public boolean committer;
public Component(IRichBolt bolt, Integer parallelism, boolean committer) {
@@ -213,7 +213,7 @@ public class TransactionalTopologyBuilder {
private class SpoutDeclarerImpl extends BaseConfigurationDeclarer<SpoutDeclarer> implements SpoutDeclarer {
@Override
- public SpoutDeclarer addConfigurations(Map conf) {
+ public SpoutDeclarer addConfigurations(Map<String, Object> conf) {
_spoutConfs.add(conf);
return this;
}
@@ -513,7 +513,7 @@ public class TransactionalTopologyBuilder {
}
@Override
- public BoltDeclarer addConfigurations(Map conf) {
+ public BoltDeclarer addConfigurations(Map<String, Object> conf) {
_component.componentConfs.add(conf);
return this;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/f55f7a7e/storm-core/src/jvm/storm/trident/spout/BatchSpoutExecutor.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/storm/trident/spout/BatchSpoutExecutor.java b/storm-core/src/jvm/storm/trident/spout/BatchSpoutExecutor.java
index 69c0ed1..6a57518 100644
--- a/storm-core/src/jvm/storm/trident/spout/BatchSpoutExecutor.java
+++ b/storm-core/src/jvm/storm/trident/spout/BatchSpoutExecutor.java
@@ -80,7 +80,7 @@ public class BatchSpoutExecutor implements ITridentSpout {
}
@Override
- public Map getComponentConfiguration() {
+ public Map<String, Object> getComponentConfiguration() {
return _spout.getComponentConfiguration();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/f55f7a7e/storm-core/src/jvm/storm/trident/spout/IBatchSpout.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/storm/trident/spout/IBatchSpout.java b/storm-core/src/jvm/storm/trident/spout/IBatchSpout.java
index b075082..d6b0350 100644
--- a/storm-core/src/jvm/storm/trident/spout/IBatchSpout.java
+++ b/storm-core/src/jvm/storm/trident/spout/IBatchSpout.java
@@ -28,6 +28,6 @@ public interface IBatchSpout extends Serializable {
void emitBatch(long batchId, TridentCollector collector);
void ack(long batchId);
void close();
- Map getComponentConfiguration();
+ Map<String, Object> getComponentConfiguration();
Fields getOutputFields();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/f55f7a7e/storm-core/src/jvm/storm/trident/spout/IOpaquePartitionedTridentSpout.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/storm/trident/spout/IOpaquePartitionedTridentSpout.java b/storm-core/src/jvm/storm/trident/spout/IOpaquePartitionedTridentSpout.java
index 43710dd..c3d19ef 100644
--- a/storm-core/src/jvm/storm/trident/spout/IOpaquePartitionedTridentSpout.java
+++ b/storm-core/src/jvm/storm/trident/spout/IOpaquePartitionedTridentSpout.java
@@ -57,6 +57,6 @@ public interface IOpaquePartitionedTridentSpout<Partitions, Partition extends IS
Emitter<Partitions, Partition, M> getEmitter(Map conf, TopologyContext context);
Coordinator getCoordinator(Map conf, TopologyContext context);
- Map getComponentConfiguration();
+ Map<String, Object> getComponentConfiguration();
Fields getOutputFields();
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/storm/blob/f55f7a7e/storm-core/src/jvm/storm/trident/spout/IPartitionedTridentSpout.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/storm/trident/spout/IPartitionedTridentSpout.java b/storm-core/src/jvm/storm/trident/spout/IPartitionedTridentSpout.java
index b5ea455..56a83bb 100644
--- a/storm-core/src/jvm/storm/trident/spout/IPartitionedTridentSpout.java
+++ b/storm-core/src/jvm/storm/trident/spout/IPartitionedTridentSpout.java
@@ -72,6 +72,6 @@ public interface IPartitionedTridentSpout<Partitions, Partition extends ISpoutPa
Coordinator<Partitions> getCoordinator(Map conf, TopologyContext context);
Emitter<Partitions, Partition, T> getEmitter(Map conf, TopologyContext context);
- Map getComponentConfiguration();
+ Map<String, Object> getComponentConfiguration();
Fields getOutputFields();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/f55f7a7e/storm-core/src/jvm/storm/trident/spout/ITridentSpout.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/storm/trident/spout/ITridentSpout.java b/storm-core/src/jvm/storm/trident/spout/ITridentSpout.java
index bfef745..365b08a 100644
--- a/storm-core/src/jvm/storm/trident/spout/ITridentSpout.java
+++ b/storm-core/src/jvm/storm/trident/spout/ITridentSpout.java
@@ -89,6 +89,6 @@ public interface ITridentSpout<T> extends Serializable {
*/
Emitter<T> getEmitter(String txStateId, Map conf, TopologyContext context);
- Map getComponentConfiguration();
+ Map<String, Object> getComponentConfiguration();
Fields getOutputFields();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/f55f7a7e/storm-core/src/jvm/storm/trident/spout/RichSpoutBatchExecutor.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/storm/trident/spout/RichSpoutBatchExecutor.java b/storm-core/src/jvm/storm/trident/spout/RichSpoutBatchExecutor.java
index 2668598..2450f31 100644
--- a/storm-core/src/jvm/storm/trident/spout/RichSpoutBatchExecutor.java
+++ b/storm-core/src/jvm/storm/trident/spout/RichSpoutBatchExecutor.java
@@ -41,7 +41,7 @@ public class RichSpoutBatchExecutor implements ITridentSpout {
}
@Override
- public Map getComponentConfiguration() {
+ public Map<String, Object> getComponentConfiguration() {
return _spout.getComponentConfiguration();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/f55f7a7e/storm-core/src/jvm/storm/trident/testing/FeederBatchSpout.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/storm/trident/testing/FeederBatchSpout.java b/storm-core/src/jvm/storm/trident/testing/FeederBatchSpout.java
index 21408fe..aedf97a 100644
--- a/storm-core/src/jvm/storm/trident/testing/FeederBatchSpout.java
+++ b/storm-core/src/jvm/storm/trident/testing/FeederBatchSpout.java
@@ -157,7 +157,7 @@ public class FeederBatchSpout implements ITridentSpout, IFeeder {
@Override
- public Map getComponentConfiguration() {
+ public Map<String, Object> getComponentConfiguration() {
return null;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/f55f7a7e/storm-core/src/jvm/storm/trident/testing/FeederCommitterBatchSpout.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/storm/trident/testing/FeederCommitterBatchSpout.java b/storm-core/src/jvm/storm/trident/testing/FeederCommitterBatchSpout.java
index 7c1d9fe..d730ebd 100644
--- a/storm-core/src/jvm/storm/trident/testing/FeederCommitterBatchSpout.java
+++ b/storm-core/src/jvm/storm/trident/testing/FeederCommitterBatchSpout.java
@@ -84,7 +84,7 @@ public class FeederCommitterBatchSpout implements ICommitterTridentSpout, IFeede
}
@Override
- public Map getComponentConfiguration() {
+ public Map<String, Object> getComponentConfiguration() {
return _spout.getComponentConfiguration();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/f55f7a7e/storm-core/src/jvm/storm/trident/testing/FixedBatchSpout.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/storm/trident/testing/FixedBatchSpout.java b/storm-core/src/jvm/storm/trident/testing/FixedBatchSpout.java
index 0125f76..a6ef601 100644
--- a/storm-core/src/jvm/storm/trident/testing/FixedBatchSpout.java
+++ b/storm-core/src/jvm/storm/trident/testing/FixedBatchSpout.java
@@ -83,7 +83,7 @@ public class FixedBatchSpout implements IBatchSpout {
}
@Override
- public Map getComponentConfiguration() {
+ public Map<String, Object> getComponentConfiguration() {
Config conf = new Config();
conf.setMaxTaskParallelism(1);
return conf;
http://git-wip-us.apache.org/repos/asf/storm/blob/f55f7a7e/storm-core/src/jvm/storm/trident/topology/TridentTopologyBuilder.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/storm/trident/topology/TridentTopologyBuilder.java b/storm-core/src/jvm/storm/trident/topology/TridentTopologyBuilder.java
index 3591644..226a11a 100644
--- a/storm-core/src/jvm/storm/trident/topology/TridentTopologyBuilder.java
+++ b/storm-core/src/jvm/storm/trident/topology/TridentTopologyBuilder.java
@@ -161,7 +161,7 @@ public class TridentTopologyBuilder {
.globalGrouping(masterCoordinator(c.batchGroupId), MasterBatchCoordinator.BATCH_STREAM_ID)
.globalGrouping(masterCoordinator(c.batchGroupId), MasterBatchCoordinator.SUCCESS_STREAM_ID);
- for(Map m: c.componentConfs) {
+ for(Map<String, Object> m: c.componentConfs) {
scd.addConfigurations(m);
}
@@ -181,7 +181,7 @@ public class TridentTopologyBuilder {
if(c.spout instanceof ICommitterTridentSpout) {
bd.allGrouping(masterCoordinator(batchGroup), MasterBatchCoordinator.COMMIT_STREAM_ID);
}
- for(Map m: c.componentConfs) {
+ for(Map<String, Object> m: c.componentConfs) {
bd.addConfigurations(m);
}
}
@@ -191,7 +191,7 @@ public class TridentTopologyBuilder {
SpoutComponent c = _batchPerTupleSpouts.get(id);
SpoutDeclarer d = builder.setSpout(id, new RichSpoutBatchTriggerer((IRichSpout) c.spout, c.streamName, c.batchGroupId), c.parallelism);
- for(Map conf: c.componentConfs) {
+ for(Map<String, Object> conf: c.componentConfs) {
d.addConfigurations(conf);
}
}
@@ -204,7 +204,7 @@ public class TridentTopologyBuilder {
for(String id: _bolts.keySet()) {
Component c = _bolts.get(id);
- Map<String, CoordSpec> specs = new HashMap();
+ Map<String, CoordSpec> specs = new HashMap<>();
for(GlobalStreamId s: getBoltSubscriptionStreams(id)) {
String batch = batchIdsForBolts.get(s);
@@ -224,7 +224,7 @@ public class TridentTopologyBuilder {
}
BoltDeclarer d = builder.setBolt(id, new TridentBoltExecutor(c.bolt, batchIdsForBolts, specs), c.parallelism);
- for(Map conf: c.componentConfs) {
+ for(Map<String, Object> conf: c.componentConfs) {
d.addConfigurations(conf);
}
@@ -257,7 +257,7 @@ public class TridentTopologyBuilder {
private static class SpoutComponent {
public Object spout;
public Integer parallelism;
- public List<Map> componentConfs = new ArrayList<Map>();
+ public List<Map<String, Object>> componentConfs = new ArrayList<>();
String batchGroupId;
String streamName;
@@ -292,7 +292,7 @@ public class TridentTopologyBuilder {
public ITridentBatchBolt bolt;
public Integer parallelism;
public List<InputDeclaration> declarations = new ArrayList<InputDeclaration>();
- public List<Map> componentConfs = new ArrayList<Map>();
+ public List<Map<String, Object>> componentConfs = new ArrayList<>();
public Set<String> committerBatches;
public Component(ITridentBatchBolt bolt, Integer parallelism,Set<String> committerBatches) {
@@ -340,7 +340,7 @@ public class TridentTopologyBuilder {
}
@Override
- public SpoutDeclarer addConfigurations(Map conf) {
+ public SpoutDeclarer addConfigurations(Map<String, Object> conf) {
_component.componentConfs.add(conf);
return this;
}
@@ -725,7 +725,7 @@ public class TridentTopologyBuilder {
}
@Override
- public BoltDeclarer addConfigurations(Map conf) {
+ public BoltDeclarer addConfigurations(Map<String, Object> conf) {
_component.componentConfs.add(conf);
return this;
}
[2/3] storm git commit: Merge branch 'configuration_map_generics' of
https://github.com/ddebree/storm into STORM-1032
Posted by ka...@apache.org.
Merge branch 'configuration_map_generics' of https://github.com/ddebree/storm into STORM-1032
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e48e03c6
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e48e03c6
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e48e03c6
Branch: refs/heads/master
Commit: e48e03c6fe65a0dc9e7a7f169fd3540af7f867fa
Parents: 87b9b3a f55f7a7
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sat Sep 19 09:05:34 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Sep 19 09:05:34 2015 +0900
----------------------------------------------------------------------
docs/documentation/Tutorial.md | 2 +-
.../elasticsearch/trident/TridentEsTopology.java | 2 +-
.../trident/OpaqueTridentEventHubSpout.java | 2 +-
.../TransactionalTridentEventHubSpout.java | 2 +-
.../storm/hdfs/trident/FixedBatchSpout.java | 2 +-
.../storm/hive/trident/TridentHiveTopology.java | 2 +-
.../coordination/BatchSubtopologyBuilder.java | 4 ++--
.../storm/drpc/LinearDRPCTopologyBuilder.java | 7 +++----
.../storm/topology/BaseConfigurationDeclarer.java | 2 +-
.../topology/ComponentConfigurationDeclarer.java | 2 +-
.../backtype/storm/topology/TopologyBuilder.java | 2 +-
.../TransactionalTopologyBuilder.java | 10 +++++-----
.../storm/trident/spout/BatchSpoutExecutor.java | 2 +-
.../src/jvm/storm/trident/spout/IBatchSpout.java | 2 +-
.../spout/IOpaquePartitionedTridentSpout.java | 2 +-
.../trident/spout/IPartitionedTridentSpout.java | 2 +-
.../jvm/storm/trident/spout/ITridentSpout.java | 2 +-
.../trident/spout/RichSpoutBatchExecutor.java | 2 +-
.../storm/trident/testing/FeederBatchSpout.java | 2 +-
.../testing/FeederCommitterBatchSpout.java | 2 +-
.../storm/trident/testing/FixedBatchSpout.java | 2 +-
.../trident/topology/TridentTopologyBuilder.java | 18 +++++++++---------
22 files changed, 37 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
[3/3] storm git commit: add STORM-1032 to CHANGELOG.md
Posted by ka...@apache.org.
add STORM-1032 to CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fc398c6a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fc398c6a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fc398c6a
Branch: refs/heads/master
Commit: fc398c6a28f138fb865ff1ba11bcb07bbd5b50fe
Parents: e48e03c
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sat Sep 19 09:52:14 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Sep 19 09:52:14 2015 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/fc398c6a/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b46df24..d85ead7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-1032: Add generics to component configuration methods
* STORM-886: Automatic Back Pressure
* STORM-1037: do not remove storm-code in supervisor until kill job
* STORM-1007: Add more metrics to DisruptorQueue