You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2015/09/01 15:32:11 UTC
[09/10] storm git commit: Merge branch 'master' of
https://github.com/alexpanov/storm into STORM-1013
Merge branch 'master' of https://github.com/alexpanov/storm into STORM-1013
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/25aecf17
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/25aecf17
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/25aecf17
Branch: refs/heads/master
Commit: 25aecf17002b04c43ac258f3ef027f67a3de60df
Parents: bf5c35b fff82fd
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Tue Sep 1 22:22:45 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue Sep 1 22:22:45 2015 +0900
----------------------------------------------------------------------
external/storm-elasticsearch/README.md | 37 ++++-----
external/storm-elasticsearch/pom.xml | 6 ++
.../elasticsearch/bolt/AbstractEsBolt.java | 10 ++-
.../elasticsearch/bolt/ElasticSearchClient.java | 57 --------------
.../storm/elasticsearch/bolt/EsIndexBolt.java | 4 +-
.../storm/elasticsearch/bolt/EsLookupBolt.java | 10 +++
.../elasticsearch/bolt/EsPercolateBolt.java | 4 +-
.../elasticsearch/bolt/TransportAddresses.java | 72 -----------------
.../storm/elasticsearch/common/EsConfig.java | 64 +++++++++++-----
.../common/StormElasticSearchClient.java | 48 ++++++++++++
.../common/TransportAddresses.java | 72 +++++++++++++++++
.../storm/elasticsearch/trident/EsState.java | 32 ++------
.../elasticsearch/trident/EsStateFactory.java | 20 ++---
.../storm/elasticsearch/trident/EsUpdater.java | 2 +-
.../elasticsearch/bolt/AbstractEsBoltTest.java | 15 +++-
.../elasticsearch/bolt/EsIndexBoltTest.java | 5 ++
.../elasticsearch/bolt/EsIndexTopology.java | 4 +-
.../bolt/EsLookupBoltIntegrationTest.java | 5 ++
.../elasticsearch/bolt/EsLookupBoltTest.java | 5 ++
.../elasticsearch/bolt/EsPercolateBoltTest.java | 5 ++
.../bolt/TransportAddressesTest.java | 81 --------------------
.../elasticsearch/common/EsConfigTest.java | 71 +++++++++++++++++
.../common/TransportAddressesTest.java | 81 ++++++++++++++++++++
.../trident/EsStateFactoryTest.java | 32 ++++++++
.../trident/TridentEsTopology.java | 6 +-
25 files changed, 450 insertions(+), 298 deletions(-)
----------------------------------------------------------------------