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 ba1bfcc CAMEL-16731: Fixed camel-sql doc mistake about dataSource.
Remove the deprecated dataSourceRef option.
ba1bfcc is described below
commit ba1bfccc26765afa6e7b338121f51e825d451fff
Author: Claus Ibsen <[email protected]>
AuthorDate: Fri Jun 18 12:29:03 2021 +0200
CAMEL-16731: Fixed camel-sql doc mistake about dataSource. Remove the
deprecated dataSourceRef option.
---
.../org/apache/camel/catalog/components/elsql.json | 3 +-
.../org/apache/camel/catalog/components/sql.json | 3 +-
.../apache/camel/catalog/docs/elsql-component.adoc | 5 +-
.../apache/camel/catalog/docs/sql-component.adoc | 9 ++-
.../component/elsql/ElsqlEndpointConfigurer.java | 6 --
.../component/elsql/ElsqlEndpointUriFactory.java | 3 +-
.../org/apache/camel/component/elsql/elsql.json | 3 +-
.../camel-elsql/src/main/docs/elsql-component.adoc | 5 +-
.../camel/component/elsql/ElsqlComponent.java | 11 ++--
.../camel/component/elsql/ElsqlEndpoint.java | 18 +-----
.../camel/component/sql/SqlEndpointConfigurer.java | 6 --
.../camel/component/sql/SqlEndpointUriFactory.java | 3 +-
.../org/apache/camel/component/sql/sql.json | 3 +-
.../camel-sql/src/main/docs/sql-component.adoc | 9 ++-
.../camel/component/sql/DefaultSqlEndpoint.java | 16 +-----
.../apache/camel/component/sql/SqlComponent.java | 8 +--
.../component/sql/stored/SqlStoredComponent.java | 5 ++
.../endpoint/dsl/ElsqlEndpointBuilderFactory.java | 66 ++++------------------
.../endpoint/dsl/SqlEndpointBuilderFactory.java | 60 ++------------------
.../modules/ROOT/pages/elsql-component.adoc | 5 +-
.../modules/ROOT/pages/sql-component.adoc | 9 ++-
21 files changed, 56 insertions(+), 200 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/elsql.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/elsql.json
index 0e66239..47f6ae5 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/elsql.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/elsql.json
@@ -35,8 +35,7 @@
"resourceUri": { "kind": "path", "displayName": "Resource Uri", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "The resource file which contains the elsql SQL statements to
use. You can specify multiple resources separated by comma. The resources are
loaded on the classpath by default, you can prefix with file: to load from file
system. Notice you can set thi [...]
"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." },
"databaseVendor": { "kind": "parameter", "displayName": "Database Vendor",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.component.elsql.ElSqlDatabaseVendor", "enum": [
"Default", "Postgres", "HSql", "MySql", "Oracle", "SqlServer2008", "Veritca" ],
"deprecated": false, "autowired": false, "secret": false, "description": "To
use a vendor specific com.opengamma.elsql.ElSqlConfig" },
- "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." },
- "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." },
+ "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 at endpoint level." },
"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 [...]
"outputType": { "kind": "parameter", "displayName": "Output Type",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.component.sql.SqlOutputType", "enum": [
"SelectOne", "SelectList", "StreamList" ], "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "SelectList", "description": "Make the
output of consumer or producer to SelectList as List of Map, or SelectOne as
single Java object in the following way: a) If th [...]
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 a7b341b..3b9e04d 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,8 +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 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." },
+ "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 at endpoint level." },
"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 [...]
"outputType": { "kind": "parameter", "displayName": "Output Type",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.component.sql.SqlOutputType", "enum": [
"SelectOne", "SelectList", "StreamList" ], "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "SelectList", "description": "Make the
output of consumer or producer to SelectList as List of Map, or SelectOne as
single Java object in the following way: a) If th [...]
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/elsql-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/elsql-component.adoc
index 33dc3d9..1485a1a 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/elsql-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/elsql-component.adoc
@@ -98,7 +98,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (48 parameters):
+=== Query Parameters (47 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -106,8 +106,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
| *databaseVendor* (common) | To use a vendor specific
com.opengamma.elsql.ElSqlConfig. There are 7 enums and the value can be one of:
Default, Postgres, HSql, MySql, Oracle, SqlServer2008, Veritca | |
ElSqlDatabaseVendor
-| *dataSource* (common) | Sets the DataSource to use to communicate with the
database. | | DataSource
-| *dataSourceRef* (common) | *Deprecated* Sets the reference to a DataSource
to lookup from the registry, to use for communicating with the database. | |
String
+| *dataSource* (common) | Sets the DataSource to use to communicate with the
database at endpoint level. | | DataSource
| *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
| *outputType* (common) | Make the output of consumer or producer to
SelectList as List of Map, or SelectOne as single Java object in the following
way: a) If the query has only single column, then that JDBC Column object is
returned. (such as SELECT COUNT( ) FROM PROJECT will return a Long object. b)
If the query has more than one column, then it will return a Map of that
result. c) If the outputClass is set, then it will convert the query result
into an Java bean object by calling all [...]
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 af5a795..fa009e4 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
@@ -154,15 +154,14 @@ with the following path and query parameters:
|===
-=== Query Parameters (46 parameters):
+=== Query Parameters (45 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| 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
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
+| *dataSource* (common) | Sets the DataSource to use to communicate with the
database at endpoint level. | | DataSource
| *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
| *outputType* (common) | Make the output of consumer or producer to
SelectList as List of Map, or SelectOne as single Java object in the following
way: a) If the query has only single column, then that JDBC Column object is
returned. (such as SELECT COUNT( ) FROM PROJECT will return a Long object. b)
If the query has more than one column, then it will return a Map of that
result. c) If the outputClass is set, then it will convert the query result
into an Java bean object by calling all [...]
@@ -341,11 +340,11 @@
https://gitbox.apache.org/repos/asf?p=camel.git;a=blob;f=components/camel-sql/sr
== DataSource
-You can now set a reference to a `DataSource` in the URI directly:
+You can set a reference to a `DataSource` in the URI directly:
[source,text]
----
-sql:select * from table where id=# order by name?dataSource=myDS
+sql:select * from table where id=# order by name?dataSource=#myDS
----
== Using named parameters
diff --git
a/components/camel-elsql/src/generated/java/org/apache/camel/component/elsql/ElsqlEndpointConfigurer.java
b/components/camel-elsql/src/generated/java/org/apache/camel/component/elsql/ElsqlEndpointConfigurer.java
index b5ebb28..327c806 100644
---
a/components/camel-elsql/src/generated/java/org/apache/camel/component/elsql/ElsqlEndpointConfigurer.java
+++
b/components/camel-elsql/src/generated/java/org/apache/camel/component/elsql/ElsqlEndpointConfigurer.java
@@ -38,8 +38,6 @@ public class ElsqlEndpointConfigurer extends
PropertyConfigurerSupport implement
case "bridgeErrorHandler":
target.setBridgeErrorHandler(property(camelContext, boolean.class, value));
return true;
case "datasource":
case "dataSource": target.setDataSource(property(camelContext,
javax.sql.DataSource.class, value)); return true;
- case "datasourceref":
- case "dataSourceRef": target.setDataSourceRef(property(camelContext,
java.lang.String.class, value)); return true;
case "databasevendor":
case "databaseVendor": target.setDatabaseVendor(property(camelContext,
org.apache.camel.component.elsql.ElSqlDatabaseVendor.class, value)); return
true;
case "delay": target.setDelay(property(camelContext, long.class,
value)); return true;
@@ -133,8 +131,6 @@ public class ElsqlEndpointConfigurer extends
PropertyConfigurerSupport implement
case "bridgeErrorHandler": return boolean.class;
case "datasource":
case "dataSource": return javax.sql.DataSource.class;
- case "datasourceref":
- case "dataSourceRef": return java.lang.String.class;
case "databasevendor":
case "databaseVendor": return
org.apache.camel.component.elsql.ElSqlDatabaseVendor.class;
case "delay": return long.class;
@@ -229,8 +225,6 @@ public class ElsqlEndpointConfigurer extends
PropertyConfigurerSupport implement
case "bridgeErrorHandler": return target.isBridgeErrorHandler();
case "datasource":
case "dataSource": return target.getDataSource();
- case "datasourceref":
- case "dataSourceRef": return target.getDataSourceRef();
case "databasevendor":
case "databaseVendor": return target.getDatabaseVendor();
case "delay": return target.getDelay();
diff --git
a/components/camel-elsql/src/generated/java/org/apache/camel/component/elsql/ElsqlEndpointUriFactory.java
b/components/camel-elsql/src/generated/java/org/apache/camel/component/elsql/ElsqlEndpointUriFactory.java
index 83fedd4..b205b17 100644
---
a/components/camel-elsql/src/generated/java/org/apache/camel/component/elsql/ElsqlEndpointUriFactory.java
+++
b/components/camel-elsql/src/generated/java/org/apache/camel/component/elsql/ElsqlEndpointUriFactory.java
@@ -20,7 +20,7 @@ public class ElsqlEndpointUriFactory extends
org.apache.camel.support.component.
private static final Set<String> PROPERTY_NAMES;
private static final Set<String> SECRET_PROPERTY_NAMES;
static {
- Set<String> props = new HashSet<>(50);
+ Set<String> props = new HashSet<>(49);
props.add("initialDelay");
props.add("allowNamedParameters");
props.add("usePlaceholder");
@@ -49,7 +49,6 @@ public class ElsqlEndpointUriFactory extends
org.apache.camel.support.component.
props.add("onConsume");
props.add("onConsumeFailed");
props.add("useMessageBodyForSql");
- props.add("dataSourceRef");
props.add("outputType");
props.add("transacted");
props.add("useIterator");
diff --git
a/components/camel-elsql/src/generated/resources/org/apache/camel/component/elsql/elsql.json
b/components/camel-elsql/src/generated/resources/org/apache/camel/component/elsql/elsql.json
index 0e66239..47f6ae5 100644
---
a/components/camel-elsql/src/generated/resources/org/apache/camel/component/elsql/elsql.json
+++
b/components/camel-elsql/src/generated/resources/org/apache/camel/component/elsql/elsql.json
@@ -35,8 +35,7 @@
"resourceUri": { "kind": "path", "displayName": "Resource Uri", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "The resource file which contains the elsql SQL statements to
use. You can specify multiple resources separated by comma. The resources are
loaded on the classpath by default, you can prefix with file: to load from file
system. Notice you can set thi [...]
"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." },
"databaseVendor": { "kind": "parameter", "displayName": "Database Vendor",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.component.elsql.ElSqlDatabaseVendor", "enum": [
"Default", "Postgres", "HSql", "MySql", "Oracle", "SqlServer2008", "Veritca" ],
"deprecated": false, "autowired": false, "secret": false, "description": "To
use a vendor specific com.opengamma.elsql.ElSqlConfig" },
- "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." },
- "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." },
+ "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 at endpoint level." },
"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 [...]
"outputType": { "kind": "parameter", "displayName": "Output Type",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.component.sql.SqlOutputType", "enum": [
"SelectOne", "SelectList", "StreamList" ], "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "SelectList", "description": "Make the
output of consumer or producer to SelectList as List of Map, or SelectOne as
single Java object in the following way: a) If th [...]
diff --git a/components/camel-elsql/src/main/docs/elsql-component.adoc
b/components/camel-elsql/src/main/docs/elsql-component.adoc
index 33dc3d9..1485a1a 100644
--- a/components/camel-elsql/src/main/docs/elsql-component.adoc
+++ b/components/camel-elsql/src/main/docs/elsql-component.adoc
@@ -98,7 +98,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (48 parameters):
+=== Query Parameters (47 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -106,8 +106,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
| *databaseVendor* (common) | To use a vendor specific
com.opengamma.elsql.ElSqlConfig. There are 7 enums and the value can be one of:
Default, Postgres, HSql, MySql, Oracle, SqlServer2008, Veritca | |
ElSqlDatabaseVendor
-| *dataSource* (common) | Sets the DataSource to use to communicate with the
database. | | DataSource
-| *dataSourceRef* (common) | *Deprecated* Sets the reference to a DataSource
to lookup from the registry, to use for communicating with the database. | |
String
+| *dataSource* (common) | Sets the DataSource to use to communicate with the
database at endpoint level. | | DataSource
| *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
| *outputType* (common) | Make the output of consumer or producer to
SelectList as List of Map, or SelectOne as single Java object in the following
way: a) If the query has only single column, then that JDBC Column object is
returned. (such as SELECT COUNT( ) FROM PROJECT will return a Long object. b)
If the query has more than one column, then it will return a Map of that
result. c) If the outputClass is set, then it will convert the query result
into an Java bean object by calling all [...]
diff --git
a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlComponent.java
b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlComponent.java
index 722279c..f49eb75 100644
---
a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlComponent.java
+++
b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlComponent.java
@@ -24,15 +24,18 @@ import com.opengamma.elsql.ElSqlConfig;
import org.apache.camel.Endpoint;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.annotations.Component;
-import org.apache.camel.support.CamelContextHelper;
import org.apache.camel.support.DefaultComponent;
import org.apache.camel.support.PropertyBindingSupport;
import org.apache.camel.util.PropertiesHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
@Component("elsql")
public class ElsqlComponent extends DefaultComponent {
+ private static final Logger LOG =
LoggerFactory.getLogger(ElsqlComponent.class);
+
@Metadata
private ElSqlDatabaseVendor databaseVendor;
@Metadata
@@ -54,10 +57,6 @@ public class ElsqlComponent extends DefaultComponent {
if (ds != null) {
target = ds;
}
- String dataSourceRef = getAndRemoveParameter(parameters,
"dataSourceRef", String.class);
- if (target == null && dataSourceRef != null) {
- target = CamelContextHelper.mandatoryLookup(getCamelContext(),
dataSourceRef, DataSource.class);
- }
if (target == null) {
// fallback and use component
target = getDataSource();
@@ -65,6 +64,7 @@ public class ElsqlComponent extends DefaultComponent {
if (target == null) {
throw new IllegalArgumentException("DataSource must be
configured");
}
+ LOG.trace("Using DataSource: {}", target);
NamedParameterJdbcTemplate jdbcTemplate = new
NamedParameterJdbcTemplate(target);
Map<String, Object> params =
PropertiesHelper.extractProperties(parameters, "template.");
@@ -97,7 +97,6 @@ public class ElsqlComponent extends DefaultComponent {
endpoint.setElSqlConfig(elSqlConfig);
endpoint.setDatabaseVendor(databaseVendor);
endpoint.setDataSource(target);
- endpoint.setDataSourceRef(dataSourceRef);
endpoint.setOnConsume(onConsume);
endpoint.setOnConsumeFailed(onConsumeFailed);
endpoint.setOnConsumeBatchComplete(onConsumeBatchComplete);
diff --git
a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlEndpoint.java
b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlEndpoint.java
index 22b9eaf..88572cc 100644
---
a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlEndpoint.java
+++
b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlEndpoint.java
@@ -65,8 +65,6 @@ public class ElsqlEndpoint extends DefaultSqlEndpoint {
@UriPath
private String resourceUri;
@UriParam
- private DataSource dataSource;
- @UriParam
private ElSqlDatabaseVendor databaseVendor;
@UriParam(label = "advanced")
private ElSqlConfig elSqlConfig;
@@ -78,7 +76,7 @@ public class ElsqlEndpoint extends DefaultSqlEndpoint {
this.elsqlName = elsqlName;
this.resourceUri = resourceUri;
this.namedJdbcTemplate = namedJdbcTemplate;
- this.dataSource = dataSource;
+ setDataSource(dataSource);
}
@Override
@@ -110,7 +108,7 @@ public class ElsqlEndpoint extends DefaultSqlEndpoint {
final SqlPrepareStatementStrategy prepareStrategy =
getPrepareStatementStrategy() != null
? getPrepareStatementStrategy() : new
DefaultSqlPrepareStatementStrategy(getSeparator());
final ElsqlProducer result
- = new ElsqlProducer(this, elSql, elsqlName, namedJdbcTemplate,
dataSource, prepareStrategy, isBatch());
+ = new ElsqlProducer(this, elSql, elsqlName, namedJdbcTemplate,
getDataSource(), prepareStrategy, isBatch());
return result;
}
@@ -200,16 +198,4 @@ public class ElsqlEndpoint extends DefaultSqlEndpoint {
this.resourceUri = resourceUri;
}
- @Override
- public DataSource getDataSource() {
- return dataSource;
- }
-
- /**
- * Sets the DataSource to use to communicate with the database.
- */
- @Override
- public void setDataSource(final DataSource dataSource) {
- this.dataSource = dataSource;
- }
}
diff --git
a/components/camel-sql/src/generated/java/org/apache/camel/component/sql/SqlEndpointConfigurer.java
b/components/camel-sql/src/generated/java/org/apache/camel/component/sql/SqlEndpointConfigurer.java
index e316c71..75da018 100644
---
a/components/camel-sql/src/generated/java/org/apache/camel/component/sql/SqlEndpointConfigurer.java
+++
b/components/camel-sql/src/generated/java/org/apache/camel/component/sql/SqlEndpointConfigurer.java
@@ -38,8 +38,6 @@ public class SqlEndpointConfigurer extends
PropertyConfigurerSupport implements
case "bridgeErrorHandler":
target.setBridgeErrorHandler(property(camelContext, boolean.class, value));
return true;
case "datasource":
case "dataSource": target.setDataSource(property(camelContext,
javax.sql.DataSource.class, value)); return true;
- case "datasourceref":
- case "dataSourceRef": target.setDataSourceRef(property(camelContext,
java.lang.String.class, value)); return true;
case "delay": target.setDelay(property(camelContext, long.class,
value)); return true;
case "exceptionhandler":
case "exceptionHandler":
target.setExceptionHandler(property(camelContext,
org.apache.camel.spi.ExceptionHandler.class, value)); return true;
@@ -129,8 +127,6 @@ public class SqlEndpointConfigurer extends
PropertyConfigurerSupport implements
case "bridgeErrorHandler": return boolean.class;
case "datasource":
case "dataSource": return javax.sql.DataSource.class;
- case "datasourceref":
- case "dataSourceRef": return java.lang.String.class;
case "delay": return long.class;
case "exceptionhandler":
case "exceptionHandler": return
org.apache.camel.spi.ExceptionHandler.class;
@@ -221,8 +217,6 @@ public class SqlEndpointConfigurer extends
PropertyConfigurerSupport implements
case "bridgeErrorHandler": return target.isBridgeErrorHandler();
case "datasource":
case "dataSource": return target.getDataSource();
- case "datasourceref":
- case "dataSourceRef": return target.getDataSourceRef();
case "delay": return target.getDelay();
case "exceptionhandler":
case "exceptionHandler": return target.getExceptionHandler();
diff --git
a/components/camel-sql/src/generated/java/org/apache/camel/component/sql/SqlEndpointUriFactory.java
b/components/camel-sql/src/generated/java/org/apache/camel/component/sql/SqlEndpointUriFactory.java
index 07599e0..2be37b4 100644
---
a/components/camel-sql/src/generated/java/org/apache/camel/component/sql/SqlEndpointUriFactory.java
+++
b/components/camel-sql/src/generated/java/org/apache/camel/component/sql/SqlEndpointUriFactory.java
@@ -20,13 +20,12 @@ public class SqlEndpointUriFactory extends
org.apache.camel.support.component.En
private static final Set<String> PROPERTY_NAMES;
private static final Set<String> SECRET_PROPERTY_NAMES;
static {
- Set<String> props = new HashSet<>(47);
+ Set<String> props = new HashSet<>(46);
props.add("backoffMultiplier");
props.add("breakBatchOnConsumeFail");
props.add("onConsume");
props.add("onConsumeFailed");
props.add("useMessageBodyForSql");
- props.add("dataSourceRef");
props.add("outputType");
props.add("transacted");
props.add("initialDelay");
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 a7b341b..3b9e04d 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,8 +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 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." },
+ "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 at endpoint level." },
"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 [...]
"outputType": { "kind": "parameter", "displayName": "Output Type",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.component.sql.SqlOutputType", "enum": [
"SelectOne", "SelectList", "StreamList" ], "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "SelectList", "description": "Make the
output of consumer or producer to SelectList as List of Map, or SelectOne as
single Java object in the following way: a) If th [...]
diff --git a/components/camel-sql/src/main/docs/sql-component.adoc
b/components/camel-sql/src/main/docs/sql-component.adoc
index af5a795..fa009e4 100644
--- a/components/camel-sql/src/main/docs/sql-component.adoc
+++ b/components/camel-sql/src/main/docs/sql-component.adoc
@@ -154,15 +154,14 @@ with the following path and query parameters:
|===
-=== Query Parameters (46 parameters):
+=== Query Parameters (45 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| 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
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
+| *dataSource* (common) | Sets the DataSource to use to communicate with the
database at endpoint level. | | DataSource
| *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
| *outputType* (common) | Make the output of consumer or producer to
SelectList as List of Map, or SelectOne as single Java object in the following
way: a) If the query has only single column, then that JDBC Column object is
returned. (such as SELECT COUNT( ) FROM PROJECT will return a Long object. b)
If the query has more than one column, then it will return a Map of that
result. c) If the outputClass is set, then it will convert the query result
into an Java bean object by calling all [...]
@@ -341,11 +340,11 @@
https://gitbox.apache.org/repos/asf?p=camel.git;a=blob;f=components/camel-sql/sr
== DataSource
-You can now set a reference to a `DataSource` in the URI directly:
+You can set a reference to a `DataSource` in the URI directly:
[source,text]
----
-sql:select * from table where id=# order by name?dataSource=myDS
+sql:select * from table where id=# order by name?dataSource=#myDS
----
== Using named parameters
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 0b6a9a0..207ee0e 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
@@ -41,10 +41,7 @@ import
org.springframework.jdbc.core.RowMapperResultSetExtractor;
public abstract class DefaultSqlEndpoint extends DefaultPollingEndpoint {
private JdbcTemplate jdbcTemplate;
- @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 databaset at endpoint level.")
+ @UriParam(description = "Sets the DataSource to use to communicate with
the database 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"
@@ -358,17 +355,6 @@ public abstract class DefaultSqlEndpoint extends
DefaultPollingEndpoint {
this.useMessageBodyForSql = useMessageBodyForSql;
}
- public String getDataSourceRef() {
- return dataSourceRef;
- }
-
- /**
- * Sets the reference to a DataSource to lookup from the registry, to use
for communicating with the database.
- */
- public void setDataSourceRef(String dataSourceRef) {
- this.dataSourceRef = dataSourceRef;
- }
-
public DataSource getDataSource() {
return dataSource;
}
diff --git
a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java
b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java
index d974ce6..cd7880f 100644
---
a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java
+++
b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java
@@ -25,7 +25,6 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.annotations.Component;
-import org.apache.camel.support.CamelContextHelper;
import org.apache.camel.support.DefaultComponent;
import org.apache.camel.support.PropertyBindingSupport;
import org.apache.camel.util.PropertiesHelper;
@@ -70,10 +69,6 @@ public class SqlComponent extends DefaultComponent {
if (ds != null) {
target = ds;
}
- String dataSourceRef = getAndRemoveParameter(parameters,
"dataSourceRef", String.class);
- if (target == null && dataSourceRef != null) {
- target = CamelContextHelper.mandatoryLookup(getCamelContext(),
dataSourceRef, DataSource.class);
- }
if (target == null) {
// fallback and use component
target = dataSource;
@@ -91,7 +86,7 @@ public class SqlComponent extends DefaultComponent {
if (target == null) {
throw new IllegalArgumentException("DataSource must be
configured");
}
- LOG.debug("Using default DataSource discovered from registry: {}",
target);
+ LOG.trace("Using DataSource: {}", target);
String parameterPlaceholderSubstitute =
getAndRemoveParameter(parameters, "placeholder", String.class, "#");
@@ -133,7 +128,6 @@ public class SqlComponent extends DefaultComponent {
endpoint.setOnConsumeFailed(onConsumeFailed);
endpoint.setOnConsumeBatchComplete(onConsumeBatchComplete);
endpoint.setDataSource(ds);
- endpoint.setDataSourceRef(dataSourceRef);
endpoint.setTemplateOptions(templateOptions);
setProperties(endpoint, parameters);
return endpoint;
diff --git
a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/SqlStoredComponent.java
b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/SqlStoredComponent.java
index 73f5a4e..20754ab 100644
---
a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/SqlStoredComponent.java
+++
b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/SqlStoredComponent.java
@@ -27,11 +27,15 @@ import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
import org.apache.camel.support.PropertyBindingSupport;
import org.apache.camel.util.PropertiesHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.jdbc.core.JdbcTemplate;
@Component("sql-stored")
public class SqlStoredComponent extends DefaultComponent {
+ private static final Logger LOG =
LoggerFactory.getLogger(SqlStoredComponent.class);
+
@Metadata
private DataSource dataSource;
@@ -61,6 +65,7 @@ public class SqlStoredComponent extends DefaultComponent {
if (target == null) {
throw new IllegalArgumentException("DataSource must be
configured");
}
+ LOG.trace("Using DataSource: {}", target);
JdbcTemplate jdbcTemplate = new JdbcTemplate(target);
diff --git
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElsqlEndpointBuilderFactory.java
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElsqlEndpointBuilderFactory.java
index 6a5e919..b69e63d 100644
---
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElsqlEndpointBuilderFactory.java
+++
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElsqlEndpointBuilderFactory.java
@@ -112,7 +112,8 @@ public interface ElsqlEndpointBuilderFactory {
return this;
}
/**
- * Sets the DataSource to use to communicate with the database.
+ * Sets the DataSource to use to communicate with the database at
+ * endpoint level.
*
* The option is a: <code>javax.sql.DataSource</code> type.
*
@@ -126,7 +127,8 @@ public interface ElsqlEndpointBuilderFactory {
return this;
}
/**
- * Sets the DataSource to use to communicate with the database.
+ * Sets the DataSource to use to communicate with the database at
+ * endpoint level.
*
* The option will be converted to a
* <code>javax.sql.DataSource</code> type.
@@ -141,22 +143,6 @@ public interface ElsqlEndpointBuilderFactory {
return this;
}
/**
- * Sets the reference to a DataSource to lookup from the registry, to
- * use for communicating with the database.
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: common
- *
- * @param dataSourceRef the value to set
- * @return the dsl builder
- */
- @Deprecated
- default ElsqlEndpointConsumerBuilder dataSourceRef(String
dataSourceRef) {
- doSetProperty("dataSourceRef", dataSourceRef);
- return this;
- }
- /**
* Specify the full package and class name to use as conversion when
* outputType=SelectOne.
*
@@ -1558,7 +1544,8 @@ public interface ElsqlEndpointBuilderFactory {
return this;
}
/**
- * Sets the DataSource to use to communicate with the database.
+ * Sets the DataSource to use to communicate with the database at
+ * endpoint level.
*
* The option is a: <code>javax.sql.DataSource</code> type.
*
@@ -1572,7 +1559,8 @@ public interface ElsqlEndpointBuilderFactory {
return this;
}
/**
- * Sets the DataSource to use to communicate with the database.
+ * Sets the DataSource to use to communicate with the database at
+ * endpoint level.
*
* The option will be converted to a
* <code>javax.sql.DataSource</code> type.
@@ -1587,22 +1575,6 @@ public interface ElsqlEndpointBuilderFactory {
return this;
}
/**
- * Sets the reference to a DataSource to lookup from the registry, to
- * use for communicating with the database.
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: common
- *
- * @param dataSourceRef the value to set
- * @return the dsl builder
- */
- @Deprecated
- default ElsqlEndpointProducerBuilder dataSourceRef(String
dataSourceRef) {
- doSetProperty("dataSourceRef", dataSourceRef);
- return this;
- }
- /**
* Specify the full package and class name to use as conversion when
* outputType=SelectOne.
*
@@ -2210,7 +2182,8 @@ public interface ElsqlEndpointBuilderFactory {
return this;
}
/**
- * Sets the DataSource to use to communicate with the database.
+ * Sets the DataSource to use to communicate with the database at
+ * endpoint level.
*
* The option is a: <code>javax.sql.DataSource</code> type.
*
@@ -2224,7 +2197,8 @@ public interface ElsqlEndpointBuilderFactory {
return this;
}
/**
- * Sets the DataSource to use to communicate with the database.
+ * Sets the DataSource to use to communicate with the database at
+ * endpoint level.
*
* The option will be converted to a
* <code>javax.sql.DataSource</code> type.
@@ -2239,22 +2213,6 @@ public interface ElsqlEndpointBuilderFactory {
return this;
}
/**
- * Sets the reference to a DataSource to lookup from the registry, to
- * use for communicating with the database.
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: common
- *
- * @param dataSourceRef the value to set
- * @return the dsl builder
- */
- @Deprecated
- default ElsqlEndpointBuilder dataSourceRef(String dataSourceRef) {
- doSetProperty("dataSourceRef", dataSourceRef);
- return this;
- }
- /**
* Specify the full package and class name to use as conversion when
* outputType=SelectOne.
*
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 a9f63ea..cfd8ba9 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,7 @@ public interface SqlEndpointBuilderFactory {
return this;
}
/**
- * Sets the DataSource to use to communicate with the databaset at
+ * Sets the DataSource to use to communicate with the database at
* endpoint level.
*
* The option is a: <code>javax.sql.DataSource</code> type.
@@ -95,7 +95,7 @@ public interface SqlEndpointBuilderFactory {
return this;
}
/**
- * Sets the DataSource to use to communicate with the databaset at
+ * Sets the DataSource to use to communicate with the database at
* endpoint level.
*
* The option will be converted to a
@@ -111,22 +111,6 @@ public interface SqlEndpointBuilderFactory {
return this;
}
/**
- * Sets the reference to a DataSource to lookup from the registry, to
- * use for communicating with the database.
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: common
- *
- * @param dataSourceRef the value to set
- * @return the dsl builder
- */
- @Deprecated
- default SqlEndpointConsumerBuilder dataSourceRef(String dataSourceRef)
{
- doSetProperty("dataSourceRef", dataSourceRef);
- return this;
- }
- /**
* Specify the full package and class name to use as conversion when
* outputType=SelectOne.
*
@@ -1460,7 +1444,7 @@ public interface SqlEndpointBuilderFactory {
return this;
}
/**
- * Sets the DataSource to use to communicate with the databaset at
+ * Sets the DataSource to use to communicate with the database at
* endpoint level.
*
* The option is a: <code>javax.sql.DataSource</code> type.
@@ -1475,7 +1459,7 @@ public interface SqlEndpointBuilderFactory {
return this;
}
/**
- * Sets the DataSource to use to communicate with the databaset at
+ * Sets the DataSource to use to communicate with the database at
* endpoint level.
*
* The option will be converted to a
@@ -1491,22 +1475,6 @@ public interface SqlEndpointBuilderFactory {
return this;
}
/**
- * Sets the reference to a DataSource to lookup from the registry, to
- * use for communicating with the database.
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: common
- *
- * @param dataSourceRef the value to set
- * @return the dsl builder
- */
- @Deprecated
- default SqlEndpointProducerBuilder dataSourceRef(String dataSourceRef)
{
- doSetProperty("dataSourceRef", dataSourceRef);
- return this;
- }
- /**
* Specify the full package and class name to use as conversion when
* outputType=SelectOne.
*
@@ -2049,7 +2017,7 @@ public interface SqlEndpointBuilderFactory {
return this;
}
/**
- * Sets the DataSource to use to communicate with the databaset at
+ * Sets the DataSource to use to communicate with the database at
* endpoint level.
*
* The option is a: <code>javax.sql.DataSource</code> type.
@@ -2064,7 +2032,7 @@ public interface SqlEndpointBuilderFactory {
return this;
}
/**
- * Sets the DataSource to use to communicate with the databaset at
+ * Sets the DataSource to use to communicate with the database at
* endpoint level.
*
* The option will be converted to a
@@ -2080,22 +2048,6 @@ public interface SqlEndpointBuilderFactory {
return this;
}
/**
- * Sets the reference to a DataSource to lookup from the registry, to
- * use for communicating with the database.
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: common
- *
- * @param dataSourceRef the value to set
- * @return the dsl builder
- */
- @Deprecated
- default SqlEndpointBuilder dataSourceRef(String dataSourceRef) {
- doSetProperty("dataSourceRef", dataSourceRef);
- return this;
- }
- /**
* Specify the full package and class name to use as conversion when
* outputType=SelectOne.
*
diff --git a/docs/components/modules/ROOT/pages/elsql-component.adoc
b/docs/components/modules/ROOT/pages/elsql-component.adoc
index 5e6291f..f53dbdf 100644
--- a/docs/components/modules/ROOT/pages/elsql-component.adoc
+++ b/docs/components/modules/ROOT/pages/elsql-component.adoc
@@ -100,7 +100,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (48 parameters):
+=== Query Parameters (47 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -108,8 +108,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
| *databaseVendor* (common) | To use a vendor specific
com.opengamma.elsql.ElSqlConfig. There are 7 enums and the value can be one of:
Default, Postgres, HSql, MySql, Oracle, SqlServer2008, Veritca | |
ElSqlDatabaseVendor
-| *dataSource* (common) | Sets the DataSource to use to communicate with the
database. | | DataSource
-| *dataSourceRef* (common) | *Deprecated* Sets the reference to a DataSource
to lookup from the registry, to use for communicating with the database. | |
String
+| *dataSource* (common) | Sets the DataSource to use to communicate with the
database at endpoint level. | | DataSource
| *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
| *outputType* (common) | Make the output of consumer or producer to
SelectList as List of Map, or SelectOne as single Java object in the following
way: a) If the query has only single column, then that JDBC Column object is
returned. (such as SELECT COUNT( ) FROM PROJECT will return a Long object. b)
If the query has more than one column, then it will return a Map of that
result. c) If the outputClass is set, then it will convert the query result
into an Java bean object by calling all [...]
diff --git a/docs/components/modules/ROOT/pages/sql-component.adoc
b/docs/components/modules/ROOT/pages/sql-component.adoc
index 9263b64..7da723b 100644
--- a/docs/components/modules/ROOT/pages/sql-component.adoc
+++ b/docs/components/modules/ROOT/pages/sql-component.adoc
@@ -156,15 +156,14 @@ with the following path and query parameters:
|===
-=== Query Parameters (46 parameters):
+=== Query Parameters (45 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| 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
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
+| *dataSource* (common) | Sets the DataSource to use to communicate with the
database at endpoint level. | | DataSource
| *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
| *outputType* (common) | Make the output of consumer or producer to
SelectList as List of Map, or SelectOne as single Java object in the following
way: a) If the query has only single column, then that JDBC Column object is
returned. (such as SELECT COUNT( ) FROM PROJECT will return a Long object. b)
If the query has more than one column, then it will return a Map of that
result. c) If the outputClass is set, then it will convert the query result
into an Java bean object by calling all [...]
@@ -343,11 +342,11 @@
https://gitbox.apache.org/repos/asf?p=camel.git;a=blob;f=components/camel-sql/sr
== DataSource
-You can now set a reference to a `DataSource` in the URI directly:
+You can set a reference to a `DataSource` in the URI directly:
[source,text]
----
-sql:select * from table where id=# order by name?dataSource=myDS
+sql:select * from table where id=# order by name?dataSource=#myDS
----
== Using named parameters
