You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2017/05/18 14:08:40 UTC
[13/13] storm git commit: STORM-2477: Result of transforming the code
STORM-2477: Result of transforming the code
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/64e29f36
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/64e29f36
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/64e29f36
Branch: refs/heads/master
Commit: 64e29f365c9b5d3e15b33f33ab64e200345333e4
Parents: b7cb2d5
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Thu May 18 08:51:20 2017 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Thu May 18 08:51:20 2017 -0500
----------------------------------------------------------------------
.travis.yml | 1 -
.../elasticsearch/bolt/EsIndexTopology.java | 2 +-
.../trident/TridentEsTopology.java | 2 +-
.../storm/hbase/topology/TotalWordCounter.java | 2 +-
.../storm/hbase/topology/WordCounter.java | 2 +-
.../apache/storm/hbase/topology/WordSpout.java | 2 +-
.../storm/hdfs/bolt/HdfsFileTopology.java | 4 +-
.../storm/hdfs/bolt/SequenceFileTopology.java | 4 +-
.../storm/hdfs/spout/HdfsSpoutTopology.java | 2 +-
.../storm/hdfs/trident/FixedBatchSpout.java | 2 +-
.../storm/hive/bolt/BucketTestHiveTopology.java | 2 +-
.../apache/storm/hive/bolt/HiveTopology.java | 2 +-
.../hive/bolt/HiveTopologyPartitioned.java | 2 +-
.../storm/hive/trident/TridentHiveTopology.java | 2 +-
.../org/apache/storm/jdbc/spout/UserSpout.java | 2 +-
.../apache/storm/jms/example/GenericBolt.java | 2 +-
.../mongodb/topology/TotalWordCounter.java | 2 +-
.../storm/mongodb/topology/WordCounter.java | 2 +-
.../storm/mongodb/topology/WordSpout.java | 2 +-
.../storm/opentsdb/MetricGenBatchSpout.java | 2 +-
.../apache/storm/opentsdb/MetricGenSpout.java | 4 +-
.../storm/perf/HdfsSpoutNullBoltTopo.java | 4 +-
.../org/apache/storm/perf/KafkaHdfsTopo.java | 6 +-
.../storm/perf/KafkaSpoutNullBoltTopo.java | 4 +-
.../storm/perf/StrGenSpoutHdfsBoltTopo.java | 2 +-
.../org/apache/storm/perf/bolt/CountBolt.java | 2 +-
.../org/apache/storm/perf/bolt/DevNullBolt.java | 2 +-
.../java/org/apache/storm/perf/bolt/IdBolt.java | 4 +-
.../storm/perf/bolt/SplitSentenceBolt.java | 2 +-
.../org/apache/storm/perf/spout/ConstSpout.java | 2 +-
.../apache/storm/perf/spout/FileReadSpout.java | 2 +-
.../apache/storm/perf/spout/StringGenSpout.java | 2 +-
.../storm/perf/utils/BasicMetricsCollector.java | 14 +--
.../org/apache/storm/perf/utils/Helper.java | 2 +-
.../apache/storm/perf/utils/IdentityBolt.java | 2 +-
.../apache/storm/perf/utils/MetricsSample.java | 2 +-
.../apache/storm/pmml/RawInputFromCSVSpout.java | 2 +-
.../storm/redis/topology/LookupWordCount.java | 2 +-
.../redis/topology/WhitelistWordCount.java | 2 +-
.../storm/redis/topology/WordCounter.java | 2 +-
.../apache/storm/redis/topology/WordSpout.java | 2 +-
.../storm/rocketmq/topology/WordCounter.java | 2 +-
.../storm/solr/spout/SolrFieldsSpout.java | 2 +-
.../apache/storm/solr/spout/SolrJsonSpout.java | 2 +-
.../starter/BlobStoreAPIWordCountTopology.java | 2 +-
.../storm/starter/ExclamationTopology.java | 2 +-
.../storm/starter/FastWordCountTopology.java | 2 +-
.../storm/starter/InOrderDeliveryTest.java | 2 +-
.../storm/starter/MultipleLoggerTopology.java | 2 +-
.../org/apache/storm/starter/ReachTopology.java | 4 +-
.../starter/ResourceAwareExampleTopology.java | 2 +-
.../storm/starter/SlidingWindowTopology.java | 2 +-
.../apache/storm/starter/StatefulTopology.java | 2 +-
.../starter/StatefulWindowingTopology.java | 2 +-
.../storm/starter/ThroughputVsLatency.java | 2 +-
.../storm/starter/TransactionalGlobalCount.java | 4 +-
.../storm/starter/TransactionalWords.java | 4 +-
.../storm/starter/bolt/RollingCountAggBolt.java | 2 +-
.../storm/starter/bolt/RollingCountBolt.java | 2 +-
.../storm/starter/bolt/SingleJoinBolt.java | 2 +-
.../starter/bolt/SlidingWindowSumBolt.java | 2 +-
.../storm/starter/spout/RandomIntegerSpout.java | 2 +-
.../spout/RandomNumberGeneratorSpout.java | 2 +-
.../starter/spout/RandomSentenceSpout.java | 2 +-
.../streams/GroupByKeyAndWindowExample.java | 2 +-
.../storm/starter/streams/JoinExample.java | 2 +-
.../starter/streams/StateQueryExample.java | 2 +-
.../starter/trident/DebugMemoryMapState.java | 2 +-
.../storm/starter/trident/TridentReach.java | 2 +-
.../starter/bolt/RollingCountBoltTest.java | 4 +-
.../apache/storm/common/AbstractAutoCreds.java | 20 ++--
.../apache/storm/hbase/security/AutoHBase.java | 14 +--
.../storm/hbase/security/HBaseSecurityUtil.java | 2 +-
.../apache/storm/hdfs/security/AutoHDFS.java | 14 +--
.../storm/hdfs/security/HdfsSecurityUtil.java | 2 +-
.../apache/storm/hive/security/AutoHive.java | 14 +--
.../storm/cassandra/CassandraContext.java | 12 +-
.../storm/cassandra/bolt/BaseCassandraBolt.java | 8 +-
.../bolt/BatchCassandraWriterBolt.java | 6 +-
.../cassandra/bolt/CassandraWriterBolt.java | 2 +-
.../storm/cassandra/client/ClusterFactory.java | 6 +-
.../cassandra/context/BaseBeanFactory.java | 8 +-
.../storm/cassandra/context/BeanFactory.java | 6 +-
.../storm/cassandra/context/WorkerCtx.java | 12 +-
.../query/BaseCQLStatementTupleMapper.java | 2 +-
.../query/CQLStatementTupleMapper.java | 4 +-
.../storm/cassandra/query/ContextQuery.java | 8 +-
.../impl/BatchCQLStatementTupleMapper.java | 2 +-
.../impl/BoundCQLStatementTupleMapper.java | 2 +-
.../query/impl/SimpleCQLStatementMapper.java | 2 +-
.../trident/state/CassandraBackingMap.java | 4 +-
.../trident/state/CassandraMapStateFactory.java | 2 +-
.../cassandra/trident/state/CassandraState.java | 4 +-
.../trident/state/CassandraStateFactory.java | 2 +-
.../cassandra/trident/state/SimpleTuple.java | 2 +-
.../testtools/EmbeddedCassandraResource.java | 2 +-
.../storm/cassandra/trident/MapStateTest.java | 4 +-
.../cassandra/trident/WeatherBatchSpout.java | 2 +-
.../apache/storm/druid/bolt/DruidBeamBolt.java | 4 +-
.../druid/trident/DruidBeamStateFactory.java | 2 +-
.../storm/druid/SampleDruidBeamFactoryImpl.java | 2 +-
.../apache/storm/druid/SimpleBatchSpout.java | 2 +-
.../org/apache/storm/druid/SimpleSpout.java | 2 +-
.../apache/storm/elasticsearch/doc/Shards.java | 2 +-
.../elasticsearch/trident/EsStateFactory.java | 2 +-
.../storm/eventhubs/bolt/EventHubBolt.java | 2 +-
.../eventhubs/spout/EventHubException.java | 2 +-
.../storm/eventhubs/spout/EventHubSpout.java | 4 +-
.../trident/OpaqueTridentEventHubSpout.java | 4 +-
.../TransactionalTridentEventHubSpout.java | 4 +-
.../eventhubs/samples/bolt/GlobalCountBolt.java | 2 +-
.../samples/bolt/PartialCountBolt.java | 2 +-
.../storm/hbase/bolt/AbstractHBaseBolt.java | 2 +-
.../storm/hbase/bolt/HBaseLookupBolt.java | 2 +-
.../hbase/trident/state/HBaseMapState.java | 2 +-
.../trident/windowing/HBaseWindowsStore.java | 6 +-
.../windowing/HBaseWindowsStoreFactory.java | 4 +-
.../hdfs/avro/ConfluentAvroSerializer.java | 6 +-
.../storm/hdfs/avro/GenericAvroSerializer.java | 2 +-
.../storm/hdfs/blobstore/HdfsBlobStore.java | 6 +-
.../hdfs/blobstore/HdfsClientBlobStore.java | 4 +-
.../storm/hdfs/bolt/AbstractHdfsBolt.java | 4 +-
.../storm/hdfs/bolt/AvroGenericRecordBolt.java | 2 +-
.../org/apache/storm/hdfs/bolt/HdfsBolt.java | 2 +-
.../storm/hdfs/bolt/SequenceFileBolt.java | 2 +-
.../hdfs/bolt/format/DefaultFileNameFormat.java | 2 +-
.../storm/hdfs/bolt/format/FileNameFormat.java | 2 +-
.../hdfs/bolt/format/SimpleFileNameFormat.java | 2 +-
.../org/apache/storm/hdfs/spout/FileOffset.java | 2 +-
.../org/apache/storm/hdfs/spout/HdfsSpout.java | 4 +-
.../storm/hdfs/spout/SequenceFileReader.java | 4 +-
.../apache/storm/hdfs/spout/TextFileReader.java | 6 +-
.../apache/storm/hdfs/trident/HdfsState.java | 12 +-
.../storm/hdfs/trident/HdfsStateFactory.java | 2 +-
.../trident/format/DefaultFileNameFormat.java | 2 +-
.../hdfs/trident/format/FileNameFormat.java | 2 +-
.../trident/format/SimpleFileNameFormat.java | 2 +-
.../storm/hdfs/blobstore/BlobStoreTest.java | 4 +-
.../hdfs/blobstore/HdfsBlobStoreImplTest.java | 4 +-
.../apache/storm/hdfs/spout/TestHdfsSpout.java | 28 ++---
.../storm/hdfs/trident/HdfsStateTest.java | 4 +-
.../org/apache/storm/hive/bolt/HiveBolt.java | 2 +-
.../org/apache/storm/hive/common/HiveUtils.java | 2 +-
.../apache/storm/hive/trident/HiveState.java | 2 +-
.../storm/hive/trident/HiveStateFactory.java | 2 +-
.../java/org/apache/storm/jms/bolt/JmsBolt.java | 2 +-
.../org/apache/storm/jms/spout/JmsSpout.java | 2 +-
.../storm/jms/trident/TridentJmsSpout.java | 8 +-
.../org/apache/storm/kafka/bolt/KafkaBolt.java | 8 +-
.../apache/storm/kafka/spout/KafkaSpout.java | 2 +-
.../spout/ManualPartitionNamedSubscription.java | 2 +-
.../ManualPartitionPatternSubscription.java | 2 +-
.../storm/kafka/spout/internal/Timer.java | 2 +-
.../spout/trident/KafkaTridentSpoutOpaque.java | 4 +-
.../trident/KafkaTridentSpoutTransactional.java | 4 +-
.../kafka/trident/TridentKafkaStateFactory.java | 2 +-
.../java/org/apache/storm/kafka/KafkaUnit.java | 2 +-
.../org/apache/storm/kafka/KafkaUnitRule.java | 2 +-
.../kafka/spout/test/KafkaSpoutTestBolt.java | 2 +-
.../storm/kafka/DynamicBrokersReader.java | 4 +-
.../ExponentialBackoffMsgRetryManager.java | 2 +-
.../storm/kafka/FailedMsgRetryManager.java | 2 +-
.../jvm/org/apache/storm/kafka/KafkaSpout.java | 2 +-
.../jvm/org/apache/storm/kafka/KafkaUtils.java | 4 +-
.../apache/storm/kafka/PartitionManager.java | 14 +--
.../apache/storm/kafka/StaticCoordinator.java | 4 +-
.../org/apache/storm/kafka/ZkCoordinator.java | 16 +--
.../org/apache/storm/kafka/bolt/KafkaBolt.java | 6 +-
.../apache/storm/kafka/trident/Coordinator.java | 2 +-
.../kafka/trident/OpaqueTridentKafkaSpout.java | 4 +-
.../trident/TransactionalTridentKafkaSpout.java | 4 +-
.../kafka/trident/TridentKafkaEmitter.java | 2 +-
.../kafka/trident/TridentKafkaStateFactory.java | 2 +-
.../storm/kafka/trident/ZkBrokerReader.java | 2 +-
.../apache/storm/kafka/ZkCoordinatorTest.java | 8 +-
.../storm/kinesis/spout/KinesisSpout.java | 2 +-
.../kinesis/spout/test/KinesisBoltTest.java | 2 +-
.../storm/mongodb/bolt/AbstractMongoBolt.java | 2 +-
.../storm/mongodb/bolt/MongoInsertBolt.java | 4 +-
.../mongodb/trident/state/MongoMapState.java | 2 +-
.../trident/state/MongoStateFactory.java | 2 +-
.../org/apache/storm/mqtt/bolt/MqttBolt.java | 2 +-
.../apache/storm/mqtt/spout/AckableMessage.java | 2 +-
.../org/apache/storm/mqtt/spout/MqttSpout.java | 4 +-
.../storm/mqtt/trident/MqttPublishFunction.java | 2 +-
.../storm/opentsdb/bolt/OpenTsdbBolt.java | 2 +-
.../storm/opentsdb/trident/OpenTsdbState.java | 4 +-
.../opentsdb/trident/OpenTsdbStateFactory.java | 2 +-
.../apache/storm/pmml/PMMLPredictorBolt.java | 2 +-
.../pmml/model/jpmml/JpmmlModelOutputs.java | 4 +-
.../storm/pmml/runner/jpmml/JpmmlFactory.java | 6 +-
.../storm/redis/bolt/AbstractRedisBolt.java | 2 +-
.../redis/state/RedisKeyValueStateProvider.java | 12 +-
.../trident/state/RedisClusterMapState.java | 2 +-
.../redis/trident/state/RedisClusterState.java | 2 +-
.../trident/state/RedisClusterStateQuerier.java | 2 +-
.../redis/trident/state/RedisMapState.java | 2 +-
.../storm/redis/trident/state/RedisState.java | 2 +-
.../redis/trident/state/RedisStateQuerier.java | 2 +-
.../redis/state/DefaultStateSerializerTest.java | 2 +-
.../state/RedisKeyValueStateProviderTest.java | 14 +--
.../redis/state/RedisKeyValueStateTest.java | 2 +-
.../storm/rocketmq/bolt/RocketMQBolt.java | 2 +-
.../storm/rocketmq/spout/RocketMQSpout.java | 2 +-
.../trident/state/RocketMQStateFactory.java | 2 +-
.../apache/storm/solr/bolt/SolrUpdateBolt.java | 2 +-
.../flux/examples/StatefulWordCounter.java | 2 +-
.../storm/flux/examples/TestWindowBolt.java | 2 +-
.../apache/storm/flux/examples/WordCounter.java | 2 +-
.../org/apache/storm/ExclamationTopology.java | 2 +-
.../topology/window/SlidingTimeCorrectness.java | 4 +-
.../window/SlidingWindowCorrectness.java | 4 +-
.../window/TumblingTimeCorrectness.java | 4 +-
.../window/TumblingWindowCorrectness.java | 4 +-
.../apache/storm/st/wrapper/StormCluster.java | 2 +-
.../src/jvm/org/apache/storm/sql/StormSql.java | 2 +-
.../jvm/org/apache/storm/sql/StormSqlImpl.java | 4 +-
.../org/apache/storm/sql/StormSqlRunner.java | 2 +-
.../sql/compiler/RexNodeToJavaCodeCompiler.java | 2 +-
.../storm/sql/javac/CompilingClassLoader.java | 2 +-
.../backends/standalone/TestCompilerUtils.java | 2 +-
.../backends/trident/TestCompilerUtils.java | 2 +-
.../backends/trident/TestPlanCompiler.java | 2 +-
.../apache/storm/sql/parser/TestSqlParser.java | 2 +-
.../datasource/socket/trident/SocketState.java | 4 +-
.../socket/trident/TridentSocketSpout.java | 2 +-
.../sql/runtime/serde/avro/CachedSchemas.java | 2 +-
.../trident/functions/EvaluationCalc.java | 2 +-
.../trident/functions/EvaluationFilter.java | 2 +-
.../trident/functions/EvaluationFunction.java | 2 +-
.../test/org/apache/storm/sql/TestUtils.java | 14 +--
.../socket/TestSocketDataSourceProvider.java | 2 +-
.../metric/HttpForwardingMetricsConsumer.java | 4 +-
.../metric/HttpForwardingMetricsServer.java | 2 +-
.../src/jvm/org/apache/storm/Config.java | 44 +++----
.../jvm/org/apache/storm/ISubmitterHook.java | 2 +-
.../jvm/org/apache/storm/StormSubmitter.java | 114 +++++++++----------
.../src/jvm/org/apache/storm/Thrift.java | 16 +--
.../org/apache/storm/blobstore/BlobStore.java | 2 +-
.../storm/blobstore/BlobStoreAclHandler.java | 2 +-
.../apache/storm/blobstore/ClientBlobStore.java | 6 +-
.../apache/storm/blobstore/NimbusBlobStore.java | 4 +-
.../src/jvm/org/apache/storm/bolt/JoinBolt.java | 4 +-
.../storm/callback/ZKStateChangedCallback.java | 2 +-
.../org/apache/storm/cluster/ClusterUtils.java | 6 +-
.../cluster/PaceMakerStateStorageFactory.java | 2 +-
.../storm/cluster/StateStorageFactory.java | 2 +-
.../apache/storm/cluster/ZKStateStorage.java | 4 +-
.../storm/cluster/ZKStateStorageFactory.java | 2 +-
.../storm/coordination/BatchBoltExecutor.java | 2 +-
.../coordination/BatchSubtopologyBuilder.java | 4 +-
.../storm/coordination/CoordinatedBolt.java | 2 +-
.../apache/storm/coordination/IBatchBolt.java | 2 +-
.../src/jvm/org/apache/storm/daemon/Acker.java | 2 +-
.../org/apache/storm/daemon/GrouperFactory.java | 2 +-
.../org/apache/storm/daemon/StormCommon.java | 58 +++++-----
.../src/jvm/org/apache/storm/daemon/Task.java | 12 +-
.../storm/daemon/metrics/BuiltinMetrics.java | 4 +-
.../daemon/metrics/BuiltinMetricsUtil.java | 16 +--
.../daemon/metrics/SpoutThrottlingMetrics.java | 2 +-
.../supervisor/ClientSupervisorUtils.java | 8 +-
.../daemon/supervisor/ExitCodeCallback.java | 2 +-
.../org/apache/storm/daemon/worker/Worker.java | 8 +-
.../apache/storm/daemon/worker/WorkerState.java | 10 +-
.../dependency/DependencyPropertiesParser.java | 2 +-
.../storm/dependency/DependencyUploader.java | 2 +-
.../dependency/FileNotAvailableException.java | 2 +-
.../storm/drpc/DRPCInvocationsClient.java | 2 +-
.../jvm/org/apache/storm/drpc/DRPCSpout.java | 6 +-
.../org/apache/storm/drpc/KeyedFairBolt.java | 4 +-
.../org/apache/storm/drpc/ReturnResults.java | 6 +-
.../jvm/org/apache/storm/executor/Executor.java | 56 ++++-----
.../apache/storm/executor/ExecutorTransfer.java | 10 +-
.../storm/executor/bolt/BoltExecutor.java | 14 +--
.../storm/executor/error/ReportError.java | 10 +-
.../storm/executor/spout/SpoutExecutor.java | 18 +--
.../storm/generated/TopologyPageInfo.java | 96 ++++++++--------
.../org/apache/storm/hooks/BaseTaskHook.java | 2 +-
.../org/apache/storm/hooks/BaseWorkerHook.java | 4 +-
.../jvm/org/apache/storm/hooks/ITaskHook.java | 2 +-
.../jvm/org/apache/storm/hooks/IWorkerHook.java | 4 +-
.../org/apache/storm/lambda/LambdaSpout.java | 2 +-
.../DeserializingConnectionCallback.java | 2 +-
.../org/apache/storm/messaging/IContext.java | 6 +-
.../storm/messaging/TransportFactory.java | 10 +-
.../apache/storm/messaging/local/Context.java | 2 +-
.../apache/storm/messaging/netty/Client.java | 30 ++---
.../apache/storm/messaging/netty/Context.java | 12 +-
.../netty/KerberosSaslClientHandler.java | 8 +-
.../netty/KerberosSaslNettyClient.java | 4 +-
.../netty/KerberosSaslNettyServer.java | 4 +-
.../netty/KerberosSaslServerHandler.java | 8 +-
.../apache/storm/messaging/netty/SaslUtils.java | 2 +-
.../apache/storm/messaging/netty/Server.java | 18 +--
.../messaging/netty/StormClientHandler.java | 2 +-
.../netty/StormClientPipelineFactory.java | 4 +-
.../netty/StormServerPipelineFactory.java | 2 +-
.../apache/storm/metric/EventLoggerBolt.java | 4 +-
.../storm/metric/FileBasedEventLogger.java | 4 +-
.../org/apache/storm/metric/IEventLogger.java | 2 +-
.../storm/metric/LoggingMetricsConsumer.java | 2 +-
.../storm/metric/MetricsConsumerBolt.java | 4 +-
.../jvm/org/apache/storm/metric/SystemBolt.java | 2 +-
.../storm/metric/api/IMetricsConsumer.java | 2 +-
.../storm/metric/filter/FilterByMetricName.java | 2 +-
.../org/apache/storm/multilang/ISerializer.java | 2 +-
.../apache/storm/multilang/JsonSerializer.java | 2 +-
.../apache/storm/pacemaker/PacemakerClient.java | 2 +-
.../storm/pacemaker/PacemakerClientPool.java | 4 +-
.../pacemaker/codec/ThriftNettyClientCodec.java | 8 +-
.../jvm/org/apache/storm/scheduler/Cluster.java | 6 +-
.../jvm/org/apache/storm/scheduler/INimbus.java | 2 +-
.../org/apache/storm/scheduler/IScheduler.java | 2 +-
.../org/apache/storm/scheduler/ISupervisor.java | 2 +-
.../apache/storm/scheduler/TopologyDetails.java | 8 +-
.../storm/scheduler/resource/ResourceUtils.java | 12 +-
.../scheduler/resource/SchedulingState.java | 4 +-
.../storm/security/INimbusCredentialPlugin.java | 4 +-
.../apache/storm/security/auth/AuthUtils.java | 36 +++---
.../org/apache/storm/security/auth/AutoSSL.java | 8 +-
.../auth/DefaultHttpCredentialsPlugin.java | 4 +-
.../security/auth/DefaultPrincipalToLocal.java | 2 +-
.../apache/storm/security/auth/IAuthorizer.java | 8 +-
.../storm/security/auth/IAutoCredentials.java | 2 +-
.../security/auth/ICredentialsRenewer.java | 4 +-
.../auth/IGroupMappingServiceProvider.java | 4 +-
.../security/auth/IHttpCredentialsPlugin.java | 4 +-
.../storm/security/auth/IPrincipalToLocal.java | 4 +-
.../storm/security/auth/ITransportPlugin.java | 4 +-
.../security/auth/KerberosPrincipalToLocal.java | 4 +-
.../security/auth/SaslTransportPlugin.java | 14 +--
.../security/auth/ShellBasedGroupsMapping.java | 6 +-
.../security/auth/SimpleTransportPlugin.java | 18 +--
.../storm/security/auth/ThriftClient.java | 14 +--
.../security/auth/ThriftConnectionType.java | 12 +-
.../storm/security/auth/ThriftServer.java | 10 +-
.../auth/authorizer/DRPCAuthorizerBase.java | 2 +-
.../authorizer/DRPCSimpleACLAuthorizer.java | 4 +-
.../auth/authorizer/DenyAuthorizer.java | 6 +-
.../authorizer/ImpersonationAuthorizer.java | 4 +-
.../auth/authorizer/NoopAuthorizer.java | 6 +-
.../auth/authorizer/SimpleACLAuthorizer.java | 14 +--
.../authorizer/SimpleWhitelistAuthorizer.java | 6 +-
.../storm/security/auth/kerberos/AutoTGT.java | 8 +-
.../kerberos/KerberosSaslTransportPlugin.java | 2 +-
.../auth/kerberos/ServerCallbackHandler.java | 2 +-
.../serialization/BlowfishTupleSerializer.java | 4 +-
.../storm/serialization/DefaultKryoFactory.java | 8 +-
.../DefaultSerializationDelegate.java | 2 +-
.../GzipBridgeSerializationDelegate.java | 6 +-
.../GzipBridgeThriftSerializationDelegate.java | 6 +-
.../GzipSerializationDelegate.java | 2 +-
.../GzipThriftSerializationDelegate.java | 2 +-
.../storm/serialization/IKryoFactory.java | 8 +-
.../serialization/KryoTupleDeserializer.java | 2 +-
.../serialization/KryoTupleSerializer.java | 2 +-
.../serialization/KryoValuesDeserializer.java | 2 +-
.../serialization/KryoValuesSerializer.java | 2 +-
.../serialization/SerializationDelegate.java | 2 +-
.../serialization/SerializationFactory.java | 6 +-
.../ThriftSerializationDelegate.java | 2 +-
.../org/apache/storm/spout/CheckpointSpout.java | 10 +-
.../src/jvm/org/apache/storm/spout/ISpout.java | 2 +-
.../apache/storm/spout/ISpoutWaitStrategy.java | 2 +-
.../storm/spout/NothingEmptyEmitStrategy.java | 2 +-
.../jvm/org/apache/storm/spout/ShellSpout.java | 10 +-
.../storm/spout/SleepSpoutWaitStrategy.java | 2 +-
.../jvm/org/apache/storm/state/IStateSpout.java | 2 +-
.../state/InMemoryKeyValueStateProvider.java | 2 +-
.../org/apache/storm/state/StateFactory.java | 10 +-
.../org/apache/storm/state/StateProvider.java | 4 +-
.../org/apache/storm/streams/ProcessorBolt.java | 4 +-
.../storm/streams/ProcessorBoltDelegate.java | 6 +-
.../storm/streams/StatefulProcessorBolt.java | 4 +-
.../org/apache/storm/streams/StreamState.java | 2 +-
.../storm/streams/WindowedProcessorBolt.java | 4 +-
.../storm/task/GeneralTopologyContext.java | 10 +-
.../src/jvm/org/apache/storm/task/IBolt.java | 4 +-
.../jvm/org/apache/storm/task/ShellBolt.java | 14 +--
.../org/apache/storm/task/TopologyContext.java | 6 +-
.../storm/task/WorkerTopologyContext.java | 4 +-
.../apache/storm/testing/BatchNumberList.java | 2 +-
.../apache/storm/testing/CountingBatchBolt.java | 2 +-
.../storm/testing/CountingCommitBolt.java | 2 +-
.../org/apache/storm/testing/FeederSpout.java | 4 +-
.../apache/storm/testing/FixedTupleSpout.java | 2 +-
.../testing/ForwardingMetricsConsumer.java | 2 +-
.../storm/testing/KeyedCountingBatchBolt.java | 2 +-
.../storm/testing/KeyedSummingBatchBolt.java | 2 +-
.../storm/testing/MemoryTransactionalSpout.java | 6 +-
.../storm/testing/NonRichBoltTracker.java | 4 +-
.../testing/OpaqueMemoryTransactionalSpout.java | 6 +-
.../storm/testing/PythonShellMetricsBolt.java | 4 +-
.../storm/testing/PythonShellMetricsSpout.java | 2 +-
.../org/apache/storm/testing/SpoutTracker.java | 2 +-
.../storm/testing/TestAggregatesCounter.java | 2 +-
.../org/apache/storm/testing/TestConfBolt.java | 2 +-
.../apache/storm/testing/TestEventLogSpout.java | 2 +-
.../storm/testing/TestEventOrderCheckBolt.java | 2 +-
.../apache/storm/testing/TestGlobalCount.java | 2 +-
.../apache/storm/testing/TestPlannerBolt.java | 2 +-
.../apache/storm/testing/TestPlannerSpout.java | 2 +-
.../apache/storm/testing/TestWordCounter.java | 2 +-
.../org/apache/storm/testing/TestWordSpout.java | 2 +-
.../jvm/org/apache/storm/testing/TmpPath.java | 2 +-
.../apache/storm/testing/TupleCaptureBolt.java | 2 +-
.../storm/topology/BasicBoltExecutor.java | 4 +-
.../topology/CheckpointTupleForwarder.java | 4 +-
.../org/apache/storm/topology/IBasicBolt.java | 2 +-
.../apache/storm/topology/IStatefulBolt.java | 2 +-
.../apache/storm/topology/IWindowedBolt.java | 2 +-
.../storm/topology/StatefulBoltExecutor.java | 8 +-
.../topology/StatefulWindowedBoltExecutor.java | 20 ++--
.../apache/storm/topology/TopologyBuilder.java | 6 +-
.../storm/topology/WindowedBoltExecutor.java | 60 +++++-----
.../storm/topology/base/BaseBasicBolt.java | 2 +-
.../storm/topology/base/BaseStatefulBolt.java | 2 +-
.../storm/topology/base/BaseWindowedBolt.java | 2 +-
.../ICommitterTransactionalSpout.java | 2 +-
.../transactional/ITransactionalSpout.java | 4 +-
.../TransactionalSpoutBatchExecutor.java | 2 +-
.../TransactionalSpoutCoordinator.java | 2 +-
.../TransactionalTopologyBuilder.java | 2 +-
.../IOpaquePartitionedTransactionalSpout.java | 4 +-
.../IPartitionedTransactionalSpout.java | 4 +-
...uePartitionedTransactionalSpoutExecutor.java | 8 +-
.../PartitionedTransactionalSpoutExecutor.java | 8 +-
.../state/TestTransactionalState.java | 2 +-
.../transactional/state/TransactionalState.java | 6 +-
.../apache/storm/trident/JoinOutFieldsMode.java | 2 +-
.../apache/storm/trident/TridentTopology.java | 2 +-
.../trident/drpc/ReturnResultsReducer.java | 4 +-
.../trident/operation/BaseMultiReducer.java | 2 +-
.../storm/trident/operation/BaseOperation.java | 2 +-
.../operation/DefaultResourceDeclarer.java | 2 +-
.../trident/operation/GroupedMultiReducer.java | 2 +-
.../storm/trident/operation/MultiReducer.java | 2 +-
.../storm/trident/operation/Operation.java | 2 +-
.../storm/trident/operation/builtin/Negate.java | 2 +-
.../operation/impl/ChainedAggregatorImpl.java | 2 +-
.../operation/impl/CombinerAggStateUpdater.java | 2 +-
.../impl/CombinerAggregatorCombineImpl.java | 2 +-
.../impl/CombinerAggregatorInitImpl.java | 2 +-
.../trident/operation/impl/FilterExecutor.java | 2 +-
.../operation/impl/FlatMapFunctionExecutor.java | 2 +-
.../operation/impl/GroupedAggregator.java | 2 +-
.../impl/GroupedMultiReducerExecutor.java | 2 +-
.../operation/impl/IdentityMultiReducer.java | 2 +-
.../operation/impl/JoinerMultiReducer.java | 2 +-
.../operation/impl/MapFunctionExecutor.java | 2 +-
...PreservingFieldsOrderJoinerMultiReducer.java | 2 +-
.../operation/impl/ReducerAggStateUpdater.java | 2 +-
.../operation/impl/ReducerAggregatorImpl.java | 2 +-
.../operation/impl/SingleEmitAggregator.java | 2 +-
.../trident/operation/impl/TrueFilter.java | 2 +-
.../storm/trident/planner/SubtopologyBolt.java | 2 +-
.../storm/trident/planner/TridentProcessor.java | 2 +-
.../planner/processor/AggregateProcessor.java | 2 +-
.../planner/processor/EachProcessor.java | 2 +-
.../trident/planner/processor/MapProcessor.java | 2 +-
.../processor/MultiReducerProcessor.java | 2 +-
.../processor/PartitionPersistProcessor.java | 2 +-
.../planner/processor/ProjectedProcessor.java | 2 +-
.../planner/processor/StateQueryProcessor.java | 2 +-
.../storm/trident/spout/BatchSpoutExecutor.java | 4 +-
.../apache/storm/trident/spout/IBatchSpout.java | 2 +-
.../trident/spout/ICommitterTridentSpout.java | 2 +-
.../spout/IOpaquePartitionedTridentSpout.java | 4 +-
.../trident/spout/IPartitionedTridentSpout.java | 4 +-
.../storm/trident/spout/ITridentSpout.java | 4 +-
.../OpaquePartitionedTridentSpoutExecutor.java | 8 +-
.../spout/PartitionedTridentSpoutExecutor.java | 8 +-
.../trident/spout/RichSpoutBatchExecutor.java | 6 +-
.../trident/spout/RichSpoutBatchTriggerer.java | 2 +-
.../trident/spout/TridentSpoutCoordinator.java | 2 +-
.../trident/spout/TridentSpoutExecutor.java | 2 +-
.../storm/trident/state/StateFactory.java | 2 +-
.../state/map/MapCombinerAggStateUpdater.java | 2 +-
.../state/map/MapReducerAggStateUpdater.java | 2 +-
.../storm/trident/testing/FeederBatchSpout.java | 4 +-
.../testing/FeederCommitterBatchSpout.java | 4 +-
.../storm/trident/testing/FixedBatchSpout.java | 2 +-
.../trident/testing/LRUMemoryMapState.java | 2 +-
.../storm/trident/testing/MemoryMapState.java | 2 +-
.../trident/topology/ITridentBatchBolt.java | 2 +-
.../topology/MasterBatchCoordinator.java | 2 +-
.../trident/topology/TridentBoltExecutor.java | 2 +-
.../topology/state/TestTransactionalState.java | 2 +-
.../topology/state/TransactionalState.java | 6 +-
.../windowing/InMemoryTridentWindowManager.java | 2 +-
.../windowing/InMemoryWindowsStoreFactory.java | 2 +-
.../trident/windowing/WindowKryoSerializer.java | 4 +-
.../windowing/WindowTridentProcessor.java | 8 +-
.../trident/windowing/WindowsStateFactory.java | 2 +-
.../trident/windowing/WindowsStateUpdater.java | 2 +-
.../trident/windowing/WindowsStoreFactory.java | 4 +-
.../jvm/org/apache/storm/utils/ConfigUtils.java | 60 +++++-----
.../org/apache/storm/utils/CuratorUtils.java | 14 +--
.../jvm/org/apache/storm/utils/DRPCClient.java | 6 +-
.../org/apache/storm/utils/NimbusClient.java | 14 +--
.../org/apache/storm/utils/ShellProcess.java | 6 +-
.../src/jvm/org/apache/storm/utils/Utils.java | 34 +++---
.../apache/storm/utils/ZookeeperAuthInfo.java | 2 +-
.../apache/storm/zookeeper/ClientZookeeper.java | 12 +-
.../org/apache/storm/TestConfigValidate.java | 10 +-
.../storm/blobstore/ClientBlobStoreTest.java | 6 +-
.../DependencyPropertiesParserTest.java | 2 +-
.../dependency/DependencyUploaderTest.java | 2 +-
.../storm/grouping/ShuffleGroupingTest.java | 2 +-
.../metric/filter/FilterByMetricNameTest.java | 2 +-
.../metric/util/DataPointExpanderTest.java | 2 +-
.../storm/security/auth/AuthUtilsTestMock.java | 6 +-
.../apache/storm/security/auth/AutoSSLTest.java | 6 +-
.../storm/security/auth/ThriftClientTest.java | 2 +-
.../authorizer/DRPCSimpleACLAuthorizerTest.java | 2 +-
.../BlowfishTupleSerializerTest.java | 6 +-
.../serialization/SerializationFactoryTest.java | 6 +-
.../apache/storm/spout/CheckpointSpoutTest.java | 24 ++--
.../storm/state/InMemoryKeyValueStateTest.java | 2 +-
.../apache/storm/streams/StreamBuilderTest.java | 6 +-
.../streams/processors/JoinProcessorTest.java | 2 +-
.../topology/StatefulBoltExecutorTest.java | 2 +-
.../StatefulWindowedBoltExecutorTest.java | 2 +-
.../storm/topology/TopologyBuilderTest.java | 2 +-
.../storm/trident/TridentWindowingTest.java | 2 +-
.../jvm/org/apache/storm/utils/UtilsTest.java | 2 +-
.../org/apache/storm/clojure/ClojureBolt.java | 6 +-
.../org/apache/storm/clojure/ClojureSpout.java | 2 +-
.../org/apache/storm/command/HealthCheck.java | 2 +-
.../apache/storm/testing/MockLeaderElector.java | 2 +-
.../apache/storm/utils/TopologySpoutLag.java | 10 +-
.../test/jvm/org/apache/storm/MockAutoCred.java | 6 +-
.../apache/storm/metric/FakeMetricConsumer.java | 2 +-
.../storm/serialization/SerializationTest.java | 10 +-
.../staticmocking/ConfigUtilsInstaller.java | 2 +-
.../staticmocking/ReflectionUtilsInstaller.java | 2 +-
.../ServerConfigUtilsInstaller.java | 2 +-
.../utils/staticmocking/UtilsInstaller.java | 2 +-
.../java/org/apache/storm/DaemonConfig.java | 8 +-
.../storm/blobstore/BlobSynchronizer.java | 4 +-
.../storm/blobstore/KeySequenceNumber.java | 2 +-
.../storm/blobstore/LocalFsBlobStore.java | 4 +-
.../storm/daemon/metrics/MetricsUtils.java | 26 ++---
.../reporters/ConsolePreparableReporter.java | 8 +-
.../reporters/CsvPreparableReporter.java | 10 +-
.../reporters/JmxPreparableReporter.java | 6 +-
.../metrics/reporters/PreparableReporter.java | 2 +-
.../org/apache/storm/daemon/nimbus/Nimbus.java | 4 +-
.../storm/daemon/nimbus/TopologyResources.java | 2 +-
.../storm/daemon/supervisor/BasicContainer.java | 8 +-
.../supervisor/EventManagerPushCallback.java | 2 +-
.../daemon/supervisor/StandaloneSupervisor.java | 6 +-
.../daemon/supervisor/SupervisorUtils.java | 8 +-
.../supervisor/timer/SupervisorHeartbeat.java | 2 +-
.../daemon/supervisor/timer/UpdateBlobs.java | 8 +-
.../apache/storm/healthcheck/HealthChecker.java | 4 +-
.../apache/storm/localizer/AsyncLocalizer.java | 16 +--
.../localizer/LocalDownloadedResource.java | 2 +-
.../org/apache/storm/localizer/Localizer.java | 6 +-
.../metric/ClusterMetricsConsumerExecutor.java | 2 +-
.../metric/LoggingClusterMetricsConsumer.java | 2 +-
.../storm/metric/StormMetricsRegistry.java | 12 +-
.../org/apache/storm/metric/api/DataPoint.java | 2 +-
.../metric/api/IClusterMetricsConsumer.java | 2 +-
.../storm/nimbus/DefaultTopologyValidator.java | 2 +-
.../org/apache/storm/nimbus/ILeaderElector.java | 2 +-
.../apache/storm/nimbus/ITopologyValidator.java | 2 +-
.../org/apache/storm/pacemaker/Pacemaker.java | 6 +-
.../apache/storm/pacemaker/PacemakerServer.java | 2 +-
.../pacemaker/codec/ThriftNettyServerCodec.java | 10 +-
.../storm/scheduler/DefaultScheduler.java | 2 +-
.../apache/storm/scheduler/EvenScheduler.java | 2 +-
.../storm/scheduler/IsolationScheduler.java | 2 +-
.../multitenant/MultitenantScheduler.java | 2 +-
.../resource/ResourceAwareScheduler.java | 4 +-
.../storm/testing/CompleteTopologyParam.java | 12 +-
.../storm/testing/InProcessZookeeper.java | 2 +-
.../org/apache/storm/utils/ServerUtils.java | 8 +-
.../storm/utils/StormCommonInstaller.java | 2 +-
.../storm/zookeeper/LeaderElectorImp.java | 6 +-
.../org/apache/storm/zookeeper/Zookeeper.java | 6 +-
.../java/org/apache/storm/MessagingTest.java | 8 +-
.../test/java/org/apache/storm/TestCgroups.java | 4 +-
.../java/org/apache/storm/TickTupleTest.java | 14 +--
.../apache/storm/blobstore/BlobStoreTest.java | 4 +-
.../storm/blobstore/BlobSynchronizerTest.java | 4 +-
.../apache/storm/localizer/LocalizerTest.java | 20 ++--
.../ClusterMetricsConsumerExecutorTest.java | 2 +-
.../apache/storm/nimbus/LocalNimbusTest.java | 14 +--
.../TestUtilsForResourceAwareScheduler.java | 8 +-
.../submit/command/DependencyResolverMain.java | 2 +-
.../storm/submit/dependency/AetherUtils.java | 2 +-
.../submit/dependency/DependencyResolver.java | 2 +-
.../submit/dependency/AetherUtilsTest.java | 2 +-
.../dependency/DependencyResolverTest.java | 2 +-
.../daemon/drpc/webapp/DRPCApplication.java | 2 +-
transform.sh | 34 ------
597 files changed, 1490 insertions(+), 1525 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 78506ec..f70d5e0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,6 @@ before_install:
- rvm use 2.1.5 --install
- nvm install 0.12.2
- nvm use 0.12.2
- - ./transform.sh
install: /bin/bash ./dev-tools/travis/travis-install.sh `pwd`
script:
- /bin/bash ./dev-tools/travis/travis-script.sh `pwd` $MODULES
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexTopology.java
----------------------------------------------------------------------
diff --git a/examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexTopology.java b/examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexTopology.java
index c7ec7d0..8de9b11 100644
--- a/examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexTopology.java
+++ b/examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexTopology.java
@@ -74,7 +74,7 @@ public class EsIndexTopology {
declarer.declare(new Fields("source", "index", "type", "id"));
}
- public void open(Map config, TopologyContext context,
+ public void open(Map<String, Object> config, TopologyContext context,
SpoutOutputCollector collector) {
this.collector = collector;
this.pending = new ConcurrentHashMap<UUID, Values>();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/trident/TridentEsTopology.java
----------------------------------------------------------------------
diff --git a/examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/trident/TridentEsTopology.java b/examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/trident/TridentEsTopology.java
index e7fb2ef..9fdd4a8 100644
--- a/examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/trident/TridentEsTopology.java
+++ b/examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/trident/TridentEsTopology.java
@@ -87,7 +87,7 @@ public class TridentEsTopology {
}
@Override
- public void open(Map conf, TopologyContext context) {
+ public void open(Map<String, Object> conf, TopologyContext context) {
index = 0;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-hbase-examples/src/main/java/org/apache/storm/hbase/topology/TotalWordCounter.java
----------------------------------------------------------------------
diff --git a/examples/storm-hbase-examples/src/main/java/org/apache/storm/hbase/topology/TotalWordCounter.java b/examples/storm-hbase-examples/src/main/java/org/apache/storm/hbase/topology/TotalWordCounter.java
index 61b0dd8..aa28a52 100644
--- a/examples/storm-hbase-examples/src/main/java/org/apache/storm/hbase/topology/TotalWordCounter.java
+++ b/examples/storm-hbase-examples/src/main/java/org/apache/storm/hbase/topology/TotalWordCounter.java
@@ -38,7 +38,7 @@ public class TotalWordCounter implements IBasicBolt {
private static final Logger LOG = LoggerFactory.getLogger(TotalWordCounter.class);
private static final Random RANDOM = new Random();
@SuppressWarnings("rawtypes")
- public void prepare(Map stormConf, TopologyContext context) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context) {
}
/*
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-hbase-examples/src/main/java/org/apache/storm/hbase/topology/WordCounter.java
----------------------------------------------------------------------
diff --git a/examples/storm-hbase-examples/src/main/java/org/apache/storm/hbase/topology/WordCounter.java b/examples/storm-hbase-examples/src/main/java/org/apache/storm/hbase/topology/WordCounter.java
index 3a350a8..6054699 100644
--- a/examples/storm-hbase-examples/src/main/java/org/apache/storm/hbase/topology/WordCounter.java
+++ b/examples/storm-hbase-examples/src/main/java/org/apache/storm/hbase/topology/WordCounter.java
@@ -32,7 +32,7 @@ public class WordCounter implements IBasicBolt {
@SuppressWarnings("rawtypes")
- public void prepare(Map stormConf, TopologyContext context) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context) {
}
/*
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-hbase-examples/src/main/java/org/apache/storm/hbase/topology/WordSpout.java
----------------------------------------------------------------------
diff --git a/examples/storm-hbase-examples/src/main/java/org/apache/storm/hbase/topology/WordSpout.java b/examples/storm-hbase-examples/src/main/java/org/apache/storm/hbase/topology/WordSpout.java
index c5fc490..00ac67d 100644
--- a/examples/storm-hbase-examples/src/main/java/org/apache/storm/hbase/topology/WordSpout.java
+++ b/examples/storm-hbase-examples/src/main/java/org/apache/storm/hbase/topology/WordSpout.java
@@ -46,7 +46,7 @@ public class WordSpout implements IRichSpout {
}
@SuppressWarnings("rawtypes")
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/bolt/HdfsFileTopology.java
----------------------------------------------------------------------
diff --git a/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/bolt/HdfsFileTopology.java b/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/bolt/HdfsFileTopology.java
index ea3ab94..f8d69ca 100644
--- a/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/bolt/HdfsFileTopology.java
+++ b/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/bolt/HdfsFileTopology.java
@@ -128,7 +128,7 @@ public class HdfsFileTopology {
declarer.declare(new Fields("sentence", "timestamp"));
}
- public void open(Map config, TopologyContext context,
+ public void open(Map<String, Object> config, TopologyContext context,
SpoutOutputCollector collector) {
this.collector = collector;
this.pending = new ConcurrentHashMap<UUID, Values>();
@@ -167,7 +167,7 @@ public class HdfsFileTopology {
private HashMap<String, Long> counts = null;
private OutputCollector collector;
- public void prepare(Map config, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> config, TopologyContext context, OutputCollector collector) {
this.counts = new HashMap<String, Long>();
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/bolt/SequenceFileTopology.java
----------------------------------------------------------------------
diff --git a/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/bolt/SequenceFileTopology.java b/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/bolt/SequenceFileTopology.java
index 0ef3868..2707af5 100644
--- a/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/bolt/SequenceFileTopology.java
+++ b/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/bolt/SequenceFileTopology.java
@@ -134,7 +134,7 @@ public class SequenceFileTopology {
declarer.declare(new Fields("sentence", "timestamp"));
}
- public void open(Map config, TopologyContext context,
+ public void open(Map<String, Object> config, TopologyContext context,
SpoutOutputCollector collector) {
this.collector = collector;
this.pending = new ConcurrentHashMap<UUID, Values>();
@@ -175,7 +175,7 @@ public class SequenceFileTopology {
private HashMap<String, Long> counts = null;
private OutputCollector collector;
- public void prepare(Map config, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> config, TopologyContext context, OutputCollector collector) {
this.counts = new HashMap<String, Long>();
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/spout/HdfsSpoutTopology.java
----------------------------------------------------------------------
diff --git a/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/spout/HdfsSpoutTopology.java b/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/spout/HdfsSpoutTopology.java
index 580cb91..a5d283e 100644
--- a/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/spout/HdfsSpoutTopology.java
+++ b/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/spout/HdfsSpoutTopology.java
@@ -60,7 +60,7 @@ public class HdfsSpoutTopology {
}
@Override
- public void prepare(Map conf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> conf, TopologyContext context, OutputCollector collector) {
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/trident/FixedBatchSpout.java
----------------------------------------------------------------------
diff --git a/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/trident/FixedBatchSpout.java b/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/trident/FixedBatchSpout.java
index 76cc2aa..1553971 100644
--- a/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/trident/FixedBatchSpout.java
+++ b/examples/storm-hdfs-examples/src/main/java/org/apache/storm/hdfs/trident/FixedBatchSpout.java
@@ -49,7 +49,7 @@ public class FixedBatchSpout implements IBatchSpout {
}
@Override
- public void open(Map conf, TopologyContext context) {
+ public void open(Map<String, Object> conf, TopologyContext context) {
index = 0;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/BucketTestHiveTopology.java
----------------------------------------------------------------------
diff --git a/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/BucketTestHiveTopology.java b/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/BucketTestHiveTopology.java
index 50ab532..19bf4d4 100644
--- a/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/BucketTestHiveTopology.java
+++ b/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/BucketTestHiveTopology.java
@@ -123,7 +123,7 @@ public class BucketTestHiveTopology {
declarer.declare(new Fields(this.outputFields));
}
- public void open(Map config, TopologyContext context,
+ public void open(Map<String, Object> config, TopologyContext context,
SpoutOutputCollector collector) {
this.collector = collector;
this.pending = new ConcurrentHashMap<UUID, Values>();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/HiveTopology.java
----------------------------------------------------------------------
diff --git a/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/HiveTopology.java b/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/HiveTopology.java
index 39c9d5f..d9d4ea9 100644
--- a/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/HiveTopology.java
+++ b/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/HiveTopology.java
@@ -104,7 +104,7 @@ public class HiveTopology {
declarer.declare(new Fields("id","name","phone","street","city","state"));
}
- public void open(Map config, TopologyContext context,
+ public void open(Map<String, Object> config, TopologyContext context,
SpoutOutputCollector collector) {
this.collector = collector;
this.pending = new ConcurrentHashMap<UUID, Values>();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/HiveTopologyPartitioned.java
----------------------------------------------------------------------
diff --git a/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/HiveTopologyPartitioned.java b/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/HiveTopologyPartitioned.java
index dc51708..4d8089d 100644
--- a/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/HiveTopologyPartitioned.java
+++ b/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/bolt/HiveTopologyPartitioned.java
@@ -105,7 +105,7 @@ public class HiveTopologyPartitioned {
declarer.declare(new Fields("id","name","phone","street","city","state"));
}
- public void open(Map config, TopologyContext context,
+ public void open(Map<String, Object> config, TopologyContext context,
SpoutOutputCollector collector) {
this.collector = collector;
this.pending = new ConcurrentHashMap<UUID, Values>();
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/trident/TridentHiveTopology.java
----------------------------------------------------------------------
diff --git a/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/trident/TridentHiveTopology.java b/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/trident/TridentHiveTopology.java
index 5204f5b..09bb331 100644
--- a/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/trident/TridentHiveTopology.java
+++ b/examples/storm-hive-examples/src/main/java/org/apache/storm/hive/trident/TridentHiveTopology.java
@@ -142,7 +142,7 @@ public class TridentHiveTopology {
}
@Override
- public void open(Map conf, TopologyContext context) {
+ public void open(Map<String, Object> conf, TopologyContext context) {
index = 0;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-jdbc-examples/src/main/java/org/apache/storm/jdbc/spout/UserSpout.java
----------------------------------------------------------------------
diff --git a/examples/storm-jdbc-examples/src/main/java/org/apache/storm/jdbc/spout/UserSpout.java b/examples/storm-jdbc-examples/src/main/java/org/apache/storm/jdbc/spout/UserSpout.java
index fdcd053..f05f79a 100644
--- a/examples/storm-jdbc-examples/src/main/java/org/apache/storm/jdbc/spout/UserSpout.java
+++ b/examples/storm-jdbc-examples/src/main/java/org/apache/storm/jdbc/spout/UserSpout.java
@@ -48,7 +48,7 @@ public class UserSpout implements IRichSpout {
}
@SuppressWarnings("rawtypes")
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-jms-examples/src/main/java/org/apache/storm/jms/example/GenericBolt.java
----------------------------------------------------------------------
diff --git a/examples/storm-jms-examples/src/main/java/org/apache/storm/jms/example/GenericBolt.java b/examples/storm-jms-examples/src/main/java/org/apache/storm/jms/example/GenericBolt.java
index 57de1ba..be6afb0 100644
--- a/examples/storm-jms-examples/src/main/java/org/apache/storm/jms/example/GenericBolt.java
+++ b/examples/storm-jms-examples/src/main/java/org/apache/storm/jms/example/GenericBolt.java
@@ -68,7 +68,7 @@ public class GenericBolt extends BaseRichBolt {
}
@SuppressWarnings("rawtypes")
- public void prepare(Map stormConf, TopologyContext context,
+ public void prepare(Map<String, Object> topoConf, TopologyContext context,
OutputCollector collector) {
this.collector = collector;
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/TotalWordCounter.java
----------------------------------------------------------------------
diff --git a/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/TotalWordCounter.java b/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/TotalWordCounter.java
index 137aac4..3827e77 100644
--- a/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/TotalWordCounter.java
+++ b/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/TotalWordCounter.java
@@ -38,7 +38,7 @@ public class TotalWordCounter implements IBasicBolt {
private static final Logger LOG = LoggerFactory.getLogger(TotalWordCounter.class);
private static final Random RANDOM = new Random();
@SuppressWarnings("rawtypes")
- public void prepare(Map stormConf, TopologyContext context) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context) {
}
/*
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/WordCounter.java
----------------------------------------------------------------------
diff --git a/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/WordCounter.java b/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/WordCounter.java
index bc1e797..4054274 100644
--- a/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/WordCounter.java
+++ b/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/WordCounter.java
@@ -31,7 +31,7 @@ import java.util.Map;
public class WordCounter implements IBasicBolt {
private Map<String, Integer> wordCounter = Maps.newHashMap();
- public void prepare(Map stormConf, TopologyContext context) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context) {
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/WordSpout.java
----------------------------------------------------------------------
diff --git a/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/WordSpout.java b/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/WordSpout.java
index 885b1e8..086ac2f 100644
--- a/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/WordSpout.java
+++ b/examples/storm-mongodb-examples/src/main/java/org/apache/storm/mongodb/topology/WordSpout.java
@@ -46,7 +46,7 @@ public class WordSpout implements IRichSpout {
}
@SuppressWarnings("rawtypes")
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-opentsdb-examples/src/main/java/org/apache/storm/opentsdb/MetricGenBatchSpout.java
----------------------------------------------------------------------
diff --git a/examples/storm-opentsdb-examples/src/main/java/org/apache/storm/opentsdb/MetricGenBatchSpout.java b/examples/storm-opentsdb-examples/src/main/java/org/apache/storm/opentsdb/MetricGenBatchSpout.java
index b0580f6..4e57d9a 100644
--- a/examples/storm-opentsdb-examples/src/main/java/org/apache/storm/opentsdb/MetricGenBatchSpout.java
+++ b/examples/storm-opentsdb-examples/src/main/java/org/apache/storm/opentsdb/MetricGenBatchSpout.java
@@ -45,7 +45,7 @@ public class MetricGenBatchSpout implements IBatchSpout {
}
@Override
- public void open(Map conf, TopologyContext context) {
+ public void open(Map<String, Object> conf, TopologyContext context) {
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-opentsdb-examples/src/main/java/org/apache/storm/opentsdb/MetricGenSpout.java
----------------------------------------------------------------------
diff --git a/examples/storm-opentsdb-examples/src/main/java/org/apache/storm/opentsdb/MetricGenSpout.java b/examples/storm-opentsdb-examples/src/main/java/org/apache/storm/opentsdb/MetricGenSpout.java
index 21af196..09904ee 100644
--- a/examples/storm-opentsdb-examples/src/main/java/org/apache/storm/opentsdb/MetricGenSpout.java
+++ b/examples/storm-opentsdb-examples/src/main/java/org/apache/storm/opentsdb/MetricGenSpout.java
@@ -41,7 +41,7 @@ public class MetricGenSpout extends BaseRichSpout {
TupleOpenTsdbDatapointMapper.DEFAULT_MAPPER.getValueField(),
TupleOpenTsdbDatapointMapper.DEFAULT_MAPPER.getTagsField());
- private Map conf;
+ private Map<String, Object> conf;
private TopologyContext context;
private SpoutOutputCollector collector;
@@ -51,7 +51,7 @@ public class MetricGenSpout extends BaseRichSpout {
}
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
this.conf = conf;
this.context = context;
this.collector = collector;
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-perf/src/main/java/org/apache/storm/perf/HdfsSpoutNullBoltTopo.java
----------------------------------------------------------------------
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/HdfsSpoutNullBoltTopo.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/HdfsSpoutNullBoltTopo.java
index 248b523..2917587 100644
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/HdfsSpoutNullBoltTopo.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/HdfsSpoutNullBoltTopo.java
@@ -54,7 +54,7 @@ public class HdfsSpoutNullBoltTopo {
public static final int DEFAULT_BOLT_NUM = 1;
- public static StormTopology getTopology(Map config) {
+ public static StormTopology getTopology(Map<String, Object> config) {
final int spoutNum = Helper.getInt(config, SPOUT_NUM, DEFAULT_SPOUT_NUM);
final int boltNum = Helper.getInt(config, BOLT_NUM, DEFAULT_BOLT_NUM);
@@ -93,7 +93,7 @@ public class HdfsSpoutNullBoltTopo {
}
Integer durationSec = Integer.parseInt(args[0]);
- Map topoConf = Utils.findAndReadConfigFile(args[1]);
+ Map<String, Object> topoConf = Utils.findAndReadConfigFile(args[1]);
// Submit to Storm cluster
Helper.runOnClusterAndPrintMetrics(durationSec, TOPOLOGY_NAME, topoConf, getTopology(topoConf));
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-perf/src/main/java/org/apache/storm/perf/KafkaHdfsTopo.java
----------------------------------------------------------------------
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/KafkaHdfsTopo.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/KafkaHdfsTopo.java
index 1dda177..d2ed691 100755
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/KafkaHdfsTopo.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/KafkaHdfsTopo.java
@@ -72,7 +72,7 @@ public class KafkaHdfsTopo {
- public static StormTopology getTopology(Map config) {
+ public static StormTopology getTopology(Map<String, Object> config) {
final int spoutNum = getInt(config, SPOUT_NUM, DEFAULT_SPOUT_NUM);
final int boltNum = getInt(config, BOLT_NUM, DEFAULT_BOLT_NUM);
@@ -136,7 +136,7 @@ public class KafkaHdfsTopo {
Integer durationSec = Integer.parseInt(args[0]);
String confFile = args[1];
- Map topoConf = Utils.findAndReadConfigFile(confFile);
+ Map<String, Object> topoConf = Utils.findAndReadConfigFile(confFile);
// Submit topology to Storm cluster
Helper.runOnClusterAndPrintMetrics(durationSec, TOPOLOGY_NAME, topoConf, getTopology(topoConf));
@@ -166,4 +166,4 @@ public class KafkaHdfsTopo {
return (tuple.getValueByField(fieldName).toString() + this.lineDelimiter).getBytes();
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-perf/src/main/java/org/apache/storm/perf/KafkaSpoutNullBoltTopo.java
----------------------------------------------------------------------
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/KafkaSpoutNullBoltTopo.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/KafkaSpoutNullBoltTopo.java
index e755ec5..321ab78 100755
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/KafkaSpoutNullBoltTopo.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/KafkaSpoutNullBoltTopo.java
@@ -60,7 +60,7 @@ public class KafkaSpoutNullBoltTopo {
public static final String BOLT_ID = "devNullBolt";
- public static StormTopology getTopology(Map config) {
+ public static StormTopology getTopology(Map<String, Object> config) {
final int spoutNum = getInt(config, SPOUT_NUM, DEFAULT_SPOUT_NUM);
final int boltNum = getInt(config, BOLT_NUM, DEFAULT_BOLT_NUM);
@@ -107,7 +107,7 @@ public class KafkaSpoutNullBoltTopo {
return;
}
Integer durationSec = Integer.parseInt(args[0]);
- Map topoConf = Utils.findAndReadConfigFile(args[1]);
+ Map<String, Object> topoConf = Utils.findAndReadConfigFile(args[1]);
// Submit to Storm cluster
Helper.runOnClusterAndPrintMetrics(durationSec, TOPOLOGY_NAME, topoConf, getTopology(topoConf));
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-perf/src/main/java/org/apache/storm/perf/StrGenSpoutHdfsBoltTopo.java
----------------------------------------------------------------------
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/StrGenSpoutHdfsBoltTopo.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/StrGenSpoutHdfsBoltTopo.java
index ed81a4a..61cf394 100755
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/StrGenSpoutHdfsBoltTopo.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/StrGenSpoutHdfsBoltTopo.java
@@ -150,4 +150,4 @@ public class StrGenSpoutHdfsBoltTopo {
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/CountBolt.java
----------------------------------------------------------------------
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/CountBolt.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/CountBolt.java
index b79a0ee..3286ac3 100644
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/CountBolt.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/CountBolt.java
@@ -37,7 +37,7 @@ public class CountBolt extends BaseBasicBolt {
Map<String, Integer> counts = new HashMap<>();
@Override
- public void prepare(Map stormConf, TopologyContext context) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context) {
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/DevNullBolt.java
----------------------------------------------------------------------
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/DevNullBolt.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/DevNullBolt.java
index b85ce15..f9d045e 100755
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/DevNullBolt.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/DevNullBolt.java
@@ -31,7 +31,7 @@ public class DevNullBolt extends BaseRichBolt {
private OutputCollector collector;
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/IdBolt.java
----------------------------------------------------------------------
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/IdBolt.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/IdBolt.java
index 116265e..3735447 100644
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/IdBolt.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/IdBolt.java
@@ -32,7 +32,7 @@ public class IdBolt extends BaseRichBolt {
private OutputCollector collector;
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
this.collector = collector;
}
@@ -46,4 +46,4 @@ public class IdBolt extends BaseRichBolt {
public void declareOutputFields(OutputFieldsDeclarer declarer) {
declarer.declare(new Fields("field1"));
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/SplitSentenceBolt.java
----------------------------------------------------------------------
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/SplitSentenceBolt.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/SplitSentenceBolt.java
index 96f9f73..f32628d 100644
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/SplitSentenceBolt.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/bolt/SplitSentenceBolt.java
@@ -33,7 +33,7 @@ public class SplitSentenceBolt extends BaseBasicBolt {
public static final String FIELDS = "word";
@Override
- public void prepare(Map stormConf, TopologyContext context) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context) {
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/ConstSpout.java
----------------------------------------------------------------------
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/ConstSpout.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/ConstSpout.java
index b66e4f3..afd2ebc 100755
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/ConstSpout.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/ConstSpout.java
@@ -52,7 +52,7 @@ public class ConstSpout extends BaseRichSpout {
}
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/FileReadSpout.java
----------------------------------------------------------------------
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/FileReadSpout.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/FileReadSpout.java
index 959e7c6..4815a02 100644
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/FileReadSpout.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/FileReadSpout.java
@@ -56,7 +56,7 @@ public class FileReadSpout extends BaseRichSpout {
}
@Override
- public void open(Map conf, TopologyContext context,
+ public void open(Map<String, Object> conf, TopologyContext context,
SpoutOutputCollector collector) {
this.collector = collector;
Object ackObj = conf.get("topology.acker.executors");
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/StringGenSpout.java
----------------------------------------------------------------------
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/StringGenSpout.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/StringGenSpout.java
index f9c665b..6adb2e3 100755
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/StringGenSpout.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/spout/StringGenSpout.java
@@ -61,7 +61,7 @@ public class StringGenSpout extends BaseRichSpout {
}
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
this.records = genStringList(strLen, strCount);
this.collector = collector;
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/BasicMetricsCollector.java
----------------------------------------------------------------------
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/BasicMetricsCollector.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/BasicMetricsCollector.java
index a008888..97c1aa9 100755
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/BasicMetricsCollector.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/BasicMetricsCollector.java
@@ -77,9 +77,9 @@ public class BasicMetricsCollector implements AutoCloseable {
boolean first = true;
- public BasicMetricsCollector(String topoName, Map<String, Object> stormConfig) {
+ public BasicMetricsCollector(String topoName, Map<String, Object> topoConfig) {
Set<MetricsItem> items = getMetricsToCollect();
- this.config = new MetricsCollectorConfig(topoName, stormConfig);
+ this.config = new MetricsCollectorConfig(topoName, topoConfig);
collectTopologyStats = collectTopologyStats(items);
collectExecutorStats = collectExecutorStats(items);
collectThroughput = collectThroughput(items);
@@ -252,15 +252,15 @@ public class BasicMetricsCollector implements AutoCloseable {
private static final Logger LOG = Logger.getLogger(MetricsCollectorConfig.class);
// storm configuration
- public final Map<String, Object> stormConfig;
+ public final Map<String, Object> topoConfig;
// storm topology name
public final String name;
// benchmark label
public final String label;
- public MetricsCollectorConfig(String topoName, Map<String, Object> stormConfig) {
- this.stormConfig = stormConfig;
- String labelStr = (String) stormConfig.get("benchmark.label");
+ public MetricsCollectorConfig(String topoName, Map<String, Object> topoConfig) {
+ this.topoConfig = topoConfig;
+ String labelStr = (String) topoConfig.get("benchmark.label");
this.name = topoName;
if (labelStr == null) {
LOG.warn("'benchmark.label' not found in config. Defaulting to topology name");
@@ -270,4 +270,4 @@ public class BasicMetricsCollector implements AutoCloseable {
}
} // MetricsCollectorConfig
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/Helper.java
----------------------------------------------------------------------
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/Helper.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/Helper.java
index d26078a..e34cb6e 100755
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/Helper.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/Helper.java
@@ -84,7 +84,7 @@ public class Helper {
});
}
- public static void runOnClusterAndPrintMetrics(int durationSec, String topoName, Map topoConf, StormTopology topology) throws Exception {
+ public static void runOnClusterAndPrintMetrics(int durationSec, String topoName, Map<String, Object> topoConf, StormTopology topology) throws Exception {
// submit topology
StormSubmitter.submitTopologyWithProgressBar(topoName, topoConf, topology);
setupShutdownHook(topoName); // handle Ctrl-C
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/IdentityBolt.java
----------------------------------------------------------------------
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/IdentityBolt.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/IdentityBolt.java
index 396ad53..54f8ee1 100755
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/IdentityBolt.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/IdentityBolt.java
@@ -33,7 +33,7 @@ public class IdentityBolt extends BaseRichBolt {
private OutputCollector collector;
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/MetricsSample.java
----------------------------------------------------------------------
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/MetricsSample.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/MetricsSample.java
index fbcea13..9becb0a 100755
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/MetricsSample.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/utils/MetricsSample.java
@@ -238,4 +238,4 @@ public class MetricsSample {
return this.usedSlots;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-pmml-examples/src/main/java/org/apache/storm/pmml/RawInputFromCSVSpout.java
----------------------------------------------------------------------
diff --git a/examples/storm-pmml-examples/src/main/java/org/apache/storm/pmml/RawInputFromCSVSpout.java b/examples/storm-pmml-examples/src/main/java/org/apache/storm/pmml/RawInputFromCSVSpout.java
index ddfc36e..444837b 100644
--- a/examples/storm-pmml-examples/src/main/java/org/apache/storm/pmml/RawInputFromCSVSpout.java
+++ b/examples/storm-pmml-examples/src/main/java/org/apache/storm/pmml/RawInputFromCSVSpout.java
@@ -71,7 +71,7 @@ public class RawInputFromCSVSpout extends BaseRichSpout {
}
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
this.collector = collector;
openReader();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/LookupWordCount.java
----------------------------------------------------------------------
diff --git a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/LookupWordCount.java b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/LookupWordCount.java
index 43798d0..475bbab 100644
--- a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/LookupWordCount.java
+++ b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/LookupWordCount.java
@@ -55,7 +55,7 @@ public class LookupWordCount {
private OutputCollector collector;
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WhitelistWordCount.java
----------------------------------------------------------------------
diff --git a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WhitelistWordCount.java b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WhitelistWordCount.java
index 4ac410a..9999afe 100644
--- a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WhitelistWordCount.java
+++ b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WhitelistWordCount.java
@@ -52,7 +52,7 @@ public class WhitelistWordCount {
private OutputCollector collector;
@Override
- public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector) {
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WordCounter.java
----------------------------------------------------------------------
diff --git a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WordCounter.java b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WordCounter.java
index 2dd95ff..6c6e67a 100644
--- a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WordCounter.java
+++ b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WordCounter.java
@@ -32,7 +32,7 @@ public class WordCounter implements IBasicBolt {
private Map<String, Integer> wordCounter = Maps.newHashMap();
@SuppressWarnings("rawtypes")
- public void prepare(Map stormConf, TopologyContext context) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context) {
}
public void execute(Tuple input, BasicOutputCollector collector) {
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WordSpout.java
----------------------------------------------------------------------
diff --git a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WordSpout.java b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WordSpout.java
index e2cdfde..76b2887 100644
--- a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WordSpout.java
+++ b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WordSpout.java
@@ -46,7 +46,7 @@ public class WordSpout implements IRichSpout {
}
@SuppressWarnings("rawtypes")
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-rocketmq-examples/src/main/java/org/apache/storm/rocketmq/topology/WordCounter.java
----------------------------------------------------------------------
diff --git a/examples/storm-rocketmq-examples/src/main/java/org/apache/storm/rocketmq/topology/WordCounter.java b/examples/storm-rocketmq-examples/src/main/java/org/apache/storm/rocketmq/topology/WordCounter.java
index 327c11a..b679643 100644
--- a/examples/storm-rocketmq-examples/src/main/java/org/apache/storm/rocketmq/topology/WordCounter.java
+++ b/examples/storm-rocketmq-examples/src/main/java/org/apache/storm/rocketmq/topology/WordCounter.java
@@ -31,7 +31,7 @@ import java.util.Map;
public class WordCounter implements IBasicBolt {
private Map<String, Integer> wordCounter = new HashMap<>();
- public void prepare(Map stormConf, TopologyContext context) {
+ public void prepare(Map<String, Object> topoConf, TopologyContext context) {
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/spout/SolrFieldsSpout.java
----------------------------------------------------------------------
diff --git a/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/spout/SolrFieldsSpout.java b/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/spout/SolrFieldsSpout.java
index 8e3390d..2959eed 100644
--- a/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/spout/SolrFieldsSpout.java
+++ b/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/spout/SolrFieldsSpout.java
@@ -48,7 +48,7 @@ public class SolrFieldsSpout extends BaseRichSpout {
}
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/spout/SolrJsonSpout.java
----------------------------------------------------------------------
diff --git a/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/spout/SolrJsonSpout.java b/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/spout/SolrJsonSpout.java
index e42155d..4f52668 100644
--- a/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/spout/SolrJsonSpout.java
+++ b/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/spout/SolrJsonSpout.java
@@ -39,7 +39,7 @@ public class SolrJsonSpout extends BaseRichSpout {
getPojoValues("1"), getPojoValues("2")); // Tuple contains Java object that must be serialized to JSON by SolrJsonMapper
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
this.collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-starter/src/jvm/org/apache/storm/starter/BlobStoreAPIWordCountTopology.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/BlobStoreAPIWordCountTopology.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/BlobStoreAPIWordCountTopology.java
index a6352c9..2fc28d2 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/BlobStoreAPIWordCountTopology.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/BlobStoreAPIWordCountTopology.java
@@ -78,7 +78,7 @@ public class BlobStoreAPIWordCountTopology {
SpoutOutputCollector _collector;
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
_collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-starter/src/jvm/org/apache/storm/starter/ExclamationTopology.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/ExclamationTopology.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/ExclamationTopology.java
index ed93686..a691201 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/ExclamationTopology.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/ExclamationTopology.java
@@ -39,7 +39,7 @@ public class ExclamationTopology extends ConfigurableTopology {
OutputCollector _collector;
@Override
- public void prepare(Map conf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> conf, TopologyContext context, OutputCollector collector) {
_collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-starter/src/jvm/org/apache/storm/starter/FastWordCountTopology.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/FastWordCountTopology.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/FastWordCountTopology.java
index 1c48480..7c1cffd 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/FastWordCountTopology.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/FastWordCountTopology.java
@@ -55,7 +55,7 @@ public class FastWordCountTopology {
};
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
_collector = collector;
_rand = ThreadLocalRandom.current();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-starter/src/jvm/org/apache/storm/starter/InOrderDeliveryTest.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/InOrderDeliveryTest.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/InOrderDeliveryTest.java
index 63be726..f725d14 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/InOrderDeliveryTest.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/InOrderDeliveryTest.java
@@ -44,7 +44,7 @@ public class InOrderDeliveryTest {
int _i = 0;
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
_collector = collector;
_base = context.getThisTaskIndex();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-starter/src/jvm/org/apache/storm/starter/MultipleLoggerTopology.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/MultipleLoggerTopology.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/MultipleLoggerTopology.java
index 26c4ee8..aeedc78 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/MultipleLoggerTopology.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/MultipleLoggerTopology.java
@@ -46,7 +46,7 @@ public class MultipleLoggerTopology {
Logger _subLogger = LoggerFactory.getLogger ("com.myapp.sub");
@Override
- public void prepare(Map conf, TopologyContext context, OutputCollector collector) {
+ public void prepare(Map<String, Object> conf, TopologyContext context, OutputCollector collector) {
_collector = collector;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/examples/storm-starter/src/jvm/org/apache/storm/starter/ReachTopology.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/ReachTopology.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/ReachTopology.java
index efac86a..4da1c85 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/ReachTopology.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/ReachTopology.java
@@ -115,7 +115,7 @@ public class ReachTopology {
Set<String> _followers = new HashSet<String>();
@Override
- public void prepare(Map conf, TopologyContext context, BatchOutputCollector collector, Object id) {
+ public void prepare(Map<String, Object> conf, TopologyContext context, BatchOutputCollector collector, Object id) {
_collector = collector;
_id = id;
}
@@ -142,7 +142,7 @@ public class ReachTopology {
int _count = 0;
@Override
- public void prepare(Map conf, TopologyContext context, BatchOutputCollector collector, Object id) {
+ public void prepare(Map<String, Object> conf, TopologyContext context, BatchOutputCollector collector, Object id) {
_collector = collector;
_id = id;
}