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 70d9e92ee039 CAMEL-23581: camel-elasticsearch + camel-opensearch - 
align Exchange header constant names with Camel naming convention (#23442)
70d9e92ee039 is described below

commit 70d9e92ee039fcd7840e2316d8ab5bad3fcc6d75
Author: Andrea Cosentino <[email protected]>
AuthorDate: Fri May 22 18:33:22 2026 +0200

    CAMEL-23581: camel-elasticsearch + camel-opensearch - align Exchange header 
constant names with Camel naming convention (#23442)
    
    Renames the Exchange header string values in ElasticsearchConstants and
    OpensearchConstants from non-Camel prefixed values (operation, indexId,
    indexName, documentClass, waitForActiveShards, scrollKeepAliveMs,
    useScroll, size, from, enableDocumentOnlyMode) to CamelElasticsearch* /
    CamelOpensearch*, following the convention used across the rest of the
    Camel component catalog and matching the pattern established in
    CAMEL-23526 (camel-cxf), CAMEL-23522 (camel-mail), CAMEL-23461
    (camel-aws-bedrock), CAMEL-23532 (camel-vertx-websocket /
    camel-atmosphere-websocket / camel-iggy), and CAMEL-23576 (camel-jira).
    
    The Java field names (PARAM_OPERATION, PARAM_INDEX_ID, PARAM_INDEX_NAME,
    PARAM_DOCUMENT_CLASS, PARAM_WAIT_FOR_ACTIVE_SHARDS,
    PARAM_SCROLL_KEEP_ALIVE_MS, PARAM_SCROLL, PARAM_SIZE, PARAM_FROM,
    PARAM_DOCUMENT_MODE) are unchanged so routes referencing the constants
    symbolically continue to work; routes using the literal string values
    must be updated (documented in the 4.21 upgrade guide).
    
    The already-Camel-prefixed PROPERTY_SCROLL_ES_QUERY_COUNT and
    PROPERTY_SCROLL_OPENSEARCH_QUERY_COUNT constants are unchanged.
    
    The generated Endpoint DSL header accessors on
    ElasticsearchHeaderNameBuilder and OpensearchHeaderNameBuilder have been
    renamed accordingly (operation() -> elasticsearchOperation() /
    opensearchOperation(), indexId() -> elasticsearchIndexId() /
    opensearchIndexId(), etc.).
    
    All existing tests use symbolic constant references and continue to pass
    without changes.
    
    Tracker: CAMEL-23577
    
    Reported by Claude Code on behalf of Andrea Cosentino
    
    Signed-off-by: Andrea Cosentino <[email protected]>
---
 .../camel/catalog/components/elasticsearch.json    | 20 +++----
 .../camel/catalog/components/opensearch.json       | 18 +++----
 .../apache/camel/component/es/elasticsearch.json   | 20 +++----
 .../camel/component/es/ElasticsearchConstants.java | 20 +++----
 .../camel/component/opensearch/opensearch.json     | 18 +++----
 .../component/opensearch/OpensearchConstants.java  | 18 +++----
 .../ROOT/pages/camel-4x-upgrade-guide-4_21.adoc    | 57 ++++++++++++++++++++
 .../dsl/ElasticsearchEndpointBuilderFactory.java   | 63 +++++++++++-----------
 .../dsl/OpensearchEndpointBuilderFactory.java      | 54 +++++++++----------
 9 files changed, 174 insertions(+), 114 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 fa342a1bb5cb..1d6b698ce6b2 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
@@ -41,16 +41,16 @@
     "user": { "index": 14, "kind": "property", "displayName": "User", "group": 
"security", "label": "security", "required": false, "type": "string", 
"javaType": "java.lang.String", "deprecated": false, "autowired": false, 
"secret": true, "security": "secret", "description": "Basic authenticate user" }
   },
   "headers": {
-    "operation": { "index": 0, "kind": "header", "displayName": "", "group": 
"producer", "label": "", "required": false, "javaType": 
"org.apache.camel.component.es.ElasticsearchOperation", "enum": [ "Index", 
"Update", "Bulk", "GetById", "MultiGet", "MultiSearch", "Delete", 
"DeleteIndex", "Search", "Exists", "Ping" ], "deprecated": false, 
"deprecationNote": "", "autowired": false, "secret": false, "description": "The 
operation to perform", "constantName": "org.apache.camel.component.es.El [...]
-    "indexId": { "index": 1, "kind": "header", "displayName": "", "group": 
"producer", "label": "", "required": false, "javaType": "String", "deprecated": 
false, "deprecationNote": "", "autowired": false, "secret": false, 
"description": "The id of the indexed document.", "constantName": 
"org.apache.camel.component.es.ElasticsearchConstants#PARAM_INDEX_ID" },
-    "indexName": { "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" },
-    "documentClass": { "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" },
-    "waitForActiveShards": { "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"
 },
-    "scrollKeepAliveMs": { "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"
 },
-    "useScroll": { "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" },
-    "size": { "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" },
-    "from": { "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" },
-    "enableDocumentOnlyMode": { "index": 9, "kind": "header", "displayName": 
"", "group": "producer", "label": "", "required": false, "javaType": "Boolean", 
"deprecated": false, "deprecationNote": "", "autowired": false, "secret": 
false, "defaultValue": "false", "description": "Indicates whether the body of 
the message contains only documents.", "constantName": 
"org.apache.camel.component.es.ElasticsearchConstants#PARAM_DOCUMENT_MODE" }
+    "CamelElasticsearchOperation": { "index": 0, "kind": "header", 
"displayName": "", "group": "producer", "label": "", "required": false, 
"javaType": "org.apache.camel.component.es.ElasticsearchOperation", "enum": [ 
"Index", "Update", "Bulk", "GetById", "MultiGet", "MultiSearch", "Delete", 
"DeleteIndex", "Search", "Exists", "Ping" ], "deprecated": false, 
"deprecationNote": "", "autowired": false, "secret": false, "description": "The 
operation to perform", "constantName": "org.apache.cam [...]
+    "CamelElasticsearchIndexId": { "index": 1, "kind": "header", 
"displayName": "", "group": "producer", "label": "", "required": false, 
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": 
false, "secret": false, "description": "The id of the indexed document.", 
"constantName": 
"org.apache.camel.component.es.ElasticsearchConstants#PARAM_INDEX_ID" },
+    "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"
 },
+    "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" },
+    "CamelElasticsearchEnableDocumentOnlyMode": { "index": 9, "kind": 
"header", "displayName": "", "group": "producer", "label": "", "required": 
false, "javaType": "Boolean", "deprecated": false, "deprecationNote": "", 
"autowired": false, "secret": false, "defaultValue": "false", "description": 
"Indicates whether the body of the message contains only documents.", 
"constantName": 
"org.apache.camel.component.es.ElasticsearchConstants#PARAM_DOCUMENT_MODE" }
   },
   "properties": {
     "clusterName": { "index": 0, "kind": "path", "displayName": "Cluster 
Name", "group": "producer", "label": "", "required": true, "type": "string", 
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", 
"autowired": false, "secret": false, "configurationClass": 
"org.apache.camel.component.es.ElasticsearchConfiguration", 
"configurationField": "configuration", "description": "Name of the cluster" },
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 4010b9705769..aaed7be13a86 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
@@ -41,15 +41,15 @@
     "user": { "index": 14, "kind": "property", "displayName": "User", "group": 
"security", "label": "security", "required": false, "type": "string", 
"javaType": "java.lang.String", "deprecated": false, "autowired": false, 
"secret": true, "security": "secret", "description": "Basic authenticate user" }
   },
   "headers": {
-    "operation": { "index": 0, "kind": "header", "displayName": "", "group": 
"producer", "label": "", "required": false, "javaType": 
"org.apache.camel.component.opensearch.OpensearchOperation", "enum": [ "Index", 
"Update", "Bulk", "GetById", "MultiGet", "MultiSearch", "Delete", 
"DeleteIndex", "Search", "Exists", "Ping" ], "deprecated": false, 
"deprecationNote": "", "autowired": false, "secret": false, "description": "The 
operation to perform", "constantName": "org.apache.camel.component. [...]
-    "indexId": { "index": 1, "kind": "header", "displayName": "", "group": 
"producer", "label": "", "required": false, "javaType": "String", "deprecated": 
false, "deprecationNote": "", "autowired": false, "secret": false, 
"description": "The id of the indexed document.", "constantName": 
"org.apache.camel.component.opensearch.OpensearchConstants#PARAM_INDEX_ID" },
-    "indexName": { "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" },
-    "documentClass": { "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"
 },
-    "waitForActiveShards": { "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"
 },
-    "scrollKeepAliveMs": { "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"
 },
-    "useScroll": { "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.component.opensear [...]
-    "size": { "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" },
-    "from": { "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" }
+    "CamelOpensearchOperation": { "index": 0, "kind": "header", "displayName": 
"", "group": "producer", "label": "", "required": false, "javaType": 
"org.apache.camel.component.opensearch.OpensearchOperation", "enum": [ "Index", 
"Update", "Bulk", "GetById", "MultiGet", "MultiSearch", "Delete", 
"DeleteIndex", "Search", "Exists", "Ping" ], "deprecated": false, 
"deprecationNote": "", "autowired": false, "secret": false, "description": "The 
operation to perform", "constantName": "org.apache.c [...]
+    "CamelOpensearchIndexId": { "index": 1, "kind": "header", "displayName": 
"", "group": "producer", "label": "", "required": false, "javaType": "String", 
"deprecated": false, "deprecationNote": "", "autowired": false, "secret": 
false, "description": "The id of the indexed document.", "constantName": 
"org.apache.camel.component.opensearch.OpensearchConstants#PARAM_INDEX_ID" },
+    "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"
 },
+    "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" }
   },
   "properties": {
     "clusterName": { "index": 0, "kind": "path", "displayName": "Cluster 
Name", "group": "producer", "label": "", "required": true, "type": "string", 
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", 
"autowired": false, "secret": false, "configurationClass": 
"org.apache.camel.component.opensearch.OpensearchConfiguration", 
"configurationField": "configuration", "description": "Name of the cluster" },
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 fa342a1bb5cb..1d6b698ce6b2 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
@@ -41,16 +41,16 @@
     "user": { "index": 14, "kind": "property", "displayName": "User", "group": 
"security", "label": "security", "required": false, "type": "string", 
"javaType": "java.lang.String", "deprecated": false, "autowired": false, 
"secret": true, "security": "secret", "description": "Basic authenticate user" }
   },
   "headers": {
-    "operation": { "index": 0, "kind": "header", "displayName": "", "group": 
"producer", "label": "", "required": false, "javaType": 
"org.apache.camel.component.es.ElasticsearchOperation", "enum": [ "Index", 
"Update", "Bulk", "GetById", "MultiGet", "MultiSearch", "Delete", 
"DeleteIndex", "Search", "Exists", "Ping" ], "deprecated": false, 
"deprecationNote": "", "autowired": false, "secret": false, "description": "The 
operation to perform", "constantName": "org.apache.camel.component.es.El [...]
-    "indexId": { "index": 1, "kind": "header", "displayName": "", "group": 
"producer", "label": "", "required": false, "javaType": "String", "deprecated": 
false, "deprecationNote": "", "autowired": false, "secret": false, 
"description": "The id of the indexed document.", "constantName": 
"org.apache.camel.component.es.ElasticsearchConstants#PARAM_INDEX_ID" },
-    "indexName": { "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" },
-    "documentClass": { "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" },
-    "waitForActiveShards": { "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"
 },
-    "scrollKeepAliveMs": { "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"
 },
-    "useScroll": { "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" },
-    "size": { "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" },
-    "from": { "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" },
-    "enableDocumentOnlyMode": { "index": 9, "kind": "header", "displayName": 
"", "group": "producer", "label": "", "required": false, "javaType": "Boolean", 
"deprecated": false, "deprecationNote": "", "autowired": false, "secret": 
false, "defaultValue": "false", "description": "Indicates whether the body of 
the message contains only documents.", "constantName": 
"org.apache.camel.component.es.ElasticsearchConstants#PARAM_DOCUMENT_MODE" }
+    "CamelElasticsearchOperation": { "index": 0, "kind": "header", 
"displayName": "", "group": "producer", "label": "", "required": false, 
"javaType": "org.apache.camel.component.es.ElasticsearchOperation", "enum": [ 
"Index", "Update", "Bulk", "GetById", "MultiGet", "MultiSearch", "Delete", 
"DeleteIndex", "Search", "Exists", "Ping" ], "deprecated": false, 
"deprecationNote": "", "autowired": false, "secret": false, "description": "The 
operation to perform", "constantName": "org.apache.cam [...]
+    "CamelElasticsearchIndexId": { "index": 1, "kind": "header", 
"displayName": "", "group": "producer", "label": "", "required": false, 
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": 
false, "secret": false, "description": "The id of the indexed document.", 
"constantName": 
"org.apache.camel.component.es.ElasticsearchConstants#PARAM_INDEX_ID" },
+    "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"
 },
+    "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" },
+    "CamelElasticsearchEnableDocumentOnlyMode": { "index": 9, "kind": 
"header", "displayName": "", "group": "producer", "label": "", "required": 
false, "javaType": "Boolean", "deprecated": false, "deprecationNote": "", 
"autowired": false, "secret": false, "defaultValue": "false", "description": 
"Indicates whether the body of the message contains only documents.", 
"constantName": 
"org.apache.camel.component.es.ElasticsearchConstants#PARAM_DOCUMENT_MODE" }
   },
   "properties": {
     "clusterName": { "index": 0, "kind": "path", "displayName": "Cluster 
Name", "group": "producer", "label": "", "required": true, "type": "string", 
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", 
"autowired": false, "secret": false, "configurationClass": 
"org.apache.camel.component.es.ElasticsearchConfiguration", 
"configurationField": "configuration", "description": "Name of the cluster" },
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 c937321e9774..6a0ae00b7a3c 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
@@ -22,28 +22,28 @@ public interface ElasticsearchConstants {
 
     @Metadata(description = "The operation to perform",
               javaType = 
"org.apache.camel.component.es.ElasticsearchOperation")
-    String PARAM_OPERATION = "operation";
+    String PARAM_OPERATION = "CamelElasticsearchOperation";
     @Metadata(description = "The id of the indexed document.", javaType = 
"String")
-    String PARAM_INDEX_ID = "indexId";
+    String PARAM_INDEX_ID = "CamelElasticsearchIndexId";
     @Metadata(description = "The name of the index to act against", javaType = 
"String")
-    String PARAM_INDEX_NAME = "indexName";
+    String PARAM_INDEX_NAME = "CamelElasticsearchIndexName";
     @Metadata(description = "The full qualified name of the class of the 
document to unmarshall", javaType = "Class",
               defaultValue = "ObjectNode")
-    String PARAM_DOCUMENT_CLASS = "documentClass";
+    String PARAM_DOCUMENT_CLASS = "CamelElasticsearchDocumentClass";
     @Metadata(description = "The index creation waits for the write 
consistency number of shards to be available",
               javaType = "Integer")
-    String PARAM_WAIT_FOR_ACTIVE_SHARDS = "waitForActiveShards";
+    String PARAM_WAIT_FOR_ACTIVE_SHARDS = 
"CamelElasticsearchWaitForActiveShards";
     @Metadata(description = "The starting index of the response.", javaType = 
"Integer")
-    String PARAM_SCROLL_KEEP_ALIVE_MS = "scrollKeepAliveMs";
+    String PARAM_SCROLL_KEEP_ALIVE_MS = "CamelElasticsearchScrollKeepAliveMs";
     @Metadata(description = "Set to true to enable scroll usage", javaType = 
"Boolean")
-    String PARAM_SCROLL = "useScroll";
+    String PARAM_SCROLL = "CamelElasticsearchUseScroll";
     @Metadata(description = "The size of the response.", javaType = "Integer")
-    String PARAM_SIZE = "size";
+    String PARAM_SIZE = "CamelElasticsearchSize";
     @Metadata(description = "The starting index of the response.", javaType = 
"Integer")
-    String PARAM_FROM = "from";
+    String PARAM_FROM = "CamelElasticsearchFrom";
     @Metadata(description = "Indicates whether the body of the message 
contains only documents.", javaType = "Boolean",
               defaultValue = "false")
-    String PARAM_DOCUMENT_MODE = "enableDocumentOnlyMode";
+    String PARAM_DOCUMENT_MODE = "CamelElasticsearchEnableDocumentOnlyMode";
 
     String PROPERTY_SCROLL_ES_QUERY_COUNT = 
"CamelElasticsearchScrollQueryCount";
 
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 4010b9705769..aaed7be13a86 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
@@ -41,15 +41,15 @@
     "user": { "index": 14, "kind": "property", "displayName": "User", "group": 
"security", "label": "security", "required": false, "type": "string", 
"javaType": "java.lang.String", "deprecated": false, "autowired": false, 
"secret": true, "security": "secret", "description": "Basic authenticate user" }
   },
   "headers": {
-    "operation": { "index": 0, "kind": "header", "displayName": "", "group": 
"producer", "label": "", "required": false, "javaType": 
"org.apache.camel.component.opensearch.OpensearchOperation", "enum": [ "Index", 
"Update", "Bulk", "GetById", "MultiGet", "MultiSearch", "Delete", 
"DeleteIndex", "Search", "Exists", "Ping" ], "deprecated": false, 
"deprecationNote": "", "autowired": false, "secret": false, "description": "The 
operation to perform", "constantName": "org.apache.camel.component. [...]
-    "indexId": { "index": 1, "kind": "header", "displayName": "", "group": 
"producer", "label": "", "required": false, "javaType": "String", "deprecated": 
false, "deprecationNote": "", "autowired": false, "secret": false, 
"description": "The id of the indexed document.", "constantName": 
"org.apache.camel.component.opensearch.OpensearchConstants#PARAM_INDEX_ID" },
-    "indexName": { "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" },
-    "documentClass": { "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"
 },
-    "waitForActiveShards": { "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"
 },
-    "scrollKeepAliveMs": { "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"
 },
-    "useScroll": { "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.component.opensear [...]
-    "size": { "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" },
-    "from": { "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" }
+    "CamelOpensearchOperation": { "index": 0, "kind": "header", "displayName": 
"", "group": "producer", "label": "", "required": false, "javaType": 
"org.apache.camel.component.opensearch.OpensearchOperation", "enum": [ "Index", 
"Update", "Bulk", "GetById", "MultiGet", "MultiSearch", "Delete", 
"DeleteIndex", "Search", "Exists", "Ping" ], "deprecated": false, 
"deprecationNote": "", "autowired": false, "secret": false, "description": "The 
operation to perform", "constantName": "org.apache.c [...]
+    "CamelOpensearchIndexId": { "index": 1, "kind": "header", "displayName": 
"", "group": "producer", "label": "", "required": false, "javaType": "String", 
"deprecated": false, "deprecationNote": "", "autowired": false, "secret": 
false, "description": "The id of the indexed document.", "constantName": 
"org.apache.camel.component.opensearch.OpensearchConstants#PARAM_INDEX_ID" },
+    "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"
 },
+    "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" }
   },
   "properties": {
     "clusterName": { "index": 0, "kind": "path", "displayName": "Cluster 
Name", "group": "producer", "label": "", "required": true, "type": "string", 
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", 
"autowired": false, "secret": false, "configurationClass": 
"org.apache.camel.component.opensearch.OpensearchConfiguration", 
"configurationField": "configuration", "description": "Name of the cluster" },
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 e3e7b1c90218..2e45be7709c9 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
@@ -22,28 +22,28 @@ public interface OpensearchConstants {
 
     @Metadata(description = "The operation to perform",
               javaType = 
"org.apache.camel.component.opensearch.OpensearchOperation")
-    String PARAM_OPERATION = "operation";
+    String PARAM_OPERATION = "CamelOpensearchOperation";
     @Metadata(description = "The id of the indexed document.", javaType = 
"String")
-    String PARAM_INDEX_ID = "indexId";
+    String PARAM_INDEX_ID = "CamelOpensearchIndexId";
     @Metadata(description = "The name of the index to act against", javaType = 
"String")
-    String PARAM_INDEX_NAME = "indexName";
+    String PARAM_INDEX_NAME = "CamelOpensearchIndexName";
     @Metadata(description = "The full qualified name of the class of the 
document to unmarshall", javaType = "Class",
               defaultValue = "ObjectNode")
-    String PARAM_DOCUMENT_CLASS = "documentClass";
+    String PARAM_DOCUMENT_CLASS = "CamelOpensearchDocumentClass";
     @Metadata(description = "The index creation waits for the write 
consistency number of shards to be available",
               javaType = "Integer")
-    String PARAM_WAIT_FOR_ACTIVE_SHARDS = "waitForActiveShards";
+    String PARAM_WAIT_FOR_ACTIVE_SHARDS = "CamelOpensearchWaitForActiveShards";
     @Metadata(description = "The starting index of the response.", javaType = 
"Integer")
-    String PARAM_SCROLL_KEEP_ALIVE_MS = "scrollKeepAliveMs";
+    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`."
                             +
                             " Make sure to use the stream and close it 
accordingly to avoid potential resource leaks.",
               javaType = "Boolean")
-    String PARAM_SCROLL = "useScroll";
+    String PARAM_SCROLL = "CamelOpensearchUseScroll";
     @Metadata(description = "The size of the response.", javaType = "Integer")
-    String PARAM_SIZE = "size";
+    String PARAM_SIZE = "CamelOpensearchSize";
     @Metadata(description = "The starting index of the response.", javaType = 
"Integer")
-    String PARAM_FROM = "from";
+    String PARAM_FROM = "CamelOpensearchFrom";
 
     String PROPERTY_SCROLL_OPENSEARCH_QUERY_COUNT = 
"CamelOpenSearchScrollQueryCount";
 
diff --git 
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_21.adoc 
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_21.adoc
index 04c5d7ec96b1..729adb6da7b5 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_21.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_21.adoc
@@ -1090,6 +1090,63 @@ As a consequence, the generated Endpoint DSL header 
accessors on
 * `decryptionMaterial()` -> `pdfDecryptionMaterial()`
 * `filesToMerge()` -> `pdfFilesToMerge()`
 
+=== camel-elasticsearch / camel-opensearch
+
+The Exchange header constants in `ElasticsearchConstants` and
+`OpensearchConstants` have been renamed to follow the Camel naming convention
+used across the rest of the component catalog. The Java field names are
+unchanged; only the header string values have changed.
+
+`ElasticsearchConstants`:
+
+[options="header"]
+|===
+| Constant | Previous value | New value
+| `ElasticsearchConstants.PARAM_OPERATION` | `operation` | 
`CamelElasticsearchOperation`
+| `ElasticsearchConstants.PARAM_INDEX_ID` | `indexId` | 
`CamelElasticsearchIndexId`
+| `ElasticsearchConstants.PARAM_INDEX_NAME` | `indexName` | 
`CamelElasticsearchIndexName`
+| `ElasticsearchConstants.PARAM_DOCUMENT_CLASS` | `documentClass` | 
`CamelElasticsearchDocumentClass`
+| `ElasticsearchConstants.PARAM_WAIT_FOR_ACTIVE_SHARDS` | 
`waitForActiveShards` | `CamelElasticsearchWaitForActiveShards`
+| `ElasticsearchConstants.PARAM_SCROLL_KEEP_ALIVE_MS` | `scrollKeepAliveMs` | 
`CamelElasticsearchScrollKeepAliveMs`
+| `ElasticsearchConstants.PARAM_SCROLL` | `useScroll` | 
`CamelElasticsearchUseScroll`
+| `ElasticsearchConstants.PARAM_SIZE` | `size` | `CamelElasticsearchSize`
+| `ElasticsearchConstants.PARAM_FROM` | `from` | `CamelElasticsearchFrom`
+| `ElasticsearchConstants.PARAM_DOCUMENT_MODE` | `enableDocumentOnlyMode` | 
`CamelElasticsearchEnableDocumentOnlyMode`
+|===
+
+`OpensearchConstants`:
+
+[options="header"]
+|===
+| Constant | Previous value | New value
+| `OpensearchConstants.PARAM_OPERATION` | `operation` | 
`CamelOpensearchOperation`
+| `OpensearchConstants.PARAM_INDEX_ID` | `indexId` | `CamelOpensearchIndexId`
+| `OpensearchConstants.PARAM_INDEX_NAME` | `indexName` | 
`CamelOpensearchIndexName`
+| `OpensearchConstants.PARAM_DOCUMENT_CLASS` | `documentClass` | 
`CamelOpensearchDocumentClass`
+| `OpensearchConstants.PARAM_WAIT_FOR_ACTIVE_SHARDS` | `waitForActiveShards` | 
`CamelOpensearchWaitForActiveShards`
+| `OpensearchConstants.PARAM_SCROLL_KEEP_ALIVE_MS` | `scrollKeepAliveMs` | 
`CamelOpensearchScrollKeepAliveMs`
+| `OpensearchConstants.PARAM_SCROLL` | `useScroll` | `CamelOpensearchUseScroll`
+| `OpensearchConstants.PARAM_SIZE` | `size` | `CamelOpensearchSize`
+| `OpensearchConstants.PARAM_FROM` | `from` | `CamelOpensearchFrom`
+|===
+
+`ElasticsearchConstants.PROPERTY_SCROLL_ES_QUERY_COUNT` and
+`OpensearchConstants.PROPERTY_SCROLL_OPENSEARCH_QUERY_COUNT` were already
+`Camel`-prefixed (`CamelElasticsearchScrollQueryCount` /
+`CamelOpenSearchScrollQueryCount`) and are unchanged.
+
+Routes that reference the constants symbolically (for example
+`setHeader(ElasticsearchConstants.PARAM_INDEX_NAME, ...)`) continue to work
+without changes. Routes that set the header by its literal string value
+(for example `setHeader("indexName", ...)`) must be updated to use the
+new value (`setHeader("CamelElasticsearchIndexName", ...)`).
+
+The generated Endpoint DSL header accessors on
+`ElasticsearchHeaderNameBuilder` and `OpensearchHeaderNameBuilder` have
+been renamed accordingly (`operation()` -> `elasticsearchOperation()` /
+`opensearchOperation()`, `indexId()` -> `elasticsearchIndexId()` /
+`opensearchIndexId()`, etc.).
+
 === Jackson dataformat documentation pages renamed
 
 The Jackson 2.x and Jackson 3.x lines ship the same dataformat names 
(`jackson`, `jacksonXml`,
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 8e58ce677c0a..a4fc5ae1f108 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
@@ -728,10 +728,10 @@ public interface ElasticsearchEndpointBuilderFactory {
          * 
          * Group: producer
          * 
-         * @return the name of the header {@code operation}.
+         * @return the name of the header {@code ElasticsearchOperation}.
          */
-        public String operation() {
-            return "operation";
+        public String elasticsearchOperation() {
+            return "CamelElasticsearchOperation";
         }
         /**
          * The id of the indexed document.
@@ -740,10 +740,10 @@ public interface ElasticsearchEndpointBuilderFactory {
          * 
          * Group: producer
          * 
-         * @return the name of the header {@code indexId}.
+         * @return the name of the header {@code ElasticsearchIndexId}.
          */
-        public String indexId() {
-            return "indexId";
+        public String elasticsearchIndexId() {
+            return "CamelElasticsearchIndexId";
         }
         /**
          * The name of the index to act against.
@@ -752,10 +752,10 @@ public interface ElasticsearchEndpointBuilderFactory {
          * 
          * Group: producer
          * 
-         * @return the name of the header {@code indexName}.
+         * @return the name of the header {@code ElasticsearchIndexName}.
          */
-        public String indexName() {
-            return "indexName";
+        public String elasticsearchIndexName() {
+            return "CamelElasticsearchIndexName";
         }
         /**
          * The full qualified name of the class of the document to unmarshall.
@@ -765,10 +765,10 @@ public interface ElasticsearchEndpointBuilderFactory {
          * Default: ObjectNode
          * Group: producer
          * 
-         * @return the name of the header {@code documentClass}.
+         * @return the name of the header {@code ElasticsearchDocumentClass}.
          */
-        public String documentClass() {
-            return "documentClass";
+        public String elasticsearchDocumentClass() {
+            return "CamelElasticsearchDocumentClass";
         }
         /**
          * The index creation waits for the write consistency number of shards
@@ -778,10 +778,11 @@ public interface ElasticsearchEndpointBuilderFactory {
          * 
          * Group: producer
          * 
-         * @return the name of the header {@code waitForActiveShards}.
+         * @return the name of the header {@code
+         * ElasticsearchWaitForActiveShards}.
          */
-        public String waitForActiveShards() {
-            return "waitForActiveShards";
+        public String elasticsearchWaitForActiveShards() {
+            return "CamelElasticsearchWaitForActiveShards";
         }
         /**
          * The starting index of the response.
@@ -790,10 +791,11 @@ public interface ElasticsearchEndpointBuilderFactory {
          * 
          * Group: producer
          * 
-         * @return the name of the header {@code scrollKeepAliveMs}.
+         * @return the name of the header {@code
+         * ElasticsearchScrollKeepAliveMs}.
          */
-        public String scrollKeepAliveMs() {
-            return "scrollKeepAliveMs";
+        public String elasticsearchScrollKeepAliveMs() {
+            return "CamelElasticsearchScrollKeepAliveMs";
         }
         /**
          * Set to true to enable scroll usage.
@@ -802,10 +804,10 @@ public interface ElasticsearchEndpointBuilderFactory {
          * 
          * Group: producer
          * 
-         * @return the name of the header {@code useScroll}.
+         * @return the name of the header {@code ElasticsearchUseScroll}.
          */
-        public String useScroll() {
-            return "useScroll";
+        public String elasticsearchUseScroll() {
+            return "CamelElasticsearchUseScroll";
         }
         /**
          * The size of the response.
@@ -814,10 +816,10 @@ public interface ElasticsearchEndpointBuilderFactory {
          * 
          * Group: producer
          * 
-         * @return the name of the header {@code size}.
+         * @return the name of the header {@code ElasticsearchSize}.
          */
-        public String size() {
-            return "size";
+        public String elasticsearchSize() {
+            return "CamelElasticsearchSize";
         }
         /**
          * The starting index of the response.
@@ -826,10 +828,10 @@ public interface ElasticsearchEndpointBuilderFactory {
          * 
          * Group: producer
          * 
-         * @return the name of the header {@code from}.
+         * @return the name of the header {@code ElasticsearchFrom}.
          */
-        public String from() {
-            return "from";
+        public String elasticsearchFrom() {
+            return "CamelElasticsearchFrom";
         }
         /**
          * Indicates whether the body of the message contains only documents.
@@ -839,10 +841,11 @@ public interface ElasticsearchEndpointBuilderFactory {
          * Default: false
          * Group: producer
          * 
-         * @return the name of the header {@code enableDocumentOnlyMode}.
+         * @return the name of the header {@code
+         * ElasticsearchEnableDocumentOnlyMode}.
          */
-        public String enableDocumentOnlyMode() {
-            return "enableDocumentOnlyMode";
+        public String elasticsearchEnableDocumentOnlyMode() {
+            return "CamelElasticsearchEnableDocumentOnlyMode";
         }
     }
     static ElasticsearchEndpointBuilder endpointBuilder(String componentName, 
String path) {
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 1468c214fb7b..d70369acaaa7 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
@@ -757,10 +757,10 @@ public interface OpensearchEndpointBuilderFactory {
          * 
          * Group: producer
          * 
-         * @return the name of the header {@code operation}.
+         * @return the name of the header {@code OpensearchOperation}.
          */
-        public String operation() {
-            return "operation";
+        public String opensearchOperation() {
+            return "CamelOpensearchOperation";
         }
         /**
          * The id of the indexed document.
@@ -769,10 +769,10 @@ public interface OpensearchEndpointBuilderFactory {
          * 
          * Group: producer
          * 
-         * @return the name of the header {@code indexId}.
+         * @return the name of the header {@code OpensearchIndexId}.
          */
-        public String indexId() {
-            return "indexId";
+        public String opensearchIndexId() {
+            return "CamelOpensearchIndexId";
         }
         /**
          * The name of the index to act against.
@@ -781,10 +781,10 @@ public interface OpensearchEndpointBuilderFactory {
          * 
          * Group: producer
          * 
-         * @return the name of the header {@code indexName}.
+         * @return the name of the header {@code OpensearchIndexName}.
          */
-        public String indexName() {
-            return "indexName";
+        public String opensearchIndexName() {
+            return "CamelOpensearchIndexName";
         }
         /**
          * The full qualified name of the class of the document to unmarshall.
@@ -794,10 +794,10 @@ public interface OpensearchEndpointBuilderFactory {
          * Default: ObjectNode
          * Group: producer
          * 
-         * @return the name of the header {@code documentClass}.
+         * @return the name of the header {@code OpensearchDocumentClass}.
          */
-        public String documentClass() {
-            return "documentClass";
+        public String opensearchDocumentClass() {
+            return "CamelOpensearchDocumentClass";
         }
         /**
          * The index creation waits for the write consistency number of shards
@@ -807,10 +807,10 @@ public interface OpensearchEndpointBuilderFactory {
          * 
          * Group: producer
          * 
-         * @return the name of the header {@code waitForActiveShards}.
+         * @return the name of the header {@code 
OpensearchWaitForActiveShards}.
          */
-        public String waitForActiveShards() {
-            return "waitForActiveShards";
+        public String opensearchWaitForActiveShards() {
+            return "CamelOpensearchWaitForActiveShards";
         }
         /**
          * The starting index of the response.
@@ -819,10 +819,10 @@ public interface OpensearchEndpointBuilderFactory {
          * 
          * Group: producer
          * 
-         * @return the name of the header {@code scrollKeepAliveMs}.
+         * @return the name of the header {@code OpensearchScrollKeepAliveMs}.
          */
-        public String scrollKeepAliveMs() {
-            return "scrollKeepAliveMs";
+        public String opensearchScrollKeepAliveMs() {
+            return "CamelOpensearchScrollKeepAliveMs";
         }
         /**
          * Set to true to enable scroll usage. When enabled, the body is
@@ -833,10 +833,10 @@ public interface OpensearchEndpointBuilderFactory {
          * 
          * Group: producer
          * 
-         * @return the name of the header {@code useScroll}.
+         * @return the name of the header {@code OpensearchUseScroll}.
          */
-        public String useScroll() {
-            return "useScroll";
+        public String opensearchUseScroll() {
+            return "CamelOpensearchUseScroll";
         }
         /**
          * The size of the response.
@@ -845,10 +845,10 @@ public interface OpensearchEndpointBuilderFactory {
          * 
          * Group: producer
          * 
-         * @return the name of the header {@code size}.
+         * @return the name of the header {@code OpensearchSize}.
          */
-        public String size() {
-            return "size";
+        public String opensearchSize() {
+            return "CamelOpensearchSize";
         }
         /**
          * The starting index of the response.
@@ -857,10 +857,10 @@ public interface OpensearchEndpointBuilderFactory {
          * 
          * Group: producer
          * 
-         * @return the name of the header {@code from}.
+         * @return the name of the header {@code OpensearchFrom}.
          */
-        public String from() {
-            return "from";
+        public String opensearchFrom() {
+            return "CamelOpensearchFrom";
         }
     }
     static OpensearchEndpointBuilder endpointBuilder(String componentName, 
String path) {

Reply via email to