You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@heron.apache.org by GitBox <gi...@apache.org> on 2018/08/21 22:27:13 UTC
[GitHub] huijunwu closed pull request #2993: Nwang/make spout/bolt
compatible to storm 1.x
huijunwu closed pull request #2993: Nwang/make spout/bolt compatible to storm 1.x
URL: https://github.com/apache/incubator-heron/pull/2993
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestFibonacciSpout.java b/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestFibonacciSpout.java
index 451246a1fa..4c62e13922 100644
--- a/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestFibonacciSpout.java
+++ b/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestFibonacciSpout.java
@@ -42,7 +42,7 @@ public TestFibonacciSpout(TestPropertyHolder holder) {
}
@Override
- public void open(Map<String, Object> conf, TopologyContext context,
+ public void open(Map conf, TopologyContext context,
SpoutOutputCollector collector) {
this.collector = collector;
}
diff --git a/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestNameSpout.java b/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestNameSpout.java
index 23c3e34f1c..d2ad52d5a5 100644
--- a/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestNameSpout.java
+++ b/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestNameSpout.java
@@ -45,7 +45,7 @@ public TestNameSpout(boolean isDistributed) {
isdistributed = isDistributed;
}
- public void open(Map<String, Object> conf, TopologyContext context,
+ public void open(Map conf, TopologyContext context,
SpoutOutputCollector collector) {
this.collector = collector;
}
diff --git a/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestWindowBolt.java b/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestWindowBolt.java
index e6a9f2b3d1..5c7c0669e1 100644
--- a/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestWindowBolt.java
+++ b/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestWindowBolt.java
@@ -35,7 +35,7 @@
@Override
- public void prepare(Map<String, Object> topoConf, TopologyContext context,
+ public void prepare(Map topoConf, TopologyContext context,
OutputCollector collector) {
this.collector = collector;
}
diff --git a/storm-compatibility-examples/src/java/org/apache/storm/examples/SlidingWindowTopology.java b/storm-compatibility-examples/src/java/org/apache/storm/examples/SlidingWindowTopology.java
index 292db29bbc..5239faca7b 100644
--- a/storm-compatibility-examples/src/java/org/apache/storm/examples/SlidingWindowTopology.java
+++ b/storm-compatibility-examples/src/java/org/apache/storm/examples/SlidingWindowTopology.java
@@ -57,7 +57,7 @@ private SlidingWindowTopology() {
@Override
@SuppressWarnings("HiddenField")
- public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector
+ public void prepare(Map topoConf, TopologyContext context, OutputCollector
collector) {
this.collector = collector;
}
diff --git a/storm-compatibility-examples/src/java/org/apache/storm/examples/bolt/SlidingWindowSumBolt.java b/storm-compatibility-examples/src/java/org/apache/storm/examples/bolt/SlidingWindowSumBolt.java
index 092acb8cf5..3f48c58ce2 100644
--- a/storm-compatibility-examples/src/java/org/apache/storm/examples/bolt/SlidingWindowSumBolt.java
+++ b/storm-compatibility-examples/src/java/org/apache/storm/examples/bolt/SlidingWindowSumBolt.java
@@ -44,7 +44,7 @@
@Override
@SuppressWarnings("HiddenField")
- public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector
+ public void prepare(Map topoConf, TopologyContext context, OutputCollector
collector) {
this.collector = collector;
}
diff --git a/storm-compatibility-examples/src/java/org/apache/storm/examples/spout/RandomIntegerSpout.java b/storm-compatibility-examples/src/java/org/apache/storm/examples/spout/RandomIntegerSpout.java
index 691f965c37..747e6956a0 100644
--- a/storm-compatibility-examples/src/java/org/apache/storm/examples/spout/RandomIntegerSpout.java
+++ b/storm-compatibility-examples/src/java/org/apache/storm/examples/spout/RandomIntegerSpout.java
@@ -48,7 +48,7 @@ public void declareOutputFields(OutputFieldsDeclarer declarer) {
@Override
@SuppressWarnings("HiddenField")
- public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector
+ public void open(Map conf, TopologyContext context, SpoutOutputCollector
collector) {
this.collector = collector;
this.rand = new Random();
diff --git a/storm-compatibility/src/java/org/apache/storm/metric/api/IMetricsConsumer.java b/storm-compatibility/src/java/org/apache/storm/metric/api/IMetricsConsumer.java
index fd70ad45af..c20e0b3033 100644
--- a/storm-compatibility/src/java/org/apache/storm/metric/api/IMetricsConsumer.java
+++ b/storm-compatibility/src/java/org/apache/storm/metric/api/IMetricsConsumer.java
@@ -89,7 +89,7 @@ public int hashCode() {
}
@SuppressWarnings("rawtypes")
- void prepare(Map<String, Object> stormConf, Object registrationArgument,
+ void prepare(Map stormConf, Object registrationArgument,
TopologyContext context, IErrorReporter errorReporter);
void handleDataPoints(TaskInfo taskInfo, Collection<DataPoint> dataPoints);
diff --git a/storm-compatibility/src/java/org/apache/storm/spout/ISpout.java b/storm-compatibility/src/java/org/apache/storm/spout/ISpout.java
index e2ee367922..f0c2cb61e0 100644
--- a/storm-compatibility/src/java/org/apache/storm/spout/ISpout.java
+++ b/storm-compatibility/src/java/org/apache/storm/spout/ISpout.java
@@ -57,7 +57,7 @@
* @param collector The collector is used to emit tuples from this spout. Tuples can be emitted at any time, including the open and close methods. The collector is thread-safe and should be saved as an instance variable of this spout object.
*/
@SuppressWarnings("rawtypes")
- void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector);
+ void open(Map conf, TopologyContext context, SpoutOutputCollector collector);
/**
* Called when an ISpout is going to be shutdown. There is no guarentee that close
diff --git a/storm-compatibility/src/java/org/apache/storm/topology/IRichSpoutDelegate.java b/storm-compatibility/src/java/org/apache/storm/topology/IRichSpoutDelegate.java
index 542f2f8229..f8a3e3c7dd 100644
--- a/storm-compatibility/src/java/org/apache/storm/topology/IRichSpoutDelegate.java
+++ b/storm-compatibility/src/java/org/apache/storm/topology/IRichSpoutDelegate.java
@@ -45,7 +45,7 @@ public IRichSpoutDelegate(IRichSpout delegate) {
@Override
@SuppressWarnings("rawtypes")
- public void open(Map<String, Object> conf, org.apache.heron.api.topology.TopologyContext context,
+ public void open(Map conf, org.apache.heron.api.topology.TopologyContext context,
SpoutOutputCollector collector) {
topologyContextImpl = new TopologyContext(context);
spoutOutputCollectorImpl = new SpoutOutputCollectorImpl(collector);
diff --git a/storm-compatibility/src/java/org/apache/storm/topology/IWindowedBolt.java b/storm-compatibility/src/java/org/apache/storm/topology/IWindowedBolt.java
index d848c43d15..8f814bcb3a 100644
--- a/storm-compatibility/src/java/org/apache/storm/topology/IWindowedBolt.java
+++ b/storm-compatibility/src/java/org/apache/storm/topology/IWindowedBolt.java
@@ -33,7 +33,7 @@
* {@link org.apache.storm.task.IBolt#prepare(Map, TopologyContext, OutputCollector)} except
* that while emitting, the tuples are automatically anchored to the tuples in the inputWindow.
*/
- void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector);
+ void prepare(Map topoConf, TopologyContext context, OutputCollector collector);
/**
* Process the tuple window and optionally emit new tuples based on the tuples in the input
diff --git a/storm-compatibility/src/java/org/apache/storm/topology/base/BaseWindowedBolt.java b/storm-compatibility/src/java/org/apache/storm/topology/base/BaseWindowedBolt.java
index fbbc693408..4cd2c86cda 100644
--- a/storm-compatibility/src/java/org/apache/storm/topology/base/BaseWindowedBolt.java
+++ b/storm-compatibility/src/java/org/apache/storm/topology/base/BaseWindowedBolt.java
@@ -524,7 +524,7 @@ public BaseWindowedBolt withWatermarkInterval(Duration interval) {
}
@Override
- public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector
+ public void prepare(Map topoConf, TopologyContext context, OutputCollector
collector) {
// NOOP
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services