This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 2d5a098 Camel-elasticsearch-rest: user, password and enableSSL are
security stuff
2d5a098 is described below
commit 2d5a0981e873e586e36bf4980b54337adcd966cc
Author: Andrea Cosentino <[email protected]>
AuthorDate: Thu Mar 22 11:33:53 2018 +0100
Camel-elasticsearch-rest: user, password and enableSSL are security stuff
---
.../src/main/docs/elasticsearch-rest-component.adoc | 6 +++---
.../camel/component/elasticsearch/ElasticsearchComponent.java | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc
b/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc
index efd9895..367d76c 100644
---
a/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc
+++
b/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc
@@ -42,9 +42,9 @@ The Elastichsearch Rest component supports 12 options which
are listed below.
| *hostAddresses* (advanced) | Comma separated list with ip:port formatted
remote transport addresses to use. The ip and port options must be left blank
for hostAddresses to be considered instead. | | String
| *socketTimeout* (advanced) | The timeout in ms to wait before the socket
will timeout. | 30000 | int
| *connectionTimeout* (advanced) | The time in ms to wait before connection
will timeout. | 30000 | int
-| *user* (advance) | Basic authenticate user | | String
-| *password* (advance) | Password for authenticate | | String
-| *enableSSL* (advanced) | Enable SSL | false | Boolean
+| *user* (security) | Basic authenticate user | | String
+| *password* (security) | Password for authenticate | | String
+| *enableSSL* (security) | Enable SSL | false | Boolean
| *maxRetryTimeout* (advanced) | The time in ms before retry | 30000 | int
| *enableSniffer* (advanced) | Enable automatically discover nodes from a
running Elasticsearch cluster | false | Boolean
| *snifferInterval* (advanced) | The interval between consecutive ordinary
sniff executions in milliseconds. Will be honoured when sniffOnFailure is
disabled or when there are no failures between consecutive sniff executions |
300000 | int
diff --git
a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchComponent.java
b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchComponent.java
index 4a5abf9..7e76557 100644
---
a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchComponent.java
+++
b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchComponent.java
@@ -45,11 +45,11 @@ public class ElasticsearchComponent extends
DefaultComponent {
@Metadata(label = "advanced", defaultValue = "" +
ElasticsearchConstants.DEFAULT_CONNECTION_TIMEOUT)
private int connectionTimeout =
ElasticsearchConstants.DEFAULT_CONNECTION_TIMEOUT;
- @Metadata(label = "advance")
+ @Metadata(label = "security")
private String user;
- @Metadata(label = "advance", secret = true)
+ @Metadata(label = "security", secret = true)
private String password;
- @Metadata(label = "advanced", defaultValue = "false")
+ @Metadata(label = "security", defaultValue = "false")
private boolean enableSSL;
@Metadata(label = "advanced", defaultValue = "false")
private boolean enableSniffer;
--
To stop receiving notification emails like this one, please contact
[email protected].
