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 9092699ed409 CAMEL-26105: upgrade guide - the aws2-athena queryString
order note for 4.22.3 and 4.18.6 (#28408)
9092699ed409 is described below
commit 9092699ed4095228ea72ce51d29210023a1924d5
Author: Claus Ibsen <[email protected]>
AuthorDate: Sun Oct 25 08:44:36 2026 +0100
CAMEL-26105: upgrade guide - the aws2-athena queryString order note for
4.22.3 and 4.18.6 (#28408)
Signed-off-by: Claus Ibsen <[email protected]>
Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
---
.../modules/ROOT/pages/camel-4x-upgrade-guide-4_18.adoc | 15 +++++++++++++++
.../modules/ROOT/pages/camel-4x-upgrade-guide-4_22.adoc | 15 +++++++++++++++
2 files changed, 30 insertions(+)
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_18.adoc
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_18.adoc
index 9e1ce04ab972..c5b709178d14 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_18.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_18.adoc
@@ -398,6 +398,21 @@ framing, are still allowed. Routes that put a
percent-encoded control character
`CamelHttpPath` or `CamelHttpQuery` header, which the producer decodes before
building the request, are the ones most
likely to be affected.
+=== camel-aws2-athena - the queryString option takes precedence over the
message body
+
+The `startQueryExecution` operation of the `aws2-athena` producer, which is
its default operation, now takes the SQL to
+run from the `CamelAwsAthenaQueryString` header, then from the `queryString`
option, and from the message body only
+when neither the header nor the option is set. Previously the message body
came first, so an endpoint configured with
+`queryString` used the message body as the SQL whenever the message had one.
+
+Routes that set the SQL in the message body and configure no `queryString`
option, as the examples in the component
+documentation do, keep working. Routes that set both now run the `queryString`
option; remove the option, or set the
+SQL in the `CamelAwsAthenaQueryString` header, to keep running the SQL of the
message body.
+
+With `includeTrace=true`, the URI of the from endpoint in the SQL comment is
now sanitized, as Camel does when it logs
+an endpoint URI, and it is left out when the exchange has no from endpoint,
which failed with a `NullPointerException`
+before.
+
=== camel-core - pollEnrich: the body is null after a timeout also for a
message that creates its body on demand
When `pollEnrich` (or `poll`) times out and no `aggregationStrategy` is
configured, the body is set to `null`, and with
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_22.adoc
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_22.adoc
index 44c3133ed62c..b63b2b0e3b2f 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_22.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_22.adoc
@@ -197,6 +197,21 @@ framing, are still allowed. Routes that put a
percent-encoded control character
`CamelHttpPath` or `CamelHttpQuery` header, which the producer decodes before
building the request, are the ones most
likely to be affected.
+=== camel-aws2-athena - the queryString option takes precedence over the
message body
+
+The `startQueryExecution` operation of the `aws2-athena` producer, which is
its default operation, now takes the SQL to
+run from the `CamelAwsAthenaQueryString` header, then from the `queryString`
option, and from the message body only
+when neither the header nor the option is set. Previously the message body
came first, so an endpoint configured with
+`queryString` used the message body as the SQL whenever the message had one.
+
+Routes that set the SQL in the message body and configure no `queryString`
option, as the examples in the component
+documentation do, keep working. Routes that set both now run the `queryString`
option; remove the option, or set the
+SQL in the `CamelAwsAthenaQueryString` header, to keep running the SQL of the
message body.
+
+With `includeTrace=true`, the URI of the from endpoint in the SQL comment is
now sanitized, as Camel does when it logs
+an endpoint URI, and it is left out when the exchange has no from endpoint,
which failed with a `NullPointerException`
+before.
+
=== camel-core - pollEnrich: the body is null after a timeout also for a
message that creates its body on demand
When `pollEnrich` (or `poll`) times out and no `aggregationStrategy` is
configured, the body is set to `null`, and with
