Repository: nifi Updated Branches: refs/heads/master 293dc2993 -> 9d273b1e2
NIFI-2113 Updating storm dependency to 1.0.1 and fixing package names This closes #578 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/9d273b1e Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/9d273b1e Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/9d273b1e Branch: refs/heads/master Commit: 9d273b1e2f25e76d901fe143da97f86d575f845b Parents: 293dc29 Author: Bryan Bende <bbe...@apache.org> Authored: Fri Jun 24 14:46:44 2016 -0400 Committer: Oleg Zhurakousky <o...@suitcase.io> Committed: Wed Jul 6 13:03:08 2016 -0400 ---------------------------------------------------------------------- nifi-external/nifi-storm-spout/pom.xml | 2 +- .../main/java/org/apache/nifi/storm/NiFiBolt.java | 15 ++++++++------- .../org/apache/nifi/storm/NiFiDataPacketBuilder.java | 2 +- .../main/java/org/apache/nifi/storm/NiFiSpout.java | 14 +++++++------- .../java/org/apache/nifi/storm/MockTupleHelpers.java | 4 ++-- .../org/apache/nifi/storm/NiFiStormTopology.java | 10 +++++----- .../java/org/apache/nifi/storm/TestNiFiBolt.java | 6 +++--- 7 files changed, 27 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/9d273b1e/nifi-external/nifi-storm-spout/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-external/nifi-storm-spout/pom.xml b/nifi-external/nifi-storm-spout/pom.xml index 301b41f..1fbf70d 100644 --- a/nifi-external/nifi-storm-spout/pom.xml +++ b/nifi-external/nifi-storm-spout/pom.xml @@ -27,7 +27,7 @@ <dependency> <groupId>org.apache.storm</groupId> <artifactId>storm-core</artifactId> - <version>0.10.0</version> + <version>1.0.1</version> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/nifi/blob/9d273b1e/nifi-external/nifi-storm-spout/src/main/java/org/apache/nifi/storm/NiFiBolt.java ---------------------------------------------------------------------- diff --git a/nifi-external/nifi-storm-spout/src/main/java/org/apache/nifi/storm/NiFiBolt.java b/nifi-external/nifi-storm-spout/src/main/java/org/apache/nifi/storm/NiFiBolt.java index 64cd0de..733cb69 100644 --- a/nifi-external/nifi-storm-spout/src/main/java/org/apache/nifi/storm/NiFiBolt.java +++ b/nifi-external/nifi-storm-spout/src/main/java/org/apache/nifi/storm/NiFiBolt.java @@ -16,18 +16,19 @@ */ package org.apache.nifi.storm; -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.Tuple; -import backtype.storm.utils.TupleUtils; + import org.apache.commons.lang3.Validate; import org.apache.nifi.remote.Transaction; import org.apache.nifi.remote.TransferDirection; import org.apache.nifi.remote.client.SiteToSiteClient; import org.apache.nifi.remote.client.SiteToSiteClientConfig; +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.Tuple; +import org.apache.storm.utils.TupleUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/nifi/blob/9d273b1e/nifi-external/nifi-storm-spout/src/main/java/org/apache/nifi/storm/NiFiDataPacketBuilder.java ---------------------------------------------------------------------- diff --git a/nifi-external/nifi-storm-spout/src/main/java/org/apache/nifi/storm/NiFiDataPacketBuilder.java b/nifi-external/nifi-storm-spout/src/main/java/org/apache/nifi/storm/NiFiDataPacketBuilder.java index fa2e20e..c3653bf 100644 --- a/nifi-external/nifi-storm-spout/src/main/java/org/apache/nifi/storm/NiFiDataPacketBuilder.java +++ b/nifi-external/nifi-storm-spout/src/main/java/org/apache/nifi/storm/NiFiDataPacketBuilder.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.storm; -import backtype.storm.tuple.Tuple; +import org.apache.storm.tuple.Tuple; /** * Converts a Tuple into a NiFiDataPacket. http://git-wip-us.apache.org/repos/asf/nifi/blob/9d273b1e/nifi-external/nifi-storm-spout/src/main/java/org/apache/nifi/storm/NiFiSpout.java ---------------------------------------------------------------------- diff --git a/nifi-external/nifi-storm-spout/src/main/java/org/apache/nifi/storm/NiFiSpout.java b/nifi-external/nifi-storm-spout/src/main/java/org/apache/nifi/storm/NiFiSpout.java index 2cb0b66..791fe1d 100644 --- a/nifi-external/nifi-storm-spout/src/main/java/org/apache/nifi/storm/NiFiSpout.java +++ b/nifi-external/nifi-storm-spout/src/main/java/org/apache/nifi/storm/NiFiSpout.java @@ -16,19 +16,19 @@ */ package org.apache.nifi.storm; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichSpout; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Values; -import backtype.storm.utils.Utils; import org.apache.nifi.remote.Transaction; import org.apache.nifi.remote.TransferDirection; import org.apache.nifi.remote.client.SiteToSiteClient; import org.apache.nifi.remote.client.SiteToSiteClientConfig; import org.apache.nifi.remote.protocol.DataPacket; import org.apache.nifi.stream.io.StreamUtils; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichSpout; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Values; +import org.apache.storm.utils.Utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/nifi/blob/9d273b1e/nifi-external/nifi-storm-spout/src/test/java/org/apache/nifi/storm/MockTupleHelpers.java ---------------------------------------------------------------------- diff --git a/nifi-external/nifi-storm-spout/src/test/java/org/apache/nifi/storm/MockTupleHelpers.java b/nifi-external/nifi-storm-spout/src/test/java/org/apache/nifi/storm/MockTupleHelpers.java index c63bb33..260cfe9 100644 --- a/nifi-external/nifi-storm-spout/src/test/java/org/apache/nifi/storm/MockTupleHelpers.java +++ b/nifi-external/nifi-storm-spout/src/test/java/org/apache/nifi/storm/MockTupleHelpers.java @@ -17,8 +17,8 @@ */ package org.apache.nifi.storm; -import backtype.storm.Constants; -import backtype.storm.tuple.Tuple; +import org.apache.storm.Constants; +import org.apache.storm.tuple.Tuple; import org.mockito.Mockito; public final class MockTupleHelpers { http://git-wip-us.apache.org/repos/asf/nifi/blob/9d273b1e/nifi-external/nifi-storm-spout/src/test/java/org/apache/nifi/storm/NiFiStormTopology.java ---------------------------------------------------------------------- diff --git a/nifi-external/nifi-storm-spout/src/test/java/org/apache/nifi/storm/NiFiStormTopology.java b/nifi-external/nifi-storm-spout/src/test/java/org/apache/nifi/storm/NiFiStormTopology.java index 7592471..e7519a0 100644 --- a/nifi-external/nifi-storm-spout/src/test/java/org/apache/nifi/storm/NiFiStormTopology.java +++ b/nifi-external/nifi-storm-spout/src/test/java/org/apache/nifi/storm/NiFiStormTopology.java @@ -16,13 +16,13 @@ */ package org.apache.nifi.storm; -import backtype.storm.Config; -import backtype.storm.LocalCluster; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.tuple.Tuple; -import backtype.storm.utils.Utils; import org.apache.nifi.remote.client.SiteToSiteClient; import org.apache.nifi.remote.client.SiteToSiteClientConfig; +import org.apache.storm.Config; +import org.apache.storm.LocalCluster; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.utils.Utils; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/nifi/blob/9d273b1e/nifi-external/nifi-storm-spout/src/test/java/org/apache/nifi/storm/TestNiFiBolt.java ---------------------------------------------------------------------- diff --git a/nifi-external/nifi-storm-spout/src/test/java/org/apache/nifi/storm/TestNiFiBolt.java b/nifi-external/nifi-storm-spout/src/test/java/org/apache/nifi/storm/TestNiFiBolt.java index 29d1684..2a14b38 100644 --- a/nifi-external/nifi-storm-spout/src/test/java/org/apache/nifi/storm/TestNiFiBolt.java +++ b/nifi-external/nifi-storm-spout/src/test/java/org/apache/nifi/storm/TestNiFiBolt.java @@ -16,13 +16,13 @@ */ package org.apache.nifi.storm; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.tuple.Tuple; import org.apache.nifi.remote.Transaction; import org.apache.nifi.remote.TransferDirection; import org.apache.nifi.remote.client.SiteToSiteClient; import org.apache.nifi.remote.client.SiteToSiteClientConfig; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.tuple.Tuple; import org.junit.Before; import org.junit.Test;
