This is an automated email from the ASF dual-hosted git repository.
oscerd 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 a6aaa5d4a866 CAMEL-24817: camel-elasticsearch/camel-opensearch -
metadata hygiene (scroll-keep-alive description, deprecate maxRetryTimeout)
(#26591)
a6aaa5d4a866 is described below
commit a6aaa5d4a86682fa34b0d16e5c4d5186845e37e9
Author: Andrea Cosentino <[email protected]>
AuthorDate: Fri Sep 18 13:23:25 2026 +0200
CAMEL-24817: camel-elasticsearch/camel-opensearch - metadata hygiene
(scroll-keep-alive description, deprecate maxRetryTimeout) (#26591)
Co-authored-by: Claude Opus 4.8 <[email protected]>
---
.../org/apache/camel/catalog/components/elasticsearch.json | 6 +++---
.../org/apache/camel/catalog/components/opensearch.json | 6 +++---
.../META-INF/org/apache/camel/component/es/elasticsearch.json | 6 +++---
.../org/apache/camel/component/es/ElasticsearchComponent.java | 5 +++++
.../apache/camel/component/es/ElasticsearchConfiguration.java | 9 ++++++++-
.../org/apache/camel/component/es/ElasticsearchConstants.java | 2 +-
.../org/apache/camel/component/opensearch/opensearch.json | 6 +++---
.../camel/component/opensearch/OpensearchComponent.java | 5 +++++
.../camel/component/opensearch/OpensearchConfiguration.java | 9 ++++++++-
.../camel/component/opensearch/OpensearchConstants.java | 2 +-
.../modules/ROOT/pages/camel-4x-upgrade-guide-4_23.adoc | 9 +++++++++
.../component/dsl/ElasticsearchComponentBuilderFactory.java | 1 +
.../component/dsl/OpensearchComponentBuilderFactory.java | 1 +
.../endpoint/dsl/ElasticsearchEndpointBuilderFactory.java | 11 ++++++++---
.../endpoint/dsl/OpensearchEndpointBuilderFactory.java | 11 ++++++++---
15 files changed, 67 insertions(+), 22 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/elasticsearch.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/elasticsearch.json
index e63dd04979e0..c5ae8c4a4b05 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/elasticsearch.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/elasticsearch.json
@@ -28,7 +28,7 @@
"enableDocumentOnlyMode": { "index": 1, "kind": "property", "displayName":
"Enable Document Only Mode", "group": "producer", "label": "", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Indicates whether the body of the message contains only documents. By default,
it is set to false to be able to do the same requests as what the Document API
supports (see https:\/\/www.elasti [...]
"hostAddresses": { "index": 2, "kind": "property", "displayName": "Host
Addresses", "group": "producer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "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." },
"lazyStartProducer": { "index": 3, "kind": "property", "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 [...]
- "maxRetryTimeout": { "index": 4, "kind": "property", "displayName": "Max
Retry Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 30000, "description": "The time in ms before
retry" },
+ "maxRetryTimeout": { "index": 4, "kind": "property", "displayName": "Max
Retry Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": true, "autowired": false, "secret":
false, "defaultValue": 30000, "description": "The time in ms before retry" },
"socketTimeout": { "index": 5, "kind": "property", "displayName": "Socket
Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 30000, "description": "The timeout in ms to
wait before the socket will time out." },
"autowiredEnabled": { "index": 6, "kind": "property", "displayName":
"Autowired Enabled", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true, "description":
"Whether autowiring is enabled. This is used for automatic autowiring options
(the option must be marked as autowired) by looking up in the registry to find
if there is a single instance of matching t [...]
"client": { "index": 7, "kind": "property", "displayName": "Client",
"group": "advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "org.elasticsearch.client.RestClient", "deprecated": false,
"autowired": true, "secret": false, "description": "To use an existing
configured Elasticsearch client, instead of creating a client per endpoint.
This allows customizing the client with specific settings." },
@@ -48,7 +48,7 @@
"CamelElasticsearchIndexName": { "index": 2, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The name of the index to act against",
"constantName":
"org.apache.camel.component.es.ElasticsearchConstants#PARAM_INDEX_NAME" },
"CamelElasticsearchDocumentClass": { "index": 3, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Class", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "defaultValue": "ObjectNode", "description": "The full
qualified name of the class of the document to unmarshall", "constantName":
"org.apache.camel.component.es.ElasticsearchConstants#PARAM_DOCUMENT_CLASS" },
"CamelElasticsearchWaitForActiveShards": { "index": 4, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The index creation waits for the write
consistency number of shards to be available", "constantName":
"org.apache.camel.component.es.ElasticsearchConstants#PARAM_WAIT_FOR_ACTIVE_SHARDS"
},
- "CamelElasticsearchScrollKeepAliveMs": { "index": 5, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The starting index of the response.",
"constantName":
"org.apache.camel.component.es.ElasticsearchConstants#PARAM_SCROLL_KEEP_ALIVE_MS"
},
+ "CamelElasticsearchScrollKeepAliveMs": { "index": 5, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Time in ms during which Elasticsearch
will keep the search context alive", "constantName":
"org.apache.camel.component.es.ElasticsearchConstants#PARAM_SCROLL_KEEP_ALIVE_MS"
},
"CamelElasticsearchUseScroll": { "index": 6, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Boolean", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Set to true to enable scroll usage",
"constantName":
"org.apache.camel.component.es.ElasticsearchConstants#PARAM_SCROLL" },
"CamelElasticsearchSize": { "index": 7, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType": "Integer",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The size of the response.", "constantName":
"org.apache.camel.component.es.ElasticsearchConstants#PARAM_SIZE" },
"CamelElasticsearchFrom": { "index": 8, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType": "Integer",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The starting index of the response.", "constantName":
"org.apache.camel.component.es.ElasticsearchConstants#PARAM_FROM" },
@@ -62,7 +62,7 @@
"from": { "index": 4, "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.es.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Starting index of the
response." },
"hostAddresses": { "index": 5, "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.es.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Comma separated list
with ip:port formatted remote transport addresses to use." },
"indexName": { "index": 6, "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.es.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "The name of the index to
act against" },
- "maxRetryTimeout": { "index": 7, "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.es.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "The time in ms before
retry" },
+ "maxRetryTimeout": { "index": 7, "kind": "parameter", "displayName": "Max
Retry Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": true, "autowired": false, "secret":
false, "defaultValue": 30000, "configurationClass":
"org.apache.camel.component.es.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Deprecated: this option
has no effect. It was used by the old low-level REST client and is [...]
"operation": { "index": 8, "kind": "parameter", "displayName":
"Operation", "group": "producer", "label": "", "required": false, "type":
"enum", "javaType": "org.apache.camel.component.es.ElasticsearchOperation",
"enum": [ "Index", "Update", "Bulk", "GetById", "MultiGet", "MultiSearch",
"Delete", "DeleteIndex", "Search", "Exists", "Ping" ], "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.es.ElasticsearchConfiguration", "conf [...]
"scrollKeepAliveMs": { "index": 9, "kind": "parameter", "displayName":
"Scroll Keep Alive Ms", "group": "producer", "label": "", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 60000, "configurationClass":
"org.apache.camel.component.es.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Time in ms during which
elasticsearch will keep search context alive" },
"size": { "index": 10, "kind": "parameter", "displayName": "Size",
"group": "producer", "label": "", "required": false, "type": "integer",
"javaType": "java.lang.Integer", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.es.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Size of the response." },
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/opensearch.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/opensearch.json
index f6991e43f59b..3e94d4cbcb4d 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/opensearch.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/opensearch.json
@@ -27,7 +27,7 @@
"connectionTimeout": { "index": 0, "kind": "property", "displayName":
"Connection Timeout", "group": "producer", "label": "", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 30000, "description": "The time in ms to wait
before connection will time out." },
"hostAddresses": { "index": 1, "kind": "property", "displayName": "Host
Addresses", "group": "producer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "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." },
"lazyStartProducer": { "index": 2, "kind": "property", "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 [...]
- "maxRetryTimeout": { "index": 3, "kind": "property", "displayName": "Max
Retry Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 30000, "description": "The time in ms before
retry" },
+ "maxRetryTimeout": { "index": 3, "kind": "property", "displayName": "Max
Retry Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": true, "autowired": false, "secret":
false, "defaultValue": 30000, "description": "The time in ms before retry" },
"socketTimeout": { "index": 4, "kind": "property", "displayName": "Socket
Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 30000, "description": "The timeout in ms to
wait before the socket will time out." },
"autowiredEnabled": { "index": 5, "kind": "property", "displayName":
"Autowired Enabled", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true, "description":
"Whether autowiring is enabled. This is used for automatic autowiring options
(the option must be marked as autowired) by looking up in the registry to find
if there is a single instance of matching t [...]
"client": { "index": 6, "kind": "property", "displayName": "Client",
"group": "advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "org.opensearch.client.RestClient", "deprecated": false,
"autowired": true, "secret": false, "description": "To use an existing
configured OpenSearch client, instead of creating a client per endpoint. This
allows customizing the client with specific settings." },
@@ -47,7 +47,7 @@
"CamelOpensearchIndexName": { "index": 2, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The name of the index to act against", "constantName":
"org.apache.camel.component.opensearch.OpensearchConstants#PARAM_INDEX_NAME" },
"CamelOpensearchDocumentClass": { "index": 3, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Class", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "defaultValue": "ObjectNode", "description": "The full
qualified name of the class of the document to unmarshall", "constantName":
"org.apache.camel.component.opensearch.OpensearchConstants#PARAM_DOCUMENT_CLASS"
},
"CamelOpensearchWaitForActiveShards": { "index": 4, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The index creation waits for the write
consistency number of shards to be available", "constantName":
"org.apache.camel.component.opensearch.OpensearchConstants#PARAM_WAIT_FOR_ACTIVE_SHARDS"
},
- "CamelOpensearchScrollKeepAliveMs": { "index": 5, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The starting index of the response.",
"constantName":
"org.apache.camel.component.opensearch.OpensearchConstants#PARAM_SCROLL_KEEP_ALIVE_MS"
},
+ "CamelOpensearchScrollKeepAliveMs": { "index": 5, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Time in ms during which OpenSearch will
keep the search context alive", "constantName":
"org.apache.camel.component.opensearch.OpensearchConstants#PARAM_SCROLL_KEEP_ALIVE_MS"
},
"CamelOpensearchUseScroll": { "index": 6, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType": "Boolean",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "Set to true to enable scroll usage. When enabled, the
body is returned as a OpensearchScrollRequestIterator. Make sure to use the
stream and close it accordingly to avoid potential resource leaks.",
"constantName": "org.apache.camel.com [...]
"CamelOpensearchSize": { "index": 7, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "Integer",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The size of the response.", "constantName":
"org.apache.camel.component.opensearch.OpensearchConstants#PARAM_SIZE" },
"CamelOpensearchFrom": { "index": 8, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "Integer",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The starting index of the response.", "constantName":
"org.apache.camel.component.opensearch.OpensearchConstants#PARAM_FROM" }
@@ -59,7 +59,7 @@
"from": { "index": 3, "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.opensearch.OpensearchConfiguration",
"configurationField": "configuration", "description": "Starting index of the
response." },
"hostAddresses": { "index": 4, "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.opensearch.OpensearchConfiguration",
"configurationField": "configuration", "description": "Comma separated list
with ip:port formatted remote transport addresses to use." },
"indexName": { "index": 5, "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.opensearch.OpensearchConfiguration",
"configurationField": "configuration", "description": "The name of the index to
act against" },
- "maxRetryTimeout": { "index": 6, "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.opensearch.OpensearchConfiguration",
"configurationField": "configuration", "description": "The time in ms before
retry" },
+ "maxRetryTimeout": { "index": 6, "kind": "parameter", "displayName": "Max
Retry Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": true, "autowired": false, "secret":
false, "defaultValue": 30000, "configurationClass":
"org.apache.camel.component.opensearch.OpensearchConfiguration",
"configurationField": "configuration", "description": "Deprecated: this option
has no effect. It was used by the old low-level REST client a [...]
"operation": { "index": 7, "kind": "parameter", "displayName":
"Operation", "group": "producer", "label": "", "required": false, "type":
"enum", "javaType":
"org.apache.camel.component.opensearch.OpensearchOperation", "enum": [ "Index",
"Update", "Bulk", "GetById", "MultiGet", "MultiSearch", "Delete",
"DeleteIndex", "Search", "Exists", "Ping" ], "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.opensearch.OpensearchConfigurati [...]
"scrollKeepAliveMs": { "index": 8, "kind": "parameter", "displayName":
"Scroll Keep Alive Ms", "group": "producer", "label": "", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 60000, "configurationClass":
"org.apache.camel.component.opensearch.OpensearchConfiguration",
"configurationField": "configuration", "description": "Time in ms during which
OpenSearch will keep search context alive" },
"size": { "index": 9, "kind": "parameter", "displayName": "Size", "group":
"producer", "label": "", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.opensearch.OpensearchConfiguration",
"configurationField": "configuration", "description": "Size of the response." },
diff --git
a/components/camel-elasticsearch/src/generated/resources/META-INF/org/apache/camel/component/es/elasticsearch.json
b/components/camel-elasticsearch/src/generated/resources/META-INF/org/apache/camel/component/es/elasticsearch.json
index e63dd04979e0..c5ae8c4a4b05 100644
---
a/components/camel-elasticsearch/src/generated/resources/META-INF/org/apache/camel/component/es/elasticsearch.json
+++
b/components/camel-elasticsearch/src/generated/resources/META-INF/org/apache/camel/component/es/elasticsearch.json
@@ -28,7 +28,7 @@
"enableDocumentOnlyMode": { "index": 1, "kind": "property", "displayName":
"Enable Document Only Mode", "group": "producer", "label": "", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Indicates whether the body of the message contains only documents. By default,
it is set to false to be able to do the same requests as what the Document API
supports (see https:\/\/www.elasti [...]
"hostAddresses": { "index": 2, "kind": "property", "displayName": "Host
Addresses", "group": "producer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "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." },
"lazyStartProducer": { "index": 3, "kind": "property", "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 [...]
- "maxRetryTimeout": { "index": 4, "kind": "property", "displayName": "Max
Retry Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 30000, "description": "The time in ms before
retry" },
+ "maxRetryTimeout": { "index": 4, "kind": "property", "displayName": "Max
Retry Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": true, "autowired": false, "secret":
false, "defaultValue": 30000, "description": "The time in ms before retry" },
"socketTimeout": { "index": 5, "kind": "property", "displayName": "Socket
Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 30000, "description": "The timeout in ms to
wait before the socket will time out." },
"autowiredEnabled": { "index": 6, "kind": "property", "displayName":
"Autowired Enabled", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true, "description":
"Whether autowiring is enabled. This is used for automatic autowiring options
(the option must be marked as autowired) by looking up in the registry to find
if there is a single instance of matching t [...]
"client": { "index": 7, "kind": "property", "displayName": "Client",
"group": "advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "org.elasticsearch.client.RestClient", "deprecated": false,
"autowired": true, "secret": false, "description": "To use an existing
configured Elasticsearch client, instead of creating a client per endpoint.
This allows customizing the client with specific settings." },
@@ -48,7 +48,7 @@
"CamelElasticsearchIndexName": { "index": 2, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The name of the index to act against",
"constantName":
"org.apache.camel.component.es.ElasticsearchConstants#PARAM_INDEX_NAME" },
"CamelElasticsearchDocumentClass": { "index": 3, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Class", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "defaultValue": "ObjectNode", "description": "The full
qualified name of the class of the document to unmarshall", "constantName":
"org.apache.camel.component.es.ElasticsearchConstants#PARAM_DOCUMENT_CLASS" },
"CamelElasticsearchWaitForActiveShards": { "index": 4, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The index creation waits for the write
consistency number of shards to be available", "constantName":
"org.apache.camel.component.es.ElasticsearchConstants#PARAM_WAIT_FOR_ACTIVE_SHARDS"
},
- "CamelElasticsearchScrollKeepAliveMs": { "index": 5, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The starting index of the response.",
"constantName":
"org.apache.camel.component.es.ElasticsearchConstants#PARAM_SCROLL_KEEP_ALIVE_MS"
},
+ "CamelElasticsearchScrollKeepAliveMs": { "index": 5, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Time in ms during which Elasticsearch
will keep the search context alive", "constantName":
"org.apache.camel.component.es.ElasticsearchConstants#PARAM_SCROLL_KEEP_ALIVE_MS"
},
"CamelElasticsearchUseScroll": { "index": 6, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Boolean", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Set to true to enable scroll usage",
"constantName":
"org.apache.camel.component.es.ElasticsearchConstants#PARAM_SCROLL" },
"CamelElasticsearchSize": { "index": 7, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType": "Integer",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The size of the response.", "constantName":
"org.apache.camel.component.es.ElasticsearchConstants#PARAM_SIZE" },
"CamelElasticsearchFrom": { "index": 8, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType": "Integer",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The starting index of the response.", "constantName":
"org.apache.camel.component.es.ElasticsearchConstants#PARAM_FROM" },
@@ -62,7 +62,7 @@
"from": { "index": 4, "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.es.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Starting index of the
response." },
"hostAddresses": { "index": 5, "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.es.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Comma separated list
with ip:port formatted remote transport addresses to use." },
"indexName": { "index": 6, "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.es.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "The name of the index to
act against" },
- "maxRetryTimeout": { "index": 7, "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.es.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "The time in ms before
retry" },
+ "maxRetryTimeout": { "index": 7, "kind": "parameter", "displayName": "Max
Retry Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": true, "autowired": false, "secret":
false, "defaultValue": 30000, "configurationClass":
"org.apache.camel.component.es.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Deprecated: this option
has no effect. It was used by the old low-level REST client and is [...]
"operation": { "index": 8, "kind": "parameter", "displayName":
"Operation", "group": "producer", "label": "", "required": false, "type":
"enum", "javaType": "org.apache.camel.component.es.ElasticsearchOperation",
"enum": [ "Index", "Update", "Bulk", "GetById", "MultiGet", "MultiSearch",
"Delete", "DeleteIndex", "Search", "Exists", "Ping" ], "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.es.ElasticsearchConfiguration", "conf [...]
"scrollKeepAliveMs": { "index": 9, "kind": "parameter", "displayName":
"Scroll Keep Alive Ms", "group": "producer", "label": "", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 60000, "configurationClass":
"org.apache.camel.component.es.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Time in ms during which
elasticsearch will keep search context alive" },
"size": { "index": 10, "kind": "parameter", "displayName": "Size",
"group": "producer", "label": "", "required": false, "type": "integer",
"javaType": "java.lang.Integer", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.es.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Size of the response." },
diff --git
a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/es/ElasticsearchComponent.java
b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/es/ElasticsearchComponent.java
index d117eba6e9d6..cc515070799e 100644
---
a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/es/ElasticsearchComponent.java
+++
b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/es/ElasticsearchComponent.java
@@ -77,6 +77,7 @@ public class ElasticsearchComponent extends DefaultComponent
implements SSLConte
}
@Override
+ @SuppressWarnings("deprecation") // copies the deprecated maxRetryTimeout
option while it still exists
protected Endpoint createEndpoint(String uri, String remaining,
Map<String, Object> parameters) throws Exception {
ElasticsearchConfiguration config = new ElasticsearchConfiguration();
config.setHostAddresses(this.getHostAddresses());
@@ -231,11 +232,15 @@ public class ElasticsearchComponent extends
DefaultComponent implements SSLConte
/**
* The time in ms before retry
+ *
+ * @deprecated this option has no effect and is ignored by the current
client
*/
+ @Deprecated
public int getMaxRetryTimeout() {
return maxRetryTimeout;
}
+ @Deprecated
public void setMaxRetryTimeout(int maxRetryTimeout) {
this.maxRetryTimeout = maxRetryTimeout;
}
diff --git
a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/es/ElasticsearchConfiguration.java
b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/es/ElasticsearchConfiguration.java
index f2849896ca4e..1d28482c670e 100644
---
a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/es/ElasticsearchConfiguration.java
+++
b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/es/ElasticsearchConfiguration.java
@@ -50,7 +50,10 @@ public class ElasticsearchConfiguration {
private String hostAddresses;
@UriParam(defaultValue = "" +
ElasticsearchConstants.DEFAULT_SOCKET_TIMEOUT)
private int socketTimeout = ElasticsearchConstants.DEFAULT_SOCKET_TIMEOUT;
- @UriParam(defaultValue = "" + ElasticsearchConstants.MAX_RETRY_TIMEOUT)
+ @Deprecated
+ @UriParam(defaultValue = "" + ElasticsearchConstants.MAX_RETRY_TIMEOUT,
+ description = "Deprecated: this option has no effect. It was
used by the old low-level REST client and is"
+ + " ignored by the current client.")
private int maxRetryTimeout = ElasticsearchConstants.MAX_RETRY_TIMEOUT;
@UriParam(defaultValue = "" +
ElasticsearchConstants.DEFAULT_CONNECTION_TIMEOUT)
private int connectionTimeout =
ElasticsearchConstants.DEFAULT_CONNECTION_TIMEOUT;
@@ -245,11 +248,15 @@ public class ElasticsearchConfiguration {
/**
* The time in ms before retry
+ *
+ * @deprecated this option has no effect and is ignored by the current
client
*/
+ @Deprecated
public int getMaxRetryTimeout() {
return maxRetryTimeout;
}
+ @Deprecated
public void setMaxRetryTimeout(int maxRetryTimeout) {
this.maxRetryTimeout = maxRetryTimeout;
}
diff --git
a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/es/ElasticsearchConstants.java
b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/es/ElasticsearchConstants.java
index 6a0ae00b7a3c..cb78d4a7f075 100644
---
a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/es/ElasticsearchConstants.java
+++
b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/es/ElasticsearchConstants.java
@@ -33,7 +33,7 @@ public interface ElasticsearchConstants {
@Metadata(description = "The index creation waits for the write
consistency number of shards to be available",
javaType = "Integer")
String PARAM_WAIT_FOR_ACTIVE_SHARDS =
"CamelElasticsearchWaitForActiveShards";
- @Metadata(description = "The starting index of the response.", javaType =
"Integer")
+ @Metadata(description = "Time in ms during which Elasticsearch will keep
the search context alive", javaType = "Integer")
String PARAM_SCROLL_KEEP_ALIVE_MS = "CamelElasticsearchScrollKeepAliveMs";
@Metadata(description = "Set to true to enable scroll usage", javaType =
"Boolean")
String PARAM_SCROLL = "CamelElasticsearchUseScroll";
diff --git
a/components/camel-opensearch/src/generated/resources/META-INF/org/apache/camel/component/opensearch/opensearch.json
b/components/camel-opensearch/src/generated/resources/META-INF/org/apache/camel/component/opensearch/opensearch.json
index f6991e43f59b..3e94d4cbcb4d 100644
---
a/components/camel-opensearch/src/generated/resources/META-INF/org/apache/camel/component/opensearch/opensearch.json
+++
b/components/camel-opensearch/src/generated/resources/META-INF/org/apache/camel/component/opensearch/opensearch.json
@@ -27,7 +27,7 @@
"connectionTimeout": { "index": 0, "kind": "property", "displayName":
"Connection Timeout", "group": "producer", "label": "", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 30000, "description": "The time in ms to wait
before connection will time out." },
"hostAddresses": { "index": 1, "kind": "property", "displayName": "Host
Addresses", "group": "producer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "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." },
"lazyStartProducer": { "index": 2, "kind": "property", "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 [...]
- "maxRetryTimeout": { "index": 3, "kind": "property", "displayName": "Max
Retry Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 30000, "description": "The time in ms before
retry" },
+ "maxRetryTimeout": { "index": 3, "kind": "property", "displayName": "Max
Retry Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": true, "autowired": false, "secret":
false, "defaultValue": 30000, "description": "The time in ms before retry" },
"socketTimeout": { "index": 4, "kind": "property", "displayName": "Socket
Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 30000, "description": "The timeout in ms to
wait before the socket will time out." },
"autowiredEnabled": { "index": 5, "kind": "property", "displayName":
"Autowired Enabled", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true, "description":
"Whether autowiring is enabled. This is used for automatic autowiring options
(the option must be marked as autowired) by looking up in the registry to find
if there is a single instance of matching t [...]
"client": { "index": 6, "kind": "property", "displayName": "Client",
"group": "advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "org.opensearch.client.RestClient", "deprecated": false,
"autowired": true, "secret": false, "description": "To use an existing
configured OpenSearch client, instead of creating a client per endpoint. This
allows customizing the client with specific settings." },
@@ -47,7 +47,7 @@
"CamelOpensearchIndexName": { "index": 2, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The name of the index to act against", "constantName":
"org.apache.camel.component.opensearch.OpensearchConstants#PARAM_INDEX_NAME" },
"CamelOpensearchDocumentClass": { "index": 3, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Class", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "defaultValue": "ObjectNode", "description": "The full
qualified name of the class of the document to unmarshall", "constantName":
"org.apache.camel.component.opensearch.OpensearchConstants#PARAM_DOCUMENT_CLASS"
},
"CamelOpensearchWaitForActiveShards": { "index": 4, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The index creation waits for the write
consistency number of shards to be available", "constantName":
"org.apache.camel.component.opensearch.OpensearchConstants#PARAM_WAIT_FOR_ACTIVE_SHARDS"
},
- "CamelOpensearchScrollKeepAliveMs": { "index": 5, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The starting index of the response.",
"constantName":
"org.apache.camel.component.opensearch.OpensearchConstants#PARAM_SCROLL_KEEP_ALIVE_MS"
},
+ "CamelOpensearchScrollKeepAliveMs": { "index": 5, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Time in ms during which OpenSearch will
keep the search context alive", "constantName":
"org.apache.camel.component.opensearch.OpensearchConstants#PARAM_SCROLL_KEEP_ALIVE_MS"
},
"CamelOpensearchUseScroll": { "index": 6, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType": "Boolean",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "Set to true to enable scroll usage. When enabled, the
body is returned as a OpensearchScrollRequestIterator. Make sure to use the
stream and close it accordingly to avoid potential resource leaks.",
"constantName": "org.apache.camel.com [...]
"CamelOpensearchSize": { "index": 7, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "Integer",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The size of the response.", "constantName":
"org.apache.camel.component.opensearch.OpensearchConstants#PARAM_SIZE" },
"CamelOpensearchFrom": { "index": 8, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "Integer",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The starting index of the response.", "constantName":
"org.apache.camel.component.opensearch.OpensearchConstants#PARAM_FROM" }
@@ -59,7 +59,7 @@
"from": { "index": 3, "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.opensearch.OpensearchConfiguration",
"configurationField": "configuration", "description": "Starting index of the
response." },
"hostAddresses": { "index": 4, "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.opensearch.OpensearchConfiguration",
"configurationField": "configuration", "description": "Comma separated list
with ip:port formatted remote transport addresses to use." },
"indexName": { "index": 5, "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.opensearch.OpensearchConfiguration",
"configurationField": "configuration", "description": "The name of the index to
act against" },
- "maxRetryTimeout": { "index": 6, "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.opensearch.OpensearchConfiguration",
"configurationField": "configuration", "description": "The time in ms before
retry" },
+ "maxRetryTimeout": { "index": 6, "kind": "parameter", "displayName": "Max
Retry Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": true, "autowired": false, "secret":
false, "defaultValue": 30000, "configurationClass":
"org.apache.camel.component.opensearch.OpensearchConfiguration",
"configurationField": "configuration", "description": "Deprecated: this option
has no effect. It was used by the old low-level REST client a [...]
"operation": { "index": 7, "kind": "parameter", "displayName":
"Operation", "group": "producer", "label": "", "required": false, "type":
"enum", "javaType":
"org.apache.camel.component.opensearch.OpensearchOperation", "enum": [ "Index",
"Update", "Bulk", "GetById", "MultiGet", "MultiSearch", "Delete",
"DeleteIndex", "Search", "Exists", "Ping" ], "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.opensearch.OpensearchConfigurati [...]
"scrollKeepAliveMs": { "index": 8, "kind": "parameter", "displayName":
"Scroll Keep Alive Ms", "group": "producer", "label": "", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 60000, "configurationClass":
"org.apache.camel.component.opensearch.OpensearchConfiguration",
"configurationField": "configuration", "description": "Time in ms during which
OpenSearch will keep search context alive" },
"size": { "index": 9, "kind": "parameter", "displayName": "Size", "group":
"producer", "label": "", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.opensearch.OpensearchConfiguration",
"configurationField": "configuration", "description": "Size of the response." },
diff --git
a/components/camel-opensearch/src/main/java/org/apache/camel/component/opensearch/OpensearchComponent.java
b/components/camel-opensearch/src/main/java/org/apache/camel/component/opensearch/OpensearchComponent.java
index 4fdcff614a65..40c17bf1565c 100644
---
a/components/camel-opensearch/src/main/java/org/apache/camel/component/opensearch/OpensearchComponent.java
+++
b/components/camel-opensearch/src/main/java/org/apache/camel/component/opensearch/OpensearchComponent.java
@@ -76,6 +76,7 @@ public class OpensearchComponent extends DefaultComponent
implements SSLContextP
}
@Override
+ @SuppressWarnings("deprecation") // copies the deprecated maxRetryTimeout
option while it still exists
protected Endpoint createEndpoint(String uri, String remaining,
Map<String, Object> parameters) throws Exception {
OpensearchConfiguration config = new OpensearchConfiguration();
config.setHostAddresses(this.getHostAddresses());
@@ -214,11 +215,15 @@ public class OpensearchComponent extends DefaultComponent
implements SSLContextP
/**
* The time in ms before retry
+ *
+ * @deprecated this option has no effect and is ignored by the current
client
*/
+ @Deprecated
public int getMaxRetryTimeout() {
return maxRetryTimeout;
}
+ @Deprecated
public void setMaxRetryTimeout(int maxRetryTimeout) {
this.maxRetryTimeout = maxRetryTimeout;
}
diff --git
a/components/camel-opensearch/src/main/java/org/apache/camel/component/opensearch/OpensearchConfiguration.java
b/components/camel-opensearch/src/main/java/org/apache/camel/component/opensearch/OpensearchConfiguration.java
index 25117ff43b91..c18bddd23aef 100644
---
a/components/camel-opensearch/src/main/java/org/apache/camel/component/opensearch/OpensearchConfiguration.java
+++
b/components/camel-opensearch/src/main/java/org/apache/camel/component/opensearch/OpensearchConfiguration.java
@@ -52,7 +52,10 @@ public class OpensearchConfiguration {
private String hostAddresses;
@UriParam(defaultValue = "" + OpensearchConstants.DEFAULT_SOCKET_TIMEOUT)
private int socketTimeout = OpensearchConstants.DEFAULT_SOCKET_TIMEOUT;
- @UriParam(defaultValue = "" + OpensearchConstants.MAX_RETRY_TIMEOUT)
+ @Deprecated
+ @UriParam(defaultValue = "" + OpensearchConstants.MAX_RETRY_TIMEOUT,
+ description = "Deprecated: this option has no effect. It was
used by the old low-level REST client and is"
+ + " ignored by the current client.")
private int maxRetryTimeout = OpensearchConstants.MAX_RETRY_TIMEOUT;
@UriParam(defaultValue = "" +
OpensearchConstants.DEFAULT_CONNECTION_TIMEOUT)
private int connectionTimeout =
OpensearchConstants.DEFAULT_CONNECTION_TIMEOUT;
@@ -234,11 +237,15 @@ public class OpensearchConfiguration {
/**
* The time in ms before retry
+ *
+ * @deprecated this option has no effect and is ignored by the current
client
*/
+ @Deprecated
public int getMaxRetryTimeout() {
return maxRetryTimeout;
}
+ @Deprecated
public void setMaxRetryTimeout(int maxRetryTimeout) {
this.maxRetryTimeout = maxRetryTimeout;
}
diff --git
a/components/camel-opensearch/src/main/java/org/apache/camel/component/opensearch/OpensearchConstants.java
b/components/camel-opensearch/src/main/java/org/apache/camel/component/opensearch/OpensearchConstants.java
index 2e45be7709c9..9da28b9d0709 100644
---
a/components/camel-opensearch/src/main/java/org/apache/camel/component/opensearch/OpensearchConstants.java
+++
b/components/camel-opensearch/src/main/java/org/apache/camel/component/opensearch/OpensearchConstants.java
@@ -33,7 +33,7 @@ public interface OpensearchConstants {
@Metadata(description = "The index creation waits for the write
consistency number of shards to be available",
javaType = "Integer")
String PARAM_WAIT_FOR_ACTIVE_SHARDS = "CamelOpensearchWaitForActiveShards";
- @Metadata(description = "The starting index of the response.", javaType =
"Integer")
+ @Metadata(description = "Time in ms during which OpenSearch will keep the
search context alive", javaType = "Integer")
String PARAM_SCROLL_KEEP_ALIVE_MS = "CamelOpensearchScrollKeepAliveMs";
@Metadata(description = "Set to true to enable scroll usage. When enabled,
the body is returned as a `OpensearchScrollRequestIterator`."
+
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_23.adoc
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_23.adoc
index ea7421392502..c47c29377c56 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_23.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_23.adoc
@@ -2231,3 +2231,12 @@ component.
This is a bug fix (CAMEL-24747). Routes that relied on `toD` passing the
encoded form to a `useRawUri()`
component will now see the original raw value instead. For all other
components (`useRawUri()` returns
`false`), behaviour is unchanged.
+
+=== camel-elasticsearch, camel-opensearch - the maxRetryTimeout option is
deprecated
+
+The `maxRetryTimeout` endpoint and component option is deprecated in both
`camel-elasticsearch` and
+`camel-opensearch`. It was a leftover from the old low-level Elasticsearch
REST client
+(`setMaxRetryTimeoutMillis`), which no longer exists in the client these
components use today, so setting
+it had no effect. The option is kept for backward compatibility of existing
endpoint URIs but is marked
+deprecated and will be removed in a future release. Routes that set
`maxRetryTimeout` can simply drop it;
+behaviour is unchanged.
diff --git
a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ElasticsearchComponentBuilderFactory.java
b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ElasticsearchComponentBuilderFactory.java
index 6e3ffdf9c3a1..798aa9e8c354 100644
---
a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ElasticsearchComponentBuilderFactory.java
+++
b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ElasticsearchComponentBuilderFactory.java
@@ -141,6 +141,7 @@ public interface ElasticsearchComponentBuilderFactory {
* @param maxRetryTimeout the value to set
* @return the dsl builder
*/
+ @Deprecated
default ElasticsearchComponentBuilder maxRetryTimeout(int
maxRetryTimeout) {
doSetProperty("maxRetryTimeout", maxRetryTimeout);
return this;
diff --git
a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpensearchComponentBuilderFactory.java
b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpensearchComponentBuilderFactory.java
index 88ac7e6ed78b..0bdb8bb05b4e 100644
---
a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpensearchComponentBuilderFactory.java
+++
b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpensearchComponentBuilderFactory.java
@@ -121,6 +121,7 @@ public interface OpensearchComponentBuilderFactory {
* @param maxRetryTimeout the value to set
* @return the dsl builder
*/
+ @Deprecated
default OpensearchComponentBuilder maxRetryTimeout(int
maxRetryTimeout) {
doSetProperty("maxRetryTimeout", maxRetryTimeout);
return this;
diff --git
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
index 6f0292e19e2d..d1d1e7afd099 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
@@ -199,7 +199,8 @@ public interface ElasticsearchEndpointBuilderFactory {
return this;
}
/**
- * The time in ms before retry.
+ * Deprecated: this option has no effect. It was used by the old
+ * low-level REST client and is ignored by the current client.
*
* The option is a: <code>int</code> type.
*
@@ -209,12 +210,14 @@ public interface ElasticsearchEndpointBuilderFactory {
* @param maxRetryTimeout the value to set
* @return the dsl builder
*/
+ @Deprecated
default ElasticsearchEndpointBuilder maxRetryTimeout(int
maxRetryTimeout) {
doSetProperty("maxRetryTimeout", maxRetryTimeout);
return this;
}
/**
- * The time in ms before retry.
+ * Deprecated: this option has no effect. It was used by the old
+ * low-level REST client and is ignored by the current client.
*
* The option will be converted to a <code>int</code> type.
*
@@ -224,6 +227,7 @@ public interface ElasticsearchEndpointBuilderFactory {
* @param maxRetryTimeout the value to set
* @return the dsl builder
*/
+ @Deprecated
default ElasticsearchEndpointBuilder maxRetryTimeout(String
maxRetryTimeout) {
doSetProperty("maxRetryTimeout", maxRetryTimeout);
return this;
@@ -821,7 +825,8 @@ public interface ElasticsearchEndpointBuilderFactory {
return "CamelElasticsearchWaitForActiveShards";
}
/**
- * The starting index of the response.
+ * Time in ms during which Elasticsearch will keep the search context
+ * alive.
*
* The option is a: {@code Integer} type.
*
diff --git
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/OpensearchEndpointBuilderFactory.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/OpensearchEndpointBuilderFactory.java
index 28c3cd1ab959..df3035d84f54 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/OpensearchEndpointBuilderFactory.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/OpensearchEndpointBuilderFactory.java
@@ -163,7 +163,8 @@ public interface OpensearchEndpointBuilderFactory {
return this;
}
/**
- * The time in ms before retry.
+ * Deprecated: this option has no effect. It was used by the old
+ * low-level REST client and is ignored by the current client.
*
* The option is a: <code>int</code> type.
*
@@ -173,12 +174,14 @@ public interface OpensearchEndpointBuilderFactory {
* @param maxRetryTimeout the value to set
* @return the dsl builder
*/
+ @Deprecated
default OpensearchEndpointBuilder maxRetryTimeout(int maxRetryTimeout)
{
doSetProperty("maxRetryTimeout", maxRetryTimeout);
return this;
}
/**
- * The time in ms before retry.
+ * Deprecated: this option has no effect. It was used by the old
+ * low-level REST client and is ignored by the current client.
*
* The option will be converted to a <code>int</code> type.
*
@@ -188,6 +191,7 @@ public interface OpensearchEndpointBuilderFactory {
* @param maxRetryTimeout the value to set
* @return the dsl builder
*/
+ @Deprecated
default OpensearchEndpointBuilder maxRetryTimeout(String
maxRetryTimeout) {
doSetProperty("maxRetryTimeout", maxRetryTimeout);
return this;
@@ -813,7 +817,8 @@ public interface OpensearchEndpointBuilderFactory {
return "CamelOpensearchWaitForActiveShards";
}
/**
- * The starting index of the response.
+ * Time in ms during which OpenSearch will keep the search context
+ * alive.
*
* The option is a: {@code Integer} type.
*
