You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/07/30 09:03:57 UTC
[4/5] camel git commit: [CAMEL-11597] Disable sniffing by default.
[CAMEL-11597] Disable sniffing by default.
-Remove client.transport.ignore_cluster_name setting
-Rename property
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/811d6f75
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/811d6f75
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/811d6f75
Branch: refs/heads/master
Commit: 811d6f75ace6df2be5076018357e5b3b4a02e89d
Parents: dc56d62
Author: fharms <fl...@gmail.com>
Authored: Thu Jul 27 10:53:34 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Jul 30 10:47:26 2017 +0200
----------------------------------------------------------------------
.../elasticsearch5/ElasticsearchConfiguration.java | 14 +++++++-------
.../elasticsearch5/ElasticsearchProducer.java | 6 ++----
2 files changed, 9 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/811d6f75/components/camel-elasticsearch5/src/main/java/org/apache/camel/component/elasticsearch5/ElasticsearchConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-elasticsearch5/src/main/java/org/apache/camel/component/elasticsearch5/ElasticsearchConfiguration.java b/components/camel-elasticsearch5/src/main/java/org/apache/camel/component/elasticsearch5/ElasticsearchConfiguration.java
index b24c662..a0c423f 100644
--- a/components/camel-elasticsearch5/src/main/java/org/apache/camel/component/elasticsearch5/ElasticsearchConfiguration.java
+++ b/components/camel-elasticsearch5/src/main/java/org/apache/camel/component/elasticsearch5/ElasticsearchConfiguration.java
@@ -45,8 +45,8 @@ public class ElasticsearchConfiguration {
private String transportAddresses;
@UriParam(defaultValue = "" + ElasticsearchConstants.DEFAULT_PORT)
private int port = ElasticsearchConstants.DEFAULT_PORT;
- @UriParam(defaultValue = "true")
- private Boolean clientTransportSniff = true;
+ @UriParam(defaultValue = "false")
+ private Boolean clientTransportSniff = false;
@UriParam(defaultValue = "" +ElasticsearchConstants.DEFAULT_PING_SCHEDULE)
private String pingSchedule = ElasticsearchConstants.DEFAULT_PING_SCHEDULE;
@UriParam(defaultValue = "" +ElasticsearchConstants.DEFAULT_PING_TIMEOUT)
@@ -60,7 +60,7 @@ public class ElasticsearchConfiguration {
@UriParam(secret = true)
private String password;
@UriParam(defaultValue = "false")
- private Boolean enabledSSL = false;
+ private Boolean enableSSL = false;
/**
@@ -230,12 +230,12 @@ public class ElasticsearchConfiguration {
/**
* Enable SSL
*/
- public Boolean getEnabledSSL() {
- return enabledSSL;
+ public Boolean getEnableSSL() {
+ return enableSSL;
}
- public void setEnabledSSL(Boolean enabledSSL) {
- this.enabledSSL = enabledSSL;
+ public void setEnableSSL(Boolean enableSSL) {
+ this.enableSSL = enableSSL;
}
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/811d6f75/components/camel-elasticsearch5/src/main/java/org/apache/camel/component/elasticsearch5/ElasticsearchProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-elasticsearch5/src/main/java/org/apache/camel/component/elasticsearch5/ElasticsearchProducer.java b/components/camel-elasticsearch5/src/main/java/org/apache/camel/component/elasticsearch5/ElasticsearchProducer.java
index a6b0c91..03390de 100644
--- a/components/camel-elasticsearch5/src/main/java/org/apache/camel/component/elasticsearch5/ElasticsearchProducer.java
+++ b/components/camel-elasticsearch5/src/main/java/org/apache/camel/component/elasticsearch5/ElasticsearchProducer.java
@@ -38,7 +38,6 @@ import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.transport.InetSocketTransportAddress;
import org.elasticsearch.common.transport.TransportAddress;
import org.elasticsearch.index.IndexNotFoundException;
-import org.elasticsearch.transport.client.PreBuiltTransportClient;
import org.elasticsearch.xpack.client.PreBuiltXPackTransportClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -228,7 +227,7 @@ public class ElasticsearchProducer extends DefaultProducer {
for (TransportAddress address : configuration.getTransportAddressesList()) {
addresses.add(address);
}
- client = new PreBuiltTransportClient(getSettings()).addTransportAddresses(addresses.toArray(new TransportAddress[addresses.size()]));
+ client = new PreBuiltXPackTransportClient(getSettings()).addTransportAddresses(addresses.toArray(new TransportAddress[addresses.size()]));
} else {
LOG.info("Incorrect ip address and port parameters settings for ElasticSearch cluster");
}
@@ -238,7 +237,6 @@ public class ElasticsearchProducer extends DefaultProducer {
private Settings getSettings() {
final Settings.Builder settings = Settings.builder()
.put("cluster.name", configuration.getClusterName())
- .put("client.transport.ignore_cluster_name", false)
.put("client.transport.sniff", configuration.getClientTransportSniff())
.put("transport.ping_schedule", configuration.getPingSchedule())
.put("client.transport.ping_timeout", configuration.getPingTimeout())
@@ -247,7 +245,7 @@ public class ElasticsearchProducer extends DefaultProducer {
if (configuration.getUser() != null && configuration.getPassword() != null) {
settings.put("xpack.security.user", configuration.getUser() +":"+ configuration.getPassword())
- .put("xpack.security.transport.ssl.enabled", configuration.getEnabledSSL());
+ .put("xpack.security.transport.ssl.enabled", configuration.getEnableSSL());
}
return settings.build();
}