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/01/29 06:37:24 UTC
[camel] branch master updated (7396616 -> e74477d)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 7396616 Sync deps
new 20d0557 Camel-SQL: Underline the fact that when you set the datasource on endpoint it will be done only on the endpoint
new fc63a41 Regen docs
new e74477d Regen catalog
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/camel/catalog/components/sql.json | 2 +-
.../org/apache/camel/catalog/docs/sql-component.adoc | 2 +-
.../resources/org/apache/camel/component/sql/sql.json | 2 +-
components/camel-sql/src/main/docs/sql-component.adoc | 2 +-
.../apache/camel/component/sql/DefaultSqlEndpoint.java | 2 +-
.../endpoint/dsl/SqlEndpointBuilderFactory.java | 18 ++++++++++++------
docs/components/modules/ROOT/pages/sql-component.adoc | 2 +-
7 files changed, 18 insertions(+), 12 deletions(-)
[camel] 02/03: Regen docs
Posted by ac...@apache.org.
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 fc63a41b8ac05412204bac6e93f40d311ce0baf5
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Jan 29 07:34:08 2021 +0100
Regen docs
---
.../org/apache/camel/catalog/docs/sql-component.adoc | 2 +-
.../resources/org/apache/camel/component/sql/sql.json | 2 +-
components/camel-sql/src/main/docs/sql-component.adoc | 2 +-
.../endpoint/dsl/SqlEndpointBuilderFactory.java | 18 ++++++++++++------
docs/components/modules/ROOT/pages/sql-component.adoc | 2 +-
5 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sql-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sql-component.adoc
index b003120..2360151 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sql-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sql-component.adoc
@@ -161,7 +161,7 @@ with the following path and query parameters:
|===
| Name | Description | Default | Type
| *allowNamedParameters* (common) | Whether to allow using named parameters in the queries. | true | boolean
-| *dataSource* (common) | Sets the DataSource to use to communicate with the database. | | DataSource
+| *dataSource* (common) | Sets the DataSource to use to communicate with the databaset at endpoint level. | | DataSource
| *dataSourceRef* (common) | *Deprecated* Sets the reference to a DataSource to lookup from the registry, to use for communicating with the database. | | String
| *outputClass* (common) | Specify the full package and class name to use as conversion when outputType=SelectOne. | | String
| *outputHeader* (common) | Store the query result in a header instead of the message body. By default, outputHeader == null and the query result is stored in the message body, any existing content in the message body is discarded. If outputHeader is set, the value is used as the name of the header to store the query result and the original message body is preserved. | | String
diff --git a/components/camel-sql/src/generated/resources/org/apache/camel/component/sql/sql.json b/components/camel-sql/src/generated/resources/org/apache/camel/component/sql/sql.json
index e99d371..03b4a31 100644
--- a/components/camel-sql/src/generated/resources/org/apache/camel/component/sql/sql.json
+++ b/components/camel-sql/src/generated/resources/org/apache/camel/component/sql/sql.json
@@ -31,7 +31,7 @@
"properties": {
"query": { "kind": "path", "displayName": "Query", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Sets the SQL query to perform. You can externalize the query by using file: or classpath: as prefix and specify the location of the file." },
"allowNamedParameters": { "kind": "parameter", "displayName": "Allow Named Parameters", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow using named parameters in the queries." },
- "dataSource": { "kind": "parameter", "displayName": "Data Source", "group": "common", "label": "", "required": false, "type": "object", "javaType": "javax.sql.DataSource", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the DataSource to use to communicate with the database." },
+ "dataSource": { "kind": "parameter", "displayName": "Data Source", "group": "common", "label": "", "required": false, "type": "object", "javaType": "javax.sql.DataSource", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the DataSource to use to communicate with the databaset at endpoint level." },
"dataSourceRef": { "kind": "parameter", "displayName": "Data Source Ref", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Sets the reference to a DataSource to lookup from the registry, to use for communicating with the database." },
"outputClass": { "kind": "parameter", "displayName": "Output Class", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Specify the full package and class name to use as conversion when outputType=SelectOne." },
"outputHeader": { "kind": "parameter", "displayName": "Output Header", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Store the query result in a header instead of the message body. By default, outputHeader == null and the query result is stored in the message body, any existing content in the message body is discarded. If outputHeader is set, the value is u [...]
diff --git a/components/camel-sql/src/main/docs/sql-component.adoc b/components/camel-sql/src/main/docs/sql-component.adoc
index b003120..2360151 100644
--- a/components/camel-sql/src/main/docs/sql-component.adoc
+++ b/components/camel-sql/src/main/docs/sql-component.adoc
@@ -161,7 +161,7 @@ with the following path and query parameters:
|===
| Name | Description | Default | Type
| *allowNamedParameters* (common) | Whether to allow using named parameters in the queries. | true | boolean
-| *dataSource* (common) | Sets the DataSource to use to communicate with the database. | | DataSource
+| *dataSource* (common) | Sets the DataSource to use to communicate with the databaset at endpoint level. | | DataSource
| *dataSourceRef* (common) | *Deprecated* Sets the reference to a DataSource to lookup from the registry, to use for communicating with the database. | | String
| *outputClass* (common) | Specify the full package and class name to use as conversion when outputType=SelectOne. | | String
| *outputHeader* (common) | Store the query result in a header instead of the message body. By default, outputHeader == null and the query result is stored in the message body, any existing content in the message body is discarded. If outputHeader is set, the value is used as the name of the header to store the query result and the original message body is preserved. | | String
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SqlEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SqlEndpointBuilderFactory.java
index d749b7e..a9f63ea 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SqlEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SqlEndpointBuilderFactory.java
@@ -80,7 +80,8 @@ public interface SqlEndpointBuilderFactory {
return this;
}
/**
- * Sets the DataSource to use to communicate with the database.
+ * Sets the DataSource to use to communicate with the databaset at
+ * endpoint level.
*
* The option is a: <code>javax.sql.DataSource</code> type.
*
@@ -94,7 +95,8 @@ public interface SqlEndpointBuilderFactory {
return this;
}
/**
- * Sets the DataSource to use to communicate with the database.
+ * Sets the DataSource to use to communicate with the databaset at
+ * endpoint level.
*
* The option will be converted to a
* <code>javax.sql.DataSource</code> type.
@@ -1458,7 +1460,8 @@ public interface SqlEndpointBuilderFactory {
return this;
}
/**
- * Sets the DataSource to use to communicate with the database.
+ * Sets the DataSource to use to communicate with the databaset at
+ * endpoint level.
*
* The option is a: <code>javax.sql.DataSource</code> type.
*
@@ -1472,7 +1475,8 @@ public interface SqlEndpointBuilderFactory {
return this;
}
/**
- * Sets the DataSource to use to communicate with the database.
+ * Sets the DataSource to use to communicate with the databaset at
+ * endpoint level.
*
* The option will be converted to a
* <code>javax.sql.DataSource</code> type.
@@ -2045,7 +2049,8 @@ public interface SqlEndpointBuilderFactory {
return this;
}
/**
- * Sets the DataSource to use to communicate with the database.
+ * Sets the DataSource to use to communicate with the databaset at
+ * endpoint level.
*
* The option is a: <code>javax.sql.DataSource</code> type.
*
@@ -2059,7 +2064,8 @@ public interface SqlEndpointBuilderFactory {
return this;
}
/**
- * Sets the DataSource to use to communicate with the database.
+ * Sets the DataSource to use to communicate with the databaset at
+ * endpoint level.
*
* The option will be converted to a
* <code>javax.sql.DataSource</code> type.
diff --git a/docs/components/modules/ROOT/pages/sql-component.adoc b/docs/components/modules/ROOT/pages/sql-component.adoc
index 64ffd36..2d5c9f8 100644
--- a/docs/components/modules/ROOT/pages/sql-component.adoc
+++ b/docs/components/modules/ROOT/pages/sql-component.adoc
@@ -163,7 +163,7 @@ with the following path and query parameters:
|===
| Name | Description | Default | Type
| *allowNamedParameters* (common) | Whether to allow using named parameters in the queries. | true | boolean
-| *dataSource* (common) | Sets the DataSource to use to communicate with the database. | | DataSource
+| *dataSource* (common) | Sets the DataSource to use to communicate with the databaset at endpoint level. | | DataSource
| *dataSourceRef* (common) | *Deprecated* Sets the reference to a DataSource to lookup from the registry, to use for communicating with the database. | | String
| *outputClass* (common) | Specify the full package and class name to use as conversion when outputType=SelectOne. | | String
| *outputHeader* (common) | Store the query result in a header instead of the message body. By default, outputHeader == null and the query result is stored in the message body, any existing content in the message body is discarded. If outputHeader is set, the value is used as the name of the header to store the query result and the original message body is preserved. | | String
[camel] 01/03: Camel-SQL: Underline the fact that when you set the
datasource on endpoint it will be done only on the endpoint
Posted by ac...@apache.org.
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 20d05579beeb206ef9f81a9abf80770ed2208b62
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Jan 29 07:28:49 2021 +0100
Camel-SQL: Underline the fact that when you set the datasource on endpoint it will be done only on the endpoint
---
.../main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java
index a086d8f..0b6a9a0 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java
@@ -44,7 +44,7 @@ public abstract class DefaultSqlEndpoint extends DefaultPollingEndpoint {
@UriParam(description = "Sets the reference to a DataSource to lookup from the registry, to use for communicating with the database.")
@Deprecated
private String dataSourceRef;
- @UriParam(description = "Sets the DataSource to use to communicate with the database.")
+ @UriParam(description = "Sets the DataSource to use to communicate with the databaset at endpoint level.")
private DataSource dataSource;
@UriParam(label = "consumer",
description = "Enables or disables transaction. If enabled then if processing an exchange failed then the consumer"
[camel] 03/03: Regen catalog
Posted by ac...@apache.org.
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 e74477d90b99a41240e228a981d633150d5f40a2
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Jan 29 07:36:48 2021 +0100
Regen catalog
---
.../generated/resources/org/apache/camel/catalog/components/sql.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sql.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sql.json
index e99d371..03b4a31 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sql.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sql.json
@@ -31,7 +31,7 @@
"properties": {
"query": { "kind": "path", "displayName": "Query", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Sets the SQL query to perform. You can externalize the query by using file: or classpath: as prefix and specify the location of the file." },
"allowNamedParameters": { "kind": "parameter", "displayName": "Allow Named Parameters", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow using named parameters in the queries." },
- "dataSource": { "kind": "parameter", "displayName": "Data Source", "group": "common", "label": "", "required": false, "type": "object", "javaType": "javax.sql.DataSource", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the DataSource to use to communicate with the database." },
+ "dataSource": { "kind": "parameter", "displayName": "Data Source", "group": "common", "label": "", "required": false, "type": "object", "javaType": "javax.sql.DataSource", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the DataSource to use to communicate with the databaset at endpoint level." },
"dataSourceRef": { "kind": "parameter", "displayName": "Data Source Ref", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Sets the reference to a DataSource to lookup from the registry, to use for communicating with the database." },
"outputClass": { "kind": "parameter", "displayName": "Output Class", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Specify the full package and class name to use as conversion when outputType=SelectOne." },
"outputHeader": { "kind": "parameter", "displayName": "Output Header", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Store the query result in a header instead of the message body. By default, outputHeader == null and the query result is stored in the message body, any existing content in the message body is discarded. If outputHeader is set, the value is u [...]