You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2021/03/05 08:31:35 UTC
[camel] 01/03: CAMEL-16308 - Camel-Google-bigquery-sql: Rename
query parameter in bigquery sql component
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9a5b604d681d79a70f5cc731b5ec55accb2bcb12
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Mar 5 09:22:38 2021 +0100
CAMEL-16308 - Camel-Google-bigquery-sql: Rename query parameter in bigquery sql component
---
.../google/bigquery/sql/GoogleBigQuerySQLConfiguration.java | 12 ++++++------
.../google/bigquery/sql/GoogleBigQuerySQLEndpoint.java | 2 +-
.../google/bigquery/sql/GoogleBigQuerySQLProducer.java | 2 +-
.../bigquery/unit/sql/GoogleBigQuerySQLComponentTest.java | 4 ++--
.../bigquery/unit/sql/GoogleBigQuerySQLProducerBaseTest.java | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLConfiguration.java b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLConfiguration.java
index ab4fd55..6287405 100644
--- a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLConfiguration.java
+++ b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLConfiguration.java
@@ -33,7 +33,7 @@ public class GoogleBigQuerySQLConfiguration {
private String projectId;
@UriPath(label = "common", description = "BigQuery standard SQL query")
@Metadata(required = true)
- private String query;
+ private String queryString;
public void parseRemaining(String remaining) {
int indexOfColon = remaining.indexOf(':');
@@ -43,7 +43,7 @@ public class GoogleBigQuerySQLConfiguration {
}
projectId = remaining.substring(0, indexOfColon);
- query = remaining.substring(indexOfColon + 1);
+ queryString = remaining.substring(indexOfColon + 1);
}
/**
@@ -57,12 +57,12 @@ public class GoogleBigQuerySQLConfiguration {
this.connectionFactory = connectionFactory;
}
- public String getQuery() {
- return query;
+ public String getQueryString() {
+ return queryString;
}
- public GoogleBigQuerySQLConfiguration setQuery(String query) {
- this.query = query;
+ public GoogleBigQuerySQLConfiguration setQueryString(String queryString) {
+ this.queryString = queryString;
return this;
}
diff --git a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLEndpoint.java b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLEndpoint.java
index bde60e3..5549a3c 100644
--- a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLEndpoint.java
+++ b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLEndpoint.java
@@ -37,7 +37,7 @@ import org.apache.camel.support.DefaultEndpoint;
* handled by Camel.
*/
@UriEndpoint(firstVersion = "2.23.0", scheme = "google-bigquery-sql", title = "Google BigQuery Standard SQL",
- syntax = "google-bigquery-sql:projectId:query", label = "cloud,messaging", producerOnly = true)
+ syntax = "google-bigquery-sql:projectId:queryString", label = "cloud,messaging", producerOnly = true)
public class GoogleBigQuerySQLEndpoint extends DefaultEndpoint {
@UriParam
diff --git a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLProducer.java b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLProducer.java
index 1690956..7ab6b7a 100644
--- a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLProducer.java
+++ b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLProducer.java
@@ -166,7 +166,7 @@ public class GoogleBigQuerySQLProducer extends DefaultProducer {
protected void doStart() throws Exception {
super.doStart();
String placeholder = ":#";
- query = SqlHelper.resolveQuery(getEndpoint().getCamelContext(), configuration.getQuery(), placeholder);
+ query = SqlHelper.resolveQuery(getEndpoint().getCamelContext(), configuration.getQueryString(), placeholder);
queryParameterNames = SqlHelper.extractParameterNames(query);
}
}
diff --git a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLComponentTest.java b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLComponentTest.java
index aba57e6..e05d002 100644
--- a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLComponentTest.java
+++ b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLComponentTest.java
@@ -33,7 +33,7 @@ public class GoogleBigQuerySQLComponentTest extends CamelTestSupport {
= (GoogleBigQuerySQLEndpoint) new GoogleBigQuerySQLComponent(context).createEndpoint(uri);
assertEquals("myproject", endpoint.getConfiguration().getProjectId());
- assertEquals("insert into testDatasetId.testTableId(id) values(1)", endpoint.getConfiguration().getQuery());
+ assertEquals("insert into testDatasetId.testTableId(id) values(1)", endpoint.getConfiguration().getQueryString());
}
@Test
@@ -44,6 +44,6 @@ public class GoogleBigQuerySQLComponentTest extends CamelTestSupport {
= (GoogleBigQuerySQLEndpoint) new GoogleBigQuerySQLComponent(context).createEndpoint(uri);
assertEquals("myproject", endpoint.getConfiguration().getProjectId());
- assertEquals("classpath:sql/delete.sql", endpoint.getConfiguration().getQuery());
+ assertEquals("classpath:sql/delete.sql", endpoint.getConfiguration().getQueryString());
}
}
diff --git a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerBaseTest.java b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerBaseTest.java
index 0614d86..0c99830 100644
--- a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerBaseTest.java
+++ b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerBaseTest.java
@@ -40,7 +40,7 @@ public class GoogleBigQuerySQLProducerBaseTest extends CamelTestSupport {
protected GoogleBigQuerySQLProducer createAndStartProducer() throws Exception {
configuration.setProjectId(projectId);
- configuration.setQuery(sql);
+ configuration.setQueryString(sql);
GoogleBigQuerySQLProducer sqlProducer = new GoogleBigQuerySQLProducer(bigquery, endpoint, configuration);
sqlProducer.start();