Repository: samza Updated Branches: refs/heads/master de8cffdfa -> e753c8de3
SAMZA-868: support elasticsearch version 2.x Project: http://git-wip-us.apache.org/repos/asf/samza/repo Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/e753c8de Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/e753c8de Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/e753c8de Branch: refs/heads/master Commit: e753c8de306b8427291420f0b1c63d407fb6410e Parents: de8cffd Author: Jiri Humpolicek <humpoli...@seznam.cz> Authored: Thu Apr 20 01:25:31 2017 -0700 Committer: Yi Pan (Data Infrastructure) <nickpa...@gmail.com> Committed: Thu Apr 20 01:25:31 2017 -0700 ---------------------------------------------------------------------- gradle/dependency-versions.gradle | 2 +- .../samza/system/elasticsearch/client/NodeClientFactory.java | 3 +-- .../system/elasticsearch/client/TransportClientFactory.java | 8 ++++---- .../indexrequest/DefaultIndexRequestFactoryTest.java | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/samza/blob/e753c8de/gradle/dependency-versions.gradle ---------------------------------------------------------------------- diff --git a/gradle/dependency-versions.gradle b/gradle/dependency-versions.gradle index 62872f8..8122ca9 100644 --- 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" http://git-wip-us.apache.org/repos/asf/samza/blob/e753c8de/samza-elasticsearch/src/main/java/org/apache/samza/system/elasticsearch/client/NodeClientFactory.java ---------------------------------------------------------------------- diff --git a/samza-elasticsearch/src/main/java/org/apache/samza/system/elasticsearch/client/NodeClientFactory.java b/samza-elasticsearch/src/main/java/org/apache/samza/system/elasticsearch/client/NodeClientFactory.java index 0ee9e3f..25e93b1 100644 --- a/samza-elasticsearch/src/main/java/org/apache/samza/system/elasticsearch/client/NodeClientFactory.java +++ b/samza-elasticsearch/src/main/java/org/apache/samza/system/elasticsearch/client/NodeClientFactory.java @@ -21,7 +21,6 @@ package org.apache.samza.system.elasticsearch.client; 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 class NodeClientFactory implements ClientFactory { @Override public Client getClient() { - Settings settings = ImmutableSettings.settingsBuilder() + Settings settings = Settings.settingsBuilder() .put(clientSettings) .build(); http://git-wip-us.apache.org/repos/asf/samza/blob/e753c8de/samza-elasticsearch/src/main/java/org/apache/samza/system/elasticsearch/client/TransportClientFactory.java ---------------------------------------------------------------------- diff --git a/samza-elasticsearch/src/main/java/org/apache/samza/system/elasticsearch/client/TransportClientFactory.java b/samza-elasticsearch/src/main/java/org/apache/samza/system/elasticsearch/client/TransportClientFactory.java index 7f8f3f3..e336ad9 100644 --- a/samza-elasticsearch/src/main/java/org/apache/samza/system/elasticsearch/client/TransportClientFactory.java +++ b/samza-elasticsearch/src/main/java/org/apache/samza/system/elasticsearch/client/TransportClientFactory.java @@ -23,12 +23,12 @@ import org.apache.samza.SamzaException; 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 class TransportClientFactory implements ClientFactory { @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); } } http://git-wip-us.apache.org/repos/asf/samza/blob/e753c8de/samza-elasticsearch/src/test/java/org/apache/samza/system/elasticsearch/indexrequest/DefaultIndexRequestFactoryTest.java ---------------------------------------------------------------------- diff --git a/samza-elasticsearch/src/test/java/org/apache/samza/system/elasticsearch/indexrequest/DefaultIndexRequestFactoryTest.java b/samza-elasticsearch/src/test/java/org/apache/samza/system/elasticsearch/indexrequest/DefaultIndexRequestFactoryTest.java index 61c3e7d..7eca108 100644 --- a/samza-elasticsearch/src/test/java/org/apache/samza/system/elasticsearch/indexrequest/DefaultIndexRequestFactoryTest.java +++ b/samza-elasticsearch/src/test/java/org/apache/samza/system/elasticsearch/indexrequest/DefaultIndexRequestFactoryTest.java @@ -23,7 +23,7 @@ import org.apache.samza.SamzaException; 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;
