This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 62b9a970193d camel-zookeeper, camel-aws2-sqs: three header javaTypes
name their class by simple name (#30090)
62b9a970193d is described below
commit 62b9a970193df1aa299c9f89a4c6cddaac2dcbb1
Author: dhairya05 <[email protected]>
AuthorDate: Fri Nov 20 02:02:28 2026 +0530
camel-zookeeper, camel-aws2-sqs: three header javaTypes name their class by
simple name (#30090)
Qualify the header javaType metadata, so the catalog names resolvable
classes:
- camel-zookeeper CamelZookeeperAcl: List<org.apache.zookeeper.data.ACL>
- camel-aws2-sqs CamelAwsSqsAttributes:
Map<software.amazon.awssdk.services.sqs.model.MessageSystemAttributeName,
String>
- camel-aws2-sqs CamelAwsSqsMessageAttributes: Map<String,
software.amazon.awssdk.services.sqs.model.MessageAttributeValue>
Metadata only, no behaviour change. The component JSON, the catalog copies
and the Endpoint DSL javadoc are regenerated.
---
.../resources/org/apache/camel/catalog/components/aws2-sqs.json | 4 ++--
.../resources/org/apache/camel/catalog/components/zookeeper.json | 2 +-
.../META-INF/org/apache/camel/component/aws2/sqs/aws2-sqs.json | 4 ++--
.../java/org/apache/camel/component/aws2/sqs/Sqs2Constants.java | 4 ++--
.../META-INF/org/apache/camel/component/zookeeper/zookeeper.json | 2 +-
.../org/apache/camel/component/zookeeper/ZooKeeperMessage.java | 2 +-
.../camel/builder/endpoint/dsl/Sqs2EndpointBuilderFactory.java | 8 +++++---
.../builder/endpoint/dsl/ZooKeeperEndpointBuilderFactory.java | 2 +-
8 files changed, 15 insertions(+), 13 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json
index eacfa7c92137..d104a1f161fc 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json
@@ -78,8 +78,8 @@
"useSessionCredentials": { "index": 51, "kind": "property", "displayName":
"Use Session Credentials", "group": "security", "label": "security",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration",
"configurationField": "configuration", "description": "Set whether the SQS
client should expect to use Session Credentials. [...]
},
"headers": {
- "CamelAwsSqsAttributes": { "index": 0, "kind": "header", "displayName":
"", "group": "consumer", "label": "consumer", "required": false, "javaType":
"Map<MessageSystemAttributeName, String>", "deprecated": false, "autowired":
false, "secret": false, "description": "A map of the attributes requested in
ReceiveMessage to their respective values.", "constantName":
"org.apache.camel.component.aws2.sqs.Sqs2Constants#ATTRIBUTES" },
- "CamelAwsSqsMessageAttributes": { "index": 1, "kind": "header",
"displayName": "", "group": "consumer", "label": "consumer", "required": false,
"javaType": "Map<String, MessageAttributeValue>", "deprecated": false,
"autowired": false, "secret": false, "description": "The Amazon SQS message
attributes.", "constantName":
"org.apache.camel.component.aws2.sqs.Sqs2Constants#MESSAGE_ATTRIBUTES" },
+ "CamelAwsSqsAttributes": { "index": 0, "kind": "header", "displayName":
"", "group": "consumer", "label": "consumer", "required": false, "javaType":
"Map<software.amazon.awssdk.services.sqs.model.MessageSystemAttributeName,
String>", "deprecated": false, "autowired": false, "secret": false,
"description": "A map of the attributes requested in ReceiveMessage to their
respective values.", "constantName":
"org.apache.camel.component.aws2.sqs.Sqs2Constants#ATTRIBUTES" },
+ "CamelAwsSqsMessageAttributes": { "index": 1, "kind": "header",
"displayName": "", "group": "consumer", "label": "consumer", "required": false,
"javaType": "Map<String,
software.amazon.awssdk.services.sqs.model.MessageAttributeValue>",
"deprecated": false, "autowired": false, "secret": false, "description": "The
Amazon SQS message attributes.", "constantName":
"org.apache.camel.component.aws2.sqs.Sqs2Constants#MESSAGE_ATTRIBUTES" },
"CamelAwsSqsMD5OfBody": { "index": 2, "kind": "header", "displayName": "",
"group": "common", "label": "", "required": false, "javaType": "String",
"deprecated": false, "autowired": false, "secret": false, "description": "The
MD5 checksum of the Amazon SQS message.", "constantName":
"org.apache.camel.component.aws2.sqs.Sqs2Constants#MD5_OF_BODY" },
"CamelAwsSqsMessageId": { "index": 3, "kind": "header", "displayName": "",
"group": "common", "label": "", "required": false, "javaType": "String",
"deprecated": false, "autowired": false, "secret": false, "description": "The
Amazon SQS message ID.", "constantName":
"org.apache.camel.component.aws2.sqs.Sqs2Constants#MESSAGE_ID" },
"CamelAwsSqsReceiptHandle": { "index": 4, "kind": "header", "displayName":
"", "group": "common", "label": "", "required": false, "javaType": "String",
"deprecated": false, "autowired": false, "secret": false, "description": "The
Amazon SQS message receipt handle.", "constantName":
"org.apache.camel.component.aws2.sqs.Sqs2Constants#RECEIPT_HANDLE" },
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/zookeeper.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/zookeeper.json
index f478cf3c3a8c..b47ae769059c 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/zookeeper.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/zookeeper.json
@@ -39,7 +39,7 @@
"headers": {
"CamelZooKeeperNode": { "index": 0, "kind": "header", "displayName": "",
"group": "common", "label": "", "required": false, "javaType": "String",
"deprecated": false, "autowired": false, "secret": false, "description": "The
node", "constantName":
"org.apache.camel.component.zookeeper.ZooKeeperMessage#ZOOKEEPER_NODE" },
"CamelZooKeeperVersion": { "index": 1, "kind": "header", "displayName":
"", "group": "common", "label": "", "required": false, "javaType": "Integer",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": "-1",
"description": "The node version", "constantName":
"org.apache.camel.component.zookeeper.ZooKeeperMessage#ZOOKEEPER_NODE_VERSION"
},
- "CamelZookeeperAcl": { "index": 2, "kind": "header", "displayName": "",
"group": "common", "label": "", "required": false, "javaType": "List<ACL>",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"Ids.OPEN_ACL_UNSAFE", "description": "The ACL", "constantName":
"org.apache.camel.component.zookeeper.ZooKeeperMessage#ZOOKEEPER_ACL" },
+ "CamelZookeeperAcl": { "index": 2, "kind": "header", "displayName": "",
"group": "common", "label": "", "required": false, "javaType":
"List<org.apache.zookeeper.data.ACL>", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "Ids.OPEN_ACL_UNSAFE", "description": "The
ACL", "constantName":
"org.apache.camel.component.zookeeper.ZooKeeperMessage#ZOOKEEPER_ACL" },
"CamelZookeeperCreateMode": { "index": 3, "kind": "header", "displayName":
"", "group": "common", "label": "", "required": false, "javaType":
"org.apache.zookeeper.CreateMode or String", "deprecated": false, "autowired":
false, "secret": false, "description": "The create mode", "constantName":
"org.apache.camel.component.zookeeper.ZooKeeperMessage#ZOOKEEPER_CREATE_MODE" },
"CamelZookeeperStatistics": { "index": 4, "kind": "header", "displayName":
"", "group": "common", "label": "", "required": false, "javaType":
"org.apache.zookeeper.data.Stat", "deprecated": false, "autowired": false,
"secret": false, "description": "The statistics", "constantName":
"org.apache.camel.component.zookeeper.ZooKeeperMessage#ZOOKEEPER_STATISTICS" },
"CamelZookeeperEventType": { "index": 5, "kind": "header", "displayName":
"", "group": "common", "label": "", "required": false, "javaType":
"org.apache.zookeeper.Watcher.Event.EventType", "enum": [ "None",
"NodeCreated", "NodeDeleted", "NodeDataChanged", "NodeChildrenChanged",
"DataWatchRemoved", "ChildWatchRemoved", "PersistentWatchRemoved" ],
"deprecated": false, "autowired": false, "secret": false, "description": "The
event type", "constantName": "org.apache.camel.component.zooke [...]
diff --git
a/components/camel-aws/camel-aws2-sqs/src/generated/resources/META-INF/org/apache/camel/component/aws2/sqs/aws2-sqs.json
b/components/camel-aws/camel-aws2-sqs/src/generated/resources/META-INF/org/apache/camel/component/aws2/sqs/aws2-sqs.json
index eacfa7c92137..d104a1f161fc 100644
---
a/components/camel-aws/camel-aws2-sqs/src/generated/resources/META-INF/org/apache/camel/component/aws2/sqs/aws2-sqs.json
+++
b/components/camel-aws/camel-aws2-sqs/src/generated/resources/META-INF/org/apache/camel/component/aws2/sqs/aws2-sqs.json
@@ -78,8 +78,8 @@
"useSessionCredentials": { "index": 51, "kind": "property", "displayName":
"Use Session Credentials", "group": "security", "label": "security",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration",
"configurationField": "configuration", "description": "Set whether the SQS
client should expect to use Session Credentials. [...]
},
"headers": {
- "CamelAwsSqsAttributes": { "index": 0, "kind": "header", "displayName":
"", "group": "consumer", "label": "consumer", "required": false, "javaType":
"Map<MessageSystemAttributeName, String>", "deprecated": false, "autowired":
false, "secret": false, "description": "A map of the attributes requested in
ReceiveMessage to their respective values.", "constantName":
"org.apache.camel.component.aws2.sqs.Sqs2Constants#ATTRIBUTES" },
- "CamelAwsSqsMessageAttributes": { "index": 1, "kind": "header",
"displayName": "", "group": "consumer", "label": "consumer", "required": false,
"javaType": "Map<String, MessageAttributeValue>", "deprecated": false,
"autowired": false, "secret": false, "description": "The Amazon SQS message
attributes.", "constantName":
"org.apache.camel.component.aws2.sqs.Sqs2Constants#MESSAGE_ATTRIBUTES" },
+ "CamelAwsSqsAttributes": { "index": 0, "kind": "header", "displayName":
"", "group": "consumer", "label": "consumer", "required": false, "javaType":
"Map<software.amazon.awssdk.services.sqs.model.MessageSystemAttributeName,
String>", "deprecated": false, "autowired": false, "secret": false,
"description": "A map of the attributes requested in ReceiveMessage to their
respective values.", "constantName":
"org.apache.camel.component.aws2.sqs.Sqs2Constants#ATTRIBUTES" },
+ "CamelAwsSqsMessageAttributes": { "index": 1, "kind": "header",
"displayName": "", "group": "consumer", "label": "consumer", "required": false,
"javaType": "Map<String,
software.amazon.awssdk.services.sqs.model.MessageAttributeValue>",
"deprecated": false, "autowired": false, "secret": false, "description": "The
Amazon SQS message attributes.", "constantName":
"org.apache.camel.component.aws2.sqs.Sqs2Constants#MESSAGE_ATTRIBUTES" },
"CamelAwsSqsMD5OfBody": { "index": 2, "kind": "header", "displayName": "",
"group": "common", "label": "", "required": false, "javaType": "String",
"deprecated": false, "autowired": false, "secret": false, "description": "The
MD5 checksum of the Amazon SQS message.", "constantName":
"org.apache.camel.component.aws2.sqs.Sqs2Constants#MD5_OF_BODY" },
"CamelAwsSqsMessageId": { "index": 3, "kind": "header", "displayName": "",
"group": "common", "label": "", "required": false, "javaType": "String",
"deprecated": false, "autowired": false, "secret": false, "description": "The
Amazon SQS message ID.", "constantName":
"org.apache.camel.component.aws2.sqs.Sqs2Constants#MESSAGE_ID" },
"CamelAwsSqsReceiptHandle": { "index": 4, "kind": "header", "displayName":
"", "group": "common", "label": "", "required": false, "javaType": "String",
"deprecated": false, "autowired": false, "secret": false, "description": "The
Amazon SQS message receipt handle.", "constantName":
"org.apache.camel.component.aws2.sqs.Sqs2Constants#RECEIPT_HANDLE" },
diff --git
a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Constants.java
b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Constants.java
index db13a85e7bd2..d275888dc1c1 100644
---
a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Constants.java
+++
b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Constants.java
@@ -25,10 +25,10 @@ public interface Sqs2Constants {
@Metadata(label = "consumer",
description = "A map of the attributes requested in
ReceiveMessage to their respective values.",
- javaType = "Map<MessageSystemAttributeName, String>")
+ javaType =
"Map<software.amazon.awssdk.services.sqs.model.MessageSystemAttributeName,
String>")
String ATTRIBUTES = "CamelAwsSqsAttributes";
@Metadata(label = "consumer", description = "The Amazon SQS message
attributes.",
- javaType = "Map<String, MessageAttributeValue>")
+ javaType = "Map<String,
software.amazon.awssdk.services.sqs.model.MessageAttributeValue>")
String MESSAGE_ATTRIBUTES = "CamelAwsSqsMessageAttributes";
@Metadata(description = "The MD5 checksum of the Amazon SQS message.",
javaType = "String")
String MD5_OF_BODY = "CamelAwsSqsMD5OfBody";
diff --git
a/components/camel-zookeeper/src/generated/resources/META-INF/org/apache/camel/component/zookeeper/zookeeper.json
b/components/camel-zookeeper/src/generated/resources/META-INF/org/apache/camel/component/zookeeper/zookeeper.json
index f478cf3c3a8c..b47ae769059c 100644
---
a/components/camel-zookeeper/src/generated/resources/META-INF/org/apache/camel/component/zookeeper/zookeeper.json
+++
b/components/camel-zookeeper/src/generated/resources/META-INF/org/apache/camel/component/zookeeper/zookeeper.json
@@ -39,7 +39,7 @@
"headers": {
"CamelZooKeeperNode": { "index": 0, "kind": "header", "displayName": "",
"group": "common", "label": "", "required": false, "javaType": "String",
"deprecated": false, "autowired": false, "secret": false, "description": "The
node", "constantName":
"org.apache.camel.component.zookeeper.ZooKeeperMessage#ZOOKEEPER_NODE" },
"CamelZooKeeperVersion": { "index": 1, "kind": "header", "displayName":
"", "group": "common", "label": "", "required": false, "javaType": "Integer",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": "-1",
"description": "The node version", "constantName":
"org.apache.camel.component.zookeeper.ZooKeeperMessage#ZOOKEEPER_NODE_VERSION"
},
- "CamelZookeeperAcl": { "index": 2, "kind": "header", "displayName": "",
"group": "common", "label": "", "required": false, "javaType": "List<ACL>",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"Ids.OPEN_ACL_UNSAFE", "description": "The ACL", "constantName":
"org.apache.camel.component.zookeeper.ZooKeeperMessage#ZOOKEEPER_ACL" },
+ "CamelZookeeperAcl": { "index": 2, "kind": "header", "displayName": "",
"group": "common", "label": "", "required": false, "javaType":
"List<org.apache.zookeeper.data.ACL>", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "Ids.OPEN_ACL_UNSAFE", "description": "The
ACL", "constantName":
"org.apache.camel.component.zookeeper.ZooKeeperMessage#ZOOKEEPER_ACL" },
"CamelZookeeperCreateMode": { "index": 3, "kind": "header", "displayName":
"", "group": "common", "label": "", "required": false, "javaType":
"org.apache.zookeeper.CreateMode or String", "deprecated": false, "autowired":
false, "secret": false, "description": "The create mode", "constantName":
"org.apache.camel.component.zookeeper.ZooKeeperMessage#ZOOKEEPER_CREATE_MODE" },
"CamelZookeeperStatistics": { "index": 4, "kind": "header", "displayName":
"", "group": "common", "label": "", "required": false, "javaType":
"org.apache.zookeeper.data.Stat", "deprecated": false, "autowired": false,
"secret": false, "description": "The statistics", "constantName":
"org.apache.camel.component.zookeeper.ZooKeeperMessage#ZOOKEEPER_STATISTICS" },
"CamelZookeeperEventType": { "index": 5, "kind": "header", "displayName":
"", "group": "common", "label": "", "required": false, "javaType":
"org.apache.zookeeper.Watcher.Event.EventType", "enum": [ "None",
"NodeCreated", "NodeDeleted", "NodeDataChanged", "NodeChildrenChanged",
"DataWatchRemoved", "ChildWatchRemoved", "PersistentWatchRemoved" ],
"deprecated": false, "autowired": false, "secret": false, "description": "The
event type", "constantName": "org.apache.camel.component.zooke [...]
diff --git
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperMessage.java
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperMessage.java
index 3c9e89dc8548..3b341faa6bbe 100644
---
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperMessage.java
+++
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperMessage.java
@@ -39,7 +39,7 @@ public class ZooKeeperMessage extends DefaultMessage {
public static final String ZOOKEEPER_NODE_VERSION =
"CamelZooKeeperVersion";
public static final String ZOOKEEPER_ERROR_CODE =
"CamelZooKeeperErrorCode";
- @Metadata(description = "The ACL", javaType = "List<ACL>", defaultValue =
"Ids.OPEN_ACL_UNSAFE")
+ @Metadata(description = "The ACL", javaType =
"List<org.apache.zookeeper.data.ACL>", defaultValue = "Ids.OPEN_ACL_UNSAFE")
public static final String ZOOKEEPER_ACL = "CamelZookeeperAcl";
@Metadata(description = "The create mode", javaType =
"org.apache.zookeeper.CreateMode or String")
public static final String ZOOKEEPER_CREATE_MODE =
"CamelZookeeperCreateMode";
diff --git
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sqs2EndpointBuilderFactory.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sqs2EndpointBuilderFactory.java
index f9343053e1aa..8ab6d23f2dc0 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sqs2EndpointBuilderFactory.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sqs2EndpointBuilderFactory.java
@@ -3403,8 +3403,8 @@ public interface Sqs2EndpointBuilderFactory {
* A map of the attributes requested in ReceiveMessage to their
* respective values.
*
- * The option is a: {@code Map<MessageSystemAttributeName, String>}
- * type.
+ * The option is a: {@code
+ *
Map<software.amazon.awssdk.services.sqs.model.MessageSystemAttributeName,
String>} type.
*
* Group: consumer
*
@@ -3416,7 +3416,9 @@ public interface Sqs2EndpointBuilderFactory {
/**
* The Amazon SQS message attributes.
*
- * The option is a: {@code Map<String, MessageAttributeValue>} type.
+ * The option is a: {@code Map<String,
+ * software.amazon.awssdk.services.sqs.model.MessageAttributeValue>}
+ * type.
*
* Group: consumer
*
diff --git
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ZooKeeperEndpointBuilderFactory.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ZooKeeperEndpointBuilderFactory.java
index 582e665c9c96..24031367dc77 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ZooKeeperEndpointBuilderFactory.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ZooKeeperEndpointBuilderFactory.java
@@ -690,7 +690,7 @@ public interface ZooKeeperEndpointBuilderFactory {
/**
* The ACL.
*
- * The option is a: {@code List<ACL>} type.
+ * The option is a: {@code List<org.apache.zookeeper.data.ACL>} type.
*
* Default: Ids.OPEN_ACL_UNSAFE
* Group: common