Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 295AE1818A for ; Tue, 5 Jan 2016 14:43:59 +0000 (UTC) Received: (qmail 46449 invoked by uid 500); 5 Jan 2016 14:43:59 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 46374 invoked by uid 500); 5 Jan 2016 14:43:59 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 46361 invoked by uid 99); 5 Jan 2016 14:43:59 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jan 2016 14:43:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9C40CDFFD8; Tue, 5 Jan 2016 14:43:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davsclaus@apache.org To: commits@camel.apache.org Date: Tue, 05 Jan 2016 14:43:58 -0000 Message-Id: <72899294c36643c59e46d3cd49ca5ef4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] camel git commit: CAMEL-9472: Add multi value to component docs Repository: camel Updated Branches: refs/heads/camel-2.16.x c769389b5 -> aea0bef84 refs/heads/master f80881c01 -> 7e73e303a CAMEL-9472: Add multi value to component docs Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7e73e303 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7e73e303 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7e73e303 Branch: refs/heads/master Commit: 7e73e303a713f4b763243b63726f950555a0755c Parents: f80881c Author: Claus Ibsen Authored: Tue Jan 5 15:43:11 2016 +0100 Committer: Claus Ibsen Committed: Tue Jan 5 15:43:11 2016 +0100 ---------------------------------------------------------------------- .../camel/component/sql/DefaultSqlEndpoint.java | 14 ++++++++++++++ .../org/apache/camel/component/sql/SqlComponent.java | 4 +++- 2 files changed, 17 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/7e73e303/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java ---------------------------------------------------------------------- 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 67e8f23..17fcb68 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 @@ -110,6 +110,9 @@ public abstract class DefaultSqlEndpoint extends DefaultPollingEndpoint { @UriParam(label = "advanced", defaultValue = "#", description = "Specifies a character that will be replaced to ? in SQL query." + " Notice, that it is simple String.replaceAll() operation and no SQL parsing is involved (quoted strings will also change).") private String placeholder = "#"; + @UriParam(label = "advanced", prefix = "template.", multiValue = true, + description = "Configures the Spring JdbcTemplate with the key/values from the Map") + private Map templateOptions; public DefaultSqlEndpoint() { } @@ -415,6 +418,17 @@ public abstract class DefaultSqlEndpoint extends DefaultPollingEndpoint { this.placeholder = placeholder; } + public Map getTemplateOptions() { + return templateOptions; + } + + /** + * Configures the Spring JdbcTemplate with the key/values from the Map + */ + public void setTemplateOptions(Map templateOptions) { + this.templateOptions = templateOptions; + } + @SuppressWarnings("unchecked") public List queryForList(ResultSet rs, boolean allowMapToClass) throws SQLException { if (allowMapToClass && outputClass != null) { http://git-wip-us.apache.org/repos/asf/camel/blob/7e73e303/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java ---------------------------------------------------------------------- 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 0446520..460b4f3 100755 --- 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 @@ -77,7 +77,8 @@ public class SqlComponent extends UriEndpointComponent { String parameterPlaceholderSubstitute = getAndRemoveParameter(parameters, "placeholder", String.class, "#"); JdbcTemplate jdbcTemplate = new JdbcTemplate(target); - IntrospectionSupport.setProperties(jdbcTemplate, parameters, "template."); + Map templateOptions = IntrospectionSupport.extractProperties(parameters, "template."); + IntrospectionSupport.setProperties(jdbcTemplate, templateOptions); String query = remaining.replaceAll(parameterPlaceholderSubstitute, "?"); @@ -110,6 +111,7 @@ public class SqlComponent extends UriEndpointComponent { endpoint.setOnConsumeBatchComplete(onConsumeBatchComplete); endpoint.setDataSource(ds); endpoint.setDataSourceRef(dataSourceRef); + endpoint.setTemplateOptions(templateOptions); return endpoint; }