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 85a3f76791a CAMEL-18382: Google-bigquery - allow different value types 
from headers (#8222)
85a3f76791a is described below

commit 85a3f76791a833293861e9e48906d2c1fbeb8ed4
Author: JiriOndrusek <[email protected]>
AuthorDate: Sat Aug 27 07:01:48 2022 +0200

    CAMEL-18382: Google-bigquery - allow different value types from headers 
(#8222)
---
 .../main/docs/google-bigquery-sql-component.adoc   |  4 +-
 .../bigquery/sql/GoogleBigQuerySQLProducer.java    | 10 ++-
 .../GoogleBigQuerySQLProducerWithParamersTest.java | 77 ++++++++++++++++++++++
 .../ROOT/pages/camel-3x-upgrade-guide-3_19.adoc    |  3 +
 4 files changed, 91 insertions(+), 3 deletions(-)

diff --git 
a/components/camel-google/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc
 
b/components/camel-google/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc
index 8a44abc01a7..aeb31ac7494 100644
--- 
a/components/camel-google/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc
+++ 
b/components/camel-google/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc
@@ -82,8 +82,8 @@ google-bigquery-sql://project-17248459:delete * from 
${datasetId}.${tableId} whe
 --------------------------------------------------------
 where
 
- * parameters in form $\{name} are extracted from message headers and formed 
the translated query
- * parameters in form @name are extracted from body or message headers and 
sent to Google Bigquery
+ * parameters in form $\{name} are extracted from message headers and formed 
the translated query.
+ * parameters in form @name are extracted from body or message headers and 
sent to Google Bigquery. The `com.google.cloud.bigquery.StandardSQLTypeName` of 
the parameter is detected from the type of the parameter using `<T> 
QueryParameterValue<T>.of(T value, Class<T> type)`
 
 You can externalize your SQL queries to files in the classpath or file system 
as shown:
 
diff --git 
a/components/camel-google/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLProducer.java
 
b/components/camel-google/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLProducer.java
index 82fae9bcedb..63fd7c1405c 100644
--- 
a/components/camel-google/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLProducer.java
+++ 
b/components/camel-google/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLProducer.java
@@ -163,7 +163,15 @@ public class GoogleBigQuerySQLProducer extends 
DefaultProducer {
         }
 
         params.forEach((key, value) -> {
-            QueryParameterValue parameterValue = 
QueryParameterValue.of(value.toString(), StandardSQLTypeName.STRING);
+            QueryParameterValue parameterValue;
+
+            try {
+                parameterValue = QueryParameterValue.of(value, (Class<Object>) 
value.getClass());
+            } catch (IllegalArgumentException e) {
+                LOG.warn("{} Fallback to *.toString() value.", e.getMessage());
+                //use String representation
+                parameterValue = QueryParameterValue.of(value.toString(), 
StandardSQLTypeName.STRING);
+            }
             builder.addNamedParameter(key, parameterValue);
         });
     }
diff --git 
a/components/camel-google/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerWithParamersTest.java
 
b/components/camel-google/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerWithParamersTest.java
index 9eb0982db56..c9ee2732a04 100644
--- 
a/components/camel-google/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerWithParamersTest.java
+++ 
b/components/camel-google/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerWithParamersTest.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.google.bigquery.unit.sql;
 
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -23,6 +24,7 @@ import com.google.cloud.bigquery.JobId;
 import com.google.cloud.bigquery.JobInfo;
 import com.google.cloud.bigquery.QueryJobConfiguration;
 import com.google.cloud.bigquery.QueryParameterValue;
+import com.google.cloud.bigquery.StandardSQLTypeName;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.RuntimeExchangeException;
@@ -97,6 +99,66 @@ public class GoogleBigQuerySQLProducerWithParamersTest 
extends GoogleBigQuerySQL
         assertEquals("some data", namedParameters.get("data").getValue());
     }
 
+    @Test
+    public void parametersAutomaticTypeConversion() throws Exception {
+        Map<String, String> body = new HashMap<>();
+
+        Exchange exchange = createExchangeWithBody(body);
+        Message message = exchange.getMessage();
+        message.setHeader("id", 200);
+        message.setHeader("data", new BigDecimal(1));
+
+        producer.process(exchange);
+
+        ArgumentCaptor<JobInfo> dataCaptor = 
ArgumentCaptor.forClass(JobInfo.class);
+        verify(bigquery).create(dataCaptor.capture());
+
+        QueryJobConfiguration request = 
dataCaptor.getValue().getConfiguration();
+        assertEquals(sql, request.getQuery());
+
+        Map<String, QueryParameterValue> namedParameters = 
request.getNamedParameters();
+        assertEquals(2, namedParameters.size());
+
+        assertTrue(namedParameters.containsKey("id"));
+        assertEquals("200", namedParameters.get("id").getValue());
+        assertEquals(StandardSQLTypeName.INT64, 
namedParameters.get("id").getType(), "Integer parameter is detected as INT64");
+
+        assertTrue(namedParameters.containsKey("data"));
+        assertEquals("1", namedParameters.get("data").getValue());
+        assertEquals(StandardSQLTypeName.NUMERIC, 
namedParameters.get("data").getType(),
+                "BigDecimal parameter is detected as NUMERIC");
+    }
+
+    @Test
+    public void parametersAutomaticTypeConversionFallback() throws Exception {
+        Map<String, String> body = new HashMap<>();
+
+        Exchange exchange = createExchangeWithBody(body);
+        Message message = exchange.getMessage();
+        message.setHeader("id", "1");
+        message.setHeader("data", new CustomField("Hello"));
+
+        producer.process(exchange);
+
+        ArgumentCaptor<JobInfo> dataCaptor = 
ArgumentCaptor.forClass(JobInfo.class);
+        verify(bigquery).create(dataCaptor.capture());
+
+        QueryJobConfiguration request = 
dataCaptor.getValue().getConfiguration();
+        assertEquals(sql, request.getQuery());
+
+        Map<String, QueryParameterValue> namedParameters = 
request.getNamedParameters();
+        assertEquals(2, namedParameters.size());
+
+        assertTrue(namedParameters.containsKey("id"));
+        assertEquals("1", namedParameters.get("id").getValue());
+        assertEquals(StandardSQLTypeName.STRING, 
namedParameters.get("id").getType(), "String parameter is detected as STRING");
+
+        assertTrue(namedParameters.containsKey("data"));
+        assertEquals("CustomField{value='Hello'}", 
namedParameters.get("data").getValue());
+        assertEquals(StandardSQLTypeName.STRING, 
namedParameters.get("data").getType(),
+                "Unknown parameter fallbacks to STRING");
+    }
+
     @Test
     public void sendMessageWithJobIdHeader() throws Exception {
         Map<String, String> body = new HashMap<>();
@@ -134,4 +196,19 @@ public class GoogleBigQuerySQLProducerWithParamersTest 
extends GoogleBigQuerySQL
 
         assertThrows(RuntimeExchangeException.class, () -> 
producer.process(exchangeWithBody));
     }
+
+    private class CustomField {
+        private final String value;
+
+        public CustomField(String value) {
+            this.value = value;
+        }
+
+        @Override
+        public String toString() {
+            return "CustomField{" +
+                   "value='" + value + '\'' +
+                   '}';
+        }
+    }
 }
diff --git 
a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_19.adoc 
b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_19.adoc
index 9eb82a5c0ed..633757ea16f 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_19.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_19.adoc
@@ -63,3 +63,6 @@ The deprecated options were removed and should be replaced by 
the following opti
 |`writeTimeout`
 |===
 
+=== camel-google-bigquery-sql
+
+Parameters in form of `@name` are extracted from the body or message and their 
type is preserved and translated into corresponding 
`com.google.cloud.bigquery.StandardSQLTypeName`. See the 
https://cloud.google.com/java/docs/reference/google-cloud-bigquery/latest/com.google.cloud.bigquery.QueryParameterValue[documentation]
 for more information. (Conversion to StandardSQLTypeName.STRING was used for 
each type before)
\ No newline at end of file

Reply via email to