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:05 UTC
[03/10] storm git commit: Switch to ES shaded Preconditions instead
of guava
Switch to ES shaded Preconditions instead of guava
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/677d3c5d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/677d3c5d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/677d3c5d
Branch: refs/heads/master
Commit: 677d3c5d601ccd954982d8753fa0a67a21ca3694
Parents: ae0f814
Author: Alex Panov <al...@teradata.com>
Authored: Sun Aug 30 12:11:28 2015 +0200
Committer: Alex Panov <al...@teradata.com>
Committed: Sun Aug 30 12:11:28 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/storm/elasticsearch/bolt/AbstractEsBolt.java | 2 +-
.../java/org/apache/storm/elasticsearch/bolt/EsIndexBolt.java | 4 +++-
.../java/org/apache/storm/elasticsearch/bolt/EsLookupBolt.java | 2 +-
.../org/apache/storm/elasticsearch/bolt/EsPercolateBolt.java | 4 +++-
.../java/org/apache/storm/elasticsearch/common/EsConfig.java | 4 ++--
.../java/org/apache/storm/elasticsearch/trident/EsState.java | 1 -
.../org/apache/storm/elasticsearch/trident/EsStateFactory.java | 3 +--
7 files changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/677d3c5d/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/AbstractEsBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/AbstractEsBolt.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/AbstractEsBolt.java
index fa7356a..784a57f 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
@@ -32,7 +32,7 @@ import backtype.storm.topology.OutputFieldsDeclarer;
import backtype.storm.topology.base.BaseRichBolt;
import backtype.storm.tuple.Tuple;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.elasticsearch.common.base.Preconditions.checkNotNull;
public abstract class AbstractEsBolt extends BaseRichBolt {
http://git-wip-us.apache.org/repos/asf/storm/blob/677d3c5d/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexBolt.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexBolt.java
index 36b9d28..1c5983e 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
@@ -26,6 +26,8 @@ import org.apache.storm.elasticsearch.common.EsTupleMapper;
import java.util.Map;
+import static org.elasticsearch.common.base.Preconditions.checkNotNull;
+
/**
* Basic bolt for storing tuple to ES document.
*/
@@ -39,7 +41,7 @@ public class EsIndexBolt extends AbstractEsBolt {
*/
public EsIndexBolt(EsConfig esConfig, EsTupleMapper tupleMapper) {
super(esConfig);
- this.tupleMapper = tupleMapper;
+ this.tupleMapper = checkNotNull(tupleMapper);
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/677d3c5d/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsLookupBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsLookupBolt.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsLookupBolt.java
index bd7178b..1676a79 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
@@ -29,7 +29,7 @@ import backtype.storm.topology.OutputFieldsDeclarer;
import backtype.storm.tuple.Tuple;
import backtype.storm.tuple.Values;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.elasticsearch.common.base.Preconditions.checkNotNull;
/**
* @since 0.11
http://git-wip-us.apache.org/repos/asf/storm/blob/677d3c5d/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsPercolateBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsPercolateBolt.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/bolt/EsPercolateBolt.java
index 27e5e00..a361464 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
@@ -30,6 +30,8 @@ import org.elasticsearch.action.percolate.PercolateSourceBuilder;
import java.util.Map;
+import static org.elasticsearch.common.base.Preconditions.checkNotNull;
+
/**
* Basic bolt for retrieve matched percolate queries.
*/
@@ -44,7 +46,7 @@ public class EsPercolateBolt extends AbstractEsBolt {
*/
public EsPercolateBolt(EsConfig esConfig, EsTupleMapper tupleMapper) {
super(esConfig);
- this.tupleMapper = tupleMapper;
+ this.tupleMapper = checkNotNull(tupleMapper);
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/677d3c5d/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/common/EsConfig.java
----------------------------------------------------------------------
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 5724519..6e9b128 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
@@ -26,8 +26,8 @@ import com.google.common.collect.ImmutableMap;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.settings.Settings;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.elasticsearch.common.base.Preconditions.checkArgument;
+import static org.elasticsearch.common.base.Preconditions.checkNotNull;
/**
* @since 0.11
http://git-wip-us.apache.org/repos/asf/storm/blob/677d3c5d/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/trident/EsState.java
----------------------------------------------------------------------
diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/trident/EsState.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/trident/EsState.java
index 1eb0d04..c066553 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
@@ -93,7 +93,6 @@ class EsState implements State {
*
* @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.
- * @param collector
*/
public void updateState(List<TridentTuple> tuples) {
BulkRequestBuilder bulkRequest = client.prepareBulk();
http://git-wip-us.apache.org/repos/asf/storm/blob/677d3c5d/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/trident/EsStateFactory.java
----------------------------------------------------------------------
diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/trident/EsStateFactory.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/trident/EsStateFactory.java
index e5733e7..6904298 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
@@ -32,8 +32,7 @@ import java.util.Map;
*/
class EsStateFactory implements StateFactory {
private final EsConfig esConfig;
- private EsConfig esConfig;
- private EsTupleMapper tupleMapper;
+ private final EsTupleMapper tupleMapper;
/**
* EsStateFactory constructor