This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new c43d338 camel-elasticsearch - The hostAddress is not required as
endpoint uri parameter as it can be set on component level.
c43d338 is described below
commit c43d3386b52195938ff98c5b1faf391116af67be
Author: Claus Ibsen <[email protected]>
AuthorDate: Mon Nov 15 18:22:34 2021 +0100
camel-elasticsearch - The hostAddress is not required as endpoint uri
parameter as it can be set on component level.
---
.../catalog/components/elasticsearch-rest.json | 6 +--
.../elasticsearch/elasticsearch-rest.json | 6 +--
.../elasticsearch/ElasticsearchConfiguration.java | 8 ++-
.../dsl/ElasticsearchEndpointBuilderFactory.java | 63 +++++++++++-----------
4 files changed, 40 insertions(+), 43 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/elasticsearch-rest.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/elasticsearch-rest.json
index b939d1d..d424497 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/elasticsearch-rest.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/elasticsearch-rest.json
@@ -41,9 +41,8 @@
"connectionTimeout": { "kind": "parameter", "displayName": "Connection
Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 30000, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "The time in ms to wait
before connection will timeout." },
"disconnect": { "kind": "parameter", "displayName": "Disconnect", "group":
"producer", "label": "", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Disconnect after it
finish calling the producer" },
"enableSniffer": { "kind": "parameter", "displayName": "Enable Sniffer",
"group": "producer", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Enable automatically
discover nodes from a running Elasticsearch cluster" },
- "enableSSL": { "kind": "parameter", "displayName": "Enable SSL", "group":
"producer", "label": "", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Enable SSL" },
"from": { "kind": "parameter", "displayName": "From", "group": "producer",
"label": "", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Starting index of the
response." },
- "hostAddresses": { "kind": "parameter", "displayName": "Host Addresses",
"group": "producer", "label": "", "required": true, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Comma separated list
with ip:port formatted remote transport addresses to use." },
+ "hostAddresses": { "kind": "parameter", "displayName": "Host Addresses",
"group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Comma separated list
with ip:port formatted remote transport addresses to use." },
"indexName": { "kind": "parameter", "displayName": "Index Name", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "The name of the index to
act against" },
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether the producer
should be started lazy (on the first message). By starting lazy you can use
this to allow CamelContext and routes to startup in situations where a producer
may otherwise fail during sta [...]
"maxRetryTimeout": { "kind": "parameter", "displayName": "Max Retry
Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 30000, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "The time in ms before
retry" },
@@ -54,6 +53,7 @@
"snifferInterval": { "kind": "parameter", "displayName": "Sniffer
Interval", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 300000, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "The interval between
consecutive ordinary sniff executions in milliseconds. Will be honour [...]
"socketTimeout": { "kind": "parameter", "displayName": "Socket Timeout",
"group": "producer", "label": "", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 30000, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "The timeout in ms to
wait before the socket will timeout." },
"useScroll": { "kind": "parameter", "displayName": "Use Scroll", "group":
"producer", "label": "", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Enable scroll usage" },
- "waitForActiveShards": { "kind": "parameter", "displayName": "Wait For
Active Shards", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 1, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Index creation waits for
the write consistency number of shards to be available" }
+ "waitForActiveShards": { "kind": "parameter", "displayName": "Wait For
Active Shards", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 1, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Index creation waits for
the write consistency number of shards to be available" },
+ "enableSSL": { "kind": "parameter", "displayName": "Enable SSL", "group":
"security", "label": "security", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Enable SSL" }
}
}
diff --git
a/components/camel-elasticsearch-rest/src/generated/resources/org/apache/camel/component/elasticsearch/elasticsearch-rest.json
b/components/camel-elasticsearch-rest/src/generated/resources/org/apache/camel/component/elasticsearch/elasticsearch-rest.json
index b939d1d..d424497 100644
---
a/components/camel-elasticsearch-rest/src/generated/resources/org/apache/camel/component/elasticsearch/elasticsearch-rest.json
+++
b/components/camel-elasticsearch-rest/src/generated/resources/org/apache/camel/component/elasticsearch/elasticsearch-rest.json
@@ -41,9 +41,8 @@
"connectionTimeout": { "kind": "parameter", "displayName": "Connection
Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 30000, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "The time in ms to wait
before connection will timeout." },
"disconnect": { "kind": "parameter", "displayName": "Disconnect", "group":
"producer", "label": "", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Disconnect after it
finish calling the producer" },
"enableSniffer": { "kind": "parameter", "displayName": "Enable Sniffer",
"group": "producer", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Enable automatically
discover nodes from a running Elasticsearch cluster" },
- "enableSSL": { "kind": "parameter", "displayName": "Enable SSL", "group":
"producer", "label": "", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Enable SSL" },
"from": { "kind": "parameter", "displayName": "From", "group": "producer",
"label": "", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Starting index of the
response." },
- "hostAddresses": { "kind": "parameter", "displayName": "Host Addresses",
"group": "producer", "label": "", "required": true, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Comma separated list
with ip:port formatted remote transport addresses to use." },
+ "hostAddresses": { "kind": "parameter", "displayName": "Host Addresses",
"group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Comma separated list
with ip:port formatted remote transport addresses to use." },
"indexName": { "kind": "parameter", "displayName": "Index Name", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "The name of the index to
act against" },
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether the producer
should be started lazy (on the first message). By starting lazy you can use
this to allow CamelContext and routes to startup in situations where a producer
may otherwise fail during sta [...]
"maxRetryTimeout": { "kind": "parameter", "displayName": "Max Retry
Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 30000, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "The time in ms before
retry" },
@@ -54,6 +53,7 @@
"snifferInterval": { "kind": "parameter", "displayName": "Sniffer
Interval", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 300000, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "The interval between
consecutive ordinary sniff executions in milliseconds. Will be honour [...]
"socketTimeout": { "kind": "parameter", "displayName": "Socket Timeout",
"group": "producer", "label": "", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 30000, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "The timeout in ms to
wait before the socket will timeout." },
"useScroll": { "kind": "parameter", "displayName": "Use Scroll", "group":
"producer", "label": "", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Enable scroll usage" },
- "waitForActiveShards": { "kind": "parameter", "displayName": "Wait For
Active Shards", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 1, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Index creation waits for
the write consistency number of shards to be available" }
+ "waitForActiveShards": { "kind": "parameter", "displayName": "Wait For
Active Shards", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 1, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Index creation waits for
the write consistency number of shards to be available" },
+ "enableSSL": { "kind": "parameter", "displayName": "Enable SSL", "group":
"security", "label": "security", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Enable SSL" }
}
}
diff --git
a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java
b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java
index 053acba..f90a1bc 100644
---
a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java
+++
b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java
@@ -28,7 +28,6 @@ import org.apache.http.HttpHost;
public class ElasticsearchConfiguration {
private List<HttpHost> hostAddressesList;
-
private String user;
private String password;
@@ -46,7 +45,6 @@ public class ElasticsearchConfiguration {
@UriParam(defaultValue = "" +
ElasticsearchConstants.DEFAULT_FOR_WAIT_ACTIVE_SHARDS)
private int waitForActiveShards =
ElasticsearchConstants.DEFAULT_FOR_WAIT_ACTIVE_SHARDS;
@UriParam
- @Metadata(required = true)
private String hostAddresses;
@UriParam(defaultValue = "" +
ElasticsearchConstants.DEFAULT_SOCKET_TIMEOUT)
private int socketTimeout = ElasticsearchConstants.DEFAULT_SOCKET_TIMEOUT;
@@ -54,11 +52,11 @@ public class ElasticsearchConfiguration {
private int maxRetryTimeout = ElasticsearchConstants.MAX_RETRY_TIMEOUT;
@UriParam(defaultValue = "" +
ElasticsearchConstants.DEFAULT_CONNECTION_TIMEOUT)
private int connectionTimeout =
ElasticsearchConstants.DEFAULT_CONNECTION_TIMEOUT;
- @UriParam(defaultValue = "false")
+ @UriParam
private boolean disconnect;
- @UriParam(defaultValue = "false")
+ @UriParam(label = "security")
private boolean enableSSL;
- @UriParam(defaultValue = "false")
+ @UriParam
private boolean useScroll;
@UriParam(defaultValue = "" +
ElasticsearchConstants.DEFAULT_SCROLL_KEEP_ALIVE_MS)
private int scrollKeepAliveMs =
ElasticsearchConstants.DEFAULT_SCROLL_KEEP_ALIVE_MS;
diff --git
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
index 2db24f6..0fb1332 100644
---
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
+++
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
@@ -133,37 +133,6 @@ public interface ElasticsearchEndpointBuilderFactory {
return this;
}
/**
- * Enable SSL.
- *
- * The option is a: <code>boolean</code> type.
- *
- * Default: false
- * Group: producer
- *
- * @param enableSSL the value to set
- * @return the dsl builder
- */
- default ElasticsearchEndpointBuilder enableSSL(boolean enableSSL) {
- doSetProperty("enableSSL", enableSSL);
- return this;
- }
- /**
- * Enable SSL.
- *
- * The option will be converted to a <code>boolean</code>
- * type.
- *
- * Default: false
- * Group: producer
- *
- * @param enableSSL the value to set
- * @return the dsl builder
- */
- default ElasticsearchEndpointBuilder enableSSL(String enableSSL) {
- doSetProperty("enableSSL", enableSSL);
- return this;
- }
- /**
* Starting index of the response.
*
* The option is a: <code>java.lang.Integer</code> type.
@@ -198,7 +167,6 @@ public interface ElasticsearchEndpointBuilderFactory {
*
* The option is a: <code>java.lang.String</code> type.
*
- * Required: true
* Group: producer
*
* @param hostAddresses the value to set
@@ -558,6 +526,37 @@ public interface ElasticsearchEndpointBuilderFactory {
doSetProperty("waitForActiveShards", waitForActiveShards);
return this;
}
+ /**
+ * Enable SSL.
+ *
+ * The option is a: <code>boolean</code> type.
+ *
+ * Default: false
+ * Group: security
+ *
+ * @param enableSSL the value to set
+ * @return the dsl builder
+ */
+ default ElasticsearchEndpointBuilder enableSSL(boolean enableSSL) {
+ doSetProperty("enableSSL", enableSSL);
+ return this;
+ }
+ /**
+ * Enable SSL.
+ *
+ * The option will be converted to a <code>boolean</code>
+ * type.
+ *
+ * Default: false
+ * Group: security
+ *
+ * @param enableSSL the value to set
+ * @return the dsl builder
+ */
+ default ElasticsearchEndpointBuilder enableSSL(String enableSSL) {
+ doSetProperty("enableSSL", enableSSL);
+ return this;
+ }
}
/**
