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:10 UTC
[08/10] storm git commit: Remove guava leftovers
Remove guava leftovers
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fff82fd8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fff82fd8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fff82fd8
Branch: refs/heads/master
Commit: fff82fd8d4e72993af61c2ca6725dcd4a9af2d1f
Parents: 4f53fc4
Author: Alex Panov <al...@teradata.com>
Authored: Mon Aug 31 17:31:44 2015 +0200
Committer: Alex Panov <al...@teradata.com>
Committed: Mon Aug 31 17:31:44 2015 +0200
----------------------------------------------------------------------
.../org/apache/storm/elasticsearch/common/EsConfig.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/fff82fd8/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 6e9b128..6bbd81f 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
@@ -19,10 +19,9 @@ package org.apache.storm.elasticsearch.common;
import java.io.Serializable;
import java.util.Collections;
+import java.util.HashMap;
import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.settings.Settings;
@@ -44,7 +43,7 @@ public class EsConfig implements Serializable {
* @param clusterName Elasticsearch cluster name
* @param nodes Elasticsearch addresses in host:port pattern string array
* @throws IllegalArgumentException if nodes are empty
- * @throws NullPointerException on any of the fields being null
+ * @throws NullPointerException on any of the fields being null
*/
public EsConfig(String clusterName, String[] nodes) {
this(clusterName, nodes, Collections.<String, String>emptyMap());
@@ -57,7 +56,7 @@ public class EsConfig implements Serializable {
* @param nodes Elasticsearch addresses in host:port pattern string array
* @param additionalConfiguration Additional Elasticsearch configuration
* @throws IllegalArgumentException if nodes are empty
- * @throws NullPointerException on any of the fields being null
+ * @throws NullPointerException on any of the fields being null
*/
public EsConfig(String clusterName, String[] nodes, Map<String, String> additionalConfiguration) {
checkNotNull(clusterName);
@@ -67,7 +66,7 @@ public class EsConfig implements Serializable {
checkArgument(nodes.length != 0, "Nodes cannot be empty");
this.clusterName = clusterName;
this.nodes = nodes;
- this.additionalConfiguration = ImmutableMap.copyOf(additionalConfiguration);
+ this.additionalConfiguration = new HashMap<>(additionalConfiguration);
}
TransportAddresses getTransportAddresses() {