Repository: camel Updated Branches: refs/heads/master b0c314151 -> a16081995
CAMEL-9418: camel-elasticsearch: make client.transport.sniff configurable Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a1608199 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a1608199 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a1608199 Branch: refs/heads/master Commit: a16081995df8b323cf85bcf4b96374169cac1b39 Parents: b0c3141 Author: Andrea Cosentino <[email protected]> Authored: Tue Dec 15 08:43:35 2015 +0100 Committer: Andrea Cosentino <[email protected]> Committed: Tue Dec 15 08:43:35 2015 +0100 ---------------------------------------------------------------------- .../elasticsearch/ElasticsearchConfiguration.java | 15 ++++++++++++++- .../elasticsearch/ElasticsearchEndpoint.java | 6 +----- .../elasticsearch/ElasticsearchIndexTest.java | 1 - 3 files changed, 15 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/a1608199/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java index 30656de..0f618f4 100644 --- a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java +++ b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java @@ -49,6 +49,8 @@ public class ElasticsearchConfiguration { private String transportAddresses; @UriParam(defaultValue = "9300") private int port = ElasticsearchConstants.DEFAULT_PORT; + @UriParam(defaultValue = "true") + private Boolean clientTransportSniff = true; /** * Name of cluster or use local for local mode @@ -149,7 +151,18 @@ public class ElasticsearchConfiguration { public void setPort(int port) { this.port = port; } - + + /** + * Is the client allowed to sniff the rest of the cluster or not (default true). This setting map to the <tt>client.transport.sniff</tt> setting. + */ + public Boolean getClientTransportSniff() { + return clientTransportSniff; + } + + public void setClientTransportSniff(Boolean clientTransportSniff) { + this.clientTransportSniff = clientTransportSniff; + } + public boolean isLocal() { return local; } http://git-wip-us.apache.org/repos/asf/camel/blob/a1608199/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java index ed12e40..18842b3 100644 --- a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java +++ b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java @@ -108,14 +108,10 @@ public class ElasticsearchEndpoint extends DefaultEndpoint { private Settings getSettings() { return Settings.settingsBuilder() - // setting the classloader here will allow the underlying elasticsearch-java - // class to find its names.txt in an OSGi environment (otherwise the thread - // classloader is used, which won't be able to see the file causing a startup - // exception). .put("cluster.name", configuration.getClusterName()) .put("client.transport.ignore_cluster_name", false) .put("node.client", true) - .put("client.transport.sniff", true) + .put("client.transport.sniff", configuration.getClientTransportSniff()) .put("http.enabled", false) .build(); } http://git-wip-us.apache.org/repos/asf/camel/blob/a1608199/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchIndexTest.java ---------------------------------------------------------------------- diff --git a/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchIndexTest.java b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchIndexTest.java index 5563163..050d044 100644 --- a/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchIndexTest.java +++ b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchIndexTest.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.Map; import org.apache.camel.builder.RouteBuilder; -import org.junit.Ignore; import org.junit.Test; public class ElasticsearchIndexTest extends ElasticsearchBaseTest {
