SAMZA-868: support elasticsearch version 2.x

shanthoosh · Apr 20, 2017 · e753c8d · e753c8d
1 parent de8cffd
commit e753c8d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/gradle/dependency-versions.gradle b/gradle/dependency-versions.gradle
@@ -17,7 +17,7 @@
  * under the License.
  */
  ext {
-  elasticsearchVersion = "1.5.1"
+  elasticsearchVersion = "2.2.0"
   jerseyVersion = "2.22.1"
   jodaTimeVersion = "2.2"
   joptSimpleVersion = "3.2"

diff --git a/...csearch/src/main/java/org/apache/samza/system/elasticsearch/client/NodeClientFactory.java b/...csearch/src/main/java/org/apache/samza/system/elasticsearch/client/NodeClientFactory.java
@@ -21,7 +21,6 @@
 
 import org.apache.samza.config.ElasticsearchConfig;
 import org.elasticsearch.client.Client;
-import org.elasticsearch.common.settings.ImmutableSettings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.node.Node;
 import org.elasticsearch.node.NodeBuilder;
@@ -46,7 +45,7 @@ public NodeClientFactory(ElasticsearchConfig config) {
 
   @Override
   public Client getClient() {
-    Settings settings = ImmutableSettings.settingsBuilder()
+    Settings settings = Settings.settingsBuilder()
         .put(clientSettings)
         .build();
 

diff --git a/...ch/src/main/java/org/apache/samza/system/elasticsearch/client/TransportClientFactory.java b/...ch/src/main/java/org/apache/samza/system/elasticsearch/client/TransportClientFactory.java
@@ -23,12 +23,12 @@
 import org.apache.samza.config.ElasticsearchConfig;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.client.transport.TransportClient;
-import org.elasticsearch.common.settings.ImmutableSettings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.transport.InetSocketTransportAddress;
 import org.elasticsearch.common.transport.TransportAddress;
 
 import java.util.Map;
+import java.net.InetSocketAddress;
 
 /**
  * A {@link ClientFactory} that creates a {@link org.elasticsearch.node.Node} client that connects
@@ -65,12 +65,12 @@ public TransportClientFactory(ElasticsearchConfig config) {
 
   @Override
   public Client getClient() {
-    Settings settings = ImmutableSettings.settingsBuilder()
+    Settings settings = Settings.settingsBuilder()
         .put(clientSettings)
         .build();
 
-    TransportAddress address = new InetSocketTransportAddress(transportHost, transportPort);
+    TransportAddress address = new InetSocketTransportAddress(new InetSocketAddress(transportHost, transportPort));
 
-    return new TransportClient(settings).addTransportAddress(address);
+    return TransportClient.builder().settings(settings).build().addTransportAddress(address);
   }
 }
diff --git a/...va/org/apache/samza/system/elasticsearch/indexrequest/DefaultIndexRequestFactoryTest.java b/...va/org/apache/samza/system/elasticsearch/indexrequest/DefaultIndexRequestFactoryTest.java
@@ -23,7 +23,7 @@
 import org.apache.samza.system.OutgoingMessageEnvelope;
 import org.apache.samza.system.SystemStream;
 import org.elasticsearch.action.index.IndexRequest;
-import org.elasticsearch.common.base.Charsets;
+import com.google.common.base.Charsets;
 import org.junit.Before;
 import org.junit.Test;