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-kamelets.git


The following commit(s) were added to refs/heads/main by this push:
     new 8f934072a chore: fix SQL and CQL quoting, dead Jira and MongoDB header 
mappings, Redis channels, Sheets majorDimension and GitHub polling (#3157)
8f934072a is described below

commit 8f934072a2120a8bac52005cb0308ab15869512c
Author: Claus Ibsen <[email protected]>
AuthorDate: Tue Nov 17 11:17:37 2026 +0100

    chore: fix SQL and CQL quoting, dead Jira and MongoDB header mappings, 
Redis channels, Sheets majorDimension and GitHub polling (#3157)
    
    - The SQL sources (PostgreSQL, MySQL, MariaDB, SQL Server, Oracle,
      Snowflake, Databricks, Redshift) passed consumedQuery without RAW(), and
      the Cassandra Kamelets passed cql without RAW(): a + became a space
      ("price = price + 1" failed, 'a+b' was stored as "a b") and an & broke
      the start.
    - jira-add-issue-sink and jira-update-issue-sink mapped ce-issueDescription
      to a header no Jira producer reads. As documented since d63e6e1f2, the
      header now gives the description when the body is empty; the body still
      wins.
    - mongodb-sink mapped db-upsert/ce-dbupsert to a header an insert ignores;
      the dead mapping is removed.
    - redis-sink never used its channels option, so PUBLISH without a channel
      header failed; channels is now the default channel.
    - google-sheets-source set majorDimension only as a header, so reads were
      always by rows; it is now passed to the component.
    - The five GitHub sources polled every 500 ms, the component default, which
      is over GitHub's 5,000 calls an hour; they get a delay option, default
      60000 ms.
    
    Each was reproduced and verified on Camel 4.23.0 and 4.24.0-SNAPSHOT.
    
    Co-authored-by: Claude Opus 5.5 <[email protected]>
---
 kamelets/aws-redshift-source.kamelet.yaml            |  2 +-
 kamelets/cassandra-sink.kamelet.yaml                 |  2 +-
 kamelets/cassandra-source.kamelet.yaml               |  2 +-
 kamelets/databricks-source.kamelet.yaml              |  2 +-
 kamelets/github-commit-source.kamelet.yaml           |  7 ++++++-
 kamelets/github-event-source.kamelet.yaml            |  7 ++++++-
 .../github-pullrequest-comment-source.kamelet.yaml   |  7 ++++++-
 kamelets/github-pullrequest-source.kamelet.yaml      |  7 ++++++-
 kamelets/github-tag-source.kamelet.yaml              |  7 ++++++-
 kamelets/google-sheets-source.kamelet.yaml           |  2 +-
 kamelets/jira-add-issue-sink.kamelet.yaml            | 15 ++++++++++-----
 kamelets/jira-update-issue-sink.kamelet.yaml         | 15 ++++++++++-----
 kamelets/mariadb-source.kamelet.yaml                 |  2 +-
 kamelets/mongodb-sink.kamelet.yaml                   | 20 --------------------
 kamelets/mysql-source.kamelet.yaml                   |  2 +-
 kamelets/oracle-database-source.kamelet.yaml         |  2 +-
 kamelets/postgresql-source.kamelet.yaml              |  2 +-
 kamelets/redis-sink.kamelet.yaml                     |  9 +++++++++
 kamelets/snowflake-source.kamelet.yaml               |  2 +-
 kamelets/sqlserver-source.kamelet.yaml               |  2 +-
 .../kamelets/aws-redshift-source.kamelet.yaml        |  2 +-
 .../resources/kamelets/cassandra-sink.kamelet.yaml   |  2 +-
 .../resources/kamelets/cassandra-source.kamelet.yaml |  2 +-
 .../kamelets/databricks-source.kamelet.yaml          |  2 +-
 .../kamelets/github-commit-source.kamelet.yaml       |  7 ++++++-
 .../kamelets/github-event-source.kamelet.yaml        |  7 ++++++-
 .../github-pullrequest-comment-source.kamelet.yaml   |  7 ++++++-
 .../kamelets/github-pullrequest-source.kamelet.yaml  |  7 ++++++-
 .../kamelets/github-tag-source.kamelet.yaml          |  7 ++++++-
 .../kamelets/google-sheets-source.kamelet.yaml       |  2 +-
 .../kamelets/jira-add-issue-sink.kamelet.yaml        | 15 ++++++++++-----
 .../kamelets/jira-update-issue-sink.kamelet.yaml     | 15 ++++++++++-----
 .../resources/kamelets/mariadb-source.kamelet.yaml   |  2 +-
 .../resources/kamelets/mongodb-sink.kamelet.yaml     | 20 --------------------
 .../resources/kamelets/mysql-source.kamelet.yaml     |  2 +-
 .../kamelets/oracle-database-source.kamelet.yaml     |  2 +-
 .../kamelets/postgresql-source.kamelet.yaml          |  2 +-
 .../main/resources/kamelets/redis-sink.kamelet.yaml  |  9 +++++++++
 .../resources/kamelets/snowflake-source.kamelet.yaml |  2 +-
 .../resources/kamelets/sqlserver-source.kamelet.yaml |  2 +-
 40 files changed, 140 insertions(+), 92 deletions(-)

diff --git a/kamelets/aws-redshift-source.kamelet.yaml 
b/kamelets/aws-redshift-source.kamelet.yaml
index 969c43b6b..0f1857747 100644
--- a/kamelets/aws-redshift-source.kamelet.yaml
+++ b/kamelets/aws-redshift-source.kamelet.yaml
@@ -104,7 +104,7 @@ spec:
           url: "jdbc:redshift://{{serverName}}:{{serverPort}}/{{databaseName}}"
           driverClassName: com.amazon.redshift.jdbc.Driver
     from:
-      uri: 
"{{local-sql-redshift-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume={{?consumedQuery}}&delay={{delay}}"
+      uri: 
"{{local-sql-redshift-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume=RAW({{?consumedQuery}})&delay={{delay}}"
       steps:
         - marshal:
             json: {}
diff --git a/kamelets/cassandra-sink.kamelet.yaml 
b/kamelets/cassandra-sink.kamelet.yaml
index 8e412dda3..95bef2c17 100644
--- a/kamelets/cassandra-sink.kamelet.yaml
+++ b/kamelets/cassandra-sink.kamelet.yaml
@@ -120,4 +120,4 @@ spec:
         - removeHeader:
             name: CamelCqlQuery
         - to:
-            uri: 
"{{local-sql-cassandraql-sink}}://{{connectionHost}}:{{connectionPort}}/{{keyspace}}?username={{?username}}&password={{?password}}&prepareStatements={{prepareStatements}}&consistencyLevel={{consistencyLevel}}&cql={{query}}&extraTypeCodecs={{?extraTypeCodecs}}"
+            uri: 
"{{local-sql-cassandraql-sink}}://{{connectionHost}}:{{connectionPort}}/{{keyspace}}?username={{?username}}&password={{?password}}&prepareStatements={{prepareStatements}}&consistencyLevel={{consistencyLevel}}&cql=RAW({{query}})&extraTypeCodecs={{?extraTypeCodecs}}"
diff --git a/kamelets/cassandra-source.kamelet.yaml 
b/kamelets/cassandra-source.kamelet.yaml
index 8469bca03..90380cc56 100644
--- a/kamelets/cassandra-source.kamelet.yaml
+++ b/kamelets/cassandra-source.kamelet.yaml
@@ -101,7 +101,7 @@ spec:
         properties:
           autowiredEnabled: "false"
     from:
-      uri: 
"{{local-sql-cassandraql-source}}://{{connectionHost}}:{{connectionPort}}/{{keyspace}}?username={{?username}}&password={{?password}}&cql={{query}}&consistencyLevel={{consistencyLevel}}&resultSetConversionStrategy={{resultStrategy}}&extraTypeCodecs={{?extraTypeCodecs}}"
+      uri: 
"{{local-sql-cassandraql-source}}://{{connectionHost}}:{{connectionPort}}/{{keyspace}}?username={{?username}}&password={{?password}}&cql=RAW({{query}})&consistencyLevel={{consistencyLevel}}&resultSetConversionStrategy={{resultStrategy}}&extraTypeCodecs={{?extraTypeCodecs}}"
       steps:
         - marshal:
             json: {}
diff --git a/kamelets/databricks-source.kamelet.yaml 
b/kamelets/databricks-source.kamelet.yaml
index 86d6f1f1d..29f05597c 100644
--- a/kamelets/databricks-source.kamelet.yaml
+++ b/kamelets/databricks-source.kamelet.yaml
@@ -103,7 +103,7 @@ spec:
           url: 
"jdbc:databricks://{{serverHostname}}:{{serverPort}};httpPath={{httpPath}};AuthMech=3;transportMode=http;ssl=1{{extraOptions}}"
           driverClassName: com.databricks.client.jdbc.Driver
     from:
-      uri: 
"{{local-sql-databricks-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume={{?consumedQuery}}&delay={{delay}}"
+      uri: 
"{{local-sql-databricks-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume=RAW({{?consumedQuery}})&delay={{delay}}"
       steps:
         - marshal:
             json: {}
diff --git a/kamelets/github-commit-source.kamelet.yaml 
b/kamelets/github-commit-source.kamelet.yaml
index 5da5b64a8..7243fa95d 100644
--- a/kamelets/github-commit-source.kamelet.yaml
+++ b/kamelets/github-commit-source.kamelet.yaml
@@ -63,6 +63,11 @@ spec:
         title: Branch 
         description: The branch we want to consume commit from
         type: string
+      delay:
+        title: Delay
+        description: The number of milliseconds before the next poll
+        type: integer
+        default: 60000
   types:
     out:
       mediaType: application/json
@@ -72,7 +77,7 @@ spec:
   - "camel:kamelet"
   template:
     from:
-      uri: 
"github2://commit/{{branch}}?oauthToken=RAW({{oauthToken}})&repoName={{repoName}}&repoOwner={{repoOwner}}&startingSha={{startingSha}}"
+      uri: 
"github2://commit/{{branch}}?oauthToken=RAW({{oauthToken}})&repoName={{repoName}}&repoOwner={{repoOwner}}&delay={{delay}}&startingSha={{startingSha}}"
       steps:
         - marshal:
             json: {}
diff --git a/kamelets/github-event-source.kamelet.yaml 
b/kamelets/github-event-source.kamelet.yaml
index 56c35c617..09d0e18f0 100644
--- a/kamelets/github-event-source.kamelet.yaml
+++ b/kamelets/github-event-source.kamelet.yaml
@@ -52,6 +52,11 @@ spec:
         format: password
         x-descriptors:
         - urn:camel:group:credentials
+      delay:
+        title: Delay
+        description: The number of milliseconds before the next poll
+        type: integer
+        default: 60000
   types:
     out:
       mediaType: application/json
@@ -61,7 +66,7 @@ spec:
   - "camel:kamelet"
   template:
     from:
-      uri: 
"github2://event?oauthToken=RAW({{oauthToken}})&repoName={{repoName}}&repoOwner={{repoOwner}}"
+      uri: 
"github2://event?oauthToken=RAW({{oauthToken}})&repoName={{repoName}}&repoOwner={{repoOwner}}&delay={{delay}}"
       steps:
         - marshal:
             json: {}
diff --git a/kamelets/github-pullrequest-comment-source.kamelet.yaml 
b/kamelets/github-pullrequest-comment-source.kamelet.yaml
index 8c6437118..811620278 100644
--- a/kamelets/github-pullrequest-comment-source.kamelet.yaml
+++ b/kamelets/github-pullrequest-comment-source.kamelet.yaml
@@ -52,6 +52,11 @@ spec:
         format: password
         x-descriptors:
         - urn:camel:group:credentials
+      delay:
+        title: Delay
+        description: The number of milliseconds before the next poll
+        type: integer
+        default: 60000
   types:
     out:
       mediaType: application/json
@@ -61,7 +66,7 @@ spec:
   - "camel:kamelet"
   template:
     from:
-      uri: 
"github2://pullRequestComment?oauthToken=RAW({{oauthToken}})&repoName={{repoName}}&repoOwner={{repoOwner}}"
+      uri: 
"github2://pullRequestComment?oauthToken=RAW({{oauthToken}})&repoName={{repoName}}&repoOwner={{repoOwner}}&delay={{delay}}"
       steps:
         - marshal:
             json: {}
diff --git a/kamelets/github-pullrequest-source.kamelet.yaml 
b/kamelets/github-pullrequest-source.kamelet.yaml
index 651aa084d..0b75f01ce 100644
--- a/kamelets/github-pullrequest-source.kamelet.yaml
+++ b/kamelets/github-pullrequest-source.kamelet.yaml
@@ -52,6 +52,11 @@ spec:
         format: password
         x-descriptors:
         - urn:camel:group:credentials
+      delay:
+        title: Delay
+        description: The number of milliseconds before the next poll
+        type: integer
+        default: 60000
   types:
     out:
       mediaType: application/json
@@ -61,7 +66,7 @@ spec:
   - "camel:kamelet"
   template:
     from:
-      uri: 
"github2://pullRequest?oauthToken=RAW({{oauthToken}})&repoName={{repoName}}&repoOwner={{repoOwner}}"
+      uri: 
"github2://pullRequest?oauthToken=RAW({{oauthToken}})&repoName={{repoName}}&repoOwner={{repoOwner}}&delay={{delay}}"
       steps:
         - marshal:
             json: {}
diff --git a/kamelets/github-tag-source.kamelet.yaml 
b/kamelets/github-tag-source.kamelet.yaml
index 0640fc5d0..4cf816f13 100644
--- a/kamelets/github-tag-source.kamelet.yaml
+++ b/kamelets/github-tag-source.kamelet.yaml
@@ -52,6 +52,11 @@ spec:
         format: password
         x-descriptors:
         - urn:camel:group:credentials
+      delay:
+        title: Delay
+        description: The number of milliseconds before the next poll
+        type: integer
+        default: 60000
   types:
     out:
       mediaType: application/json
@@ -61,7 +66,7 @@ spec:
   - "camel:kamelet"
   template:
     from:
-      uri: 
"github2://tag?oauthToken=RAW({{oauthToken}})&repoName={{repoName}}&repoOwner={{repoOwner}}"
+      uri: 
"github2://tag?oauthToken=RAW({{oauthToken}})&repoName={{repoName}}&repoOwner={{repoOwner}}&delay={{delay}}"
       steps:
         - marshal:
             json: {}
diff --git a/kamelets/google-sheets-source.kamelet.yaml 
b/kamelets/google-sheets-source.kamelet.yaml
index 6bc9e559f..90aa3138b 100644
--- a/kamelets/google-sheets-source.kamelet.yaml
+++ b/kamelets/google-sheets-source.kamelet.yaml
@@ -174,7 +174,7 @@ spec:
   - "camel:google-sheets"
   template:
     from:
-      uri: 
"google-sheets-stream://{{spreadsheetId}}?accessToken=RAW({{accessToken}})&applicationName={{?applicationName}}&clientId={{clientId}}&clientSecret=RAW({{clientSecret}})&delay={{delay}}&range={{?range}}&refreshToken=RAW({{refreshToken}})&repeatCount={{?repeatCount}}&splitResults={{splitResults}}"
+      uri: 
"google-sheets-stream://{{spreadsheetId}}?accessToken=RAW({{accessToken}})&applicationName={{?applicationName}}&clientId={{clientId}}&clientSecret=RAW({{clientSecret}})&delay={{delay}}&majorDimension={{majorDimension}}&range={{?range}}&refreshToken=RAW({{refreshToken}})&repeatCount={{?repeatCount}}&splitResults={{splitResults}}"
       steps:
         - marshal:
             json: {}
diff --git a/kamelets/jira-add-issue-sink.kamelet.yaml 
b/kamelets/jira-add-issue-sink.kamelet.yaml
index a18ae8438..ddf285ab7 100644
--- a/kamelets/jira-add-issue-sink.kamelet.yaml
+++ b/kamelets/jira-add-issue-sink.kamelet.yaml
@@ -180,11 +180,16 @@ spec:
                   simple:
                     expression: "${header[ce-issueDescription]}"
                 steps:
-                  - setHeader:
-                      name: CamelJiraIssueDescription
-                      expression:
-                        simple:
-                          expression: "${header[ce-issueDescription]}"
+                  - choice:
+                      when:
+                        - expression:
+                            simple:
+                              expression: "${body} == null || 
${bodyAs(String)} == ''"
+                          steps:
+                            - setBody:
+                                expression:
+                                  simple:
+                                    expression: 
"${header[ce-issueDescription]}"
         - to:
             uri: jira
             parameters:
diff --git a/kamelets/jira-update-issue-sink.kamelet.yaml 
b/kamelets/jira-update-issue-sink.kamelet.yaml
index a538d78e6..703fc900e 100644
--- a/kamelets/jira-update-issue-sink.kamelet.yaml
+++ b/kamelets/jira-update-issue-sink.kamelet.yaml
@@ -145,11 +145,16 @@ spec:
                   simple:
                     expression: "${header[ce-issueDescription]}"
                 steps:
-                  - setHeader:
-                      name: CamelJiraIssueDescription
-                      expression:
-                        simple:
-                          expression: "${header[ce-issueDescription]}"
+                  - choice:
+                      when:
+                        - expression:
+                            simple:
+                              expression: "${body} == null || 
${bodyAs(String)} == ''"
+                          steps:
+                            - setBody:
+                                expression:
+                                  simple:
+                                    expression: 
"${header[ce-issueDescription]}"
         - to:
             uri: jira
             parameters:
diff --git a/kamelets/mariadb-source.kamelet.yaml 
b/kamelets/mariadb-source.kamelet.yaml
index 07ee19618..455f6ca84 100644
--- a/kamelets/mariadb-source.kamelet.yaml
+++ b/kamelets/mariadb-source.kamelet.yaml
@@ -103,7 +103,7 @@ spec:
           url: "jdbc:mariadb://{{serverName}}:{{serverPort}}/{{databaseName}}"
           driverClassName: org.mariadb.jdbc.Driver
     from:
-      uri: 
"{{local-sql-mariadb-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume={{?consumedQuery}}&delay={{delay}}"
+      uri: 
"{{local-sql-mariadb-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume=RAW({{?consumedQuery}})&delay={{delay}}"
       steps:
         - marshal:
             json: {}
diff --git a/kamelets/mongodb-sink.kamelet.yaml 
b/kamelets/mongodb-sink.kamelet.yaml
index fcbd64e8f..0d8ebe5e9 100644
--- a/kamelets/mongodb-sink.kamelet.yaml
+++ b/kamelets/mongodb-sink.kamelet.yaml
@@ -104,25 +104,5 @@ spec:
     from:
       uri: kamelet:source
       steps:
-        - choice:
-            when:
-              - expression:
-                  simple:
-                    expression: "${header[db-upsert]}"
-                steps:
-                  - setHeader:
-                      name: CamelMongoDbUpsert
-                      expression:
-                        simple:
-                          expression: "${header[db-upsert]}"
-              - expression:
-                  simple:
-                    expression: "${header[ce-dbupsert]}"
-                steps:
-                  - setHeader:
-                      name: CamelMongoDbUpsert
-                      expression:
-                        simple:
-                          expression: "${header[ce-dbupsert]}"
         - to:
             uri: 
"{{local-mongodb}}:test?createCollection={{?createCollection}}&writeConcern={{?writeConcern}}&collection={{collection}}&database={{database}}&operation=insert&mongoConnection=#{{mongo-client}}"
diff --git a/kamelets/mysql-source.kamelet.yaml 
b/kamelets/mysql-source.kamelet.yaml
index 01ec9d31a..361f5e47b 100644
--- a/kamelets/mysql-source.kamelet.yaml
+++ b/kamelets/mysql-source.kamelet.yaml
@@ -103,7 +103,7 @@ spec:
           url: "jdbc:mysql://{{serverName}}:{{serverPort}}/{{databaseName}}"
           driverClassName: com.mysql.cj.jdbc.Driver
     from:
-      uri: 
"{{local-sql-mysql-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume={{?consumedQuery}}&delay={{delay}}"
+      uri: 
"{{local-sql-mysql-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume=RAW({{?consumedQuery}})&delay={{delay}}"
       steps:
         - marshal:
             json: {}
diff --git a/kamelets/oracle-database-source.kamelet.yaml 
b/kamelets/oracle-database-source.kamelet.yaml
index 5d064d735..26a91df87 100644
--- a/kamelets/oracle-database-source.kamelet.yaml
+++ b/kamelets/oracle-database-source.kamelet.yaml
@@ -98,7 +98,7 @@ spec:
           url: 
"jdbc:oracle:thin:@{{serverName}}:{{serverPort}}/{{databaseName}}"
           driverClassName: oracle.jdbc.driver.OracleDriver
     from:
-      uri: 
"{{local-sql-oracle-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume={{?consumedQuery}}"
+      uri: 
"{{local-sql-oracle-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume=RAW({{?consumedQuery}})"
       steps:
         - marshal:
             json: {}
diff --git a/kamelets/postgresql-source.kamelet.yaml 
b/kamelets/postgresql-source.kamelet.yaml
index e037f6fed..acb3b388a 100644
--- a/kamelets/postgresql-source.kamelet.yaml
+++ b/kamelets/postgresql-source.kamelet.yaml
@@ -104,7 +104,7 @@ spec:
           url: 
"jdbc:postgresql://{{serverName}}:{{serverPort}}/{{databaseName}}"
           driverClassName: org.postgresql.Driver
     from:
-      uri: 
"{{local-sql-postgres-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume={{?consumedQuery}}&delay={{delay}}"
+      uri: 
"{{local-sql-postgres-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume=RAW({{?consumedQuery}})&delay={{delay}}"
       steps:
         - marshal:
             json: {}
diff --git a/kamelets/redis-sink.kamelet.yaml b/kamelets/redis-sink.kamelet.yaml
index 71d0435bc..c34a37fdc 100644
--- a/kamelets/redis-sink.kamelet.yaml
+++ b/kamelets/redis-sink.kamelet.yaml
@@ -107,6 +107,15 @@ spec:
                       expression:
                         simple:
                           expression: "${header[ce-channel]}"
+              - expression:
+                  simple:
+                    expression: "${header[CamelRedis.Channel]} == null"
+                steps:
+                  - setHeader:
+                      name: CamelRedis.Channel
+                      expression:
+                        constant:
+                          expression: "{{channels}}"
         - setHeader:
             name: CamelRedis.Message
             expression:
diff --git a/kamelets/snowflake-source.kamelet.yaml 
b/kamelets/snowflake-source.kamelet.yaml
index d0785e9c7..d93bc1f20 100644
--- a/kamelets/snowflake-source.kamelet.yaml
+++ b/kamelets/snowflake-source.kamelet.yaml
@@ -99,7 +99,7 @@ spec:
           url: "jdbc:snowflake://{{instanceUrl}}"
           databaseName: "{{?databaseName}}"
     from:
-      uri: 
"{{local-sql-snowflake-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume={{?consumedQuery}}&delay={{delay}}"
+      uri: 
"{{local-sql-snowflake-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume=RAW({{?consumedQuery}})&delay={{delay}}"
       steps:
         - marshal:
             json: {}
diff --git a/kamelets/sqlserver-source.kamelet.yaml 
b/kamelets/sqlserver-source.kamelet.yaml
index 7fb540627..ca4e089cb 100644
--- a/kamelets/sqlserver-source.kamelet.yaml
+++ b/kamelets/sqlserver-source.kamelet.yaml
@@ -114,7 +114,7 @@ spec:
           url: 
"jdbc:sqlserver://{{serverName}}:{{serverPort}};databaseName={{databaseName}};encrypt={{encrypt}};trustServerCertificate={{trustServerCertificate}};"
           driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
     from:
-      uri: 
"{{local-sqlserver-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume={{?consumedQuery}}&delay={{delay}}"
+      uri: 
"{{local-sqlserver-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume=RAW({{?consumedQuery}})&delay={{delay}}"
       steps:
         - marshal:
             json: {}
diff --git 
a/library/camel-kamelets/src/main/resources/kamelets/aws-redshift-source.kamelet.yaml
 
b/library/camel-kamelets/src/main/resources/kamelets/aws-redshift-source.kamelet.yaml
index 969c43b6b..0f1857747 100644
--- 
a/library/camel-kamelets/src/main/resources/kamelets/aws-redshift-source.kamelet.yaml
+++ 
b/library/camel-kamelets/src/main/resources/kamelets/aws-redshift-source.kamelet.yaml
@@ -104,7 +104,7 @@ spec:
           url: "jdbc:redshift://{{serverName}}:{{serverPort}}/{{databaseName}}"
           driverClassName: com.amazon.redshift.jdbc.Driver
     from:
-      uri: 
"{{local-sql-redshift-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume={{?consumedQuery}}&delay={{delay}}"
+      uri: 
"{{local-sql-redshift-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume=RAW({{?consumedQuery}})&delay={{delay}}"
       steps:
         - marshal:
             json: {}
diff --git 
a/library/camel-kamelets/src/main/resources/kamelets/cassandra-sink.kamelet.yaml
 
b/library/camel-kamelets/src/main/resources/kamelets/cassandra-sink.kamelet.yaml
index 8e412dda3..95bef2c17 100644
--- 
a/library/camel-kamelets/src/main/resources/kamelets/cassandra-sink.kamelet.yaml
+++ 
b/library/camel-kamelets/src/main/resources/kamelets/cassandra-sink.kamelet.yaml
@@ -120,4 +120,4 @@ spec:
         - removeHeader:
             name: CamelCqlQuery
         - to:
-            uri: 
"{{local-sql-cassandraql-sink}}://{{connectionHost}}:{{connectionPort}}/{{keyspace}}?username={{?username}}&password={{?password}}&prepareStatements={{prepareStatements}}&consistencyLevel={{consistencyLevel}}&cql={{query}}&extraTypeCodecs={{?extraTypeCodecs}}"
+            uri: 
"{{local-sql-cassandraql-sink}}://{{connectionHost}}:{{connectionPort}}/{{keyspace}}?username={{?username}}&password={{?password}}&prepareStatements={{prepareStatements}}&consistencyLevel={{consistencyLevel}}&cql=RAW({{query}})&extraTypeCodecs={{?extraTypeCodecs}}"
diff --git 
a/library/camel-kamelets/src/main/resources/kamelets/cassandra-source.kamelet.yaml
 
b/library/camel-kamelets/src/main/resources/kamelets/cassandra-source.kamelet.yaml
index 8469bca03..90380cc56 100644
--- 
a/library/camel-kamelets/src/main/resources/kamelets/cassandra-source.kamelet.yaml
+++ 
b/library/camel-kamelets/src/main/resources/kamelets/cassandra-source.kamelet.yaml
@@ -101,7 +101,7 @@ spec:
         properties:
           autowiredEnabled: "false"
     from:
-      uri: 
"{{local-sql-cassandraql-source}}://{{connectionHost}}:{{connectionPort}}/{{keyspace}}?username={{?username}}&password={{?password}}&cql={{query}}&consistencyLevel={{consistencyLevel}}&resultSetConversionStrategy={{resultStrategy}}&extraTypeCodecs={{?extraTypeCodecs}}"
+      uri: 
"{{local-sql-cassandraql-source}}://{{connectionHost}}:{{connectionPort}}/{{keyspace}}?username={{?username}}&password={{?password}}&cql=RAW({{query}})&consistencyLevel={{consistencyLevel}}&resultSetConversionStrategy={{resultStrategy}}&extraTypeCodecs={{?extraTypeCodecs}}"
       steps:
         - marshal:
             json: {}
diff --git 
a/library/camel-kamelets/src/main/resources/kamelets/databricks-source.kamelet.yaml
 
b/library/camel-kamelets/src/main/resources/kamelets/databricks-source.kamelet.yaml
index 86d6f1f1d..29f05597c 100644
--- 
a/library/camel-kamelets/src/main/resources/kamelets/databricks-source.kamelet.yaml
+++ 
b/library/camel-kamelets/src/main/resources/kamelets/databricks-source.kamelet.yaml
@@ -103,7 +103,7 @@ spec:
           url: 
"jdbc:databricks://{{serverHostname}}:{{serverPort}};httpPath={{httpPath}};AuthMech=3;transportMode=http;ssl=1{{extraOptions}}"
           driverClassName: com.databricks.client.jdbc.Driver
     from:
-      uri: 
"{{local-sql-databricks-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume={{?consumedQuery}}&delay={{delay}}"
+      uri: 
"{{local-sql-databricks-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume=RAW({{?consumedQuery}})&delay={{delay}}"
       steps:
         - marshal:
             json: {}
diff --git 
a/library/camel-kamelets/src/main/resources/kamelets/github-commit-source.kamelet.yaml
 
b/library/camel-kamelets/src/main/resources/kamelets/github-commit-source.kamelet.yaml
index 5da5b64a8..7243fa95d 100644
--- 
a/library/camel-kamelets/src/main/resources/kamelets/github-commit-source.kamelet.yaml
+++ 
b/library/camel-kamelets/src/main/resources/kamelets/github-commit-source.kamelet.yaml
@@ -63,6 +63,11 @@ spec:
         title: Branch 
         description: The branch we want to consume commit from
         type: string
+      delay:
+        title: Delay
+        description: The number of milliseconds before the next poll
+        type: integer
+        default: 60000
   types:
     out:
       mediaType: application/json
@@ -72,7 +77,7 @@ spec:
   - "camel:kamelet"
   template:
     from:
-      uri: 
"github2://commit/{{branch}}?oauthToken=RAW({{oauthToken}})&repoName={{repoName}}&repoOwner={{repoOwner}}&startingSha={{startingSha}}"
+      uri: 
"github2://commit/{{branch}}?oauthToken=RAW({{oauthToken}})&repoName={{repoName}}&repoOwner={{repoOwner}}&delay={{delay}}&startingSha={{startingSha}}"
       steps:
         - marshal:
             json: {}
diff --git 
a/library/camel-kamelets/src/main/resources/kamelets/github-event-source.kamelet.yaml
 
b/library/camel-kamelets/src/main/resources/kamelets/github-event-source.kamelet.yaml
index 56c35c617..09d0e18f0 100644
--- 
a/library/camel-kamelets/src/main/resources/kamelets/github-event-source.kamelet.yaml
+++ 
b/library/camel-kamelets/src/main/resources/kamelets/github-event-source.kamelet.yaml
@@ -52,6 +52,11 @@ spec:
         format: password
         x-descriptors:
         - urn:camel:group:credentials
+      delay:
+        title: Delay
+        description: The number of milliseconds before the next poll
+        type: integer
+        default: 60000
   types:
     out:
       mediaType: application/json
@@ -61,7 +66,7 @@ spec:
   - "camel:kamelet"
   template:
     from:
-      uri: 
"github2://event?oauthToken=RAW({{oauthToken}})&repoName={{repoName}}&repoOwner={{repoOwner}}"
+      uri: 
"github2://event?oauthToken=RAW({{oauthToken}})&repoName={{repoName}}&repoOwner={{repoOwner}}&delay={{delay}}"
       steps:
         - marshal:
             json: {}
diff --git 
a/library/camel-kamelets/src/main/resources/kamelets/github-pullrequest-comment-source.kamelet.yaml
 
b/library/camel-kamelets/src/main/resources/kamelets/github-pullrequest-comment-source.kamelet.yaml
index 8c6437118..811620278 100644
--- 
a/library/camel-kamelets/src/main/resources/kamelets/github-pullrequest-comment-source.kamelet.yaml
+++ 
b/library/camel-kamelets/src/main/resources/kamelets/github-pullrequest-comment-source.kamelet.yaml
@@ -52,6 +52,11 @@ spec:
         format: password
         x-descriptors:
         - urn:camel:group:credentials
+      delay:
+        title: Delay
+        description: The number of milliseconds before the next poll
+        type: integer
+        default: 60000
   types:
     out:
       mediaType: application/json
@@ -61,7 +66,7 @@ spec:
   - "camel:kamelet"
   template:
     from:
-      uri: 
"github2://pullRequestComment?oauthToken=RAW({{oauthToken}})&repoName={{repoName}}&repoOwner={{repoOwner}}"
+      uri: 
"github2://pullRequestComment?oauthToken=RAW({{oauthToken}})&repoName={{repoName}}&repoOwner={{repoOwner}}&delay={{delay}}"
       steps:
         - marshal:
             json: {}
diff --git 
a/library/camel-kamelets/src/main/resources/kamelets/github-pullrequest-source.kamelet.yaml
 
b/library/camel-kamelets/src/main/resources/kamelets/github-pullrequest-source.kamelet.yaml
index 651aa084d..0b75f01ce 100644
--- 
a/library/camel-kamelets/src/main/resources/kamelets/github-pullrequest-source.kamelet.yaml
+++ 
b/library/camel-kamelets/src/main/resources/kamelets/github-pullrequest-source.kamelet.yaml
@@ -52,6 +52,11 @@ spec:
         format: password
         x-descriptors:
         - urn:camel:group:credentials
+      delay:
+        title: Delay
+        description: The number of milliseconds before the next poll
+        type: integer
+        default: 60000
   types:
     out:
       mediaType: application/json
@@ -61,7 +66,7 @@ spec:
   - "camel:kamelet"
   template:
     from:
-      uri: 
"github2://pullRequest?oauthToken=RAW({{oauthToken}})&repoName={{repoName}}&repoOwner={{repoOwner}}"
+      uri: 
"github2://pullRequest?oauthToken=RAW({{oauthToken}})&repoName={{repoName}}&repoOwner={{repoOwner}}&delay={{delay}}"
       steps:
         - marshal:
             json: {}
diff --git 
a/library/camel-kamelets/src/main/resources/kamelets/github-tag-source.kamelet.yaml
 
b/library/camel-kamelets/src/main/resources/kamelets/github-tag-source.kamelet.yaml
index 0640fc5d0..4cf816f13 100644
--- 
a/library/camel-kamelets/src/main/resources/kamelets/github-tag-source.kamelet.yaml
+++ 
b/library/camel-kamelets/src/main/resources/kamelets/github-tag-source.kamelet.yaml
@@ -52,6 +52,11 @@ spec:
         format: password
         x-descriptors:
         - urn:camel:group:credentials
+      delay:
+        title: Delay
+        description: The number of milliseconds before the next poll
+        type: integer
+        default: 60000
   types:
     out:
       mediaType: application/json
@@ -61,7 +66,7 @@ spec:
   - "camel:kamelet"
   template:
     from:
-      uri: 
"github2://tag?oauthToken=RAW({{oauthToken}})&repoName={{repoName}}&repoOwner={{repoOwner}}"
+      uri: 
"github2://tag?oauthToken=RAW({{oauthToken}})&repoName={{repoName}}&repoOwner={{repoOwner}}&delay={{delay}}"
       steps:
         - marshal:
             json: {}
diff --git 
a/library/camel-kamelets/src/main/resources/kamelets/google-sheets-source.kamelet.yaml
 
b/library/camel-kamelets/src/main/resources/kamelets/google-sheets-source.kamelet.yaml
index 6bc9e559f..90aa3138b 100644
--- 
a/library/camel-kamelets/src/main/resources/kamelets/google-sheets-source.kamelet.yaml
+++ 
b/library/camel-kamelets/src/main/resources/kamelets/google-sheets-source.kamelet.yaml
@@ -174,7 +174,7 @@ spec:
   - "camel:google-sheets"
   template:
     from:
-      uri: 
"google-sheets-stream://{{spreadsheetId}}?accessToken=RAW({{accessToken}})&applicationName={{?applicationName}}&clientId={{clientId}}&clientSecret=RAW({{clientSecret}})&delay={{delay}}&range={{?range}}&refreshToken=RAW({{refreshToken}})&repeatCount={{?repeatCount}}&splitResults={{splitResults}}"
+      uri: 
"google-sheets-stream://{{spreadsheetId}}?accessToken=RAW({{accessToken}})&applicationName={{?applicationName}}&clientId={{clientId}}&clientSecret=RAW({{clientSecret}})&delay={{delay}}&majorDimension={{majorDimension}}&range={{?range}}&refreshToken=RAW({{refreshToken}})&repeatCount={{?repeatCount}}&splitResults={{splitResults}}"
       steps:
         - marshal:
             json: {}
diff --git 
a/library/camel-kamelets/src/main/resources/kamelets/jira-add-issue-sink.kamelet.yaml
 
b/library/camel-kamelets/src/main/resources/kamelets/jira-add-issue-sink.kamelet.yaml
index a18ae8438..ddf285ab7 100644
--- 
a/library/camel-kamelets/src/main/resources/kamelets/jira-add-issue-sink.kamelet.yaml
+++ 
b/library/camel-kamelets/src/main/resources/kamelets/jira-add-issue-sink.kamelet.yaml
@@ -180,11 +180,16 @@ spec:
                   simple:
                     expression: "${header[ce-issueDescription]}"
                 steps:
-                  - setHeader:
-                      name: CamelJiraIssueDescription
-                      expression:
-                        simple:
-                          expression: "${header[ce-issueDescription]}"
+                  - choice:
+                      when:
+                        - expression:
+                            simple:
+                              expression: "${body} == null || 
${bodyAs(String)} == ''"
+                          steps:
+                            - setBody:
+                                expression:
+                                  simple:
+                                    expression: 
"${header[ce-issueDescription]}"
         - to:
             uri: jira
             parameters:
diff --git 
a/library/camel-kamelets/src/main/resources/kamelets/jira-update-issue-sink.kamelet.yaml
 
b/library/camel-kamelets/src/main/resources/kamelets/jira-update-issue-sink.kamelet.yaml
index a538d78e6..703fc900e 100644
--- 
a/library/camel-kamelets/src/main/resources/kamelets/jira-update-issue-sink.kamelet.yaml
+++ 
b/library/camel-kamelets/src/main/resources/kamelets/jira-update-issue-sink.kamelet.yaml
@@ -145,11 +145,16 @@ spec:
                   simple:
                     expression: "${header[ce-issueDescription]}"
                 steps:
-                  - setHeader:
-                      name: CamelJiraIssueDescription
-                      expression:
-                        simple:
-                          expression: "${header[ce-issueDescription]}"
+                  - choice:
+                      when:
+                        - expression:
+                            simple:
+                              expression: "${body} == null || 
${bodyAs(String)} == ''"
+                          steps:
+                            - setBody:
+                                expression:
+                                  simple:
+                                    expression: 
"${header[ce-issueDescription]}"
         - to:
             uri: jira
             parameters:
diff --git 
a/library/camel-kamelets/src/main/resources/kamelets/mariadb-source.kamelet.yaml
 
b/library/camel-kamelets/src/main/resources/kamelets/mariadb-source.kamelet.yaml
index 07ee19618..455f6ca84 100644
--- 
a/library/camel-kamelets/src/main/resources/kamelets/mariadb-source.kamelet.yaml
+++ 
b/library/camel-kamelets/src/main/resources/kamelets/mariadb-source.kamelet.yaml
@@ -103,7 +103,7 @@ spec:
           url: "jdbc:mariadb://{{serverName}}:{{serverPort}}/{{databaseName}}"
           driverClassName: org.mariadb.jdbc.Driver
     from:
-      uri: 
"{{local-sql-mariadb-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume={{?consumedQuery}}&delay={{delay}}"
+      uri: 
"{{local-sql-mariadb-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume=RAW({{?consumedQuery}})&delay={{delay}}"
       steps:
         - marshal:
             json: {}
diff --git 
a/library/camel-kamelets/src/main/resources/kamelets/mongodb-sink.kamelet.yaml 
b/library/camel-kamelets/src/main/resources/kamelets/mongodb-sink.kamelet.yaml
index fcbd64e8f..0d8ebe5e9 100644
--- 
a/library/camel-kamelets/src/main/resources/kamelets/mongodb-sink.kamelet.yaml
+++ 
b/library/camel-kamelets/src/main/resources/kamelets/mongodb-sink.kamelet.yaml
@@ -104,25 +104,5 @@ spec:
     from:
       uri: kamelet:source
       steps:
-        - choice:
-            when:
-              - expression:
-                  simple:
-                    expression: "${header[db-upsert]}"
-                steps:
-                  - setHeader:
-                      name: CamelMongoDbUpsert
-                      expression:
-                        simple:
-                          expression: "${header[db-upsert]}"
-              - expression:
-                  simple:
-                    expression: "${header[ce-dbupsert]}"
-                steps:
-                  - setHeader:
-                      name: CamelMongoDbUpsert
-                      expression:
-                        simple:
-                          expression: "${header[ce-dbupsert]}"
         - to:
             uri: 
"{{local-mongodb}}:test?createCollection={{?createCollection}}&writeConcern={{?writeConcern}}&collection={{collection}}&database={{database}}&operation=insert&mongoConnection=#{{mongo-client}}"
diff --git 
a/library/camel-kamelets/src/main/resources/kamelets/mysql-source.kamelet.yaml 
b/library/camel-kamelets/src/main/resources/kamelets/mysql-source.kamelet.yaml
index 01ec9d31a..361f5e47b 100644
--- 
a/library/camel-kamelets/src/main/resources/kamelets/mysql-source.kamelet.yaml
+++ 
b/library/camel-kamelets/src/main/resources/kamelets/mysql-source.kamelet.yaml
@@ -103,7 +103,7 @@ spec:
           url: "jdbc:mysql://{{serverName}}:{{serverPort}}/{{databaseName}}"
           driverClassName: com.mysql.cj.jdbc.Driver
     from:
-      uri: 
"{{local-sql-mysql-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume={{?consumedQuery}}&delay={{delay}}"
+      uri: 
"{{local-sql-mysql-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume=RAW({{?consumedQuery}})&delay={{delay}}"
       steps:
         - marshal:
             json: {}
diff --git 
a/library/camel-kamelets/src/main/resources/kamelets/oracle-database-source.kamelet.yaml
 
b/library/camel-kamelets/src/main/resources/kamelets/oracle-database-source.kamelet.yaml
index 5d064d735..26a91df87 100644
--- 
a/library/camel-kamelets/src/main/resources/kamelets/oracle-database-source.kamelet.yaml
+++ 
b/library/camel-kamelets/src/main/resources/kamelets/oracle-database-source.kamelet.yaml
@@ -98,7 +98,7 @@ spec:
           url: 
"jdbc:oracle:thin:@{{serverName}}:{{serverPort}}/{{databaseName}}"
           driverClassName: oracle.jdbc.driver.OracleDriver
     from:
-      uri: 
"{{local-sql-oracle-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume={{?consumedQuery}}"
+      uri: 
"{{local-sql-oracle-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume=RAW({{?consumedQuery}})"
       steps:
         - marshal:
             json: {}
diff --git 
a/library/camel-kamelets/src/main/resources/kamelets/postgresql-source.kamelet.yaml
 
b/library/camel-kamelets/src/main/resources/kamelets/postgresql-source.kamelet.yaml
index e037f6fed..acb3b388a 100644
--- 
a/library/camel-kamelets/src/main/resources/kamelets/postgresql-source.kamelet.yaml
+++ 
b/library/camel-kamelets/src/main/resources/kamelets/postgresql-source.kamelet.yaml
@@ -104,7 +104,7 @@ spec:
           url: 
"jdbc:postgresql://{{serverName}}:{{serverPort}}/{{databaseName}}"
           driverClassName: org.postgresql.Driver
     from:
-      uri: 
"{{local-sql-postgres-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume={{?consumedQuery}}&delay={{delay}}"
+      uri: 
"{{local-sql-postgres-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume=RAW({{?consumedQuery}})&delay={{delay}}"
       steps:
         - marshal:
             json: {}
diff --git 
a/library/camel-kamelets/src/main/resources/kamelets/redis-sink.kamelet.yaml 
b/library/camel-kamelets/src/main/resources/kamelets/redis-sink.kamelet.yaml
index 71d0435bc..c34a37fdc 100644
--- a/library/camel-kamelets/src/main/resources/kamelets/redis-sink.kamelet.yaml
+++ b/library/camel-kamelets/src/main/resources/kamelets/redis-sink.kamelet.yaml
@@ -107,6 +107,15 @@ spec:
                       expression:
                         simple:
                           expression: "${header[ce-channel]}"
+              - expression:
+                  simple:
+                    expression: "${header[CamelRedis.Channel]} == null"
+                steps:
+                  - setHeader:
+                      name: CamelRedis.Channel
+                      expression:
+                        constant:
+                          expression: "{{channels}}"
         - setHeader:
             name: CamelRedis.Message
             expression:
diff --git 
a/library/camel-kamelets/src/main/resources/kamelets/snowflake-source.kamelet.yaml
 
b/library/camel-kamelets/src/main/resources/kamelets/snowflake-source.kamelet.yaml
index d0785e9c7..d93bc1f20 100644
--- 
a/library/camel-kamelets/src/main/resources/kamelets/snowflake-source.kamelet.yaml
+++ 
b/library/camel-kamelets/src/main/resources/kamelets/snowflake-source.kamelet.yaml
@@ -99,7 +99,7 @@ spec:
           url: "jdbc:snowflake://{{instanceUrl}}"
           databaseName: "{{?databaseName}}"
     from:
-      uri: 
"{{local-sql-snowflake-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume={{?consumedQuery}}&delay={{delay}}"
+      uri: 
"{{local-sql-snowflake-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume=RAW({{?consumedQuery}})&delay={{delay}}"
       steps:
         - marshal:
             json: {}
diff --git 
a/library/camel-kamelets/src/main/resources/kamelets/sqlserver-source.kamelet.yaml
 
b/library/camel-kamelets/src/main/resources/kamelets/sqlserver-source.kamelet.yaml
index 7fb540627..ca4e089cb 100644
--- 
a/library/camel-kamelets/src/main/resources/kamelets/sqlserver-source.kamelet.yaml
+++ 
b/library/camel-kamelets/src/main/resources/kamelets/sqlserver-source.kamelet.yaml
@@ -114,7 +114,7 @@ spec:
           url: 
"jdbc:sqlserver://{{serverName}}:{{serverPort}};databaseName={{databaseName}};encrypt={{encrypt}};trustServerCertificate={{trustServerCertificate}};"
           driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
     from:
-      uri: 
"{{local-sqlserver-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume={{?consumedQuery}}&delay={{delay}}"
+      uri: 
"{{local-sqlserver-source}}:{{query}}?dataSource=#bean:{{dsBean}}&onConsume=RAW({{?consumedQuery}})&delay={{delay}}"
       steps:
         - marshal:
             json: {}

Reply via email to