This is an automated email from the ASF dual-hosted git repository.
oscerd pushed a commit to branch camel-4.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.18.x by this push:
new 29b18beaf1fb [backport camel-4.18.x] CAMEL-23574: camel-dns - align
Exchange header constant names with Camel naming convention (#23459)
29b18beaf1fb is described below
commit 29b18beaf1fb07276de909b8e19cd87f01e8abd9
Author: Andrea Cosentino <[email protected]>
AuthorDate: Fri May 22 15:26:32 2026 +0200
[backport camel-4.18.x] CAMEL-23574: camel-dns - align Exchange header
constant names with Camel naming convention (#23459)
Backport of #23411.
Rename the Exchange header string values in DnsConstants from dotted
lowercase
(dns.class / dns.name / dns.domain / dns.server / dns.type / term) to the
project-wide Camel<Component><Field> convention:
DNS_CLASS -> CamelDnsClass
DNS_NAME -> CamelDnsName
DNS_DOMAIN -> CamelDnsDomain
DNS_SERVER -> CamelDnsServer
DNS_TYPE -> CamelDnsType
TERM -> CamelDnsTerm
The Java field names are unchanged so routes and code that reference the
constants symbolically continue to work without changes. Routes that set the
headers by their literal string value must be updated.
Updates the in-module tests to go through DnsConstants, refreshes the
DnsComponent / DnsWikipediaProducer Javadoc and the component documentation
references, and regenerates the component metadata, catalog, and endpoint
DSL
factory.
The version-specific upgrade-guide entry is added on the main branch (per
the
backport upgrade-guide policy), not on this maintenance branch.
Reported by Claude Code on behalf of Andrea Cosentino
Signed-off-by: Andrea Cosentino <[email protected]>
---
.../org/apache/camel/catalog/components/dns.json | 12 +++++-----
.../org/apache/camel/component/dns/dns.json | 12 +++++-----
.../camel-dns/src/main/docs/dns-component.adoc | 6 ++---
.../apache/camel/component/dns/DnsComponent.java | 22 +++++++++---------
.../apache/camel/component/dns/DnsConstants.java | 12 +++++-----
.../camel/component/dns/DnsWikipediaProducer.java | 2 +-
.../component/dns/DnsDigEndpointSpringTest.java | 4 ++--
.../camel/component/dns/DnsDigEndpointTest.java | 4 ++--
.../component/dns/DnsIpEndpointSpringTest.java | 6 ++---
.../camel/component/dns/DnsIpEndpointTest.java | 6 ++---
.../component/dns/DnsIpHeaderTransferTest.java | 6 ++---
.../component/dns/DnsLookupEndpointSpringTest.java | 8 +++----
.../camel/component/dns/DnsLookupEndpointTest.java | 8 +++----
.../component/dns/WikipediaEndpointSpringTest.java | 2 +-
.../camel/component/dns/WikipediaEndpointTest.java | 2 +-
.../endpoint/dsl/DnsEndpointBuilderFactory.java | 26 +++++++++++-----------
16 files changed, 70 insertions(+), 68 deletions(-)
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 5ef02402aab9..4fadac40e118 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
@@ -28,12 +28,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 t [...]
},
"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": "enum", "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/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 5ef02402aab9..4fadac40e118 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
@@ -28,12 +28,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 t [...]
},
"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": "enum", "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 c8d70d63bf4d..69aee0545583 100644
--- a/components/camel-dns/src/main/docs/dns-component.adoc
+++ b/components/camel-dns/src/main/docs/dns-component.adoc
@@ -73,7 +73,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
@@ -87,7 +87,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
@@ -101,7 +101,7 @@ Dig is a Unix command-line utility to run DNS queries.
</route>
----
-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 48ca3461ce52..c74542bd46f6 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 @@ import org.apache.camel.support.DefaultComponent;
* <p>
* dns:///ip <br/>
* <p/>
- * 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.
* </p>
* <p>
* dns:///lookup This endpoint accepts three parameters.
* <ul>
- * <li>dns.name: the lookup name. Usually the domain. Mandatory.</li>
- * <li>dns.type: the type of the lookup. Should match the values of {@see
org.xbill.dns.Type}. Optional.</li>
- * <li>dns.class: the DNS class of the lookup. Should match the values of
{@see org.xbill.dns.DClass}. Optional.</li>
+ * <li>CamelDnsName: the lookup name. Usually the domain. Mandatory.</li>
+ * <li>CamelDnsType: the type of the lookup. Should match the values of {@see
org.xbill.dns.Type}. Optional.</li>
+ * <li>CamelDnsClass: the DNS class of the lookup. Should match the values of
{@see org.xbill.dns.DClass}.
+ * Optional.</li>
* </ul>
* </p>
* <p/>
* <p>
* dns:///dig This endpoint takes a few parameters, most of them optional :
* <ul>
- * <li>dns.server: the server in particular for the query. If none is given,
the default one specified by the OS will be
- * used.</li>
- * <li>dns.query: the query itself. Mandatory.</li>
- * <li>dns.type: the type of the lookup. Should match the values of {@see
org.xbill.dns.Type}. Optional.</li>
- * <li>dns.class: the DNS class of the lookup. Should match the values of
{@see org.xbill.dns.DClass}. Optional.</li>
+ * <li>CamelDnsServer: the server in particular for the query. If none is
given, the default one specified by the OS
+ * will be used.</li>
+ * <li>CamelDnsName: the lookup name to query. Mandatory.</li>
+ * <li>CamelDnsType: the type of the lookup. Should match the values of {@see
org.xbill.dns.Type}. Optional.</li>
+ * <li>CamelDnsClass: the DNS class of the lookup. Should match the values of
{@see org.xbill.dns.DClass}.
+ * Optional.</li>
* </ul>
* <p/>
* </p>
@@ -57,7 +59,7 @@ import org.apache.camel.support.DefaultComponent;
* <p>
* dns:///wikipedia This endpoint takes one paramter :
* <ul>
- * <li>term: the search term on wikipedia</li>
+ * <li>CamelDnsTerm: the search term on wikipedia</li>
* </ul>
* <p/>
* </p>
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 2c934532dff4..0c5bce4457a9 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 7965107df297..6caccb0edcd7 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 @@ import org.xbill.DNS.Type;
* <p/>
* See here for a reference:
http://www.commandlinefu.com/commands/view/2829/query-wikipedia-via-console-over-dns
* <p/>
- * 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 f588f338bd4f..9c3850d501cc 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 class DnsDigEndpointSpringTest extends
CamelSpringTestSupport {
}
});
Map<String, Object> 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 31147173449d..24b7a2f424ef 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 class DnsDigEndpointTest extends CamelTestSupport {
}
});
Map<String, Object> 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 e526b243bc1e..3593acfb1641 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);
Exception e = assertThrows(Exception.class, () -> {
- template.sendBodyAndHeader("hello", "dns.domain", null);
+ template.sendBodyAndHeader("hello", DnsConstants.DNS_DOMAIN, null);
});
assertTrue(e.getCause() instanceof IllegalArgumentException);
resultEndpoint.assertIsSatisfied();
@@ -54,7 +54,7 @@ public class DnsIpEndpointSpringTest extends
CamelSpringTestSupport {
void testEmptyIPRequests() throws Exception {
resultEndpoint.expectedMessageCount(0);
Exception e = assertThrows(Exception.class, () -> {
- template.sendBodyAndHeader("hello", "dns.domain", "");
+ template.sendBodyAndHeader("hello", DnsConstants.DNS_DOMAIN, "");
});
assertTrue(e.getCause() instanceof IllegalArgumentException);
resultEndpoint.assertIsSatisfied();
@@ -67,7 +67,7 @@ public class DnsIpEndpointSpringTest extends
CamelSpringTestSupport {
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 41be3b617ab9..3ec141a691e0 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 class DnsIpEndpointTest extends CamelTestSupport {
void testNullIPRequests() throws Exception {
resultEndpoint.expectedMessageCount(0);
Exception e = assertThrows(Exception.class, () -> {
- template.sendBodyAndHeader("hello", "dns.domain", null);
+ template.sendBodyAndHeader("hello", DnsConstants.DNS_DOMAIN, null);
});
assertTrue(e.getCause() instanceof IllegalArgumentException);
resultEndpoint.assertIsSatisfied();
@@ -63,7 +63,7 @@ public class DnsIpEndpointTest extends CamelTestSupport {
void testEmptyIPRequests() throws Exception {
resultEndpoint.expectedMessageCount(0);
Exception e = assertThrows(Exception.class, () -> {
- template.sendBodyAndHeader("hello", "dns.domain", "");
+ template.sendBodyAndHeader("hello", DnsConstants.DNS_DOMAIN, "");
});
assertTrue(e.getCause() instanceof IllegalArgumentException);
resultEndpoint.assertIsSatisfied();
@@ -76,7 +76,7 @@ public class DnsIpEndpointTest extends CamelTestSupport {
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 cdaa093ed821..b8e83006072a 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 @@ public class DnsIpHeaderTransferTest extends CamelTestSupport
{
resultEndpoint.expectedMessageCount(0);
Exception e = assertThrows(Exception.class, () -> {
- template.sendBodyAndHeader("hello", "dns.domain", null);
+ template.sendBodyAndHeader("hello", DnsConstants.DNS_DOMAIN, null);
});
assertTrue(e.getCause() instanceof IllegalArgumentException);
resultEndpoint.assertIsSatisfied();
@@ -62,7 +62,7 @@ public class DnsIpHeaderTransferTest extends CamelTestSupport
{
resultEndpoint.expectedMessageCount(0);
Exception e = assertThrows(Exception.class, () -> {
- template.sendBodyAndHeader("hello", "dns.domain", "");
+ template.sendBodyAndHeader("hello", DnsConstants.DNS_DOMAIN, "");
});
assertTrue(e.getCause() instanceof IllegalArgumentException);
resultEndpoint.assertIsSatisfied();
@@ -76,7 +76,7 @@ public class DnsIpHeaderTransferTest extends CamelTestSupport
{
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 715825753a48..bfa7eb88e3fd 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
@@ -60,7 +60,7 @@ public class DnsLookupEndpointSpringTest extends
CamelSpringTestSupport {
void testDNSWithEmptyNameHeader() throws Exception {
resultEndpoint.expectedMessageCount(0);
Exception e = assertThrows(Exception.class, () -> {
- template.sendBodyAndHeader("hello", "dns.name", "");
+ template.sendBodyAndHeader("hello", DnsConstants.DNS_NAME, "");
});
assertTrue(e.getCause() instanceof IllegalArgumentException,
e.toString());
resultEndpoint.assertIsSatisfied();
@@ -77,7 +77,7 @@ public class DnsLookupEndpointSpringTest extends
CamelSpringTestSupport {
}
});
Map<String, Object> headers = new HashMap<>();
- headers.put("dns.name", "www.example.com");
+ headers.put(DnsConstants.DNS_NAME, "www.example.com");
template.sendBodyAndHeaders("hello", headers);
resultEndpoint.assertIsSatisfied();
}
@@ -93,8 +93,8 @@ public class DnsLookupEndpointSpringTest extends
CamelSpringTestSupport {
}
});
Map<String, Object> 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 500a8e0e0b15..764cc7f0d861 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
@@ -69,7 +69,7 @@ public class DnsLookupEndpointTest extends CamelTestSupport {
void testDNSWithEmptyNameHeader() throws Exception {
resultEndpoint.expectedMessageCount(0);
Exception e = assertThrows(Exception.class, () -> {
- template.sendBodyAndHeader("hello", "dns.name", "");
+ template.sendBodyAndHeader("hello", DnsConstants.DNS_NAME, "");
});
assertTrue(e.getCause() instanceof IllegalArgumentException,
e.toString());
resultEndpoint.assertIsSatisfied();
@@ -86,7 +86,7 @@ public class DnsLookupEndpointTest extends CamelTestSupport {
}
});
Map<String, Object> headers = new HashMap<>();
- headers.put("dns.name", "www.example.com");
+ headers.put(DnsConstants.DNS_NAME, "www.example.com");
template.sendBodyAndHeaders("hello", headers);
resultEndpoint.assertIsSatisfied();
}
@@ -102,8 +102,8 @@ public class DnsLookupEndpointTest extends CamelTestSupport
{
}
});
Map<String, Object> 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 51342d45a0f6..58a431a70846 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 class WikipediaEndpointSpringTest extends
CamelSpringTestSupport {
}
});
Map<String, Object> 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 717b685c8953..ecba05e3294a 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 class WikipediaEndpointTest extends CamelTestSupport {
}
});
Map<String, Object> headers = new HashMap<>();
- headers.put("term", "monkey");
+ headers.put(DnsConstants.TERM, "monkey");
template.sendBodyAndHeaders(null, headers);
resultEndpoint.assertIsSatisfied();
}
diff --git
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DnsEndpointBuilderFactory.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DnsEndpointBuilderFactory.java
index 5d0d76347e55..23b563a7d727 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DnsEndpointBuilderFactory.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DnsEndpointBuilderFactory.java
@@ -182,10 +182,10 @@ public interface DnsEndpointBuilderFactory {
*
* Group: lookup dig
*
- * @return the name of the header {@code dns.class}.
+ * @return the name of the header {@code DnsClass}.
*/
public String dnsClass() {
- return "dns.class";
+ return "CamelDnsClass";
}
/**
* The name to lookup.
@@ -195,10 +195,10 @@ public interface DnsEndpointBuilderFactory {
* Required: true
* Group: lookup
*
- * @return the name of the header {@code dns.name}.
+ * @return the name of the header {@code DnsName}.
*/
public String dnsName() {
- return "dns.name";
+ return "CamelDnsName";
}
/**
* The domain name.
@@ -208,10 +208,10 @@ public interface DnsEndpointBuilderFactory {
* Required: true
* Group: ip
*
- * @return the name of the header {@code dns.domain}.
+ * @return the name of the header {@code DnsDomain}.
*/
public String dnsDomain() {
- return "dns.domain";
+ return "CamelDnsDomain";
}
/**
* The server in particular for the query. If none is given, the
default
@@ -221,10 +221,10 @@ public interface DnsEndpointBuilderFactory {
*
* Group: dig
*
- * @return the name of the header {@code dns.server}.
+ * @return the name of the header {@code DnsServer}.
*/
public String dnsServer() {
- return "dns.server";
+ return "CamelDnsServer";
}
/**
* The type of the lookup. Should match the values of
@@ -234,10 +234,10 @@ public interface DnsEndpointBuilderFactory {
*
* Group: lookup dig
*
- * @return the name of the header {@code dns.type}.
+ * @return the name of the header {@code DnsType}.
*/
public String dnsType() {
- return "dns.type";
+ return "CamelDnsType";
}
/**
* The term.
@@ -247,10 +247,10 @@ public interface DnsEndpointBuilderFactory {
* Required: true
* Group: wikipedia
*
- * @return the name of the header {@code term}.
+ * @return the name of the header {@code DnsTerm}.
*/
- public String term() {
- return "term";
+ public String dnsTerm() {
+ return "CamelDnsTerm";
}
}
static DnsEndpointBuilder endpointBuilder(String componentName, String
path) {
