http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraStateUpdater.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraStateUpdater.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraStateUpdater.java index 6453198..ad185b9 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraStateUpdater.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraStateUpdater.java @@ -18,9 +18,9 @@ */ package org.apache.storm.cassandra.trident.state; -import storm.trident.operation.TridentCollector; -import storm.trident.state.BaseStateUpdater; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.trident.operation.TridentCollector; +import org.apache.storm.trident.state.BaseStateUpdater; +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/TridentResultSetValuesMapper.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/TridentResultSetValuesMapper.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/TridentResultSetValuesMapper.java index be7bda1..9e41413 100644 --- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/TridentResultSetValuesMapper.java +++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/TridentResultSetValuesMapper.java @@ -18,9 +18,9 @@ */ package org.apache.storm.cassandra.trident.state; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.ITuple; -import backtype.storm.tuple.Values; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.ITuple; +import org.apache.storm.tuple.Values; import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Row; import com.datastax.driver.core.Session; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/DynamicStatementBuilderTest.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/DynamicStatementBuilderTest.java b/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/DynamicStatementBuilderTest.java index 800cad7..f96dae8 100644 --- a/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/DynamicStatementBuilderTest.java +++ b/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/DynamicStatementBuilderTest.java @@ -18,8 +18,8 @@ */ package org.apache.storm.cassandra; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; import com.datastax.driver.core.BatchStatement; import com.datastax.driver.core.ProtocolVersion; import com.datastax.driver.core.SimpleStatement; @@ -160,4 +160,4 @@ public class DynamicStatementBuilderTest { Assert.assertEquals(3, ((SimpleStatement)s).getValues(ProtocolVersion.V3).length); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/WeatherSpout.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/WeatherSpout.java b/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/WeatherSpout.java index 0b7d8a5..6dc6c06 100644 --- a/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/WeatherSpout.java +++ b/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/WeatherSpout.java @@ -18,12 +18,12 @@ */ package org.apache.storm.cassandra; -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 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.junit.Assert; import java.util.Map; @@ -81,4 +81,4 @@ public class WeatherSpout extends BaseRichSpout { spoutOutputCollector.emit(new Values(stationID, "38°C"), emit.incrementAndGet()); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/bolt/BaseTopologyTest.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/bolt/BaseTopologyTest.java b/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/bolt/BaseTopologyTest.java index 49159bc..a6d47c9 100644 --- a/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/bolt/BaseTopologyTest.java +++ b/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/bolt/BaseTopologyTest.java @@ -18,13 +18,13 @@ */ package org.apache.storm.cassandra.bolt; -import backtype.storm.Config; -import backtype.storm.generated.StormTopology; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.utils.Utils; +import org.apache.storm.Config; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.utils.Utils; import org.cassandraunit.CassandraCQLUnit; import org.cassandraunit.dataset.cql.ClassPathCQLDataSet; -import backtype.storm.LocalCluster; +import org.apache.storm.LocalCluster; import org.junit.Rule; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/bolt/BatchCassandraWriterBoltTest.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/bolt/BatchCassandraWriterBoltTest.java b/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/bolt/BatchCassandraWriterBoltTest.java index c5116e2..d0471f4 100644 --- a/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/bolt/BatchCassandraWriterBoltTest.java +++ b/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/bolt/BatchCassandraWriterBoltTest.java @@ -18,7 +18,7 @@ */ package org.apache.storm.cassandra.bolt; -import backtype.storm.topology.TopologyBuilder; +import org.apache.storm.topology.TopologyBuilder; import com.datastax.driver.core.ResultSet; import org.apache.storm.cassandra.WeatherSpout; import org.apache.storm.cassandra.query.impl.SimpleCQLStatementMapper; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/bolt/CassandraWriterBoltTest.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/bolt/CassandraWriterBoltTest.java b/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/bolt/CassandraWriterBoltTest.java index 3d1b623..4e922e3 100644 --- a/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/bolt/CassandraWriterBoltTest.java +++ b/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/bolt/CassandraWriterBoltTest.java @@ -18,7 +18,7 @@ */ package org.apache.storm.cassandra.bolt; -import backtype.storm.topology.TopologyBuilder; +import org.apache.storm.topology.TopologyBuilder; import com.datastax.driver.core.ResultSet; import org.apache.storm.cassandra.WeatherSpout; import org.apache.storm.cassandra.query.impl.SimpleCQLStatementMapper; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/trident/TridentTopologyTest.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/trident/TridentTopologyTest.java b/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/trident/TridentTopologyTest.java index bdacfe4..764a574 100644 --- a/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/trident/TridentTopologyTest.java +++ b/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/trident/TridentTopologyTest.java @@ -18,9 +18,9 @@ */ package org.apache.storm.cassandra.trident; -import backtype.storm.LocalCluster; -import backtype.storm.generated.StormTopology; -import backtype.storm.tuple.Fields; +import org.apache.storm.LocalCluster; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.tuple.Fields; import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Row; import com.datastax.driver.core.Session; @@ -34,12 +34,12 @@ import org.apache.storm.cassandra.trident.state.CassandraStateUpdater; import org.apache.storm.cassandra.trident.state.TridentResultSetValuesMapper; import org.junit.Assert; import org.junit.Test; -import storm.trident.Stream; -import storm.trident.TridentState; -import storm.trident.TridentTopology; -import storm.trident.operation.BaseFunction; -import storm.trident.operation.TridentCollector; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.trident.Stream; +import org.apache.storm.trident.TridentState; +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.tuple.TridentTuple; import java.util.Random; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/trident/WeatherBatchSpout.java ---------------------------------------------------------------------- diff --git a/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/trident/WeatherBatchSpout.java b/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/trident/WeatherBatchSpout.java index 62f31db..622a28f 100644 --- a/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/trident/WeatherBatchSpout.java +++ b/external/storm-cassandra/src/test/java/org/apache/storm/cassandra/trident/WeatherBatchSpout.java @@ -18,11 +18,11 @@ */ package org.apache.storm.cassandra.trident; -import backtype.storm.task.TopologyContext; -import backtype.storm.tuple.Fields; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.tuple.Fields; import com.google.common.collect.Lists; -import storm.trident.operation.TridentCollector; -import storm.trident.spout.IBatchSpout; +import org.apache.storm.trident.operation.TridentCollector; +import org.apache.storm.trident.spout.IBatchSpout; import java.util.ArrayList; import java.util.Arrays; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/ElasticsearchGetRequest.java ---------------------------------------------------------------------- diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/ElasticsearchGetRequest.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/ElasticsearchGetRequest.java index 6a7ce61..b9a7885 100644 --- a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/ElasticsearchGetRequest.java +++ b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/ElasticsearchGetRequest.java @@ -21,7 +21,7 @@ import java.io.Serializable; import org.elasticsearch.action.get.GetRequest; -import backtype.storm.tuple.ITuple; +import org.apache.storm.tuple.ITuple; /** * @since 0.11 http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/EsLookupResultOutput.java ---------------------------------------------------------------------- diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/EsLookupResultOutput.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/EsLookupResultOutput.java index 9ccb9e6..d00fd47 100644 --- a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/EsLookupResultOutput.java +++ b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/EsLookupResultOutput.java @@ -22,8 +22,8 @@ import java.util.Collection; import org.elasticsearch.action.get.GetResponse; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Values; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Values; /** * @since 0.11 http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/AbstractEsBolt.java ---------------------------------------------------------------------- diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/AbstractEsBolt.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/AbstractEsBolt.java index 784a57f..1ea80ad 100644 --- a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/AbstractEsBolt.java +++ b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/AbstractEsBolt.java @@ -26,11 +26,11 @@ import org.elasticsearch.common.annotations.VisibleForTesting; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -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 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 static org.elasticsearch.common.base.Preconditions.checkNotNull; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexBolt.java ---------------------------------------------------------------------- diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexBolt.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexBolt.java index 1c5983e..f79d38d 100644 --- a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexBolt.java +++ b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexBolt.java @@ -17,10 +17,10 @@ */ package org.apache.storm.elasticsearch.bolt; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.tuple.Tuple; import org.apache.storm.elasticsearch.common.EsConfig; import org.apache.storm.elasticsearch.common.EsTupleMapper; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsLookupBolt.java ---------------------------------------------------------------------- diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsLookupBolt.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsLookupBolt.java index 1676a79..0cc2c79 100644 --- a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsLookupBolt.java +++ b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsLookupBolt.java @@ -25,9 +25,9 @@ import org.apache.storm.elasticsearch.common.EsConfig; import org.elasticsearch.action.get.GetRequest; import org.elasticsearch.action.get.GetResponse; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.tuple.Tuple; -import backtype.storm.tuple.Values; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.tuple.Values; import static org.elasticsearch.common.base.Preconditions.checkNotNull; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsPercolateBolt.java ---------------------------------------------------------------------- diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsPercolateBolt.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsPercolateBolt.java index a361464..ad8f3f0 100644 --- a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsPercolateBolt.java +++ b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsPercolateBolt.java @@ -17,12 +17,12 @@ */ package org.apache.storm.elasticsearch.bolt; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; -import backtype.storm.tuple.Values; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.tuple.Values; import org.apache.storm.elasticsearch.common.EsConfig; import org.apache.storm.elasticsearch.common.EsTupleMapper; import org.elasticsearch.action.percolate.PercolateResponse; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/common/DefaultEsTupleMapper.java ---------------------------------------------------------------------- diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/common/DefaultEsTupleMapper.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/common/DefaultEsTupleMapper.java index fd0bbcc..0a15922 100644 --- a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/common/DefaultEsTupleMapper.java +++ b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/common/DefaultEsTupleMapper.java @@ -17,7 +17,7 @@ */ package org.apache.storm.elasticsearch.common; -import backtype.storm.tuple.ITuple; +import org.apache.storm.tuple.ITuple; public class DefaultEsTupleMapper implements EsTupleMapper { @Override http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/common/EsTupleMapper.java ---------------------------------------------------------------------- diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/common/EsTupleMapper.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/common/EsTupleMapper.java index f8a66bd..5b6c425 100644 --- a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/common/EsTupleMapper.java +++ b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/common/EsTupleMapper.java @@ -17,7 +17,7 @@ */ package org.apache.storm.elasticsearch.common; -import backtype.storm.tuple.ITuple; +import org.apache.storm.tuple.ITuple; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/trident/EsState.java ---------------------------------------------------------------------- diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/trident/EsState.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/trident/EsState.java index c066553..2241f4b 100644 --- a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/trident/EsState.java +++ b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/trident/EsState.java @@ -17,7 +17,7 @@ */ package org.apache.storm.elasticsearch.trident; -import backtype.storm.topology.FailedException; +import org.apache.storm.topology.FailedException; import org.apache.storm.elasticsearch.common.StormElasticSearchClient; import org.apache.storm.elasticsearch.common.EsConfig; @@ -27,8 +27,8 @@ import org.elasticsearch.action.bulk.BulkResponse; import org.elasticsearch.client.Client; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import storm.trident.state.State; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.trident.state.State; +import org.apache.storm.trident.tuple.TridentTuple; import java.util.List; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/trident/EsStateFactory.java ---------------------------------------------------------------------- diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/trident/EsStateFactory.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/trident/EsStateFactory.java index e85cdc2..5ae174f 100644 --- a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/trident/EsStateFactory.java +++ b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/trident/EsStateFactory.java @@ -17,12 +17,12 @@ */ package org.apache.storm.elasticsearch.trident; -import backtype.storm.task.IMetricsContext; +import org.apache.storm.task.IMetricsContext; import org.apache.storm.elasticsearch.common.EsConfig; import org.apache.storm.elasticsearch.common.EsTupleMapper; -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; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/trident/EsUpdater.java ---------------------------------------------------------------------- diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/trident/EsUpdater.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/trident/EsUpdater.java index 1fb998b..37c213d 100644 --- a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/trident/EsUpdater.java +++ b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/trident/EsUpdater.java @@ -17,9 +17,9 @@ */ package org.apache.storm.elasticsearch.trident; -import storm.trident.operation.TridentCollector; -import storm.trident.state.BaseStateUpdater; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.trident.operation.TridentCollector; +import org.apache.storm.trident.state.BaseStateUpdater; +import org.apache.storm.trident.tuple.TridentTuple; import java.util.List; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/AbstractEsBoltIntegrationTest.java ---------------------------------------------------------------------- diff --git a/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/AbstractEsBoltIntegrationTest.java b/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/AbstractEsBoltIntegrationTest.java index 5121b6a..87ffefa 100644 --- a/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/AbstractEsBoltIntegrationTest.java +++ b/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/AbstractEsBoltIntegrationTest.java @@ -17,7 +17,7 @@ */ package org.apache.storm.elasticsearch.bolt; -import backtype.storm.testing.IntegrationTest; +import org.apache.storm.testing.IntegrationTest; import org.apache.commons.io.FileUtils; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/AbstractEsBoltTest.java ---------------------------------------------------------------------- diff --git a/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/AbstractEsBoltTest.java b/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/AbstractEsBoltTest.java index 07b7c43..fb9739c 100644 --- a/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/AbstractEsBoltTest.java +++ b/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/AbstractEsBoltTest.java @@ -19,8 +19,8 @@ package org.apache.storm.elasticsearch.bolt; import com.google.common.testing.NullPointerTester; -import backtype.storm.Config; -import backtype.storm.task.OutputCollector; +import org.apache.storm.Config; +import org.apache.storm.task.OutputCollector; import org.apache.storm.elasticsearch.common.EsConfig; import org.junit.After; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/EsIndexBoltTest.java ---------------------------------------------------------------------- diff --git a/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/EsIndexBoltTest.java b/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/EsIndexBoltTest.java index 13fade6..9f7592d 100644 --- a/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/EsIndexBoltTest.java +++ b/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/EsIndexBoltTest.java @@ -17,8 +17,8 @@ */ package org.apache.storm.elasticsearch.bolt; -import backtype.storm.testing.IntegrationTest; -import backtype.storm.tuple.Tuple; +import org.apache.storm.testing.IntegrationTest; +import org.apache.storm.tuple.Tuple; import org.apache.storm.elasticsearch.common.EsConfig; import org.apache.storm.elasticsearch.common.EsTestUtil; import org.apache.storm.elasticsearch.common.EsTupleMapper; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/EsIndexTopology.java ---------------------------------------------------------------------- diff --git a/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/EsIndexTopology.java b/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/EsIndexTopology.java index 70e0738..d30424b 100644 --- a/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/EsIndexTopology.java +++ b/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/EsIndexTopology.java @@ -17,15 +17,15 @@ */ package org.apache.storm.elasticsearch.bolt; -import backtype.storm.Config; -import backtype.storm.LocalCluster; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.topology.base.BaseRichSpout; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Values; +import org.apache.storm.Config; +import org.apache.storm.LocalCluster; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.topology.base.BaseRichSpout; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Values; import org.apache.storm.elasticsearch.common.EsConfig; import org.apache.storm.elasticsearch.common.EsConstants; import org.apache.storm.elasticsearch.common.EsTestUtil; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/EsLookupBoltIntegrationTest.java ---------------------------------------------------------------------- diff --git a/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/EsLookupBoltIntegrationTest.java b/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/EsLookupBoltIntegrationTest.java index e5016c8..038dcce 100644 --- a/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/EsLookupBoltIntegrationTest.java +++ b/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/EsLookupBoltIntegrationTest.java @@ -17,11 +17,11 @@ */ package org.apache.storm.elasticsearch.bolt; -import backtype.storm.testing.IntegrationTest; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.ITuple; -import backtype.storm.tuple.Tuple; -import backtype.storm.tuple.Values; +import org.apache.storm.testing.IntegrationTest; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.ITuple; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.tuple.Values; import org.apache.storm.elasticsearch.ElasticsearchGetRequest; import org.apache.storm.elasticsearch.EsLookupResultOutput; import org.apache.storm.elasticsearch.common.EsConfig; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/EsLookupBoltTest.java ---------------------------------------------------------------------- diff --git a/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/EsLookupBoltTest.java b/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/EsLookupBoltTest.java index 175b2a4..c876b2c 100644 --- a/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/EsLookupBoltTest.java +++ b/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/EsLookupBoltTest.java @@ -35,10 +35,10 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; -import backtype.storm.tuple.Values; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.tuple.Values; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/EsPercolateBoltTest.java ---------------------------------------------------------------------- diff --git a/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/EsPercolateBoltTest.java b/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/EsPercolateBoltTest.java index e4f2be0..61acd36 100644 --- a/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/EsPercolateBoltTest.java +++ b/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/bolt/EsPercolateBoltTest.java @@ -17,9 +17,9 @@ */ package org.apache.storm.elasticsearch.bolt; -import backtype.storm.testing.IntegrationTest; -import backtype.storm.tuple.Tuple; -import backtype.storm.tuple.Values; +import org.apache.storm.testing.IntegrationTest; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.tuple.Values; import org.apache.storm.elasticsearch.common.EsConfig; import org.apache.storm.elasticsearch.common.EsTestUtil; import org.apache.storm.elasticsearch.common.EsTupleMapper; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/common/EsTestUtil.java ---------------------------------------------------------------------- diff --git a/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/common/EsTestUtil.java b/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/common/EsTestUtil.java index 30e684f..cb1c745 100644 --- a/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/common/EsTestUtil.java +++ b/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/common/EsTestUtil.java @@ -17,14 +17,14 @@ */ package org.apache.storm.elasticsearch.common; -import backtype.storm.Config; -import backtype.storm.task.GeneralTopologyContext; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.ITuple; -import backtype.storm.tuple.Tuple; -import backtype.storm.tuple.TupleImpl; -import backtype.storm.tuple.Values; +import org.apache.storm.Config; +import org.apache.storm.task.GeneralTopologyContext; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.ITuple; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.tuple.TupleImpl; +import org.apache.storm.tuple.Values; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.settings.ImmutableSettings; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/trident/TridentEsTopology.java ---------------------------------------------------------------------- diff --git a/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/trident/TridentEsTopology.java b/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/trident/TridentEsTopology.java index 7b525a5..67eab5b 100644 --- a/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/trident/TridentEsTopology.java +++ b/external/storm-elasticsearch/src/test/java/org/apache/storm/elasticsearch/trident/TridentEsTopology.java @@ -17,21 +17,21 @@ */ package org.apache.storm.elasticsearch.trident; -import backtype.storm.Config; -import backtype.storm.LocalCluster; -import backtype.storm.task.TopologyContext; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Values; +import org.apache.storm.Config; +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.elasticsearch.common.EsConfig; import org.apache.storm.elasticsearch.common.EsConstants; import org.apache.storm.elasticsearch.common.EsTestUtil; import org.apache.storm.elasticsearch.common.EsTupleMapper; -import storm.trident.Stream; -import storm.trident.TridentState; -import storm.trident.TridentTopology; -import storm.trident.operation.TridentCollector; -import storm.trident.spout.IBatchSpout; -import storm.trident.state.StateFactory; +import org.apache.storm.trident.Stream; +import org.apache.storm.trident.TridentState; +import org.apache.storm.trident.TridentTopology; +import org.apache.storm.trident.operation.TridentCollector; +import org.apache.storm.trident.spout.IBatchSpout; +import org.apache.storm.trident.state.StateFactory; import java.util.*; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/bolt/DefaultEventDataFormat.java ---------------------------------------------------------------------- diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/bolt/DefaultEventDataFormat.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/bolt/DefaultEventDataFormat.java index 6b3eba7..21940de 100644 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/bolt/DefaultEventDataFormat.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/bolt/DefaultEventDataFormat.java @@ -17,7 +17,7 @@ *******************************************************************************/ package org.apache.storm.eventhubs.bolt; -import backtype.storm.tuple.Tuple; +import org.apache.storm.tuple.Tuple; /** * A default implementation of IEventDataFormat that converts the tuple http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/bolt/EventHubBolt.java ---------------------------------------------------------------------- diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/bolt/EventHubBolt.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/bolt/EventHubBolt.java index 9acf7fa..ac5018b 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/bolt/EventHubBolt.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/bolt/EventHubBolt.java @@ -26,11 +26,11 @@ import com.microsoft.eventhubs.client.EventHubClient; import com.microsoft.eventhubs.client.EventHubException; import com.microsoft.eventhubs.client.EventHubSender; -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 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; /** * A bolt that writes event message to EventHub. http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/bolt/IEventDataFormat.java ---------------------------------------------------------------------- diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/bolt/IEventDataFormat.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/bolt/IEventDataFormat.java index 2003c34..743d5bb 100644 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/bolt/IEventDataFormat.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/bolt/IEventDataFormat.java @@ -18,7 +18,7 @@ package org.apache.storm.eventhubs.bolt; import java.io.Serializable; -import backtype.storm.tuple.Tuple; +import org.apache.storm.tuple.Tuple; /** * Serialize a tuple to a byte array to be sent to EventHubs http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/samples/EventCount.java ---------------------------------------------------------------------- diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/samples/EventCount.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/samples/EventCount.java index 94fdb49..2c2261c 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/samples/EventCount.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/samples/EventCount.java @@ -17,11 +17,11 @@ *******************************************************************************/ package org.apache.storm.eventhubs.samples; -import backtype.storm.StormSubmitter; -import backtype.storm.Config; -import backtype.storm.LocalCluster; -import backtype.storm.generated.StormTopology; -import backtype.storm.topology.TopologyBuilder; +import org.apache.storm.StormSubmitter; +import org.apache.storm.Config; +import org.apache.storm.LocalCluster; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.topology.TopologyBuilder; import org.apache.storm.eventhubs.samples.bolt.GlobalCountBolt; import org.apache.storm.eventhubs.samples.bolt.PartialCountBolt; @@ -126,7 +126,7 @@ public class EventCount { Config config = new Config(); config.setDebug(false); //Enable metrics - config.registerMetricsConsumer(backtype.storm.metric.LoggingMetricsConsumer.class, 1); + config.registerMetricsConsumer(org.apache.storm.metric.LoggingMetricsConsumer.class, 1); if (args != null && args.length > 0) { http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/samples/EventHubLoop.java ---------------------------------------------------------------------- diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/samples/EventHubLoop.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/samples/EventHubLoop.java index 2f62a23..665fef9 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/samples/EventHubLoop.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/samples/EventHubLoop.java @@ -17,8 +17,8 @@ *******************************************************************************/ package org.apache.storm.eventhubs.samples; -import backtype.storm.generated.StormTopology; -import backtype.storm.topology.TopologyBuilder; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.topology.TopologyBuilder; import org.apache.storm.eventhubs.bolt.EventHubBolt; import org.apache.storm.eventhubs.bolt.EventHubBoltConfig; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/samples/OpaqueTridentEventCount.java ---------------------------------------------------------------------- diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/samples/OpaqueTridentEventCount.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/samples/OpaqueTridentEventCount.java index f4fe127..e8538c1 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/samples/OpaqueTridentEventCount.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/samples/OpaqueTridentEventCount.java @@ -17,13 +17,13 @@ *******************************************************************************/ package org.apache.storm.eventhubs.samples; -import storm.trident.TridentState; -import storm.trident.TridentTopology; -import storm.trident.operation.builtin.Count; -import storm.trident.operation.builtin.Sum; -import storm.trident.testing.MemoryMapState; -import backtype.storm.generated.StormTopology; -import backtype.storm.tuple.Fields; +import org.apache.storm.trident.TridentState; +import org.apache.storm.trident.TridentTopology; +import org.apache.storm.trident.operation.builtin.Count; +import org.apache.storm.trident.operation.builtin.Sum; +import org.apache.storm.trident.testing.MemoryMapState; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.tuple.Fields; import org.apache.storm.eventhubs.samples.TransactionalTridentEventCount.LoggingFilter; import org.apache.storm.eventhubs.spout.EventHubSpout; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/samples/TransactionalTridentEventCount.java ---------------------------------------------------------------------- diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/samples/TransactionalTridentEventCount.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/samples/TransactionalTridentEventCount.java index 1e7628b..0a5295f 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/samples/TransactionalTridentEventCount.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/samples/TransactionalTridentEventCount.java @@ -20,19 +20,19 @@ package org.apache.storm.eventhubs.samples; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import backtype.storm.generated.StormTopology; -import backtype.storm.tuple.Fields; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.tuple.Fields; import org.apache.storm.eventhubs.spout.EventHubSpout; import org.apache.storm.eventhubs.trident.TransactionalTridentEventHubSpout; -import storm.trident.TridentState; -import storm.trident.TridentTopology; -import storm.trident.operation.BaseFilter; -import storm.trident.operation.builtin.Count; -import storm.trident.operation.builtin.Sum; -import storm.trident.testing.MemoryMapState; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.trident.TridentState; +import org.apache.storm.trident.TridentTopology; +import org.apache.storm.trident.operation.BaseFilter; +import org.apache.storm.trident.operation.builtin.Count; +import org.apache.storm.trident.operation.builtin.Sum; +import org.apache.storm.trident.testing.MemoryMapState; +import org.apache.storm.trident.tuple.TridentTuple; /** * A simple Trident topology uses TransactionalTridentEventHubSpout http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/samples/bolt/GlobalCountBolt.java ---------------------------------------------------------------------- diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/samples/bolt/GlobalCountBolt.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/samples/bolt/GlobalCountBolt.java index 16b34a6..6a34788 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/samples/bolt/GlobalCountBolt.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/samples/bolt/GlobalCountBolt.java @@ -23,13 +23,13 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import backtype.storm.Config; -import backtype.storm.metric.api.IMetric; -import backtype.storm.task.TopologyContext; -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.Config; +import org.apache.storm.metric.api.IMetric; +import org.apache.storm.task.TopologyContext; +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; /** * Globally count number of messages http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/samples/bolt/PartialCountBolt.java ---------------------------------------------------------------------- diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/samples/bolt/PartialCountBolt.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/samples/bolt/PartialCountBolt.java index 21f1ab4..215f8f7 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/samples/bolt/PartialCountBolt.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/samples/bolt/PartialCountBolt.java @@ -22,13 +22,13 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.BasicOutputCollector; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseBasicBolt; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; -import backtype.storm.tuple.Values; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.BasicOutputCollector; +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.apache.storm.tuple.Values; /** * Partially count number of messages from EventHubs http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventDataScheme.java ---------------------------------------------------------------------- diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventDataScheme.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventDataScheme.java index d01050d..0e275a5 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventDataScheme.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventDataScheme.java @@ -17,7 +17,7 @@ *******************************************************************************/ package org.apache.storm.eventhubs.spout; -import backtype.storm.tuple.Fields; +import org.apache.storm.tuple.Fields; import java.util.ArrayList; import java.util.List; import org.apache.qpid.amqp_1_0.client.Message; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubReceiverImpl.java ---------------------------------------------------------------------- diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubReceiverImpl.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubReceiverImpl.java index 0fcad99..5f9acbd 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubReceiverImpl.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubReceiverImpl.java @@ -21,9 +21,9 @@ import org.apache.qpid.amqp_1_0.client.Message; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import backtype.storm.metric.api.CountMetric; -import backtype.storm.metric.api.MeanReducer; -import backtype.storm.metric.api.ReducedMetric; +import org.apache.storm.metric.api.CountMetric; +import org.apache.storm.metric.api.MeanReducer; +import org.apache.storm.metric.api.ReducedMetric; import com.microsoft.eventhubs.client.Constants; import com.microsoft.eventhubs.client.EventHubException; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubSpout.java ---------------------------------------------------------------------- diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubSpout.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubSpout.java index d08ec3a..ff40315 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubSpout.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubSpout.java @@ -17,12 +17,12 @@ *******************************************************************************/ package org.apache.storm.eventhubs.spout; -import backtype.storm.Config; -import backtype.storm.metric.api.IMetric; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichSpout; +import org.apache.storm.Config; +import org.apache.storm.metric.api.IMetric; +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 java.util.HashMap; import java.util.List; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/IEventDataScheme.java ---------------------------------------------------------------------- diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/IEventDataScheme.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/IEventDataScheme.java index c96767d..b7e03b4 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/IEventDataScheme.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/IEventDataScheme.java @@ -17,7 +17,7 @@ *******************************************************************************/ package org.apache.storm.eventhubs.spout; -import backtype.storm.tuple.Fields; +import org.apache.storm.tuple.Fields; import java.io.Serializable; import java.util.List; import org.apache.qpid.amqp_1_0.client.Message; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/Coordinator.java ---------------------------------------------------------------------- diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/Coordinator.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/Coordinator.java index a43193d..ad3c75e 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/Coordinator.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/Coordinator.java @@ -20,8 +20,8 @@ package org.apache.storm.eventhubs.trident; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import storm.trident.spout.IOpaquePartitionedTridentSpout; -import storm.trident.spout.IPartitionedTridentSpout; +import org.apache.storm.trident.spout.IOpaquePartitionedTridentSpout; +import org.apache.storm.trident.spout.IPartitionedTridentSpout; import org.apache.storm.eventhubs.spout.EventHubSpoutConfig; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/OpaqueTridentEventHubEmitter.java ---------------------------------------------------------------------- diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/OpaqueTridentEventHubEmitter.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/OpaqueTridentEventHubEmitter.java index c7bd8c3..ae21ab3 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/OpaqueTridentEventHubEmitter.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/OpaqueTridentEventHubEmitter.java @@ -23,9 +23,9 @@ import java.util.Map; import org.apache.storm.eventhubs.spout.EventHubSpoutConfig; import org.apache.storm.eventhubs.spout.IEventHubReceiverFactory; -import storm.trident.operation.TridentCollector; -import storm.trident.spout.IOpaquePartitionedTridentSpout; -import storm.trident.topology.TransactionAttempt; +import org.apache.storm.trident.operation.TridentCollector; +import org.apache.storm.trident.spout.IOpaquePartitionedTridentSpout; +import org.apache.storm.trident.topology.TransactionAttempt; /** * A thin wrapper of TransactionalTridentEventHubEmitter for OpaqueTridentEventHubSpout http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/OpaqueTridentEventHubSpout.java ---------------------------------------------------------------------- diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/OpaqueTridentEventHubSpout.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/OpaqueTridentEventHubSpout.java index 17c8da2..559571f 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/OpaqueTridentEventHubSpout.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/OpaqueTridentEventHubSpout.java @@ -22,9 +22,9 @@ import java.util.Map; import org.apache.storm.eventhubs.spout.EventHubSpoutConfig; import org.apache.storm.eventhubs.spout.IEventDataScheme; -import backtype.storm.task.TopologyContext; -import backtype.storm.tuple.Fields; -import storm.trident.spout.IOpaquePartitionedTridentSpout; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.tuple.Fields; +import org.apache.storm.trident.spout.IOpaquePartitionedTridentSpout; /** * Opaque Trident EventHubs Spout http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/Partition.java ---------------------------------------------------------------------- diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/Partition.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/Partition.java index 8b166cd..b726e7f 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/Partition.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/Partition.java @@ -19,7 +19,7 @@ package org.apache.storm.eventhubs.trident; import java.io.Serializable; import org.apache.storm.eventhubs.spout.EventHubSpoutConfig; -import storm.trident.spout.ISpoutPartition; +import org.apache.storm.trident.spout.ISpoutPartition; /** * Represents an EventHub partition http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/TransactionalTridentEventHubEmitter.java ---------------------------------------------------------------------- diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/TransactionalTridentEventHubEmitter.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/TransactionalTridentEventHubEmitter.java index bf7f339..e5c1c50 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/TransactionalTridentEventHubEmitter.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/TransactionalTridentEventHubEmitter.java @@ -31,10 +31,10 @@ import org.apache.storm.eventhubs.spout.IEventHubReceiver; import org.apache.storm.eventhubs.spout.IEventHubReceiverFactory; import com.microsoft.eventhubs.client.Constants; -import storm.trident.operation.TridentCollector; -import storm.trident.spout.IOpaquePartitionedTridentSpout; -import storm.trident.spout.IPartitionedTridentSpout; -import storm.trident.topology.TransactionAttempt; +import org.apache.storm.trident.operation.TridentCollector; +import org.apache.storm.trident.spout.IOpaquePartitionedTridentSpout; +import org.apache.storm.trident.spout.IPartitionedTridentSpout; +import org.apache.storm.trident.topology.TransactionAttempt; public class TransactionalTridentEventHubEmitter http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/TransactionalTridentEventHubSpout.java ---------------------------------------------------------------------- diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/TransactionalTridentEventHubSpout.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/TransactionalTridentEventHubSpout.java index 8a01052..12b94b4 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/TransactionalTridentEventHubSpout.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/TransactionalTridentEventHubSpout.java @@ -22,9 +22,9 @@ import java.util.Map; import org.apache.storm.eventhubs.spout.EventHubSpoutConfig; import org.apache.storm.eventhubs.spout.IEventDataScheme; -import backtype.storm.task.TopologyContext; -import backtype.storm.tuple.Fields; -import storm.trident.spout.IPartitionedTridentSpout; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.tuple.Fields; +import org.apache.storm.trident.spout.IPartitionedTridentSpout; import org.apache.storm.eventhubs.trident.Partition; /** http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/spout/EventHubSpoutCallerMock.java ---------------------------------------------------------------------- diff --git a/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/spout/EventHubSpoutCallerMock.java b/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/spout/EventHubSpoutCallerMock.java index d5ba90a..7eb625c 100755 --- a/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/spout/EventHubSpoutCallerMock.java +++ b/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/spout/EventHubSpoutCallerMock.java @@ -17,7 +17,7 @@ *******************************************************************************/ package org.apache.storm.eventhubs.spout; -import backtype.storm.spout.SpoutOutputCollector; +import org.apache.storm.spout.SpoutOutputCollector; /** * Mocks EventHubSpout's caller (storm framework) @@ -93,4 +93,4 @@ public class EventHubSpoutCallerMock { String statePath = statePathPrefix + partitionIndex; return stateStore.readData(statePath); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/spout/SpoutOutputCollectorMock.java ---------------------------------------------------------------------- diff --git a/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/spout/SpoutOutputCollectorMock.java b/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/spout/SpoutOutputCollectorMock.java index df4a3ba..88bafd2 100755 --- a/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/spout/SpoutOutputCollectorMock.java +++ b/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/spout/SpoutOutputCollectorMock.java @@ -19,7 +19,7 @@ package org.apache.storm.eventhubs.spout; import java.util.List; -import backtype.storm.spout.ISpoutOutputCollector; +import org.apache.storm.spout.ISpoutOutputCollector; /** * Mock of ISpoutOutputCollector http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/trident/TridentCollectorMock.java ---------------------------------------------------------------------- diff --git a/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/trident/TridentCollectorMock.java b/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/trident/TridentCollectorMock.java index cc4686e..3fe5de0 100755 --- a/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/trident/TridentCollectorMock.java +++ b/external/storm-eventhubs/src/test/java/org/apache/storm/eventhubs/trident/TridentCollectorMock.java @@ -19,7 +19,7 @@ package org.apache.storm.eventhubs.trident; import java.util.List; -import storm.trident.operation.TridentCollector; +import org.apache.storm.trident.operation.TridentCollector; /** * A mock of TridentCollector http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/AbstractHBaseBolt.java ---------------------------------------------------------------------- diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/AbstractHBaseBolt.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/AbstractHBaseBolt.java index 404aa7a..3546f75 100644 --- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/AbstractHBaseBolt.java +++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/AbstractHBaseBolt.java @@ -17,10 +17,10 @@ */ package org.apache.storm.hbase.bolt; -import backtype.storm.Config; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.base.BaseRichBolt; +import org.apache.storm.Config; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.base.BaseRichBolt; import org.apache.commons.lang.Validate; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java ---------------------------------------------------------------------- diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java index 4413361..2a48f10 100644 --- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java +++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java @@ -17,10 +17,10 @@ */ package org.apache.storm.hbase.bolt; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.tuple.Tuple; -import backtype.storm.utils.TupleUtils; -import backtype.storm.Config; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.utils.TupleUtils; +import org.apache.storm.Config; import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.client.Mutation; import org.apache.storm.hbase.bolt.mapper.HBaseMapper; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseLookupBolt.java ---------------------------------------------------------------------- diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseLookupBolt.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseLookupBolt.java index 36e5606..58ef674 100644 --- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseLookupBolt.java +++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseLookupBolt.java @@ -17,10 +17,10 @@ */ package org.apache.storm.hbase.bolt; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.tuple.Tuple; -import backtype.storm.tuple.Values; -import backtype.storm.utils.TupleUtils; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.tuple.Values; +import org.apache.storm.utils.TupleUtils; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/mapper/HBaseMapper.java ---------------------------------------------------------------------- diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/mapper/HBaseMapper.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/mapper/HBaseMapper.java index 626ce96..70016c5 100644 --- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/mapper/HBaseMapper.java +++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/mapper/HBaseMapper.java @@ -18,13 +18,13 @@ package org.apache.storm.hbase.bolt.mapper; -import backtype.storm.tuple.Tuple; +import org.apache.storm.tuple.Tuple; import org.apache.storm.hbase.common.ColumnList; import java.io.Serializable; /** - * Maps a <code>backtype.storm.tuple.Tuple</code> object + * Maps a <code>org.apache.storm.tuple.Tuple</code> object * to a row in an HBase table. */ public interface HBaseMapper extends Serializable { http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/mapper/HBaseValueMapper.java ---------------------------------------------------------------------- diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/mapper/HBaseValueMapper.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/mapper/HBaseValueMapper.java index bc38b83..38e879f 100644 --- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/mapper/HBaseValueMapper.java +++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/mapper/HBaseValueMapper.java @@ -17,9 +17,9 @@ */ package org.apache.storm.hbase.bolt.mapper; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.tuple.ITuple; -import backtype.storm.tuple.Values; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.tuple.ITuple; +import org.apache.storm.tuple.Values; import org.apache.hadoop.hbase.client.Result; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/mapper/SimpleHBaseMapper.java ---------------------------------------------------------------------- diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/mapper/SimpleHBaseMapper.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/mapper/SimpleHBaseMapper.java index da0efd4..8747405 100644 --- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/mapper/SimpleHBaseMapper.java +++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/mapper/SimpleHBaseMapper.java @@ -17,8 +17,8 @@ */ package org.apache.storm.hbase.bolt.mapper; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; import org.apache.storm.hbase.common.ColumnList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hbase/src/main/java/org/apache/storm/hbase/security/AutoHBase.java ---------------------------------------------------------------------- diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/security/AutoHBase.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/security/AutoHBase.java index 02c81bb..a2ca68e 100644 --- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/security/AutoHBase.java +++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/security/AutoHBase.java @@ -18,10 +18,10 @@ package org.apache.storm.hbase.security; -import backtype.storm.Config; -import backtype.storm.security.INimbusCredentialPlugin; -import backtype.storm.security.auth.IAutoCredentials; -import backtype.storm.security.auth.ICredentialsRenewer; +import org.apache.storm.Config; +import org.apache.storm.security.INimbusCredentialPlugin; +import org.apache.storm.security.auth.IAutoCredentials; +import org.apache.storm.security.auth.ICredentialsRenewer; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.security.User; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hbase/src/main/java/org/apache/storm/hbase/security/HBaseSecurityUtil.java ---------------------------------------------------------------------- diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/security/HBaseSecurityUtil.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/security/HBaseSecurityUtil.java index 99dfeba..f306a51 100644 --- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/security/HBaseSecurityUtil.java +++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/security/HBaseSecurityUtil.java @@ -28,7 +28,7 @@ import java.net.InetAddress; import java.util.List; import java.util.Map; -import static backtype.storm.Config.TOPOLOGY_AUTO_CREDENTIALS; +import static org.apache.storm.Config.TOPOLOGY_AUTO_CREDENTIALS; /** * This class provides util methods for storm-hbase connector communicating http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/mapper/SimpleTridentHBaseMapper.java ---------------------------------------------------------------------- diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/mapper/SimpleTridentHBaseMapper.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/mapper/SimpleTridentHBaseMapper.java index be3ab95..eda9a32 100644 --- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/mapper/SimpleTridentHBaseMapper.java +++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/mapper/SimpleTridentHBaseMapper.java @@ -17,13 +17,13 @@ */ package org.apache.storm.hbase.trident.mapper; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; import org.apache.storm.hbase.bolt.mapper.HBaseMapper; import org.apache.storm.hbase.common.ColumnList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.trident.tuple.TridentTuple; import static org.apache.storm.hbase.common.Utils.toBytes; import static org.apache.storm.hbase.common.Utils.toLong; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/mapper/TridentHBaseMapper.java ---------------------------------------------------------------------- diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/mapper/TridentHBaseMapper.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/mapper/TridentHBaseMapper.java index 64d10d0..bb95497 100644 --- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/mapper/TridentHBaseMapper.java +++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/mapper/TridentHBaseMapper.java @@ -19,13 +19,13 @@ package org.apache.storm.hbase.trident.mapper; -import backtype.storm.tuple.Tuple; +import org.apache.storm.tuple.Tuple; import org.apache.storm.hbase.common.ColumnList; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.trident.tuple.TridentTuple; import java.io.Serializable; /** - * Maps a <code>storm.trident.tuple.TridentTuple</code> object + * Maps a <code>org.apache.storm.trident.tuple.TridentTuple</code> object * to a row in an HBase table. */ public interface TridentHBaseMapper extends Serializable { http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseMapState.java ---------------------------------------------------------------------- diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseMapState.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseMapState.java index 99ce4bf..541fa86 100644 --- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseMapState.java +++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseMapState.java @@ -17,9 +17,9 @@ */ package org.apache.storm.hbase.trident.state; -import backtype.storm.task.IMetricsContext; -import backtype.storm.topology.FailedException; -import backtype.storm.tuple.Values; +import org.apache.storm.task.IMetricsContext; +import org.apache.storm.topology.FailedException; +import org.apache.storm.tuple.Values; import com.google.common.collect.Maps; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; @@ -29,8 +29,8 @@ import org.apache.storm.hbase.security.HBaseSecurityUtil; import org.apache.storm.hbase.trident.mapper.TridentHBaseMapMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import storm.trident.state.*; -import storm.trident.state.map.*; +import org.apache.storm.trident.state.*; +import org.apache.storm.trident.state.map.*; import java.io.IOException; import java.io.InterruptedIOException; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseQuery.java ---------------------------------------------------------------------- diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseQuery.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseQuery.java index c7836ed..4d95eb5 100644 --- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseQuery.java +++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseQuery.java @@ -17,10 +17,10 @@ */ package org.apache.storm.hbase.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-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseState.java ---------------------------------------------------------------------- diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseState.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseState.java index 04518ca..b199514 100644 --- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseState.java +++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseState.java @@ -17,9 +17,9 @@ */ package org.apache.storm.hbase.trident.state; -import backtype.storm.Config; -import backtype.storm.topology.FailedException; -import backtype.storm.tuple.Values; +import org.apache.storm.Config; +import org.apache.storm.topology.FailedException; +import org.apache.storm.tuple.Values; import com.google.common.collect.Lists; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; @@ -31,9 +31,9 @@ import org.apache.storm.hbase.common.HBaseClient; import org.apache.storm.hbase.trident.mapper.TridentHBaseMapper; 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.HashMap; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseStateFactory.java ---------------------------------------------------------------------- diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseStateFactory.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseStateFactory.java index 1fedc61..e208ef3 100644 --- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseStateFactory.java +++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseStateFactory.java @@ -17,9 +17,9 @@ */ package org.apache.storm.hbase.trident.state; -import backtype.storm.task.IMetricsContext; -import storm.trident.state.State; -import storm.trident.state.StateFactory; +import org.apache.storm.task.IMetricsContext; +import org.apache.storm.trident.state.State; +import org.apache.storm.trident.state.StateFactory; import java.util.Map; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseUpdater.java ---------------------------------------------------------------------- diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseUpdater.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseUpdater.java index 248ea2d..57ca844 100644 --- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseUpdater.java +++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/state/HBaseUpdater.java @@ -17,9 +17,9 @@ */ package org.apache.storm.hbase.trident.state; -import storm.trident.operation.TridentCollector; -import storm.trident.state.BaseStateUpdater; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.trident.operation.TridentCollector; +import org.apache.storm.trident.state.BaseStateUpdater; +import org.apache.storm.trident.tuple.TridentTuple; import java.util.List; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hbase/src/test/java/org/apache/storm/hbase/topology/LookupWordCount.java ---------------------------------------------------------------------- diff --git a/external/storm-hbase/src/test/java/org/apache/storm/hbase/topology/LookupWordCount.java b/external/storm-hbase/src/test/java/org/apache/storm/hbase/topology/LookupWordCount.java index 656bce5..43f72ae 100644 --- a/external/storm-hbase/src/test/java/org/apache/storm/hbase/topology/LookupWordCount.java +++ b/external/storm-hbase/src/test/java/org/apache/storm/hbase/topology/LookupWordCount.java @@ -17,11 +17,11 @@ */ package org.apache.storm.hbase.topology; -import backtype.storm.Config; -import backtype.storm.LocalCluster; -import backtype.storm.StormSubmitter; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.tuple.Fields; +import org.apache.storm.Config; +import org.apache.storm.LocalCluster; +import org.apache.storm.StormSubmitter; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.tuple.Fields; import org.apache.storm.hbase.bolt.HBaseLookupBolt; import org.apache.storm.hbase.bolt.mapper.HBaseProjectionCriteria; import org.apache.storm.hbase.bolt.mapper.SimpleHBaseMapper; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hbase/src/test/java/org/apache/storm/hbase/topology/PersistentWordCount.java ---------------------------------------------------------------------- diff --git a/external/storm-hbase/src/test/java/org/apache/storm/hbase/topology/PersistentWordCount.java b/external/storm-hbase/src/test/java/org/apache/storm/hbase/topology/PersistentWordCount.java index 0d807b2..a171a26 100644 --- a/external/storm-hbase/src/test/java/org/apache/storm/hbase/topology/PersistentWordCount.java +++ b/external/storm-hbase/src/test/java/org/apache/storm/hbase/topology/PersistentWordCount.java @@ -17,11 +17,11 @@ */ package org.apache.storm.hbase.topology; -import backtype.storm.Config; -import backtype.storm.LocalCluster; -import backtype.storm.StormSubmitter; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.tuple.Fields; +import org.apache.storm.Config; +import org.apache.storm.LocalCluster; +import org.apache.storm.StormSubmitter; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.tuple.Fields; import org.apache.storm.hbase.bolt.HBaseBolt; import org.apache.storm.hbase.bolt.mapper.SimpleHBaseMapper; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hbase/src/test/java/org/apache/storm/hbase/topology/TotalWordCounter.java ---------------------------------------------------------------------- diff --git a/external/storm-hbase/src/test/java/org/apache/storm/hbase/topology/TotalWordCounter.java b/external/storm-hbase/src/test/java/org/apache/storm/hbase/topology/TotalWordCounter.java index 93bd522..61b0dd8 100644 --- a/external/storm-hbase/src/test/java/org/apache/storm/hbase/topology/TotalWordCounter.java +++ b/external/storm-hbase/src/test/java/org/apache/storm/hbase/topology/TotalWordCounter.java @@ -17,12 +17,12 @@ */ package org.apache.storm.hbase.topology; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.BasicOutputCollector; -import backtype.storm.topology.IBasicBolt; -import backtype.storm.topology.OutputFieldsDeclarer; -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.tuple.Fields; +import org.apache.storm.tuple.Tuple; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,7 +30,7 @@ import java.math.BigInteger; import java.util.Map; import java.util.Random; -import static backtype.storm.utils.Utils.tuple; +import static org.apache.storm.utils.Utils.tuple; public class TotalWordCounter implements IBasicBolt { @@ -67,4 +67,4 @@ public class TotalWordCounter implements IBasicBolt { return null; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hbase/src/test/java/org/apache/storm/hbase/topology/WordCountValueMapper.java ---------------------------------------------------------------------- diff --git a/external/storm-hbase/src/test/java/org/apache/storm/hbase/topology/WordCountValueMapper.java b/external/storm-hbase/src/test/java/org/apache/storm/hbase/topology/WordCountValueMapper.java index 2463085..6c3301b 100644 --- a/external/storm-hbase/src/test/java/org/apache/storm/hbase/topology/WordCountValueMapper.java +++ b/external/storm-hbase/src/test/java/org/apache/storm/hbase/topology/WordCountValueMapper.java @@ -18,10 +18,10 @@ package org.apache.storm.hbase.topology; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.ITuple; -import backtype.storm.tuple.Values; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.ITuple; +import org.apache.storm.tuple.Values; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.client.Result; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hbase/src/test/java/org/apache/storm/hbase/topology/WordCounter.java ---------------------------------------------------------------------- diff --git a/external/storm-hbase/src/test/java/org/apache/storm/hbase/topology/WordCounter.java b/external/storm-hbase/src/test/java/org/apache/storm/hbase/topology/WordCounter.java index 602978e..3a350a8 100644 --- a/external/storm-hbase/src/test/java/org/apache/storm/hbase/topology/WordCounter.java +++ b/external/storm-hbase/src/test/java/org/apache/storm/hbase/topology/WordCounter.java @@ -17,16 +17,16 @@ */ package org.apache.storm.hbase.topology; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.BasicOutputCollector; -import backtype.storm.topology.IBasicBolt; -import backtype.storm.topology.OutputFieldsDeclarer; -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.tuple.Fields; +import org.apache.storm.tuple.Tuple; import java.util.Map; -import static backtype.storm.utils.Utils.tuple; +import static org.apache.storm.utils.Utils.tuple; public class WordCounter implements IBasicBolt { @@ -56,4 +56,4 @@ public class WordCounter implements IBasicBolt { return null; } -} \ No newline at end of file +}
