This is an automated email from the ASF dual-hosted git repository.
oscerd pushed a commit to branch camel-4.22.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.22.x by this push:
new 882e81818bbf [backport camel-4.22.x] CAMEL-24895: camel-mustache,
camel-chunk - align Exchange header constant names with Camel naming convention
(#26807)
882e81818bbf is described below
commit 882e81818bbf86846102abbc9916eb0619d27d08
Author: Andrea Cosentino <[email protected]>
AuthorDate: Thu Sep 24 07:38:17 2026 +0200
[backport camel-4.22.x] CAMEL-24895: camel-mustache, camel-chunk - align
Exchange header constant names with Camel naming convention (#26807)
(cherry picked from commit 0b7670e29a68)
Co-authored-by: Claude Opus 4.8 <[email protected]>
---
.../resources/org/apache/camel/catalog/components/chunk.json | 4 ++--
.../resources/org/apache/camel/catalog/components/mustache.json | 4 ++--
.../resources/org/apache/camel/catalog/docs/chunk-component.adoc | 6 +++---
.../resources/org/apache/camel/catalog/docs/mustache-component.adoc | 6 +++---
.../resources/META-INF/org/apache/camel/component/chunk/chunk.json | 4 ++--
components/camel-chunk/src/main/docs/chunk-component.adoc | 6 +++---
.../main/java/org/apache/camel/component/chunk/ChunkConstants.java | 4 ++--
.../META-INF/org/apache/camel/component/mustache/mustache.json | 4 ++--
components/camel-mustache/src/main/docs/mustache-component.adoc | 6 +++---
.../java/org/apache/camel/component/mustache/MustacheConstants.java | 4 ++--
.../camel/builder/endpoint/dsl/ChunkEndpointBuilderFactory.java | 4 ++--
.../camel/builder/endpoint/dsl/MustacheEndpointBuilderFactory.java | 4 ++--
12 files changed, 28 insertions(+), 28 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/chunk.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/chunk.json
index 928b4256bed2..f1832e921213 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/chunk.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/chunk.json
@@ -31,8 +31,8 @@
"autowiredEnabled": { "index": 4, "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 [...]
},
"headers": {
- "ChunkResourceUri": { "index": 0, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "A URI for the template resource to use instead of the
endpoint configured.", "constantName":
"org.apache.camel.component.chunk.ChunkConstants#CHUNK_RESOURCE_URI" },
- "ChunkTemplate": { "index": 1, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The template to use instead of the endpoint
configured.", "constantName":
"org.apache.camel.component.chunk.ChunkConstants#CHUNK_TEMPLATE" }
+ "CamelChunkResourceUri": { "index": 0, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "A URI for the template resource to use instead of the
endpoint configured.", "constantName":
"org.apache.camel.component.chunk.ChunkConstants#CHUNK_RESOURCE_URI" },
+ "CamelChunkTemplate": { "index": 1, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The template to use instead of the endpoint
configured.", "constantName":
"org.apache.camel.component.chunk.ChunkConstants#CHUNK_TEMPLATE" }
},
"properties": {
"resourceUri": { "index": 0, "kind": "path", "displayName": "Resource
Uri", "group": "producer", "label": "", "required": true, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "supportFileReference": true,
"description": "Path to the resource. You can prefix with: classpath, file,
http, ref, or bean. classpath, file and http loads the resource using these
protocols (classpath is default). ref will look [...]
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mustache.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mustache.json
index dc9e26480c6c..ba9d4c456c61 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mustache.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mustache.json
@@ -32,8 +32,8 @@
"mustacheFactory": { "index": 5, "kind": "property", "displayName":
"Mustache Factory", "group": "advanced", "label": "advanced", "required":
false, "type": "object", "javaType": "com.github.mustachejava.MustacheFactory",
"deprecated": false, "autowired": true, "secret": false, "description": "To use
a custom MustacheFactory" }
},
"headers": {
- "MustacheResourceUri": { "index": 0, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "A URI for the template resource to use instead of the
endpoint.", "constantName":
"org.apache.camel.component.mustache.MustacheConstants#MUSTACHE_RESOURCE_URI" },
- "MustacheTemplate": { "index": 1, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The template to use instead of the endpoint
configured.", "constantName":
"org.apache.camel.component.mustache.MustacheConstants#MUSTACHE_TEMPLATE" }
+ "CamelMustacheResourceUri": { "index": 0, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "A URI for the template resource to use instead of the
endpoint.", "constantName":
"org.apache.camel.component.mustache.MustacheConstants#MUSTACHE_RESOURCE_URI" },
+ "CamelMustacheTemplate": { "index": 1, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The template to use instead of the endpoint
configured.", "constantName":
"org.apache.camel.component.mustache.MustacheConstants#MUSTACHE_TEMPLATE" }
},
"properties": {
"resourceUri": { "index": 0, "kind": "path", "displayName": "Resource
Uri", "group": "producer", "label": "", "required": true, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "supportFileReference": true,
"description": "Path to the resource. You can prefix with: classpath, file,
http, ref, or bean. classpath, file and http loads the resource using these
protocols (classpath is default). ref will look [...]
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/chunk-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/chunk-component.adoc
index 920ec45a1c6b..eb725f0f38a5 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/chunk-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/chunk-component.adoc
@@ -168,7 +168,7 @@ Java::
[source,java]
----
from("direct:in")
- .setHeader("ChunkResourceUri").constant("template")
+ .setHeader("CamelChunkResourceUri").constant("template")
.to("chunk:dummy?allowTemplateFromHeader=true");
----
@@ -178,7 +178,7 @@ XML::
----
<route>
<from uri="direct:in"/>
- <setHeader name="ChunkResourceUri">
+ <setHeader name="CamelChunkResourceUri">
<constant>template</constant>
</setHeader>
<to uri="chunk:dummy?allowTemplateFromHeader=true"/>
@@ -194,7 +194,7 @@ YAML::
uri: direct:in
steps:
- setHeader:
- name: ChunkResourceUri
+ name: CamelChunkResourceUri
expression:
constant:
expression: template
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/mustache-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/mustache-component.adoc
index 08802d531e78..1b113bc0a779 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/mustache-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/mustache-component.adoc
@@ -171,7 +171,7 @@ Java::
[source,java]
----
from("direct:in")
- .setHeader("MustacheResourceUri").constant("path/to/my/template.mustache")
+
.setHeader("CamelMustacheResourceUri").constant("path/to/my/template.mustache")
.to("mustache:dummy?allowTemplateFromHeader=true");
----
@@ -181,7 +181,7 @@ XML::
----
<route>
<from uri="direct:in"/>
- <setHeader name="MustacheResourceUri">
+ <setHeader name="CamelMustacheResourceUri">
<constant>path/to/my/template.mustache</constant>
</setHeader>
<to uri="mustache:dummy?allowTemplateFromHeader=true"/>
@@ -197,7 +197,7 @@ YAML::
uri: direct:in
steps:
- setHeader:
- name: MustacheResourceUri
+ name: CamelMustacheResourceUri
expression:
constant:
expression: path/to/my/template.mustache
diff --git
a/components/camel-chunk/src/generated/resources/META-INF/org/apache/camel/component/chunk/chunk.json
b/components/camel-chunk/src/generated/resources/META-INF/org/apache/camel/component/chunk/chunk.json
index 928b4256bed2..f1832e921213 100644
---
a/components/camel-chunk/src/generated/resources/META-INF/org/apache/camel/component/chunk/chunk.json
+++
b/components/camel-chunk/src/generated/resources/META-INF/org/apache/camel/component/chunk/chunk.json
@@ -31,8 +31,8 @@
"autowiredEnabled": { "index": 4, "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 [...]
},
"headers": {
- "ChunkResourceUri": { "index": 0, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "A URI for the template resource to use instead of the
endpoint configured.", "constantName":
"org.apache.camel.component.chunk.ChunkConstants#CHUNK_RESOURCE_URI" },
- "ChunkTemplate": { "index": 1, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The template to use instead of the endpoint
configured.", "constantName":
"org.apache.camel.component.chunk.ChunkConstants#CHUNK_TEMPLATE" }
+ "CamelChunkResourceUri": { "index": 0, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "A URI for the template resource to use instead of the
endpoint configured.", "constantName":
"org.apache.camel.component.chunk.ChunkConstants#CHUNK_RESOURCE_URI" },
+ "CamelChunkTemplate": { "index": 1, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The template to use instead of the endpoint
configured.", "constantName":
"org.apache.camel.component.chunk.ChunkConstants#CHUNK_TEMPLATE" }
},
"properties": {
"resourceUri": { "index": 0, "kind": "path", "displayName": "Resource
Uri", "group": "producer", "label": "", "required": true, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "supportFileReference": true,
"description": "Path to the resource. You can prefix with: classpath, file,
http, ref, or bean. classpath, file and http loads the resource using these
protocols (classpath is default). ref will look [...]
diff --git a/components/camel-chunk/src/main/docs/chunk-component.adoc
b/components/camel-chunk/src/main/docs/chunk-component.adoc
index 920ec45a1c6b..eb725f0f38a5 100644
--- a/components/camel-chunk/src/main/docs/chunk-component.adoc
+++ b/components/camel-chunk/src/main/docs/chunk-component.adoc
@@ -168,7 +168,7 @@ Java::
[source,java]
----
from("direct:in")
- .setHeader("ChunkResourceUri").constant("template")
+ .setHeader("CamelChunkResourceUri").constant("template")
.to("chunk:dummy?allowTemplateFromHeader=true");
----
@@ -178,7 +178,7 @@ XML::
----
<route>
<from uri="direct:in"/>
- <setHeader name="ChunkResourceUri">
+ <setHeader name="CamelChunkResourceUri">
<constant>template</constant>
</setHeader>
<to uri="chunk:dummy?allowTemplateFromHeader=true"/>
@@ -194,7 +194,7 @@ YAML::
uri: direct:in
steps:
- setHeader:
- name: ChunkResourceUri
+ name: CamelChunkResourceUri
expression:
constant:
expression: template
diff --git
a/components/camel-chunk/src/main/java/org/apache/camel/component/chunk/ChunkConstants.java
b/components/camel-chunk/src/main/java/org/apache/camel/component/chunk/ChunkConstants.java
index f55b8c7e4d4b..0d0357b99b87 100644
---
a/components/camel-chunk/src/main/java/org/apache/camel/component/chunk/ChunkConstants.java
+++
b/components/camel-chunk/src/main/java/org/apache/camel/component/chunk/ChunkConstants.java
@@ -27,13 +27,13 @@ public final class ChunkConstants {
* Header containing a Chunk template location
*/
@Metadata(description = "A URI for the template resource to use instead of
the endpoint configured.", javaType = "String")
- public static final String CHUNK_RESOURCE_URI = "ChunkResourceUri";
+ public static final String CHUNK_RESOURCE_URI = "CamelChunkResourceUri";
/**
* Header containing the Chunk template code
*/
@Metadata(description = "The template to use instead of the endpoint
configured.", javaType = "String")
- public static final String CHUNK_TEMPLATE = "ChunkTemplate";
+ public static final String CHUNK_TEMPLATE = "CamelChunkTemplate";
/**
* Chunk endpoint URI prefix
diff --git
a/components/camel-mustache/src/generated/resources/META-INF/org/apache/camel/component/mustache/mustache.json
b/components/camel-mustache/src/generated/resources/META-INF/org/apache/camel/component/mustache/mustache.json
index dc9e26480c6c..ba9d4c456c61 100644
---
a/components/camel-mustache/src/generated/resources/META-INF/org/apache/camel/component/mustache/mustache.json
+++
b/components/camel-mustache/src/generated/resources/META-INF/org/apache/camel/component/mustache/mustache.json
@@ -32,8 +32,8 @@
"mustacheFactory": { "index": 5, "kind": "property", "displayName":
"Mustache Factory", "group": "advanced", "label": "advanced", "required":
false, "type": "object", "javaType": "com.github.mustachejava.MustacheFactory",
"deprecated": false, "autowired": true, "secret": false, "description": "To use
a custom MustacheFactory" }
},
"headers": {
- "MustacheResourceUri": { "index": 0, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "A URI for the template resource to use instead of the
endpoint.", "constantName":
"org.apache.camel.component.mustache.MustacheConstants#MUSTACHE_RESOURCE_URI" },
- "MustacheTemplate": { "index": 1, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The template to use instead of the endpoint
configured.", "constantName":
"org.apache.camel.component.mustache.MustacheConstants#MUSTACHE_TEMPLATE" }
+ "CamelMustacheResourceUri": { "index": 0, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "A URI for the template resource to use instead of the
endpoint.", "constantName":
"org.apache.camel.component.mustache.MustacheConstants#MUSTACHE_RESOURCE_URI" },
+ "CamelMustacheTemplate": { "index": 1, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The template to use instead of the endpoint
configured.", "constantName":
"org.apache.camel.component.mustache.MustacheConstants#MUSTACHE_TEMPLATE" }
},
"properties": {
"resourceUri": { "index": 0, "kind": "path", "displayName": "Resource
Uri", "group": "producer", "label": "", "required": true, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "supportFileReference": true,
"description": "Path to the resource. You can prefix with: classpath, file,
http, ref, or bean. classpath, file and http loads the resource using these
protocols (classpath is default). ref will look [...]
diff --git a/components/camel-mustache/src/main/docs/mustache-component.adoc
b/components/camel-mustache/src/main/docs/mustache-component.adoc
index 08802d531e78..1b113bc0a779 100644
--- a/components/camel-mustache/src/main/docs/mustache-component.adoc
+++ b/components/camel-mustache/src/main/docs/mustache-component.adoc
@@ -171,7 +171,7 @@ Java::
[source,java]
----
from("direct:in")
- .setHeader("MustacheResourceUri").constant("path/to/my/template.mustache")
+
.setHeader("CamelMustacheResourceUri").constant("path/to/my/template.mustache")
.to("mustache:dummy?allowTemplateFromHeader=true");
----
@@ -181,7 +181,7 @@ XML::
----
<route>
<from uri="direct:in"/>
- <setHeader name="MustacheResourceUri">
+ <setHeader name="CamelMustacheResourceUri">
<constant>path/to/my/template.mustache</constant>
</setHeader>
<to uri="mustache:dummy?allowTemplateFromHeader=true"/>
@@ -197,7 +197,7 @@ YAML::
uri: direct:in
steps:
- setHeader:
- name: MustacheResourceUri
+ name: CamelMustacheResourceUri
expression:
constant:
expression: path/to/my/template.mustache
diff --git
a/components/camel-mustache/src/main/java/org/apache/camel/component/mustache/MustacheConstants.java
b/components/camel-mustache/src/main/java/org/apache/camel/component/mustache/MustacheConstants.java
index 05880f7b1f28..c8f490d8316d 100644
---
a/components/camel-mustache/src/main/java/org/apache/camel/component/mustache/MustacheConstants.java
+++
b/components/camel-mustache/src/main/java/org/apache/camel/component/mustache/MustacheConstants.java
@@ -27,13 +27,13 @@ public final class MustacheConstants {
* Header containing a Mustache template location
*/
@Metadata(description = "A URI for the template resource to use instead of
the endpoint.", javaType = "String")
- public static final String MUSTACHE_RESOURCE_URI = "MustacheResourceUri";
+ public static final String MUSTACHE_RESOURCE_URI =
"CamelMustacheResourceUri";
/**
* Header containing the Mustache template code
*/
@Metadata(description = "The template to use instead of the endpoint
configured.", javaType = "String")
- public static final String MUSTACHE_TEMPLATE = "MustacheTemplate";
+ public static final String MUSTACHE_TEMPLATE = "CamelMustacheTemplate";
/**
* Mustache endpoint URI prefix
diff --git
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ChunkEndpointBuilderFactory.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ChunkEndpointBuilderFactory.java
index f0759f92fdcb..b052f0f7bd7a 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ChunkEndpointBuilderFactory.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ChunkEndpointBuilderFactory.java
@@ -371,7 +371,7 @@ public interface ChunkEndpointBuilderFactory {
* @return the name of the header {@code ChunkResourceUri}.
*/
public String chunkResourceUri() {
- return "ChunkResourceUri";
+ return "CamelChunkResourceUri";
}
/**
* The template to use instead of the endpoint configured.
@@ -383,7 +383,7 @@ public interface ChunkEndpointBuilderFactory {
* @return the name of the header {@code ChunkTemplate}.
*/
public String chunkTemplate() {
- return "ChunkTemplate";
+ return "CamelChunkTemplate";
}
}
static ChunkEndpointBuilder endpointBuilder(String componentName, String
path) {
diff --git
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MustacheEndpointBuilderFactory.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MustacheEndpointBuilderFactory.java
index 9b333f3c2357..4cc93f8a81f3 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MustacheEndpointBuilderFactory.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MustacheEndpointBuilderFactory.java
@@ -344,7 +344,7 @@ public interface MustacheEndpointBuilderFactory {
* @return the name of the header {@code MustacheResourceUri}.
*/
public String mustacheResourceUri() {
- return "MustacheResourceUri";
+ return "CamelMustacheResourceUri";
}
/**
* The template to use instead of the endpoint configured.
@@ -356,7 +356,7 @@ public interface MustacheEndpointBuilderFactory {
* @return the name of the header {@code MustacheTemplate}.
*/
public String mustacheTemplate() {
- return "MustacheTemplate";
+ return "CamelMustacheTemplate";
}
}
static MustacheEndpointBuilder endpointBuilder(String componentName,
String path) {
