From 8bbee40c3c2426aea9028290296cd758c3a3b567 Mon Sep 17 00:00:00 2001 From: Jing Chen Date: Wed, 15 Aug 2018 13:34:57 -0700 Subject: [PATCH] STORM-2578: Apply new code style to storm-elasticsearch --- external/storm-elasticsearch/pom.xml | 2 +- .../DefaultEsLookupResultOutput.java | 11 +++++++--- .../elasticsearch/EsLookupResultOutput.java | 8 ++++++- .../elasticsearch/bolt/AbstractEsBolt.java | 7 ++++--- .../storm/elasticsearch/bolt/EsIndexBolt.java | 5 +++-- .../elasticsearch/bolt/EsLookupBolt.java | 12 ++++++----- .../elasticsearch/bolt/EsPercolateBolt.java | 8 ++++--- .../common/DefaultEsTupleMapper.java | 2 +- .../storm/elasticsearch/common/EsConfig.java | 8 ++++--- .../elasticsearch/common/EsTupleMapper.java | 5 +++-- .../common/StormElasticSearchClient.java | 9 ++++++++ .../apache/storm/elasticsearch/doc/Index.java | 8 +++++++ .../storm/elasticsearch/doc/IndexDoc.java | 1 + .../storm/elasticsearch/doc/IndexItem.java | 1 + .../storm/elasticsearch/doc/IndexItemDoc.java | 1 + .../storm/elasticsearch/doc/Shards.java | 1 + .../storm/elasticsearch/doc/SourceDoc.java | 1 + .../response/BulkIndexResponse.java | 11 ++++++++++ .../response/LookupResponse.java | 5 +++-- .../response/PercolateResponse.java | 5 +++-- .../storm/elasticsearch/trident/EsState.java | 21 +++++++------------ .../elasticsearch/trident/EsStateFactory.java | 4 +++- .../elasticsearch/trident/EsUpdater.java | 5 +++-- 23 files changed, 97 insertions(+), 44 deletions(-) diff --git a/external/storm-elasticsearch/pom.xml b/external/storm-elasticsearch/pom.xml index 3386fbd8f4b..2394bbb350c 100644 --- a/external/storm-elasticsearch/pom.xml +++ b/external/storm-elasticsearch/pom.xml @@ -139,7 +139,7 @@ maven-checkstyle-plugin - 69 + 0 diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/DefaultEsLookupResultOutput.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/DefaultEsLookupResultOutput.java index 533dc653422..d25beadb5b7 100644 --- a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/DefaultEsLookupResultOutput.java +++ b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/DefaultEsLookupResultOutput.java @@ -15,8 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.storm.elasticsearch; +import com.fasterxml.jackson.databind.ObjectMapper; + import java.io.IOException; import java.util.Collection; import java.util.Collections; @@ -26,8 +29,6 @@ import org.apache.storm.tuple.Values; import org.elasticsearch.client.Response; -import com.fasterxml.jackson.databind.ObjectMapper; - /** * Default implementation of {@link EsLookupResultOutput}. * Outputs the index, type, id and source as strings. @@ -51,7 +52,11 @@ public Collection toValues(Response response) { } catch (UnsupportedOperationException | IOException e) { throw new IllegalArgumentException("Response " + response + " is invalid", e); } - return Collections.singleton(new Values(lookupResponse.getIndex(), lookupResponse.getType(), lookupResponse.getId(), lookupResponse.getSource())); + return Collections.singleton(new Values( + lookupResponse.getIndex(), + lookupResponse.getType(), + lookupResponse.getId(), + lookupResponse.getSource())); } @Override 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 b0577299bf9..71e250d7fbd 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 @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.storm.elasticsearch; import java.io.Serializable; @@ -25,17 +26,22 @@ import org.elasticsearch.client.Response; /** - * @since 0.11 * The adapter to convert the results fetched from Elasticsearch to values. + * + * @since 0.11 */ public interface EsLookupResultOutput extends Serializable { /** + * Convert Elasticsearch response to a collection of {@link Values}. + * * @return collection of values to emit. */ Collection toValues(Response response); /** + * {@link Fields} to be declared for output. + * * @return output fields to declare. */ Fields fields(); 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 a819f65230a..5612e707354 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 @@ -15,11 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.storm.elasticsearch.bolt; import static java.util.Objects.requireNonNull; import static org.apache.http.util.Args.notBlank; +import com.fasterxml.jackson.databind.ObjectMapper; + import java.util.Map; import org.apache.storm.elasticsearch.common.EsConfig; @@ -32,14 +35,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.fasterxml.jackson.databind.ObjectMapper; - public abstract class AbstractEsBolt extends BaseTickTupleAwareRichBolt { private static final Logger LOG = LoggerFactory.getLogger(AbstractEsBolt.class); protected static RestClient client; - protected final static ObjectMapper objectMapper = new ObjectMapper(); + protected static final ObjectMapper objectMapper = new ObjectMapper(); protected OutputCollector collector; private EsConfig esConfig; 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 9145a1b097f..6d46863319f 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 @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.storm.elasticsearch.bolt; import static java.util.Objects.requireNonNull; @@ -38,7 +39,7 @@ public class EsIndexBolt extends AbstractEsBolt { private final EsTupleMapper tupleMapper; /** - * EsIndexBolt constructor + * EsIndexBolt constructor. * @param esConfig Elasticsearch configuration containing node addresses {@link EsConfig} */ public EsIndexBolt(EsConfig esConfig) { @@ -46,7 +47,7 @@ public EsIndexBolt(EsConfig esConfig) { } /** - * EsIndexBolt constructor + * EsIndexBolt constructor. * @param esConfig Elasticsearch configuration containing node addresses {@link EsConfig} * @param tupleMapper Tuple to ES document mapper {@link EsTupleMapper} */ 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 1ff4686b29b..5faa69fbd71 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 @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.storm.elasticsearch.bolt; import static java.util.Objects.requireNonNull; @@ -35,6 +36,7 @@ import org.elasticsearch.client.Response; /** + * Basic bolt for looking up document in ES. * @since 0.11 */ public class EsLookupBolt extends AbstractEsBolt { @@ -76,12 +78,12 @@ public void process(Tuple tuple) { } private Collection lookupValuesInEs(Tuple tuple) throws IOException { - String index = tupleMapper.getIndex(tuple); - String type = tupleMapper.getType(tuple); - String id = tupleMapper.getId(tuple); - Map params = tupleMapper.getParams(tuple, new HashMap<>()); + String index = tupleMapper.getIndex(tuple); + String type = tupleMapper.getType(tuple); + String id = tupleMapper.getId(tuple); + Map params = tupleMapper.getParams(tuple, new HashMap<>()); - Response response = client.performRequest("get", getEndpoint(index, type, id), params); + Response response = client.performRequest("get", getEndpoint(index, type, id), params); return output.toValues(response); } 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 ac9e07a1f34..3f831f74ac2 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 @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.storm.elasticsearch.bolt; import static java.util.Objects.requireNonNull; @@ -43,7 +44,7 @@ public class EsPercolateBolt extends AbstractEsBolt { private final EsTupleMapper tupleMapper; /** - * EsPercolateBolt constructor + * EsPercolateBolt constructor. * @param esConfig Elasticsearch configuration containing node addresses {@link EsConfig} */ public EsPercolateBolt(EsConfig esConfig) { @@ -51,7 +52,7 @@ public EsPercolateBolt(EsConfig esConfig) { } /** - * EsPercolateBolt constructor + * EsPercolateBolt constructor. * @param esConfig Elasticsearch configuration containing node addresses and cluster name {@link EsConfig} * @param tupleMapper Tuple to ES document mapper {@link EsTupleMapper} */ @@ -81,7 +82,8 @@ public void process(Tuple tuple) { Map indexParams = new HashMap<>(); indexParams.put(type, null); String percolateDoc = "{\"doc\": " + source + "}"; - Response response = client.performRequest("get", getEndpoint(index, type, "_percolate"), new HashMap<>(), new StringEntity(percolateDoc)); + Response response = client.performRequest("get", getEndpoint(index, type, "_percolate"), + new HashMap<>(), new StringEntity(percolateDoc)); PercolateResponse percolateResponse = objectMapper.readValue(response.getEntity().getContent(), PercolateResponse.class); if (!percolateResponse.getMatches().isEmpty()) { for (PercolateResponse.Match match : percolateResponse.getMatches()) { 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 c8d750de96e..af4f4e9804a 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 @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.storm.elasticsearch.common; import java.util.HashMap; import java.util.Map; -import java.util.stream.Collectors; import org.apache.storm.tuple.ITuple; diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/common/EsConfig.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/common/EsConfig.java index 02f045db333..c665ae4f899 100644 --- a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/common/EsConfig.java +++ b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/common/EsConfig.java @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.storm.elasticsearch.common; import java.io.Serializable; @@ -28,6 +29,7 @@ import org.elasticsearch.client.RestClientBuilder.RequestConfigCallback; /** + * Configuration for Elasticsearch connection. * @since 0.11 */ public class EsConfig implements Serializable { @@ -49,7 +51,7 @@ public EsConfig() { } /** - * EsConfig Constructor to be used in EsIndexBolt, EsPercolateBolt and EsStateFactory + * EsConfig Constructor to be used in EsIndexBolt, EsPercolateBolt and EsStateFactory. * * @param urls Elasticsearch addresses in scheme://host:port pattern string array * @throws IllegalArgumentException if urls are empty @@ -61,12 +63,12 @@ public EsConfig(String... urls) { } this.httpHosts = new HttpHost[urls.length]; for (int i = 0; i < urls.length; i++) { - URI uri = toURI(urls[i]); + URI uri = toUri(urls[i]); this.httpHosts[i] = new HttpHost(uri.getHost(), uri.getPort(), uri.getScheme()); } } - static URI toURI(String url) throws IllegalArgumentException { + static URI toUri(String url) throws IllegalArgumentException { try { return new URI(url); } catch (URISyntaxException e) { 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 285e1125901..ab658da1257 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 @@ -15,13 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.storm.elasticsearch.common; -import org.apache.storm.tuple.ITuple; +package org.apache.storm.elasticsearch.common; import java.io.Serializable; import java.util.Map; +import org.apache.storm.tuple.ITuple; + /** * TupleMapper defines how to extract source, index, type, and id from tuple for ElasticSearch. */ diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/common/StormElasticSearchClient.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/common/StormElasticSearchClient.java index a4aca59a1c0..732aa084a4e 100644 --- a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/common/StormElasticSearchClient.java +++ b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/common/StormElasticSearchClient.java @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.storm.elasticsearch.common; import java.io.Serializable; @@ -22,6 +23,9 @@ import org.elasticsearch.client.RestClient; import org.elasticsearch.client.RestClientBuilder; +/** + * Client for connecting Elasticsearch. + */ public final class StormElasticSearchClient implements Serializable { private final EsConfig esConfig; @@ -30,6 +34,11 @@ public StormElasticSearchClient(EsConfig esConfig) { this.esConfig = esConfig; } + /** + * Creates a new {@link RestClient} using given {@link EsConfig}. + * + * @return {@link RestClient} for Elasticsearch connection + */ public RestClient construct() { RestClientBuilder builder = RestClient.builder(esConfig.getHttpHosts()); if (esConfig.getMaxRetryTimeoutMillis() != null) { diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/doc/Index.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/doc/Index.java index d010abe152b..463061fb599 100644 --- a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/doc/Index.java +++ b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/doc/Index.java @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.storm.elasticsearch.doc; import com.fasterxml.jackson.annotation.JsonProperty; @@ -28,6 +29,13 @@ public Index() { } + /** + * Create a Index with the specified index, type and id. + * + * @param index index name + * @param type document type to be stored + * @param id unique document id in Elasticsearch + */ public Index(String index, String type, String id) { this.index = index; this.type = type; diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/doc/IndexDoc.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/doc/IndexDoc.java index c695638cea0..1ea2b4bb167 100644 --- a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/doc/IndexDoc.java +++ b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/doc/IndexDoc.java @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.storm.elasticsearch.doc; /** diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/doc/IndexItem.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/doc/IndexItem.java index e04c48e98c4..c35dfe4bca1 100644 --- a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/doc/IndexItem.java +++ b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/doc/IndexItem.java @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.storm.elasticsearch.doc; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/doc/IndexItemDoc.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/doc/IndexItemDoc.java index 60a330e8ffc..a7bf789e779 100644 --- a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/doc/IndexItemDoc.java +++ b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/doc/IndexItemDoc.java @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.storm.elasticsearch.doc; /** diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/doc/Shards.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/doc/Shards.java index 98cc7029a4e..1bc7e66a1dd 100644 --- a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/doc/Shards.java +++ b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/doc/Shards.java @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.storm.elasticsearch.doc; import java.util.List; diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/doc/SourceDoc.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/doc/SourceDoc.java index ea30e65ff04..6813d4da33e 100644 --- a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/doc/SourceDoc.java +++ b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/doc/SourceDoc.java @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.storm.elasticsearch.doc; /** diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/response/BulkIndexResponse.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/response/BulkIndexResponse.java index 7131e637dac..a0f40c87dba 100644 --- a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/response/BulkIndexResponse.java +++ b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/response/BulkIndexResponse.java @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.storm.elasticsearch.response; import java.util.List; @@ -58,6 +59,11 @@ public void setItems(List items) { this.items = items; } + /** + * Retrieve first error's code from response. + * + * @return error status code + */ public Integer getFirstError() { if (items == null || items.isEmpty()) { return null; @@ -71,6 +77,11 @@ public Integer getFirstError() { return null; } + /** + * Retrieve first result from response. + * + * @return result text + */ public String getFirstResult() { if (items == null || items.isEmpty()) { return null; diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/response/LookupResponse.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/response/LookupResponse.java index 8b6b24dbcb8..99730f7ce7b 100644 --- a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/response/LookupResponse.java +++ b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/response/LookupResponse.java @@ -15,14 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.storm.elasticsearch.response; -import org.apache.storm.elasticsearch.doc.Index; +package org.apache.storm.elasticsearch.response; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRawValue; import com.fasterxml.jackson.databind.JsonNode; +import org.apache.storm.elasticsearch.doc.Index; + /** * Mapped response for document lookup. */ diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/response/PercolateResponse.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/response/PercolateResponse.java index 87bc00403d6..df671344fa5 100644 --- a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/response/PercolateResponse.java +++ b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/response/PercolateResponse.java @@ -15,14 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.storm.elasticsearch.response; +import com.fasterxml.jackson.annotation.JsonProperty; + import java.util.List; import org.apache.storm.elasticsearch.doc.Shards; -import com.fasterxml.jackson.annotation.JsonProperty; - /** * Mapped response for percolate. */ 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 fb34407dd2f..86863d73442 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 @@ -15,10 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.storm.elasticsearch.trident; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + import java.io.IOException; -import java.io.UnsupportedEncodingException; import java.util.HashMap; import java.util.List; @@ -38,9 +41,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - /** * Trident State for storing tuple to ES document. * @since 0.11 @@ -53,7 +53,8 @@ class EsState implements State { private EsTupleMapper tupleMapper; /** - * EsState constructor + * EsState constructor. + * * @param esConfig Elasticsearch configuration containing node addresses and cluster name {@link EsConfig} * @param tupleMapper Tuple to ES document mapper {@link EsTupleMapper} */ @@ -64,11 +65,9 @@ public EsState(EsConfig esConfig, EsTupleMapper tupleMapper) { } /** - * @param txid - * * Elasticsearch index requests with same id will result in update operation * which means if same tuple replays, only one record will be stored in elasticsearch for same document - * without control with txid + * without control with txid. */ @Override public void beginCommit(Long txid) { @@ -76,11 +75,9 @@ public void beginCommit(Long txid) { } /** - * @param txid - * * Elasticsearch index requests with same id will result in update operation * which means if same tuple replays, only one record will be stored in elasticsearch for same document - * without control with txid + * without control with txid. */ @Override public void commit(Long txid) { @@ -121,8 +118,6 @@ private String buildRequest(List tuples) throws JsonProcessingExce * * @param tuples list of tuples for storing to ES. * Each tuple should have relevant fields (source, index, type, id) for EsState's tupleMapper to extract ES document. - * @throws IOException - * @throws UnsupportedEncodingException */ public void updateState(List tuples) { try { 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 8d7a6aab31c..d79ec2e70bf 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 @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.storm.elasticsearch.trident; import static java.util.Objects.requireNonNull; @@ -36,7 +37,8 @@ public class EsStateFactory implements StateFactory { private final EsTupleMapper tupleMapper; /** - * EsStateFactory constructor + * EsStateFactory constructor. + * * @param esConfig Elasticsearch configuration containing node addresses and cluster name {@link EsConfig} * @param tupleMapper Tuple to ES document mapper {@link EsTupleMapper} */ 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 37c213dd0a9..30f296c1937 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 @@ -15,14 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.storm.elasticsearch.trident; +import java.util.List; + 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; - public class EsUpdater extends BaseStateUpdater { /** * {@inheritDoc}