You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2017/04/18 19:26:18 UTC
[3/4] storm git commit: Merge branch 'STORM-2379' of
https://github.com/hmcc/storm
Merge branch 'STORM-2379' of https://github.com/hmcc/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/55297b01
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/55297b01
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/55297b01
Branch: refs/heads/master
Commit: 55297b01d67981572f4705b210a904e560e5ac6d
Parents: c38d795 2b4565c
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Tue Apr 18 10:50:15 2017 -0700
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Tue Apr 18 10:50:15 2017 -0700
----------------------------------------------------------------------
examples/storm-elasticsearch-examples/pom.xml | 10 ++
.../elasticsearch/bolt/EsIndexTopology.java | 3 +-
.../storm/elasticsearch/common/EsTestUtil.java | 14 +-
.../trident/TridentEsTopology.java | 3 +-
external/storm-elasticsearch/pom.xml | 44 ++++++-
.../DefaultEsLookupResultOutput.java | 62 +++++++++
.../elasticsearch/ElasticsearchGetRequest.java | 36 -----
.../elasticsearch/EsLookupResultOutput.java | 5 +-
.../elasticsearch/bolt/AbstractEsBolt.java | 53 +++++---
.../storm/elasticsearch/bolt/EsIndexBolt.java | 31 +++--
.../storm/elasticsearch/bolt/EsLookupBolt.java | 49 ++++---
.../elasticsearch/bolt/EsPercolateBolt.java | 41 ++++--
.../common/DefaultEsTupleMapper.java | 20 +++
.../storm/elasticsearch/common/EsConfig.java | 130 +++++++++++++------
.../elasticsearch/common/EsTupleMapper.java | 9 ++
.../common/StormElasticSearchClient.java | 37 +++---
.../common/TransportAddresses.java | 72 ----------
.../apache/storm/elasticsearch/doc/Index.java | 69 ++++++++++
.../storm/elasticsearch/doc/IndexDoc.java | 43 ++++++
.../storm/elasticsearch/doc/IndexItem.java | 91 +++++++++++++
.../storm/elasticsearch/doc/IndexItemDoc.java | 42 ++++++
.../apache/storm/elasticsearch/doc/Shards.java | 63 +++++++++
.../storm/elasticsearch/doc/SourceDoc.java | 43 ++++++
.../response/BulkIndexResponse.java | 80 ++++++++++++
.../elasticsearch/response/LookupResponse.java | 63 +++++++++
.../response/PercolateResponse.java | 85 ++++++++++++
.../storm/elasticsearch/trident/EsState.java | 72 ++++++----
.../elasticsearch/trident/EsStateFactory.java | 15 +--
.../bolt/AbstractEsBoltIntegrationTest.java | 68 +++-------
.../elasticsearch/bolt/AbstractEsBoltTest.java | 15 ++-
.../elasticsearch/bolt/EsIndexBoltTest.java | 44 ++++---
.../bolt/EsLookupBoltIntegrationTest.java | 75 +++--------
.../elasticsearch/bolt/EsLookupBoltTest.java | 67 +++++-----
.../elasticsearch/bolt/EsPercolateBoltTest.java | 62 ++++++---
.../elasticsearch/common/EsConfigTest.java | 60 ++++-----
.../storm/elasticsearch/common/EsTestUtil.java | 99 ++++++++++++--
.../common/TransportAddressesTest.java | 81 ------------
.../trident/EsStateFactoryTest.java | 2 +-
.../elasticsearch/trident/EsStateTest.java | 98 ++++++++++++++
.../src/test/resources/log4j2.xml | 33 +++++
40 files changed, 1424 insertions(+), 565 deletions(-)
----------------------------------------------------------------------