http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/flux/flux-core/src/test/java/org/apache/storm/flux/test/TridentTopologySource.java ---------------------------------------------------------------------- diff --git a/external/flux/flux-core/src/test/java/org/apache/storm/flux/test/TridentTopologySource.java b/external/flux/flux-core/src/test/java/org/apache/storm/flux/test/TridentTopologySource.java index 24cee7d..36b272b 100644 --- a/external/flux/flux-core/src/test/java/org/apache/storm/flux/test/TridentTopologySource.java +++ b/external/flux/flux-core/src/test/java/org/apache/storm/flux/test/TridentTopologySource.java @@ -17,18 +17,18 @@ */ package org.apache.storm.flux.test; -import backtype.storm.Config; -import backtype.storm.generated.StormTopology; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Values; -import storm.kafka.StringScheme; -import storm.trident.TridentTopology; -import storm.trident.operation.BaseFunction; -import storm.trident.operation.TridentCollector; -import storm.trident.operation.builtin.Count; -import storm.trident.testing.FixedBatchSpout; -import storm.trident.testing.MemoryMapState; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.Config; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Values; +import org.apache.storm.kafka.StringScheme; +import org.apache.storm.trident.TridentTopology; +import org.apache.storm.trident.operation.BaseFunction; +import org.apache.storm.trident.operation.TridentCollector; +import org.apache.storm.trident.operation.builtin.Count; +import org.apache.storm.trident.testing.FixedBatchSpout; +import org.apache.storm.trident.testing.MemoryMapState; +import org.apache.storm.trident.tuple.TridentTuple; /** * Basic Trident example that will return a `StormTopology` from a `getTopology()` method.
http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/flux/flux-core/src/test/resources/configs/bad_hbase.yaml ---------------------------------------------------------------------- diff --git a/external/flux/flux-core/src/test/resources/configs/bad_hbase.yaml b/external/flux/flux-core/src/test/resources/configs/bad_hbase.yaml index 5d91400..a29e314 100644 --- a/external/flux/flux-core/src/test/resources/configs/bad_hbase.yaml +++ b/external/flux/flux-core/src/test/resources/configs/bad_hbase.yaml @@ -29,12 +29,12 @@ name: "hbase-wordcount" components: - id: "columnFields" - className: "backtype.storm.tuple.Fields" + className: "org.apache.storm.tuple.Fields" constructorArgs: - ["word"] - id: "counterFields" - className: "backtype.storm.tuple.Fields" + className: "org.apache.storm.tuple.Fields" constructorArgs: # !!! the following won't work, and should thow an IllegalArgumentException... - "count" @@ -63,14 +63,14 @@ config: # spout definitions spouts: - id: "word-spout" - className: "backtype.storm.testing.TestWordSpout" + className: "org.apache.storm.testing.TestWordSpout" parallelism: 1 # bolt definitions bolts: - id: "count-bolt" - className: "backtype.storm.testing.TestWordCounter" + className: "org.apache.storm.testing.TestWordCounter" - id: "hbase-bolt" className: "org.apache.storm.hbase.bolt.HBaseBolt" @@ -95,4 +95,4 @@ streams: to: "hbase-bolt" grouping: type: FIELDS - args: ["word"] \ No newline at end of file + args: ["word"] http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/flux/flux-core/src/test/resources/configs/config-methods-test.yaml ---------------------------------------------------------------------- diff --git a/external/flux/flux-core/src/test/resources/configs/config-methods-test.yaml b/external/flux/flux-core/src/test/resources/configs/config-methods-test.yaml index cda151e..bacf203 100644 --- a/external/flux/flux-core/src/test/resources/configs/config-methods-test.yaml +++ b/external/flux/flux-core/src/test/resources/configs/config-methods-test.yaml @@ -24,7 +24,7 @@ config: # spout definitions spouts: - id: "spout-1" - className: "backtype.storm.testing.TestWordSpout" + className: "org.apache.storm.testing.TestWordSpout" parallelism: 1 # ... http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/flux/flux-core/src/test/resources/configs/diamond-topology.yaml ---------------------------------------------------------------------- diff --git a/external/flux/flux-core/src/test/resources/configs/diamond-topology.yaml b/external/flux/flux-core/src/test/resources/configs/diamond-topology.yaml index c400d6d..957c258 100644 --- a/external/flux/flux-core/src/test/resources/configs/diamond-topology.yaml +++ b/external/flux/flux-core/src/test/resources/configs/diamond-topology.yaml @@ -29,7 +29,7 @@ config: # spout definitions spouts: - id: "spout-1" - className: "backtype.storm.testing.TestWordSpout" + className: "org.apache.storm.testing.TestWordSpout" parallelism: 1 # bolt definitions http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/flux/flux-core/src/test/resources/configs/hdfs_test.yaml ---------------------------------------------------------------------- diff --git a/external/flux/flux-core/src/test/resources/configs/hdfs_test.yaml b/external/flux/flux-core/src/test/resources/configs/hdfs_test.yaml index 8fe0a9a..2bccb33 100644 --- a/external/flux/flux-core/src/test/resources/configs/hdfs_test.yaml +++ b/external/flux/flux-core/src/test/resources/configs/hdfs_test.yaml @@ -60,7 +60,7 @@ components: # spout definitions spouts: - id: "spout-1" - className: "backtype.storm.testing.TestWordSpout" + className: "org.apache.storm.testing.TestWordSpout" parallelism: 1 # ... http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/flux/flux-core/src/test/resources/configs/kafka_test.yaml ---------------------------------------------------------------------- diff --git a/external/flux/flux-core/src/test/resources/configs/kafka_test.yaml b/external/flux/flux-core/src/test/resources/configs/kafka_test.yaml index 17cd8e2..bc01d93 100644 --- a/external/flux/flux-core/src/test/resources/configs/kafka_test.yaml +++ b/external/flux/flux-core/src/test/resources/configs/kafka_test.yaml @@ -26,21 +26,21 @@ name: "kafka-topology" # for the time being, components must be declared in the order they are referenced components: - id: "stringScheme" - className: "storm.kafka.StringScheme" + className: "org.apache.storm.kafka.StringScheme" - id: "stringMultiScheme" - className: "backtype.storm.spout.SchemeAsMultiScheme" + className: "org.apache.storm.spout.SchemeAsMultiScheme" constructorArgs: - ref: "stringScheme" - id: "zkHosts" - className: "storm.kafka.ZkHosts" + className: "org.apache.storm.kafka.ZkHosts" constructorArgs: - "localhost:2181" # Alternative kafka config # - id: "kafkaConfig" -# className: "storm.kafka.KafkaConfig" +# className: "org.apache.storm.kafka.KafkaConfig" # constructorArgs: # # brokerHosts # - ref: "zkHosts" @@ -50,7 +50,7 @@ components: # - "myKafkaClientId" - id: "spoutConfig" - className: "storm.kafka.SpoutConfig" + className: "org.apache.storm.kafka.SpoutConfig" constructorArgs: # brokerHosts - ref: "zkHosts" @@ -76,7 +76,7 @@ config: # spout definitions spouts: - id: "kafka-spout" - className: "storm.kafka.KafkaSpout" + className: "org.apache.storm.kafka.KafkaSpout" constructorArgs: - ref: "spoutConfig" @@ -97,7 +97,7 @@ bolts: # ... - id: "count" - className: "backtype.storm.testing.TestWordCounter" + className: "org.apache.storm.testing.TestWordCounter" parallelism: 1 #stream definitions http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/flux/flux-core/src/test/resources/configs/shell_test.yaml ---------------------------------------------------------------------- diff --git a/external/flux/flux-core/src/test/resources/configs/shell_test.yaml b/external/flux/flux-core/src/test/resources/configs/shell_test.yaml index b473fa7..d885975 100644 --- a/external/flux/flux-core/src/test/resources/configs/shell_test.yaml +++ b/external/flux/flux-core/src/test/resources/configs/shell_test.yaml @@ -74,7 +74,7 @@ bolts: # ... - id: "count" - className: "backtype.storm.testing.TestWordCounter" + className: "org.apache.storm.testing.TestWordCounter" parallelism: 1 # ... http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/flux/flux-core/src/test/resources/configs/simple_hbase.yaml ---------------------------------------------------------------------- diff --git a/external/flux/flux-core/src/test/resources/configs/simple_hbase.yaml b/external/flux/flux-core/src/test/resources/configs/simple_hbase.yaml index e407bd9..b841b53 100644 --- a/external/flux/flux-core/src/test/resources/configs/simple_hbase.yaml +++ b/external/flux/flux-core/src/test/resources/configs/simple_hbase.yaml @@ -52,12 +52,12 @@ name: "hbase-wordcount" components: - id: "columnFields" - className: "backtype.storm.tuple.Fields" + className: "org.apache.storm.tuple.Fields" constructorArgs: - ["word"] - id: "counterFields" - className: "backtype.storm.tuple.Fields" + className: "org.apache.storm.tuple.Fields" constructorArgs: - ["count"] @@ -85,14 +85,14 @@ config: # spout definitions spouts: - id: "word-spout" - className: "backtype.storm.testing.TestWordSpout" + className: "org.apache.storm.testing.TestWordSpout" parallelism: 1 # bolt definitions bolts: - id: "count-bolt" - className: "backtype.storm.testing.TestWordCounter" + className: "org.apache.storm.testing.TestWordCounter" - id: "hbase-bolt" className: "org.apache.storm.hbase.bolt.HBaseBolt" @@ -117,4 +117,4 @@ streams: to: "hbase-bolt" grouping: type: FIELDS - args: ["word"] \ No newline at end of file + args: ["word"] http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/flux/flux-core/src/test/resources/configs/substitution-test.yaml ---------------------------------------------------------------------- diff --git a/external/flux/flux-core/src/test/resources/configs/substitution-test.yaml b/external/flux/flux-core/src/test/resources/configs/substitution-test.yaml index 13f1960..ce9e62d 100644 --- a/external/flux/flux-core/src/test/resources/configs/substitution-test.yaml +++ b/external/flux/flux-core/src/test/resources/configs/substitution-test.yaml @@ -76,7 +76,7 @@ bolts: # ... - id: "count" - className: "backtype.storm.testing.TestWordCounter" + className: "org.apache.storm.testing.TestWordCounter" parallelism: 1 # ... http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/flux/flux-core/src/test/resources/configs/tck.yaml ---------------------------------------------------------------------- diff --git a/external/flux/flux-core/src/test/resources/configs/tck.yaml b/external/flux/flux-core/src/test/resources/configs/tck.yaml index 7e9b614..5d40445 100644 --- a/external/flux/flux-core/src/test/resources/configs/tck.yaml +++ b/external/flux/flux-core/src/test/resources/configs/tck.yaml @@ -49,14 +49,14 @@ config: # spout definitions spouts: - id: "spout-1" - className: "backtype.storm.testing.TestWordSpout" + className: "org.apache.storm.testing.TestWordSpout" parallelism: 1 # ... # bolt definitions bolts: - id: "bolt-1" - className: "backtype.storm.testing.TestWordCounter" + className: "org.apache.storm.testing.TestWordCounter" parallelism: 1 # ... @@ -83,7 +83,7 @@ streams: grouping: type: CUSTOM customClass: - className: "backtype.storm.testing.NGrouping" + className: "org.apache.storm.testing.NGrouping" constructorArgs: - 1 http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/TestPrintBolt.java ---------------------------------------------------------------------- diff --git a/external/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/TestPrintBolt.java b/external/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/TestPrintBolt.java index 7e84441..137e354 100644 --- a/external/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/TestPrintBolt.java +++ b/external/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/TestPrintBolt.java @@ -17,10 +17,10 @@ */ package org.apache.storm.flux.examples; -import backtype.storm.topology.BasicOutputCollector; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseBasicBolt; -import backtype.storm.tuple.Tuple; +import org.apache.storm.topology.BasicOutputCollector; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseBasicBolt; +import org.apache.storm.tuple.Tuple; /** * Prints the tuples to stdout @@ -36,4 +36,4 @@ public class TestPrintBolt extends BaseBasicBolt { public void declareOutputFields(OutputFieldsDeclarer ofd) { } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/TestWindowBolt.java ---------------------------------------------------------------------- diff --git a/external/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/TestWindowBolt.java b/external/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/TestWindowBolt.java index 3aab9b6..8c904d9 100644 --- a/external/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/TestWindowBolt.java +++ b/external/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/TestWindowBolt.java @@ -17,13 +17,13 @@ */ package org.apache.storm.flux.examples; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseWindowedBolt; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Values; -import backtype.storm.windowing.TupleWindow; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseWindowedBolt; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Values; +import org.apache.storm.windowing.TupleWindow; import java.util.Map; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/WordCounter.java ---------------------------------------------------------------------- diff --git a/external/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/WordCounter.java b/external/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/WordCounter.java index f7c80c7..7093105 100644 --- a/external/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/WordCounter.java +++ b/external/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/WordCounter.java @@ -17,19 +17,19 @@ */ package org.apache.storm.flux.examples; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.BasicOutputCollector; -import backtype.storm.topology.IBasicBolt; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseBasicBolt; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.BasicOutputCollector; +import org.apache.storm.topology.IBasicBolt; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseBasicBolt; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.Map; -import static backtype.storm.utils.Utils.tuple; +import static org.apache.storm.utils.Utils.tuple; /** * This bolt is used by the HBase example. It simply emits the first field @@ -68,4 +68,4 @@ public class WordCounter extends BaseBasicBolt { return null; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/flux/flux-examples/src/main/resources/kafka_spout.yaml ---------------------------------------------------------------------- diff --git a/external/flux/flux-examples/src/main/resources/kafka_spout.yaml b/external/flux/flux-examples/src/main/resources/kafka_spout.yaml index 8ffddc5..db68b1b 100644 --- a/external/flux/flux-examples/src/main/resources/kafka_spout.yaml +++ b/external/flux/flux-examples/src/main/resources/kafka_spout.yaml @@ -29,21 +29,21 @@ name: "kafka-topology" # for the time being, components must be declared in the order they are referenced components: - id: "stringScheme" - className: "storm.kafka.StringScheme" + className: "org.apache.storm.kafka.StringScheme" - id: "stringMultiScheme" - className: "backtype.storm.spout.SchemeAsMultiScheme" + className: "org.apache.storm.spout.SchemeAsMultiScheme" constructorArgs: - ref: "stringScheme" - id: "zkHosts" - className: "storm.kafka.ZkHosts" + className: "org.apache.storm.kafka.ZkHosts" constructorArgs: - "localhost:2181" # Alternative kafka config # - id: "kafkaConfig" -# className: "storm.kafka.KafkaConfig" +# className: "org.apache.storm.kafka.KafkaConfig" # constructorArgs: # # brokerHosts # - ref: "zkHosts" @@ -53,7 +53,7 @@ components: # - "myKafkaClientId" - id: "spoutConfig" - className: "storm.kafka.SpoutConfig" + className: "org.apache.storm.kafka.SpoutConfig" constructorArgs: # brokerHosts - ref: "zkHosts" @@ -84,7 +84,7 @@ config: # spout definitions spouts: - id: "kafka-spout" - className: "storm.kafka.KafkaSpout" + className: "org.apache.storm.kafka.KafkaSpout" constructorArgs: - ref: "spoutConfig" @@ -106,7 +106,7 @@ bolts: # ... - id: "count" - className: "backtype.storm.testing.TestWordCounter" + className: "org.apache.storm.testing.TestWordCounter" parallelism: 1 # ... http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/flux/flux-examples/src/main/resources/multilang.yaml ---------------------------------------------------------------------- diff --git a/external/flux/flux-examples/src/main/resources/multilang.yaml b/external/flux/flux-examples/src/main/resources/multilang.yaml index 4f80667..aaab5d3 100644 --- a/external/flux/flux-examples/src/main/resources/multilang.yaml +++ b/external/flux/flux-examples/src/main/resources/multilang.yaml @@ -59,7 +59,7 @@ bolts: # ... - id: "count" - className: "backtype.storm.testing.TestWordCounter" + className: "org.apache.storm.testing.TestWordCounter" parallelism: 1 # ... http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/flux/flux-examples/src/main/resources/simple_hbase.yaml ---------------------------------------------------------------------- diff --git a/external/flux/flux-examples/src/main/resources/simple_hbase.yaml b/external/flux/flux-examples/src/main/resources/simple_hbase.yaml index 62686d0..93a2781 100644 --- a/external/flux/flux-examples/src/main/resources/simple_hbase.yaml +++ b/external/flux/flux-examples/src/main/resources/simple_hbase.yaml @@ -25,12 +25,12 @@ name: "hbase-persistent-wordcount" # Components components: - id: "columnFields" - className: "backtype.storm.tuple.Fields" + className: "org.apache.storm.tuple.Fields" constructorArgs: - ["word"] - id: "counterFields" - className: "backtype.storm.tuple.Fields" + className: "org.apache.storm.tuple.Fields" constructorArgs: - ["count"] @@ -57,7 +57,7 @@ config: # spout definitions spouts: - id: "word-spout" - className: "backtype.storm.testing.TestWordSpout" + className: "org.apache.storm.testing.TestWordSpout" parallelism: 1 # bolt definitions http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/flux/flux-examples/src/main/resources/simple_hdfs.yaml ---------------------------------------------------------------------- diff --git a/external/flux/flux-examples/src/main/resources/simple_hdfs.yaml b/external/flux/flux-examples/src/main/resources/simple_hdfs.yaml index 9007869..b8d4020 100644 --- a/external/flux/flux-examples/src/main/resources/simple_hdfs.yaml +++ b/external/flux/flux-examples/src/main/resources/simple_hdfs.yaml @@ -60,7 +60,7 @@ components: # spout definitions spouts: - id: "spout-1" - className: "backtype.storm.testing.TestWordSpout" + className: "org.apache.storm.testing.TestWordSpout" parallelism: 1 # ... @@ -102,4 +102,4 @@ streams: from: "spout-1" to: "bolt-2" grouping: - type: SHUFFLE \ No newline at end of file + type: SHUFFLE http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/flux/flux-examples/src/main/resources/simple_windowing.yaml ---------------------------------------------------------------------- diff --git a/external/flux/flux-examples/src/main/resources/simple_windowing.yaml b/external/flux/flux-examples/src/main/resources/simple_windowing.yaml index 31be109..f2f74ff 100755 --- a/external/flux/flux-examples/src/main/resources/simple_windowing.yaml +++ b/external/flux/flux-examples/src/main/resources/simple_windowing.yaml @@ -20,11 +20,11 @@ name: "sliding-window-topology" components: - id: "windowLength" - className: "backtype.storm.topology.base.BaseWindowedBolt$Count" + className: "org.apache.storm.topology.base.BaseWindowedBolt$Count" constructorArgs: - 5 - id: "slidingInterval" - className: "backtype.storm.topology.base.BaseWindowedBolt$Count" + className: "org.apache.storm.topology.base.BaseWindowedBolt$Count" constructorArgs: - 3 @@ -34,7 +34,7 @@ config: # spout definitions spouts: - id: "spout-1" - className: "backtype.storm.testing.TestWordSpout" + className: "org.apache.storm.testing.TestWordSpout" parallelism: 1 # bolt definitions http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/flux/flux-examples/src/main/resources/simple_wordcount.yaml ---------------------------------------------------------------------- diff --git a/external/flux/flux-examples/src/main/resources/simple_wordcount.yaml b/external/flux/flux-examples/src/main/resources/simple_wordcount.yaml index 380f9d2..6443a97 100644 --- a/external/flux/flux-examples/src/main/resources/simple_wordcount.yaml +++ b/external/flux/flux-examples/src/main/resources/simple_wordcount.yaml @@ -29,13 +29,13 @@ config: # spout definitions spouts: - id: "spout-1" - className: "backtype.storm.testing.TestWordSpout" + className: "org.apache.storm.testing.TestWordSpout" parallelism: 1 # bolt definitions bolts: - id: "bolt-1" - className: "backtype.storm.testing.TestWordCounter" + className: "org.apache.storm.testing.TestWordCounter" parallelism: 1 - id: "bolt-2" http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/flux/flux-wrappers/src/main/java/org/apache/storm/flux/wrappers/bolts/FluxShellBolt.java ---------------------------------------------------------------------- diff --git a/external/flux/flux-wrappers/src/main/java/org/apache/storm/flux/wrappers/bolts/FluxShellBolt.java b/external/flux/flux-wrappers/src/main/java/org/apache/storm/flux/wrappers/bolts/FluxShellBolt.java index 4e0f91c..1af1f42 100644 --- a/external/flux/flux-wrappers/src/main/java/org/apache/storm/flux/wrappers/bolts/FluxShellBolt.java +++ b/external/flux/flux-wrappers/src/main/java/org/apache/storm/flux/wrappers/bolts/FluxShellBolt.java @@ -17,10 +17,10 @@ */ package org.apache.storm.flux.wrappers.bolts; -import backtype.storm.task.ShellBolt; -import backtype.storm.topology.IRichBolt; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.tuple.Fields; +import org.apache.storm.task.ShellBolt; +import org.apache.storm.topology.IRichBolt; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.tuple.Fields; import java.util.Map; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/flux/flux-wrappers/src/main/java/org/apache/storm/flux/wrappers/bolts/LogInfoBolt.java ---------------------------------------------------------------------- diff --git a/external/flux/flux-wrappers/src/main/java/org/apache/storm/flux/wrappers/bolts/LogInfoBolt.java b/external/flux/flux-wrappers/src/main/java/org/apache/storm/flux/wrappers/bolts/LogInfoBolt.java index a42d7c3..5f0e84b 100644 --- a/external/flux/flux-wrappers/src/main/java/org/apache/storm/flux/wrappers/bolts/LogInfoBolt.java +++ b/external/flux/flux-wrappers/src/main/java/org/apache/storm/flux/wrappers/bolts/LogInfoBolt.java @@ -18,10 +18,10 @@ package org.apache.storm.flux.wrappers.bolts; -import backtype.storm.topology.BasicOutputCollector; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseBasicBolt; -import backtype.storm.tuple.Tuple; +import org.apache.storm.topology.BasicOutputCollector; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseBasicBolt; +import org.apache.storm.tuple.Tuple; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/flux/flux-wrappers/src/main/java/org/apache/storm/flux/wrappers/spouts/FluxShellSpout.java ---------------------------------------------------------------------- diff --git a/external/flux/flux-wrappers/src/main/java/org/apache/storm/flux/wrappers/spouts/FluxShellSpout.java b/external/flux/flux-wrappers/src/main/java/org/apache/storm/flux/wrappers/spouts/FluxShellSpout.java index c7e9058..1951c1e 100644 --- a/external/flux/flux-wrappers/src/main/java/org/apache/storm/flux/wrappers/spouts/FluxShellSpout.java +++ b/external/flux/flux-wrappers/src/main/java/org/apache/storm/flux/wrappers/spouts/FluxShellSpout.java @@ -17,10 +17,10 @@ */ package org.apache.storm.flux.wrappers.spouts; -import backtype.storm.spout.ShellSpout; -import backtype.storm.topology.IRichSpout; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.tuple.Fields; +import org.apache.storm.spout.ShellSpout; +import org.apache.storm.topology.IRichSpout; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.tuple.Fields; import java.util.Map; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/flux/flux-wrappers/src/main/resources/resources/randomsentence.js ---------------------------------------------------------------------- diff --git a/external/flux/flux-wrappers/src/main/resources/resources/randomsentence.js b/external/flux/flux-wrappers/src/main/resources/resources/randomsentence.js index 36fc5f5..b121915 100644 --- a/external/flux/flux-wrappers/src/main/resources/resources/randomsentence.js +++ b/external/flux/flux-wrappers/src/main/resources/resources/randomsentence.js @@ -18,7 +18,7 @@ /** * Example for storm spout. Emits random sentences. - * The original class in java - storm.starter.spout.RandomSentenceSpout. + * The original class in java - org.apache.storm.starter.spout.RandomSentenceSpout. * */ http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/sql/README.md ---------------------------------------------------------------------- diff --git a/external/sql/README.md b/external/sql/README.md index 3caba58..6f68951 100644 --- a/external/sql/README.md +++ b/external/sql/README.md @@ -26,7 +26,7 @@ In StormSQL data is represented by external tables. Users can specify data sourc statement. For example, the following statement specifies a Kafka spouts and sink: ``` -CREATE EXTERNAL TABLE FOO (ID INT PRIMARY KEY) LOCATION 'kafka://localhost:2181/brokers?topic=test' TBLPROPERTIES '{"producer":{"bootstrap.servers":"localhost:9092","acks":"1","key.serializer":"storm.kafka.IntSerializer","value.serializer":"storm.kafka.ByteBufferSerializer"}}' +CREATE EXTERNAL TABLE FOO (ID INT PRIMARY KEY) LOCATION 'kafka://localhost:2181/brokers?topic=test' TBLPROPERTIES '{"producer":{"bootstrap.servers":"localhost:9092","acks":"1","key.serializer":"org.apache.storm.kafka.IntSerializer","value.serializer":"org.apache.storm.kafka.ByteBufferSerializer"}}' ``` The syntax of `CREATE EXTERNAL TABLE` closely follows the one defined in @@ -47,9 +47,9 @@ transactions are significant and to insert these orders into another Kafka strea The user can specify the following SQL statements in the SQL file: ``` -CREATE EXTERNAL TABLE ORDERS (ID INT PRIMARY KEY, UNIT_PRICE INT, QUANTITY INT) LOCATION 'kafka://localhost:2181/brokers?topic=orders' TBLPROPERTIES '{"producer":{"bootstrap.servers":"localhost:9092","acks":"1","key.serializer":"storm.kafka.IntSerializer","value.serializer":"storm.kafka.ByteBufferSerializer"}}' +CREATE EXTERNAL TABLE ORDERS (ID INT PRIMARY KEY, UNIT_PRICE INT, QUANTITY INT) LOCATION 'kafka://localhost:2181/brokers?topic=orders' TBLPROPERTIES '{"producer":{"bootstrap.servers":"localhost:9092","acks":"1","key.serializer":"org.apache.storm.kafka.IntSerializer","value.serializer":"org.apache.storm.kafka.ByteBufferSerializer"}}' -CREATE EXTERNAL TABLE LARGE_ORDERS (ID INT PRIMARY KEY, TOTAL INT) LOCATION 'kafka://localhost:2181/brokers?topic=large_orders' TBLPROPERTIES '{"producer":{"bootstrap.servers":"localhost:9092","acks":"1","key.serializer":"storm.kafka.IntSerializer","value.serializer":"storm.kafka.ByteBufferSerializer"}}' +CREATE EXTERNAL TABLE LARGE_ORDERS (ID INT PRIMARY KEY, TOTAL INT) LOCATION 'kafka://localhost:2181/brokers?topic=large_orders' TBLPROPERTIES '{"producer":{"bootstrap.servers":"localhost:9092","acks":"1","key.serializer":"org.apache.storm.kafka.IntSerializer","value.serializer":"org.apache.storm.kafka.ByteBufferSerializer"}}' INSERT INTO LARGE_ORDERS SELECT ID, UNIT_PRICE * QUANTITY AS TOTAL FROM ORDERS WHERE UNIT_PRICE * QUANTITY > 50 ``` http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSql.java ---------------------------------------------------------------------- diff --git a/external/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSql.java b/external/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSql.java index eb1e452..57b64f6 100644 --- a/external/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSql.java +++ b/external/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSql.java @@ -17,8 +17,8 @@ */ package org.apache.storm.sql; -import backtype.storm.StormSubmitter; -import backtype.storm.generated.SubmitOptions; +import org.apache.storm.StormSubmitter; +import org.apache.storm.generated.SubmitOptions; import org.apache.storm.sql.runtime.ChannelHandler; import java.util.Map; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSqlImpl.java ---------------------------------------------------------------------- diff --git a/external/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSqlImpl.java b/external/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSqlImpl.java index c2c8bc8..7e5dfcc 100644 --- a/external/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSqlImpl.java +++ b/external/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSqlImpl.java @@ -17,8 +17,8 @@ */ package org.apache.storm.sql; -import backtype.storm.StormSubmitter; -import backtype.storm.generated.SubmitOptions; +import org.apache.storm.StormSubmitter; +import org.apache.storm.generated.SubmitOptions; import org.apache.calcite.adapter.java.JavaTypeFactory; import org.apache.calcite.jdbc.JavaTypeFactoryImpl; import org.apache.calcite.rel.RelNode; @@ -38,7 +38,7 @@ import org.apache.storm.sql.parser.SqlCreateTable; import org.apache.storm.sql.parser.StormParser; import org.apache.storm.sql.runtime.*; import org.apache.storm.sql.runtime.trident.AbstractTridentProcessor; -import storm.trident.TridentTopology; +import org.apache.storm.trident.TridentTopology; import java.io.BufferedOutputStream; import java.io.ByteArrayOutputStream; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSqlRunner.java ---------------------------------------------------------------------- diff --git a/external/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSqlRunner.java b/external/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSqlRunner.java index 970ccd2..22981d5 100644 --- a/external/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSqlRunner.java +++ b/external/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSqlRunner.java @@ -17,9 +17,9 @@ */ package org.apache.storm.sql; -import backtype.storm.generated.SubmitOptions; -import backtype.storm.generated.TopologyInitialStatus; -import backtype.storm.utils.Utils; +import org.apache.storm.generated.SubmitOptions; +import org.apache.storm.generated.TopologyInitialStatus; +import org.apache.storm.utils.Utils; import java.nio.charset.StandardCharsets; import java.nio.file.Files; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/sql/storm-sql-core/src/jvm/org/apache/storm/sql/compiler/backends/standalone/PlanCompiler.java ---------------------------------------------------------------------- diff --git a/external/sql/storm-sql-core/src/jvm/org/apache/storm/sql/compiler/backends/standalone/PlanCompiler.java b/external/sql/storm-sql-core/src/jvm/org/apache/storm/sql/compiler/backends/standalone/PlanCompiler.java index 64bc06e..eb7f4ea 100644 --- a/external/sql/storm-sql-core/src/jvm/org/apache/storm/sql/compiler/backends/standalone/PlanCompiler.java +++ b/external/sql/storm-sql-core/src/jvm/org/apache/storm/sql/compiler/backends/standalone/PlanCompiler.java @@ -39,7 +39,7 @@ public class PlanCompiler { private static final String PROLOGUE = NEW_LINE_JOINER.join( "// GENERATED CODE", "package " + PACKAGE_NAME + ";", "", "import java.util.Iterator;", "import java.util.Map;", - "import backtype.storm.tuple.Values;", + "import org.apache.storm.tuple.Values;", "import org.apache.storm.sql.runtime.AbstractChannelHandler;", "import org.apache.storm.sql.runtime.Channels;", "import org.apache.storm.sql.runtime.ChannelContext;", http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/sql/storm-sql-core/src/jvm/org/apache/storm/sql/compiler/backends/trident/PlanCompiler.java ---------------------------------------------------------------------- diff --git a/external/sql/storm-sql-core/src/jvm/org/apache/storm/sql/compiler/backends/trident/PlanCompiler.java b/external/sql/storm-sql-core/src/jvm/org/apache/storm/sql/compiler/backends/trident/PlanCompiler.java index 35e0cb7..7a5516d 100644 --- a/external/sql/storm-sql-core/src/jvm/org/apache/storm/sql/compiler/backends/trident/PlanCompiler.java +++ b/external/sql/storm-sql-core/src/jvm/org/apache/storm/sql/compiler/backends/trident/PlanCompiler.java @@ -45,17 +45,17 @@ public class PlanCompiler { "// GENERATED CODE", "package " + PACKAGE_NAME + ";", "", "import java.util.List;", "import java.util.Map;", - "import backtype.storm.tuple.Fields;", - "import backtype.storm.tuple.Values;", + "import org.apache.storm.tuple.Fields;", + "import org.apache.storm.tuple.Values;", "import org.apache.storm.sql.runtime.ISqlTridentDataSource;", "import org.apache.storm.sql.runtime.trident.AbstractTridentProcessor;", - "import storm.trident.Stream;", - "import storm.trident.TridentTopology;", - "import storm.trident.fluent.IAggregatableStream;", - "import storm.trident.operation.TridentCollector;", - "import storm.trident.operation.BaseFunction;", - "import storm.trident.spout.IBatchSpout;", - "import storm.trident.tuple.TridentTuple;", + "import org.apache.storm.trident.Stream;", + "import org.apache.storm.trident.TridentTopology;", + "import org.apache.storm.trident.fluent.IAggregatableStream;", + "import org.apache.storm.trident.operation.TridentCollector;", + "import org.apache.storm.trident.operation.BaseFunction;", + "import org.apache.storm.trident.spout.IBatchSpout;", + "import org.apache.storm.trident.tuple.TridentTuple;", "", "public final class TridentProcessor extends AbstractTridentProcessor {", ""); http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/sql/storm-sql-core/src/jvm/org/apache/storm/sql/compiler/backends/trident/RelNodeCompiler.java ---------------------------------------------------------------------- diff --git a/external/sql/storm-sql-core/src/jvm/org/apache/storm/sql/compiler/backends/trident/RelNodeCompiler.java b/external/sql/storm-sql-core/src/jvm/org/apache/storm/sql/compiler/backends/trident/RelNodeCompiler.java index 1de39d3..340b9a2 100644 --- a/external/sql/storm-sql-core/src/jvm/org/apache/storm/sql/compiler/backends/trident/RelNodeCompiler.java +++ b/external/sql/storm-sql-core/src/jvm/org/apache/storm/sql/compiler/backends/trident/RelNodeCompiler.java @@ -19,7 +19,7 @@ */ package org.apache.storm.sql.compiler.backends.trident; -import backtype.storm.tuple.Fields; +import org.apache.storm.tuple.Fields; import com.google.common.base.Joiner; import org.apache.calcite.adapter.java.JavaTypeFactory; import org.apache.calcite.rel.RelNode; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/sql/storm-sql-core/src/test/org/apache/storm/sql/TestStormSql.java ---------------------------------------------------------------------- diff --git a/external/sql/storm-sql-core/src/test/org/apache/storm/sql/TestStormSql.java b/external/sql/storm-sql-core/src/test/org/apache/storm/sql/TestStormSql.java index f145180..511e5ab 100644 --- a/external/sql/storm-sql-core/src/test/org/apache/storm/sql/TestStormSql.java +++ b/external/sql/storm-sql-core/src/test/org/apache/storm/sql/TestStormSql.java @@ -17,12 +17,12 @@ */ package org.apache.storm.sql; -import backtype.storm.Config; -import backtype.storm.ILocalCluster; -import backtype.storm.StormSubmitter; -import backtype.storm.generated.SubmitOptions; -import backtype.storm.generated.TopologyInitialStatus; -import backtype.storm.tuple.Values; +import org.apache.storm.Config; +import org.apache.storm.ILocalCluster; +import org.apache.storm.StormSubmitter; +import org.apache.storm.generated.SubmitOptions; +import org.apache.storm.generated.TopologyInitialStatus; +import org.apache.storm.tuple.Values; import org.apache.storm.sql.runtime.*; import org.junit.AfterClass; import org.junit.Assert; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/sql/storm-sql-core/src/test/org/apache/storm/sql/compiler/TestExprSemantic.java ---------------------------------------------------------------------- diff --git a/external/sql/storm-sql-core/src/test/org/apache/storm/sql/compiler/TestExprSemantic.java b/external/sql/storm-sql-core/src/test/org/apache/storm/sql/compiler/TestExprSemantic.java index febfdb5..8304a33 100644 --- a/external/sql/storm-sql-core/src/test/org/apache/storm/sql/compiler/TestExprSemantic.java +++ b/external/sql/storm-sql-core/src/test/org/apache/storm/sql/compiler/TestExprSemantic.java @@ -17,7 +17,7 @@ */ package org.apache.storm.sql.compiler; -import backtype.storm.tuple.Values; +import org.apache.storm.tuple.Values; import com.google.common.base.Joiner; import com.google.common.collect.Lists; import org.apache.calcite.adapter.java.JavaTypeFactory; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/sql/storm-sql-core/src/test/org/apache/storm/sql/compiler/backends/standalone/TestPlanCompiler.java ---------------------------------------------------------------------- diff --git a/external/sql/storm-sql-core/src/test/org/apache/storm/sql/compiler/backends/standalone/TestPlanCompiler.java b/external/sql/storm-sql-core/src/test/org/apache/storm/sql/compiler/backends/standalone/TestPlanCompiler.java index 8d7fc65..ff28231 100644 --- a/external/sql/storm-sql-core/src/test/org/apache/storm/sql/compiler/backends/standalone/TestPlanCompiler.java +++ b/external/sql/storm-sql-core/src/test/org/apache/storm/sql/compiler/backends/standalone/TestPlanCompiler.java @@ -17,7 +17,7 @@ */ package org.apache.storm.sql.compiler.backends.standalone; -import backtype.storm.tuple.Values; +import org.apache.storm.tuple.Values; import org.apache.calcite.adapter.java.JavaTypeFactory; import org.apache.calcite.jdbc.JavaTypeFactoryImpl; import org.apache.calcite.rel.type.RelDataTypeSystem; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/sql/storm-sql-core/src/test/org/apache/storm/sql/compiler/backends/trident/TestPlanCompiler.java ---------------------------------------------------------------------- diff --git a/external/sql/storm-sql-core/src/test/org/apache/storm/sql/compiler/backends/trident/TestPlanCompiler.java b/external/sql/storm-sql-core/src/test/org/apache/storm/sql/compiler/backends/trident/TestPlanCompiler.java index a68ba0c..ddc671a 100644 --- a/external/sql/storm-sql-core/src/test/org/apache/storm/sql/compiler/backends/trident/TestPlanCompiler.java +++ b/external/sql/storm-sql-core/src/test/org/apache/storm/sql/compiler/backends/trident/TestPlanCompiler.java @@ -19,13 +19,13 @@ */ package org.apache.storm.sql.compiler.backends.trident; -import backtype.storm.Config; -import backtype.storm.ILocalCluster; -import backtype.storm.LocalCluster; -import backtype.storm.generated.StormTopology; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Values; -import backtype.storm.utils.Utils; +import org.apache.storm.Config; +import org.apache.storm.ILocalCluster; +import org.apache.storm.LocalCluster; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Values; +import org.apache.storm.utils.Utils; import org.apache.calcite.adapter.java.JavaTypeFactory; import org.apache.calcite.jdbc.JavaTypeFactoryImpl; import org.apache.calcite.rel.type.RelDataTypeSystem; @@ -37,7 +37,7 @@ import org.apache.storm.sql.runtime.trident.AbstractTridentProcessor; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import storm.trident.TridentTopology; +import org.apache.storm.trident.TridentTopology; import java.util.HashMap; import java.util.Map; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/sql/storm-sql-kafka/src/jvm/org/apache/storm/sql/kafka/JsonScheme.java ---------------------------------------------------------------------- diff --git a/external/sql/storm-sql-kafka/src/jvm/org/apache/storm/sql/kafka/JsonScheme.java b/external/sql/storm-sql-kafka/src/jvm/org/apache/storm/sql/kafka/JsonScheme.java index 1b45b30..eed1282 100644 --- a/external/sql/storm-sql-kafka/src/jvm/org/apache/storm/sql/kafka/JsonScheme.java +++ b/external/sql/storm-sql-kafka/src/jvm/org/apache/storm/sql/kafka/JsonScheme.java @@ -17,9 +17,9 @@ */ package org.apache.storm.sql.kafka; -import backtype.storm.spout.Scheme; -import backtype.storm.tuple.Fields; -import backtype.storm.utils.Utils; +import org.apache.storm.spout.Scheme; +import org.apache.storm.tuple.Fields; +import org.apache.storm.utils.Utils; import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; @@ -55,4 +55,4 @@ public class JsonScheme implements Scheme { public Fields getOutputFields() { return new Fields(fields); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/sql/storm-sql-kafka/src/jvm/org/apache/storm/sql/kafka/KafkaDataSourcesProvider.java ---------------------------------------------------------------------- diff --git a/external/sql/storm-sql-kafka/src/jvm/org/apache/storm/sql/kafka/KafkaDataSourcesProvider.java b/external/sql/storm-sql-kafka/src/jvm/org/apache/storm/sql/kafka/KafkaDataSourcesProvider.java index 7da57ba..0236948 100644 --- a/external/sql/storm-sql-kafka/src/jvm/org/apache/storm/sql/kafka/KafkaDataSourcesProvider.java +++ b/external/sql/storm-sql-kafka/src/jvm/org/apache/storm/sql/kafka/KafkaDataSourcesProvider.java @@ -17,22 +17,22 @@ */ package org.apache.storm.sql.kafka; -import backtype.storm.spout.SchemeAsMultiScheme; +import org.apache.storm.spout.SchemeAsMultiScheme; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Preconditions; import org.apache.storm.sql.runtime.*; -import storm.kafka.ZkHosts; -import storm.kafka.trident.OpaqueTridentKafkaSpout; -import storm.kafka.trident.TridentKafkaConfig; -import storm.kafka.trident.TridentKafkaState; -import storm.kafka.trident.mapper.TridentTupleToKafkaMapper; -import storm.kafka.trident.selector.KafkaTopicSelector; -import storm.trident.operation.BaseFunction; -import storm.trident.operation.Function; -import storm.trident.operation.TridentCollector; -import storm.trident.operation.TridentOperationContext; -import storm.trident.spout.ITridentDataSource; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.kafka.ZkHosts; +import org.apache.storm.kafka.trident.OpaqueTridentKafkaSpout; +import org.apache.storm.kafka.trident.TridentKafkaConfig; +import org.apache.storm.kafka.trident.TridentKafkaState; +import org.apache.storm.kafka.trident.mapper.TridentTupleToKafkaMapper; +import org.apache.storm.kafka.trident.selector.KafkaTopicSelector; +import org.apache.storm.trident.operation.BaseFunction; +import org.apache.storm.trident.operation.Function; +import org.apache.storm.trident.operation.TridentCollector; +import org.apache.storm.trident.operation.TridentOperationContext; +import org.apache.storm.trident.spout.ITridentDataSource; +import org.apache.storm.trident.tuple.TridentTuple; import java.io.IOException; import java.net.URI; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/sql/storm-sql-kafka/src/test/org/apache/storm/sql/kafka/TestJsonRepresentation.java ---------------------------------------------------------------------- diff --git a/external/sql/storm-sql-kafka/src/test/org/apache/storm/sql/kafka/TestJsonRepresentation.java b/external/sql/storm-sql-kafka/src/test/org/apache/storm/sql/kafka/TestJsonRepresentation.java index 5973672..7e85410 100644 --- a/external/sql/storm-sql-kafka/src/test/org/apache/storm/sql/kafka/TestJsonRepresentation.java +++ b/external/sql/storm-sql-kafka/src/test/org/apache/storm/sql/kafka/TestJsonRepresentation.java @@ -17,7 +17,7 @@ */ package org.apache.storm.sql.kafka; -import backtype.storm.utils.Utils; +import org.apache.storm.utils.Utils; import com.google.common.collect.Lists; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/sql/storm-sql-kafka/src/test/org/apache/storm/sql/kafka/TestKafkaDataSourcesProvider.java ---------------------------------------------------------------------- diff --git a/external/sql/storm-sql-kafka/src/test/org/apache/storm/sql/kafka/TestKafkaDataSourcesProvider.java b/external/sql/storm-sql-kafka/src/test/org/apache/storm/sql/kafka/TestKafkaDataSourcesProvider.java index 399bb3e..f6e75ab 100644 --- a/external/sql/storm-sql-kafka/src/test/org/apache/storm/sql/kafka/TestKafkaDataSourcesProvider.java +++ b/external/sql/storm-sql-kafka/src/test/org/apache/storm/sql/kafka/TestKafkaDataSourcesProvider.java @@ -30,8 +30,8 @@ import org.junit.Assert; import org.junit.Test; import org.mockito.ArgumentMatcher; import org.mockito.internal.util.reflection.Whitebox; -import storm.kafka.trident.TridentKafkaState; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.kafka.trident.TridentKafkaState; +import org.apache.storm.trident.tuple.TridentTuple; import java.net.URI; import java.nio.ByteBuffer; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/AbstractChannelHandler.java ---------------------------------------------------------------------- diff --git a/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/AbstractChannelHandler.java b/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/AbstractChannelHandler.java index 892d2e4..6a8bbe5 100644 --- a/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/AbstractChannelHandler.java +++ b/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/AbstractChannelHandler.java @@ -19,7 +19,7 @@ */ package org.apache.storm.sql.runtime; -import backtype.storm.tuple.Values; +import org.apache.storm.tuple.Values; public abstract class AbstractChannelHandler implements ChannelHandler { @Override http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/AbstractValuesProcessor.java ---------------------------------------------------------------------- diff --git a/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/AbstractValuesProcessor.java b/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/AbstractValuesProcessor.java index 11aa065..ad09319 100644 --- a/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/AbstractValuesProcessor.java +++ b/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/AbstractValuesProcessor.java @@ -20,7 +20,7 @@ package org.apache.storm.sql.runtime; -import backtype.storm.tuple.Values; +import org.apache.storm.tuple.Values; import org.apache.storm.sql.runtime.ChannelHandler; import org.apache.storm.sql.runtime.DataSource; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/ChannelContext.java ---------------------------------------------------------------------- diff --git a/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/ChannelContext.java b/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/ChannelContext.java index 71aba03..c29c6b1 100644 --- a/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/ChannelContext.java +++ b/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/ChannelContext.java @@ -19,7 +19,7 @@ */ package org.apache.storm.sql.runtime; -import backtype.storm.tuple.Values; +import org.apache.storm.tuple.Values; public interface ChannelContext { /** http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/ChannelHandler.java ---------------------------------------------------------------------- diff --git a/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/ChannelHandler.java b/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/ChannelHandler.java index 117f312..f30d0a3 100644 --- a/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/ChannelHandler.java +++ b/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/ChannelHandler.java @@ -19,7 +19,7 @@ */ package org.apache.storm.sql.runtime; -import backtype.storm.tuple.Values; +import org.apache.storm.tuple.Values; /** * DataListener provides an event-driven interface for the user to process http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/Channels.java ---------------------------------------------------------------------- diff --git a/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/Channels.java b/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/Channels.java index 7214f9a..47dab11 100644 --- a/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/Channels.java +++ b/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/Channels.java @@ -19,7 +19,7 @@ */ package org.apache.storm.sql.runtime; -import backtype.storm.tuple.Values; +import org.apache.storm.tuple.Values; public class Channels { private static final ChannelContext VOID_CTX = new ChannelContext() { http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/ISqlTridentDataSource.java ---------------------------------------------------------------------- diff --git a/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/ISqlTridentDataSource.java b/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/ISqlTridentDataSource.java index d9e1db7..92961dc 100644 --- a/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/ISqlTridentDataSource.java +++ b/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/ISqlTridentDataSource.java @@ -17,9 +17,9 @@ */ package org.apache.storm.sql.runtime; -import storm.trident.operation.Function; -import storm.trident.spout.IBatchSpout; -import storm.trident.spout.ITridentDataSource; +import org.apache.storm.trident.operation.Function; +import org.apache.storm.trident.spout.IBatchSpout; +import org.apache.storm.trident.spout.ITridentDataSource; /** * A ISqlTridentDataSource specifies how an external data source produces and consumes data. http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/trident/AbstractTridentProcessor.java ---------------------------------------------------------------------- diff --git a/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/trident/AbstractTridentProcessor.java b/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/trident/AbstractTridentProcessor.java index 7faa7e4..8743795 100644 --- a/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/trident/AbstractTridentProcessor.java +++ b/external/sql/storm-sql-runtime/src/jvm/org/apache/storm/sql/runtime/trident/AbstractTridentProcessor.java @@ -21,8 +21,8 @@ package org.apache.storm.sql.runtime.trident; import org.apache.storm.sql.runtime.ISqlTridentDataSource; -import storm.trident.Stream; -import storm.trident.TridentTopology; +import org.apache.storm.trident.Stream; +import org.apache.storm.trident.TridentTopology; import java.util.Map; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/sql/storm-sql-runtime/src/test/org/apache/storm/sql/TestUtils.java ---------------------------------------------------------------------- diff --git a/external/sql/storm-sql-runtime/src/test/org/apache/storm/sql/TestUtils.java b/external/sql/storm-sql-runtime/src/test/org/apache/storm/sql/TestUtils.java index 58efdf6..c5a4043 100644 --- a/external/sql/storm-sql-runtime/src/test/org/apache/storm/sql/TestUtils.java +++ b/external/sql/storm-sql-runtime/src/test/org/apache/storm/sql/TestUtils.java @@ -19,20 +19,20 @@ */ package org.apache.storm.sql; -import backtype.storm.ILocalCluster; -import backtype.storm.LocalCluster; -import backtype.storm.task.TopologyContext; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Values; +import org.apache.storm.ILocalCluster; +import org.apache.storm.LocalCluster; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Values; import org.apache.storm.sql.runtime.ChannelContext; import org.apache.storm.sql.runtime.ChannelHandler; import org.apache.storm.sql.runtime.DataSource; import org.apache.storm.sql.runtime.ISqlTridentDataSource; -import storm.trident.operation.BaseFunction; -import storm.trident.operation.Function; -import storm.trident.operation.TridentCollector; -import storm.trident.spout.IBatchSpout; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.trident.operation.BaseFunction; +import org.apache.storm.trident.operation.Function; +import org.apache.storm.trident.operation.TridentCollector; +import org.apache.storm.trident.spout.IBatchSpout; +import org.apache.storm.trident.tuple.TridentTuple; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/AbstractExecutionResultHandler.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/AbstractExecutionResultHandler.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/AbstractExecutionResultHandler.java index 80ae284..cf68c4f 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/AbstractExecutionResultHandler.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/AbstractExecutionResultHandler.java @@ -18,8 +18,8 @@ */ package org.apache.storm.cassandra; -import backtype.storm.task.OutputCollector; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.tuple.Tuple; import com.datastax.driver.core.exceptions.QueryValidationException; import com.datastax.driver.core.exceptions.ReadTimeoutException; import com.datastax.driver.core.exceptions.UnavailableException; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/BaseExecutionResultHandler.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/BaseExecutionResultHandler.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/BaseExecutionResultHandler.java index c7fc4f1..18f9ebf 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/BaseExecutionResultHandler.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/BaseExecutionResultHandler.java @@ -18,8 +18,8 @@ */ package org.apache.storm.cassandra; -import backtype.storm.task.OutputCollector; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.tuple.Tuple; import com.datastax.driver.core.exceptions.*; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/ExecutionResultHandler.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/ExecutionResultHandler.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/ExecutionResultHandler.java index b804ee5..ac3c76e 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/ExecutionResultHandler.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/ExecutionResultHandler.java @@ -18,8 +18,8 @@ */ package org.apache.storm.cassandra; -import backtype.storm.task.OutputCollector; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.tuple.Tuple; import com.datastax.driver.core.exceptions.QueryValidationException; import com.datastax.driver.core.exceptions.ReadTimeoutException; import com.datastax.driver.core.exceptions.UnavailableException; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/Murmur3StreamGrouping.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/Murmur3StreamGrouping.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/Murmur3StreamGrouping.java index 992bfd0..5d67796 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/Murmur3StreamGrouping.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/Murmur3StreamGrouping.java @@ -18,11 +18,11 @@ */ package org.apache.storm.cassandra; -import backtype.storm.generated.GlobalStreamId; -import backtype.storm.grouping.CustomStreamGrouping; -import backtype.storm.task.WorkerTopologyContext; -import backtype.storm.topology.FailedException; -import backtype.storm.tuple.Fields; +import org.apache.storm.generated.GlobalStreamId; +import org.apache.storm.grouping.CustomStreamGrouping; +import org.apache.storm.task.WorkerTopologyContext; +import org.apache.storm.topology.FailedException; +import org.apache.storm.tuple.Fields; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; import com.google.common.hash.Hashing; @@ -36,7 +36,7 @@ import java.util.List; /** * - * Simple {@link backtype.storm.grouping.CustomStreamGrouping} that uses Murmur3 algorithm to choose the target task of a tuple. + * Simple {@link org.apache.storm.grouping.CustomStreamGrouping} that uses Murmur3 algorithm to choose the target task of a tuple. * * This stream grouping may be used to optimise writes to Apache Cassandra. */ http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/BaseCassandraBolt.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/BaseCassandraBolt.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/BaseCassandraBolt.java index dafcb22..7891fe1 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/BaseCassandraBolt.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/BaseCassandraBolt.java @@ -18,15 +18,15 @@ */ package org.apache.storm.cassandra.bolt; -import backtype.storm.Config; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; -import backtype.storm.utils.TupleUtils; -import backtype.storm.utils.Utils; +import org.apache.storm.Config; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.utils.TupleUtils; +import org.apache.storm.utils.Utils; import com.datastax.driver.core.Session; import com.datastax.driver.core.exceptions.NoHostAvailableException; import org.apache.storm.cassandra.BaseExecutionResultHandler; @@ -48,7 +48,7 @@ import java.util.Map; /** * A base cassandra bolt. * - * Default {@link backtype.storm.topology.base.BaseRichBolt} + * Default {@link org.apache.storm.topology.base.BaseRichBolt} */ public abstract class BaseCassandraBolt<T> extends BaseRichBolt { http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/BatchCassandraWriterBolt.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/BatchCassandraWriterBolt.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/BatchCassandraWriterBolt.java index fd597df..286edf8 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/BatchCassandraWriterBolt.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/BatchCassandraWriterBolt.java @@ -18,11 +18,11 @@ */ package org.apache.storm.cassandra.bolt; -import backtype.storm.Config; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.tuple.Tuple; -import backtype.storm.utils.Time; +import org.apache.storm.Config; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.utils.Time; import com.datastax.driver.core.Statement; import org.apache.storm.cassandra.executor.AsyncResultHandler; import org.apache.storm.cassandra.executor.impl.BatchAsyncResultHandler; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/CassandraWriterBolt.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/CassandraWriterBolt.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/CassandraWriterBolt.java index 19097f2..3d1229e 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/CassandraWriterBolt.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/CassandraWriterBolt.java @@ -18,7 +18,7 @@ */ package org.apache.storm.cassandra.bolt; -import backtype.storm.tuple.Tuple; +import org.apache.storm.tuple.Tuple; import com.datastax.driver.core.Statement; import org.apache.storm.cassandra.executor.AsyncResultHandler; import org.apache.storm.cassandra.executor.impl.SingleAsyncResultHandler; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/GroupingBatchBuilder.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/GroupingBatchBuilder.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/GroupingBatchBuilder.java index ea63b3d..fdafd50 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/GroupingBatchBuilder.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/GroupingBatchBuilder.java @@ -18,7 +18,7 @@ */ package org.apache.storm.cassandra.bolt; -import backtype.storm.tuple.Tuple; +import org.apache.storm.tuple.Tuple; import com.datastax.driver.core.BatchStatement; import com.google.common.base.Function; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/PairBatchStatementTuples.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/PairBatchStatementTuples.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/PairBatchStatementTuples.java index 736c482..cef422e 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/PairBatchStatementTuples.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/PairBatchStatementTuples.java @@ -18,7 +18,7 @@ */ package org.apache.storm.cassandra.bolt; -import backtype.storm.tuple.Tuple; +import org.apache.storm.tuple.Tuple; import com.datastax.driver.core.BatchStatement; import java.util.List; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/PairStatementTuple.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/PairStatementTuple.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/PairStatementTuple.java index 8f50574..0f501a3 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/PairStatementTuple.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/PairStatementTuple.java @@ -18,7 +18,7 @@ */ package org.apache.storm.cassandra.bolt; -import backtype.storm.tuple.Tuple; +import org.apache.storm.tuple.Tuple; import com.datastax.driver.core.Statement; /** http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/client/CassandraConf.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/client/CassandraConf.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/client/CassandraConf.java index 9201801..0f0de53 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/client/CassandraConf.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/client/CassandraConf.java @@ -18,7 +18,7 @@ */ package org.apache.storm.cassandra.client; -import backtype.storm.utils.Utils; +import org.apache.storm.utils.Utils; import com.datastax.driver.core.ConsistencyLevel; import com.datastax.driver.core.policies.DefaultRetryPolicy; import com.datastax.driver.core.policies.DowngradingConsistencyRetryPolicy; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/AsyncResultHandler.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/AsyncResultHandler.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/AsyncResultHandler.java index 9b51696..f827d45 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/AsyncResultHandler.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/AsyncResultHandler.java @@ -18,7 +18,7 @@ */ package org.apache.storm.cassandra.executor; -import backtype.storm.task.OutputCollector; +import org.apache.storm.task.OutputCollector; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/ExecutionResultCollector.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/ExecutionResultCollector.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/ExecutionResultCollector.java index d0f5e1d..882aeb4 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/ExecutionResultCollector.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/ExecutionResultCollector.java @@ -18,8 +18,8 @@ */ package org.apache.storm.cassandra.executor; -import backtype.storm.task.OutputCollector; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.tuple.Tuple; import com.google.common.collect.Lists; import org.apache.storm.cassandra.ExecutionResultHandler; @@ -53,7 +53,7 @@ public interface ExecutionResultCollector { } /** - * Calls {@link ExecutionResultHandler#onQuerySuccess(backtype.storm.task.OutputCollector, backtype.storm.tuple.Tuple)} before + * Calls {@link ExecutionResultHandler#onQuerySuccess(org.apache.storm.task.OutputCollector, org.apache.storm.tuple.Tuple)} before * acknowledging an single input tuple. */ @Override @@ -88,7 +88,7 @@ public interface ExecutionResultCollector { } /** - * Calls {@link ExecutionResultHandler#onThrowable(Throwable, backtype.storm.task.OutputCollector, backtype.storm.tuple.Tuple)} . + * Calls {@link ExecutionResultHandler#onThrowable(Throwable, org.apache.storm.task.OutputCollector, org.apache.storm.tuple.Tuple)} . */ @Override public void handle(OutputCollector collector, ExecutionResultHandler handler) { http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/impl/BatchAsyncResultHandler.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/impl/BatchAsyncResultHandler.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/impl/BatchAsyncResultHandler.java index c81da8c..f7a8fcc 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/impl/BatchAsyncResultHandler.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/impl/BatchAsyncResultHandler.java @@ -18,8 +18,8 @@ */ package org.apache.storm.cassandra.executor.impl; -import backtype.storm.task.OutputCollector; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.tuple.Tuple; import org.apache.storm.cassandra.ExecutionResultHandler; import org.apache.storm.cassandra.executor.AsyncResultHandler; import org.apache.storm.cassandra.executor.ExecutionResultCollector; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/impl/SingleAsyncResultHandler.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/impl/SingleAsyncResultHandler.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/impl/SingleAsyncResultHandler.java index 62a5a3b..ac79543 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/impl/SingleAsyncResultHandler.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/impl/SingleAsyncResultHandler.java @@ -18,8 +18,8 @@ */ package org.apache.storm.cassandra.executor.impl; -import backtype.storm.task.OutputCollector; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.tuple.Tuple; import org.apache.storm.cassandra.ExecutionResultHandler; import org.apache.storm.cassandra.executor.AsyncResultHandler; import org.apache.storm.cassandra.executor.ExecutionResultCollector; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/BaseCQLStatementTupleMapper.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/BaseCQLStatementTupleMapper.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/BaseCQLStatementTupleMapper.java index c9ba6fa..3bc0f08 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/BaseCQLStatementTupleMapper.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/BaseCQLStatementTupleMapper.java @@ -18,7 +18,7 @@ */ package org.apache.storm.cassandra.query; -import backtype.storm.tuple.ITuple; +import org.apache.storm.tuple.ITuple; import com.datastax.driver.core.Session; import com.datastax.driver.core.Statement; @@ -28,7 +28,7 @@ import java.util.List; import java.util.Map; /** - * Default interface to map a {@link backtype.storm.tuple.ITuple} to a CQL {@link com.datastax.driver.core.Statement}. + * Default interface to map a {@link org.apache.storm.tuple.ITuple} to a CQL {@link com.datastax.driver.core.Statement}. * */ public abstract class BaseCQLStatementTupleMapper implements CQLStatementTupleMapper, Serializable { http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CQLResultSetValuesMapper.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CQLResultSetValuesMapper.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CQLResultSetValuesMapper.java index 80b1173..d5495fb 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CQLResultSetValuesMapper.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CQLResultSetValuesMapper.java @@ -18,8 +18,8 @@ */ package org.apache.storm.cassandra.query; -import backtype.storm.tuple.ITuple; -import backtype.storm.tuple.Values; +import org.apache.storm.tuple.ITuple; +import org.apache.storm.tuple.Values; import com.datastax.driver.core.Session; import com.datastax.driver.core.Statement; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CQLStatementTupleMapper.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CQLStatementTupleMapper.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CQLStatementTupleMapper.java index fc960dd..d82f8a2 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CQLStatementTupleMapper.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CQLStatementTupleMapper.java @@ -18,7 +18,7 @@ */ package org.apache.storm.cassandra.query; -import backtype.storm.tuple.ITuple; +import org.apache.storm.tuple.ITuple; import com.datastax.driver.core.Session; import com.datastax.driver.core.Statement; @@ -28,7 +28,7 @@ import java.util.List; import java.util.Map; /** - * Default interface to map a {@link backtype.storm.tuple.ITuple} to a CQL {@link com.datastax.driver.core.Statement}. + * Default interface to map a {@link org.apache.storm.tuple.ITuple} to a CQL {@link com.datastax.driver.core.Statement}. */ public interface CQLStatementTupleMapper extends Serializable { http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/ContextQuery.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/ContextQuery.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/ContextQuery.java index d0a5491..58f0213 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/ContextQuery.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/ContextQuery.java @@ -18,7 +18,7 @@ */ package org.apache.storm.cassandra.query; -import backtype.storm.tuple.ITuple; +import org.apache.storm.tuple.ITuple; import java.io.Serializable; import java.util.Map; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CqlMapper.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CqlMapper.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CqlMapper.java index 2ab8f92..c497f3e 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CqlMapper.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CqlMapper.java @@ -18,7 +18,7 @@ */ package org.apache.storm.cassandra.query; -import backtype.storm.tuple.ITuple; +import org.apache.storm.tuple.ITuple; import org.apache.storm.cassandra.query.selector.FieldSelector; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/BatchCQLStatementTupleMapper.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/BatchCQLStatementTupleMapper.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/BatchCQLStatementTupleMapper.java index fe948f5..43077e2 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/BatchCQLStatementTupleMapper.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/BatchCQLStatementTupleMapper.java @@ -18,7 +18,7 @@ */ package org.apache.storm.cassandra.query.impl; -import backtype.storm.tuple.ITuple; +import org.apache.storm.tuple.ITuple; import com.datastax.driver.core.BatchStatement; import com.datastax.driver.core.Session; import com.datastax.driver.core.Statement; @@ -55,4 +55,4 @@ public class BatchCQLStatementTupleMapper implements CQLStatementTupleMapper { batch.addAll(m.map(conf, session, tuple)); return Arrays.asList((Statement)batch); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/BoundCQLStatementTupleMapper.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/BoundCQLStatementTupleMapper.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/BoundCQLStatementTupleMapper.java index 8cce418..dbef606 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/BoundCQLStatementTupleMapper.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/BoundCQLStatementTupleMapper.java @@ -18,7 +18,7 @@ */ package org.apache.storm.cassandra.query.impl; -import backtype.storm.tuple.ITuple; +import org.apache.storm.tuple.ITuple; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Session; import com.datastax.driver.core.Statement; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/RoutingKeyGenerator.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/RoutingKeyGenerator.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/RoutingKeyGenerator.java index 3f4f47e..57a6689 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/RoutingKeyGenerator.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/RoutingKeyGenerator.java @@ -18,7 +18,7 @@ */ package org.apache.storm.cassandra.query.impl; -import backtype.storm.tuple.ITuple; +import org.apache.storm.tuple.ITuple; import com.datastax.driver.core.DataType; import com.datastax.driver.core.ProtocolVersion; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/SimpleCQLStatementMapper.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/SimpleCQLStatementMapper.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/SimpleCQLStatementMapper.java index ab9adbf..2825c0a 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/SimpleCQLStatementMapper.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/SimpleCQLStatementMapper.java @@ -18,7 +18,7 @@ */ package org.apache.storm.cassandra.query.impl; -import backtype.storm.tuple.ITuple; +import org.apache.storm.tuple.ITuple; import com.datastax.driver.core.Session; import com.datastax.driver.core.SimpleStatement; import com.datastax.driver.core.Statement; @@ -85,4 +85,4 @@ public class SimpleCQLStatementMapper implements CQLStatementTupleMapper { private boolean hasRoutingKeys() { return rkGenerator != null; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/selector/FieldSelector.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/selector/FieldSelector.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/selector/FieldSelector.java index bba7fb5..835a3e8 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/selector/FieldSelector.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/selector/FieldSelector.java @@ -18,7 +18,7 @@ */ package org.apache.storm.cassandra.query.selector; -import backtype.storm.tuple.ITuple; +import org.apache.storm.tuple.ITuple; import com.datastax.driver.core.utils.UUIDs; import org.apache.storm.cassandra.query.Column; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraQuery.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraQuery.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraQuery.java index 085cbca..ca4416d 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraQuery.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraQuery.java @@ -18,10 +18,10 @@ */ package org.apache.storm.cassandra.trident.state; -import backtype.storm.tuple.Values; -import storm.trident.operation.TridentCollector; -import storm.trident.state.BaseQueryFunction; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.tuple.Values; +import org.apache.storm.trident.operation.TridentCollector; +import org.apache.storm.trident.state.BaseQueryFunction; +import org.apache.storm.trident.tuple.TridentTuple; import java.util.List; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraState.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraState.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraState.java index b807a60..937b8c9 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraState.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraState.java @@ -18,8 +18,8 @@ */ package org.apache.storm.cassandra.trident.state; -import backtype.storm.topology.FailedException; -import backtype.storm.tuple.Values; +import org.apache.storm.topology.FailedException; +import org.apache.storm.tuple.Values; import com.datastax.driver.core.BatchStatement; import com.datastax.driver.core.Session; import com.datastax.driver.core.Statement; @@ -30,9 +30,9 @@ import org.apache.storm.cassandra.query.CQLResultSetValuesMapper; import org.apache.storm.cassandra.query.CQLStatementTupleMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import storm.trident.operation.TridentCollector; -import storm.trident.state.State; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.trident.operation.TridentCollector; +import org.apache.storm.trident.state.State; +import org.apache.storm.trident.tuple.TridentTuple; import java.io.Serializable; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraStateFactory.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraStateFactory.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraStateFactory.java index ceaa11d..697f15f 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraStateFactory.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraStateFactory.java @@ -18,12 +18,12 @@ */ package org.apache.storm.cassandra.trident.state; -import backtype.storm.task.IMetricsContext; +import org.apache.storm.task.IMetricsContext; import org.apache.storm.cassandra.CassandraContext; import org.apache.storm.cassandra.query.CQLResultSetValuesMapper; import org.apache.storm.cassandra.query.CQLStatementTupleMapper; -import storm.trident.state.State; -import storm.trident.state.StateFactory; +import org.apache.storm.trident.state.State; +import org.apache.storm.trident.state.StateFactory; import java.util.Map;
