diff --git a/Jenkinsfile.talend b/Jenkinsfile.talend index c9c7664f554fe..444aa398cfe46 100644 --- a/Jenkinsfile.talend +++ b/Jenkinsfile.talend @@ -43,6 +43,7 @@ org.apache.camel:camel-debezium-oracle,\ org.apache.camel:camel-debezium-postgres,\ org.apache.camel:camel-debezium-sqlserver,\ org.apache.camel:camel-direct,\ +org.apache.camel:camel-dns,\ org.apache.camel:camel-drill,\ org.apache.camel:camel-dynamic-router,\ org.apache.camel:camel-file,\ @@ -62,6 +63,7 @@ org.apache.camel:camel-mail,\ org.apache.camel:camel-mina,\ org.apache.camel:camel-minio,\ org.apache.camel:camel-mongodb,\ +org.apache.camel:camel-mongodb-gridfs,\ org.apache.camel:camel-observation,\ org.apache.camel:camel-pdf,\ org.apache.camel:camel-platform-http-jolokia,\ diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dns.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dns.json index 483387ff6bac2..741c0008442cd 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dns.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dns.json @@ -27,12 +27,12 @@ "autowiredEnabled": { "index": 1, "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 type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc." } }, "headers": { - "dns.class": { "index": 0, "kind": "header", "displayName": "", "group": "lookup dig", "label": "lookup dig", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The DNS class of the lookup. Should match the values of org.xbill.dns.DClass. Optional.", "constantName": "org.apache.camel.component.dns.DnsConstants#DNS_CLASS" }, - "dns.name": { "index": 1, "kind": "header", "displayName": "", "group": "lookup", "label": "lookup", "required": true, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The name to lookup", "constantName": "org.apache.camel.component.dns.DnsConstants#DNS_NAME" }, - "dns.domain": { "index": 2, "kind": "header", "displayName": "", "group": "ip", "label": "ip", "required": true, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The domain name.", "constantName": "org.apache.camel.component.dns.DnsConstants#DNS_DOMAIN" }, - "dns.server": { "index": 3, "kind": "header", "displayName": "", "group": "dig", "label": "dig", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The server in particular for the query. If none is given, the default one specified by the OS will be used. Optional.", "constantName": "org.apache.camel.component.dns.DnsConstants#DNS_SERVER" }, - "dns.type": { "index": 4, "kind": "header", "displayName": "", "group": "lookup dig", "label": "lookup dig", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The type of the lookup. Should match the values of org.xbill.dns.Type. Optional.", "constantName": "org.apache.camel.component.dns.DnsConstants#DNS_TYPE" }, - "term": { "index": 5, "kind": "header", "displayName": "", "group": "wikipedia", "label": "wikipedia", "required": true, "javaType": "", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The term", "constantName": "org.apache.camel.component.dns.DnsConstants#TERM" } + "CamelDnsClass": { "index": 0, "kind": "header", "displayName": "", "group": "lookup dig", "label": "lookup dig", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The DNS class of the lookup. Should match the values of org.xbill.dns.DClass. Optional.", "constantName": "org.apache.camel.component.dns.DnsConstants#DNS_CLASS" }, + "CamelDnsName": { "index": 1, "kind": "header", "displayName": "", "group": "lookup", "label": "lookup", "required": true, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The name to lookup", "constantName": "org.apache.camel.component.dns.DnsConstants#DNS_NAME" }, + "CamelDnsDomain": { "index": 2, "kind": "header", "displayName": "", "group": "ip", "label": "ip", "required": true, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The domain name.", "constantName": "org.apache.camel.component.dns.DnsConstants#DNS_DOMAIN" }, + "CamelDnsServer": { "index": 3, "kind": "header", "displayName": "", "group": "dig", "label": "dig", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The server in particular for the query. If none is given, the default one specified by the OS will be used. Optional.", "constantName": "org.apache.camel.component.dns.DnsConstants#DNS_SERVER" }, + "CamelDnsType": { "index": 4, "kind": "header", "displayName": "", "group": "lookup dig", "label": "lookup dig", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The type of the lookup. Should match the values of org.xbill.dns.Type. Optional.", "constantName": "org.apache.camel.component.dns.DnsConstants#DNS_TYPE" }, + "CamelDnsTerm": { "index": 5, "kind": "header", "displayName": "", "group": "wikipedia", "label": "wikipedia", "required": true, "javaType": "", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The term", "constantName": "org.apache.camel.component.dns.DnsConstants#TERM" } }, "properties": { "dnsType": { "index": 0, "kind": "path", "displayName": "Dns Type", "group": "producer", "label": "", "required": true, "type": "object", "javaType": "org.apache.camel.component.dns.DnsType", "enum": [ "dig", "ip", "lookup", "wikipedia" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The type of the lookup." }, diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mongodb-gridfs.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mongodb-gridfs.json index e68ad3eebabb2..9518b1fb171f4 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mongodb-gridfs.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mongodb-gridfs.json @@ -34,11 +34,11 @@ "CamelFileName": { "index": 3, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The name of the file.", "constantName": "org.apache.camel.component.mongodb.gridfs.GridFsConstants#FILE_NAME" }, "Content-Type": { "index": 4, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The content type of the file.", "constantName": "org.apache.camel.component.mongodb.gridfs.GridFsConstants#CONTENT_TYPE" }, "CamelFileNameProduced": { "index": 5, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The file name produced.", "constantName": "org.apache.camel.component.mongodb.gridfs.GridFsConstants#FILE_NAME_PRODUCED" }, - "gridfs.metadata": { "index": 6, "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Any additional metadata stored along with the file in JSON format.", "constantName": "org.apache.camel.component.mongodb.gridfs.GridFsConstants#GRIDFS_METADATA" }, - "gridfs.operation": { "index": 7, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The operation to perform.", "constantName": "org.apache.camel.component.mongodb.gridfs.GridFsConstants#GRIDFS_OPERATION" }, - "gridfs.chunksize": { "index": 8, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The number of bytes per chunk for the uploaded file.", "constantName": "org.apache.camel.component.mongodb.gridfs.GridFsConstants#GRIDFS_CHUNKSIZE" }, - "gridfs.fileid": { "index": 9, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "org.bson.types.ObjectId", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The ObjectId of the file produced", "constantName": "org.apache.camel.component.mongodb.gridfs.GridFsConstants#GRIDFS_FILE_ID_PRODUCED" }, - "gridfs.objectid": { "index": 10, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "org.bson.types.ObjectId", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The ObjectId of the file.", "constantName": "org.apache.camel.component.mongodb.gridfs.GridFsConstants#GRIDFS_OBJECT_ID" } + "CamelGridFsMetadata": { "index": 6, "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Any additional metadata stored along with the file in JSON format.", "constantName": "org.apache.camel.component.mongodb.gridfs.GridFsConstants#GRIDFS_METADATA" }, + "CamelGridFsOperation": { "index": 7, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The operation to perform.", "constantName": "org.apache.camel.component.mongodb.gridfs.GridFsConstants#GRIDFS_OPERATION" }, + "CamelGridFsChunkSize": { "index": 8, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The number of bytes per chunk for the uploaded file.", "constantName": "org.apache.camel.component.mongodb.gridfs.GridFsConstants#GRIDFS_CHUNKSIZE" }, + "CamelGridFsFileId": { "index": 9, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "org.bson.types.ObjectId", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The ObjectId of the file produced", "constantName": "org.apache.camel.component.mongodb.gridfs.GridFsConstants#GRIDFS_FILE_ID_PRODUCED" }, + "CamelGridFsObjectId": { "index": 10, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "org.bson.types.ObjectId", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The ObjectId of the file.", "constantName": "org.apache.camel.component.mongodb.gridfs.GridFsConstants#GRIDFS_OBJECT_ID" } }, "properties": { "connectionBean": { "index": 0, "kind": "path", "displayName": "Connection Bean", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Name of com.mongodb.client.MongoClient to use." }, diff --git a/components/camel-dns/pom.xml b/components/camel-dns/pom.xml index 91da770761890..716865f3210b2 100644 --- a/components/camel-dns/pom.xml +++ b/components/camel-dns/pom.xml @@ -30,6 +30,11 @@ camel-dns Camel DNS support jar + ${revision} + + + ${camel-dns.tesb.version} + diff --git a/components/camel-dns/src/generated/resources/META-INF/org/apache/camel/component/dns/dns.json b/components/camel-dns/src/generated/resources/META-INF/org/apache/camel/component/dns/dns.json index 483387ff6bac2..84b02baf7433a 100644 --- a/components/camel-dns/src/generated/resources/META-INF/org/apache/camel/component/dns/dns.json +++ b/components/camel-dns/src/generated/resources/META-INF/org/apache/camel/component/dns/dns.json @@ -11,7 +11,7 @@ "supportLevel": "Stable", "groupId": "org.apache.camel", "artifactId": "camel-dns", - "version": "4.8.1-SNAPSHOT", + "version": "4.8.1.20260801", "scheme": "dns", "extendsScheme": "", "syntax": "dns:dnsType", @@ -27,12 +27,12 @@ "autowiredEnabled": { "index": 1, "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 type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc." } }, "headers": { - "dns.class": { "index": 0, "kind": "header", "displayName": "", "group": "lookup dig", "label": "lookup dig", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The DNS class of the lookup. Should match the values of org.xbill.dns.DClass. Optional.", "constantName": "org.apache.camel.component.dns.DnsConstants#DNS_CLASS" }, - "dns.name": { "index": 1, "kind": "header", "displayName": "", "group": "lookup", "label": "lookup", "required": true, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The name to lookup", "constantName": "org.apache.camel.component.dns.DnsConstants#DNS_NAME" }, - "dns.domain": { "index": 2, "kind": "header", "displayName": "", "group": "ip", "label": "ip", "required": true, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The domain name.", "constantName": "org.apache.camel.component.dns.DnsConstants#DNS_DOMAIN" }, - "dns.server": { "index": 3, "kind": "header", "displayName": "", "group": "dig", "label": "dig", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The server in particular for the query. If none is given, the default one specified by the OS will be used. Optional.", "constantName": "org.apache.camel.component.dns.DnsConstants#DNS_SERVER" }, - "dns.type": { "index": 4, "kind": "header", "displayName": "", "group": "lookup dig", "label": "lookup dig", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The type of the lookup. Should match the values of org.xbill.dns.Type. Optional.", "constantName": "org.apache.camel.component.dns.DnsConstants#DNS_TYPE" }, - "term": { "index": 5, "kind": "header", "displayName": "", "group": "wikipedia", "label": "wikipedia", "required": true, "javaType": "", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The term", "constantName": "org.apache.camel.component.dns.DnsConstants#TERM" } + "CamelDnsClass": { "index": 0, "kind": "header", "displayName": "", "group": "lookup dig", "label": "lookup dig", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The DNS class of the lookup. Should match the values of org.xbill.dns.DClass. Optional.", "constantName": "org.apache.camel.component.dns.DnsConstants#DNS_CLASS" }, + "CamelDnsName": { "index": 1, "kind": "header", "displayName": "", "group": "lookup", "label": "lookup", "required": true, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The name to lookup", "constantName": "org.apache.camel.component.dns.DnsConstants#DNS_NAME" }, + "CamelDnsDomain": { "index": 2, "kind": "header", "displayName": "", "group": "ip", "label": "ip", "required": true, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The domain name.", "constantName": "org.apache.camel.component.dns.DnsConstants#DNS_DOMAIN" }, + "CamelDnsServer": { "index": 3, "kind": "header", "displayName": "", "group": "dig", "label": "dig", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The server in particular for the query. If none is given, the default one specified by the OS will be used. Optional.", "constantName": "org.apache.camel.component.dns.DnsConstants#DNS_SERVER" }, + "CamelDnsType": { "index": 4, "kind": "header", "displayName": "", "group": "lookup dig", "label": "lookup dig", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The type of the lookup. Should match the values of org.xbill.dns.Type. Optional.", "constantName": "org.apache.camel.component.dns.DnsConstants#DNS_TYPE" }, + "CamelDnsTerm": { "index": 5, "kind": "header", "displayName": "", "group": "wikipedia", "label": "wikipedia", "required": true, "javaType": "", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The term", "constantName": "org.apache.camel.component.dns.DnsConstants#TERM" } }, "properties": { "dnsType": { "index": 0, "kind": "path", "displayName": "Dns Type", "group": "producer", "label": "", "required": true, "type": "object", "javaType": "org.apache.camel.component.dns.DnsType", "enum": [ "dig", "ip", "lookup", "wikipedia" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The type of the lookup." }, diff --git a/components/camel-dns/src/main/docs/dns-component.adoc b/components/camel-dns/src/main/docs/dns-component.adoc index c441514e555f1..7429a34362871 100644 --- a/components/camel-dns/src/main/docs/dns-component.adoc +++ b/components/camel-dns/src/main/docs/dns-component.adoc @@ -84,7 +84,7 @@ include::partial$component-endpoint-headers.adoc[] This looks up a domain's IP. For example, _www.example.com_ resolves to 192.0.32.10. -The IP address to lookup must be provided in the header with key `"dns.domain"`. +The IP address to lookup must be provided in the header with key `"CamelDnsDomain"`. === DNS lookup @@ -98,7 +98,7 @@ The IP address to lookup must be provided in the header with key `"dns.domain"`. This returns a set of DNS records associated with a domain. + The name to lookup must be provided in the header with key -`"dns.name"`. +`"CamelDnsName"`. === DNS Dig @@ -112,7 +112,7 @@ Dig is a Unix command-line utility to run DNS queries. ---- -The query must be provided in the header with key `"dns.query"`. +The query must be provided in the header with key `"CamelDnsName"`. === Dns Activation Policy diff --git a/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsComponent.java b/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsComponent.java index 48ca3461ce527..c74542bd46f60 100644 --- a/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsComponent.java +++ b/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsComponent.java @@ -31,25 +31,27 @@ *

* dns:///ip
*

- * This will return the IP address associated with the domain passed in the header dns.domain. + * This will return the IP address associated with the domain passed in the header CamelDnsDomain. *

*

* dns:///lookup This endpoint accepts three parameters. *

*

*

*

* dns:///dig This endpoint takes a few parameters, most of them optional : *

*

*

@@ -57,7 +59,7 @@ *

* dns:///wikipedia This endpoint takes one paramter : *

*

*

diff --git a/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsConstants.java b/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsConstants.java index 2c934532dff4d..0c5bce4457a9c 100644 --- a/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsConstants.java +++ b/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsConstants.java @@ -28,21 +28,21 @@ public class DnsConstants { @Metadata(label = "lookup dig", description = "The DNS class of the lookup. Should match the values of\n" + "`org.xbill.dns.DClass`. Optional.", javaType = "String") - public static final String DNS_CLASS = "dns.class"; + public static final String DNS_CLASS = "CamelDnsClass"; @Metadata(label = "lookup", description = "The name to lookup", javaType = "String", required = true) - public static final String DNS_NAME = "dns.name"; + public static final String DNS_NAME = "CamelDnsName"; @Metadata(label = "ip", description = "The domain name.", javaType = "String", required = true) - public static final String DNS_DOMAIN = "dns.domain"; + public static final String DNS_DOMAIN = "CamelDnsDomain"; @Metadata(label = "dig", description = "The server in particular for the query. If none is given, the default\n" + "one specified by the OS will be used. Optional.", javaType = "String") - public static final String DNS_SERVER = "dns.server"; + public static final String DNS_SERVER = "CamelDnsServer"; @Metadata(label = "lookup dig", description = "The type of the lookup. Should match the values of `org.xbill.dns.Type`.\n" + "Optional.", javaType = "String") - public static final String DNS_TYPE = "dns.type"; + public static final String DNS_TYPE = "CamelDnsType"; @Metadata(label = "wikipedia", description = "The term", required = true) - public static final String TERM = "term"; + public static final String TERM = "CamelDnsTerm"; protected DnsConstants() { //Utility class diff --git a/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsWikipediaProducer.java b/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsWikipediaProducer.java index 7965107df2970..6caccb0edcd77 100644 --- a/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsWikipediaProducer.java +++ b/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsWikipediaProducer.java @@ -32,7 +32,7 @@ *

* See here for a reference: http://www.commandlinefu.com/commands/view/2829/query-wikipedia-via-console-over-dns *

- * This endpoint accepts the following header: term: a simple term to use to query wikipedia. + * This endpoint accepts the following header: CamelDnsTerm: a simple term to use to query wikipedia. */ public class DnsWikipediaProducer extends DefaultProducer { diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointSpringTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointSpringTest.java index f588f338bd4f1..9c3850d501cca 100644 --- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointSpringTest.java +++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointSpringTest.java @@ -66,8 +66,8 @@ public boolean matches(Exchange exchange) { } }); Map headers = new HashMap<>(); - headers.put("dns.name", "monkey.wp.dg.cx"); - headers.put("dns.type", "TXT"); + headers.put(DnsConstants.DNS_NAME, "monkey.wp.dg.cx"); + headers.put(DnsConstants.DNS_TYPE, "TXT"); template.sendBodyAndHeaders(null, headers); resultEndpoint.assertIsSatisfied(); } diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointTest.java index 31147173449de..24b7a2f424eff 100644 --- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointTest.java +++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointTest.java @@ -71,8 +71,8 @@ public boolean matches(Exchange exchange) { } }); Map headers = new HashMap<>(); - headers.put("dns.name", "monkey.wp.dg.cx"); - headers.put("dns.type", "TXT"); + headers.put(DnsConstants.DNS_NAME, "monkey.wp.dg.cx"); + headers.put(DnsConstants.DNS_TYPE, "TXT"); template.sendBodyAndHeaders(null, headers); resultEndpoint.assertIsSatisfied(); } diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointSpringTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointSpringTest.java index 93f88f62f17f5..02503fc6646bb 100644 --- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointSpringTest.java +++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointSpringTest.java @@ -44,7 +44,7 @@ public class DnsIpEndpointSpringTest extends CamelSpringTestSupport { void testNullIPRequests() throws Exception { resultEndpoint.expectedMessageCount(0); try { - template.sendBodyAndHeader("hello", "dns.domain", null); + template.sendBodyAndHeader("hello", DnsConstants.DNS_DOMAIN, null); fail("Should have thrown exception"); } catch (Exception t) { assertTrue(t.getCause() instanceof IllegalArgumentException); @@ -56,7 +56,7 @@ void testNullIPRequests() throws Exception { void testEmptyIPRequests() throws Exception { resultEndpoint.expectedMessageCount(0); try { - template.sendBodyAndHeader("hello", "dns.domain", ""); + template.sendBodyAndHeader("hello", DnsConstants.DNS_DOMAIN, ""); fail("Should have thrown exception"); } catch (Exception t) { assertTrue(t.getCause() instanceof IllegalArgumentException); @@ -71,7 +71,7 @@ void testValidIPRequests() throws Exception { resultEndpoint.expectedBodiesReceived("40.79.78.1"); - template.sendBodyAndHeader("hello", "dns.domain", "www.apache.org"); + template.sendBodyAndHeader("hello", DnsConstants.DNS_DOMAIN, "www.apache.org"); resultEndpoint.assertIsSatisfied(); } diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointTest.java index 91a2c0eba20bf..e0acfe4473907 100644 --- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointTest.java +++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointTest.java @@ -53,7 +53,7 @@ public void configure() { void testNullIPRequests() throws Exception { resultEndpoint.expectedMessageCount(0); try { - template.sendBodyAndHeader("hello", "dns.domain", null); + template.sendBodyAndHeader("hello", DnsConstants.DNS_DOMAIN, null); fail("Should have thrown exception"); } catch (Exception t) { assertTrue(t.getCause() instanceof IllegalArgumentException); @@ -65,7 +65,7 @@ void testNullIPRequests() throws Exception { void testEmptyIPRequests() throws Exception { resultEndpoint.expectedMessageCount(0); try { - template.sendBodyAndHeader("hello", "dns.domain", ""); + template.sendBodyAndHeader("hello", DnsConstants.DNS_DOMAIN, ""); fail("Should have thrown exception"); } catch (Exception t) { assertTrue(t.getCause() instanceof IllegalArgumentException); @@ -80,7 +80,7 @@ void testValidIPRequests() throws Exception { resultEndpoint.expectedBodiesReceived("40.79.78.1"); - template.sendBodyAndHeader("hello", "dns.domain", "www.apache.org"); + template.sendBodyAndHeader("hello", DnsConstants.DNS_DOMAIN, "www.apache.org"); resultEndpoint.assertIsSatisfied(); } } diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpHeaderTransferTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpHeaderTransferTest.java index da712b107db63..988d3f454f368 100644 --- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpHeaderTransferTest.java +++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpHeaderTransferTest.java @@ -51,7 +51,7 @@ void testNullIPRequests() throws Exception { resultEndpoint.expectedMessageCount(0); try { - template.sendBodyAndHeader("hello", "dns.domain", null); + template.sendBodyAndHeader("hello", DnsConstants.DNS_DOMAIN, null); fail("Should have thrown exception"); } catch (Exception t) { assertTrue(t.getCause() instanceof IllegalArgumentException); @@ -64,7 +64,7 @@ void testEmptyIPRequests() throws Exception { resultEndpoint.expectedMessageCount(0); try { - template.sendBodyAndHeader("hello", "dns.domain", ""); + template.sendBodyAndHeader("hello", DnsConstants.DNS_DOMAIN, ""); fail("Should have thrown exception"); } catch (Exception t) { assertTrue(t.getCause() instanceof IllegalArgumentException); @@ -80,7 +80,7 @@ void testValidIPRequests() throws Exception { resultEndpoint.expectedBodiesReceived("40.79.78.1"); resultEndpoint.expectedHeaderReceived("foo", "bar"); - template.sendBodyAndHeader("hello", "dns.domain", "www.apache.org"); + template.sendBodyAndHeader("hello", DnsConstants.DNS_DOMAIN, "www.apache.org"); resultEndpoint.assertIsSatisfied(); } } diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointSpringTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointSpringTest.java index 8e88cab02d97b..947f8b9465969 100644 --- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointSpringTest.java +++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointSpringTest.java @@ -62,7 +62,7 @@ void testDNSWithNoHeaders() throws Exception { void testDNSWithEmptyNameHeader() throws Exception { resultEndpoint.expectedMessageCount(0); try { - template.sendBodyAndHeader("hello", "dns.name", ""); + template.sendBodyAndHeader("hello", DnsConstants.DNS_NAME, ""); fail("Should have thrown exception"); } catch (Exception t) { assertTrue(t.getCause() instanceof IllegalArgumentException, t.toString()); @@ -81,7 +81,7 @@ public boolean matches(Exchange exchange) { } }); Map headers = new HashMap<>(); - headers.put("dns.name", "www.example.com"); + headers.put(DnsConstants.DNS_NAME, "www.example.com"); template.sendBodyAndHeaders("hello", headers); resultEndpoint.assertIsSatisfied(); } @@ -97,8 +97,8 @@ public boolean matches(Exchange exchange) { } }); Map headers = new HashMap<>(); - headers.put("dns.name", "www.example.com"); - headers.put("dns.type", "A"); + headers.put(DnsConstants.DNS_NAME, "www.example.com"); + headers.put(DnsConstants.DNS_TYPE, "A"); template.sendBodyAndHeaders("hello", headers); resultEndpoint.assertIsSatisfied(); } diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointTest.java index fd21dae427974..069a40c68e6b4 100644 --- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointTest.java +++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointTest.java @@ -71,7 +71,7 @@ void testDNSWithNoHeaders() throws Exception { void testDNSWithEmptyNameHeader() throws Exception { resultEndpoint.expectedMessageCount(0); try { - template.sendBodyAndHeader("hello", "dns.name", ""); + template.sendBodyAndHeader("hello", DnsConstants.DNS_NAME, ""); fail("Should have thrown exception"); } catch (Exception t) { assertTrue(t.getCause() instanceof IllegalArgumentException, t.toString()); @@ -90,7 +90,7 @@ public boolean matches(Exchange exchange) { } }); Map headers = new HashMap<>(); - headers.put("dns.name", "www.example.com"); + headers.put(DnsConstants.DNS_NAME, "www.example.com"); template.sendBodyAndHeaders("hello", headers); resultEndpoint.assertIsSatisfied(); } @@ -106,8 +106,8 @@ public boolean matches(Exchange exchange) { } }); Map headers = new HashMap<>(); - headers.put("dns.name", "www.example.com"); - headers.put("dns.type", "A"); + headers.put(DnsConstants.DNS_NAME, "www.example.com"); + headers.put(DnsConstants.DNS_TYPE, "A"); template.sendBodyAndHeaders("hello", headers); resultEndpoint.assertIsSatisfied(); } diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointSpringTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointSpringTest.java index 51342d45a0f6b..58a431a708464 100644 --- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointSpringTest.java +++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointSpringTest.java @@ -59,7 +59,7 @@ public boolean matches(Exchange exchange) { } }); Map headers = new HashMap<>(); - headers.put("term", "monkey"); + headers.put(DnsConstants.TERM, "monkey"); template.sendBodyAndHeaders(null, headers); resultEndpoint.assertIsSatisfied(); } diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointTest.java index 717b685c89532..ecba05e3294aa 100644 --- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointTest.java +++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointTest.java @@ -68,7 +68,7 @@ public boolean matches(Exchange exchange) { } }); Map headers = new HashMap<>(); - headers.put("term", "monkey"); + headers.put(DnsConstants.TERM, "monkey"); template.sendBodyAndHeaders(null, headers); resultEndpoint.assertIsSatisfied(); } diff --git a/components/camel-mongodb-gridfs/pom.xml b/components/camel-mongodb-gridfs/pom.xml index 7ed1253e5a9c7..f72f3b2c66697 100644 --- a/components/camel-mongodb-gridfs/pom.xml +++ b/components/camel-mongodb-gridfs/pom.xml @@ -31,8 +31,10 @@ jar Camel :: MongoDB GridFS Camel MongoDB GridFS component + ${revision} + ${camel-mongodb-gridfs.tesb.version} true true diff --git a/components/camel-mongodb-gridfs/src/generated/resources/META-INF/org/apache/camel/component/mongodb/gridfs/mongodb-gridfs.json b/components/camel-mongodb-gridfs/src/generated/resources/META-INF/org/apache/camel/component/mongodb/gridfs/mongodb-gridfs.json index e68ad3eebabb2..f24049936fd46 100644 --- a/components/camel-mongodb-gridfs/src/generated/resources/META-INF/org/apache/camel/component/mongodb/gridfs/mongodb-gridfs.json +++ b/components/camel-mongodb-gridfs/src/generated/resources/META-INF/org/apache/camel/component/mongodb/gridfs/mongodb-gridfs.json @@ -11,7 +11,7 @@ "supportLevel": "Stable", "groupId": "org.apache.camel", "artifactId": "camel-mongodb-gridfs", - "version": "4.8.1-SNAPSHOT", + "version": "4.8.1.20260801", "scheme": "mongodb-gridfs", "extendsScheme": "", "syntax": "mongodb-gridfs:connectionBean", @@ -34,11 +34,11 @@ "CamelFileName": { "index": 3, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The name of the file.", "constantName": "org.apache.camel.component.mongodb.gridfs.GridFsConstants#FILE_NAME" }, "Content-Type": { "index": 4, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The content type of the file.", "constantName": "org.apache.camel.component.mongodb.gridfs.GridFsConstants#CONTENT_TYPE" }, "CamelFileNameProduced": { "index": 5, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The file name produced.", "constantName": "org.apache.camel.component.mongodb.gridfs.GridFsConstants#FILE_NAME_PRODUCED" }, - "gridfs.metadata": { "index": 6, "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Any additional metadata stored along with the file in JSON format.", "constantName": "org.apache.camel.component.mongodb.gridfs.GridFsConstants#GRIDFS_METADATA" }, - "gridfs.operation": { "index": 7, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The operation to perform.", "constantName": "org.apache.camel.component.mongodb.gridfs.GridFsConstants#GRIDFS_OPERATION" }, - "gridfs.chunksize": { "index": 8, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The number of bytes per chunk for the uploaded file.", "constantName": "org.apache.camel.component.mongodb.gridfs.GridFsConstants#GRIDFS_CHUNKSIZE" }, - "gridfs.fileid": { "index": 9, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "org.bson.types.ObjectId", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The ObjectId of the file produced", "constantName": "org.apache.camel.component.mongodb.gridfs.GridFsConstants#GRIDFS_FILE_ID_PRODUCED" }, - "gridfs.objectid": { "index": 10, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "org.bson.types.ObjectId", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The ObjectId of the file.", "constantName": "org.apache.camel.component.mongodb.gridfs.GridFsConstants#GRIDFS_OBJECT_ID" } + "CamelGridFsMetadata": { "index": 6, "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Any additional metadata stored along with the file in JSON format.", "constantName": "org.apache.camel.component.mongodb.gridfs.GridFsConstants#GRIDFS_METADATA" }, + "CamelGridFsOperation": { "index": 7, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The operation to perform.", "constantName": "org.apache.camel.component.mongodb.gridfs.GridFsConstants#GRIDFS_OPERATION" }, + "CamelGridFsChunkSize": { "index": 8, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The number of bytes per chunk for the uploaded file.", "constantName": "org.apache.camel.component.mongodb.gridfs.GridFsConstants#GRIDFS_CHUNKSIZE" }, + "CamelGridFsFileId": { "index": 9, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "org.bson.types.ObjectId", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The ObjectId of the file produced", "constantName": "org.apache.camel.component.mongodb.gridfs.GridFsConstants#GRIDFS_FILE_ID_PRODUCED" }, + "CamelGridFsObjectId": { "index": 10, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "org.bson.types.ObjectId", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The ObjectId of the file.", "constantName": "org.apache.camel.component.mongodb.gridfs.GridFsConstants#GRIDFS_OBJECT_ID" } }, "properties": { "connectionBean": { "index": 0, "kind": "path", "displayName": "Connection Bean", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Name of com.mongodb.client.MongoClient to use." }, diff --git a/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/mongodb/gridfs/GridFsConstants.java b/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/mongodb/gridfs/GridFsConstants.java index f05dde5fd811a..674fa58a6207a 100644 --- a/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/mongodb/gridfs/GridFsConstants.java +++ b/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/mongodb/gridfs/GridFsConstants.java @@ -41,15 +41,15 @@ public final class GridFsConstants { public static final String GRIDFS_FILE_KEY_UPLOAD_DATE = "uploadDate"; public static final String PERSISTENT_TIMESTAMP_KEY = "timestamp"; @Metadata(description = "Any additional metadata stored along with the file in JSON format.", javaType = "String") - public static final String GRIDFS_METADATA = "gridfs.metadata"; + public static final String GRIDFS_METADATA = "CamelGridFsMetadata"; @Metadata(label = "producer", description = "The operation to perform.", javaType = "String") - public static final String GRIDFS_OPERATION = "gridfs.operation"; + public static final String GRIDFS_OPERATION = "CamelGridFsOperation"; @Metadata(label = "producer", description = "The number of bytes per chunk for the uploaded file.", javaType = "Integer") - public static final String GRIDFS_CHUNKSIZE = "gridfs.chunksize"; + public static final String GRIDFS_CHUNKSIZE = "CamelGridFsChunkSize"; @Metadata(label = "producer", description = "The ObjectId of the file produced", javaType = "org.bson.types.ObjectId") - public static final String GRIDFS_FILE_ID_PRODUCED = "gridfs.fileid"; + public static final String GRIDFS_FILE_ID_PRODUCED = "CamelGridFsFileId"; @Metadata(label = "producer", description = "The ObjectId of the file.", javaType = "org.bson.types.ObjectId") - public static final String GRIDFS_OBJECT_ID = "gridfs.objectid"; + public static final String GRIDFS_OBJECT_ID = "CamelGridFsObjectId"; private GridFsConstants() { } diff --git a/pom.xml b/pom.xml index 155e9f67cd710..f425c4869d91c 100644 --- a/pom.xml +++ b/pom.xml @@ -133,6 +133,7 @@ 4.8.1.20250320 4.8.1.20250320 4.8.1.20250320 + 4.8.1.20260801 4.8.1.20250901 4.8.1.20250320 4.8.1.20250320 @@ -149,6 +150,7 @@ 4.8.1.20260608 4.8.1.20250320 4.8.1.20250320 + 4.8.1.20260801 4.8.1.20250320 4.8.1.20250320 4.8.1.20250320 @@ -361,6 +363,7 @@ ${camel-debezium-postgres.tesb.version} ${camel-debezium-sqlserver.tesb.version} ${camel-direct.tesb.version} + ${camel-dns.tesb.version} ${camel-drill.tesb.version} ${camel-dynamic-router.tesb.version} ${camel-file.tesb.version} @@ -377,6 +380,7 @@ ${camel-mina.tesb.version} ${camel-minio.tesb.version} ${camel-mongodb.tesb.version} + ${camel-mongodb-gridfs.tesb.version} ${camel-observation.tesb.version} ${camel-pdf.tesb.version} ${camel-platform-http-jolokia.tesb.version}