Updated Branches: refs/heads/camel-2.11.x 7c031be09 -> e09468419 refs/heads/master f7258dab3 -> c8b48628c
CAMEL-6091: Added parametersCount option to sql producer. Thanks to Zemian Deng for the patch. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c8b48628 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c8b48628 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c8b48628 Branch: refs/heads/master Commit: c8b48628cad8bc6033eea7ed775e048c3161b4ce Parents: f7258da Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Aug 20 17:15:02 2013 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Aug 20 17:15:02 2013 +0200 ---------------------------------------------------------------------- .../apache/camel/component/sql/SqlEndpoint.java | 14 +++- .../apache/camel/component/sql/SqlProducer.java | 7 +- .../sql/SqlProducerParametersCountTest.java | 82 ++++++++++++++++++++ 3 files changed, 101 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/c8b48628/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlEndpoint.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlEndpoint.java index 0ee261b..dd6d1a2 100644 --- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlEndpoint.java +++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlEndpoint.java @@ -72,6 +72,8 @@ public class SqlEndpoint extends DefaultPollingEndpoint { private SqlOutputType outputType = SqlOutputType.SelectList; @UriParam private String outputClass; + @UriParam + private int parametersCount; public SqlEndpoint() { } @@ -96,7 +98,9 @@ public class SqlEndpoint extends DefaultPollingEndpoint { public Producer createProducer() throws Exception { SqlPrepareStatementStrategy prepareStrategy = prepareStatementStrategy != null ? prepareStatementStrategy : new DefaultSqlPrepareStatementStrategy(separator); - return new SqlProducer(this, query, jdbcTemplate, prepareStrategy, batch, alwaysPopulateStatement); + SqlProducer result = new SqlProducer(this, query, jdbcTemplate, prepareStrategy, batch, alwaysPopulateStatement); + result.setParametersCount(parametersCount); + return result; } public boolean isSingleton() { @@ -224,6 +228,14 @@ public class SqlEndpoint extends DefaultPollingEndpoint { this.outputClass = outputClass; } + public int getParametersCount() { + return parametersCount; + } + + public void setParametersCount(int parametersCount) { + this.parametersCount = parametersCount; + } + @Override protected String createEndpointUri() { // Make sure it's properly encoded http://git-wip-us.apache.org/repos/asf/camel/blob/c8b48628/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java index cf726a9..5047566 100644 --- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java +++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java @@ -34,6 +34,7 @@ public class SqlProducer extends DefaultProducer { private boolean batch; private boolean alwaysPopulateStatement; private SqlPrepareStatementStrategy sqlPrepareStatementStrategy; + private int parametersCount; public SqlProducer(SqlEndpoint endpoint, String query, JdbcTemplate jdbcTemplate, SqlPrepareStatementStrategy sqlPrepareStatementStrategy, boolean batch, boolean alwaysPopulateStatement) { @@ -58,7 +59,7 @@ public class SqlProducer extends DefaultProducer { jdbcTemplate.execute(preparedQuery, new PreparedStatementCallback<Map<?, ?>>() { public Map<?, ?> doInPreparedStatement(PreparedStatement ps) throws SQLException { - int expected = ps.getParameterMetaData().getParameterCount(); + int expected = parametersCount > 0 ? parametersCount : ps.getParameterMetaData().getParameterCount(); // only populate if really needed if (alwaysPopulateStatement || expected > 0) { @@ -117,4 +118,8 @@ public class SqlProducer extends DefaultProducer { } }); } + + public void setParametersCount(int parametersCount) { + this.parametersCount = parametersCount; + } } http://git-wip-us.apache.org/repos/asf/camel/blob/c8b48628/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerParametersCountTest.java ---------------------------------------------------------------------- diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerParametersCountTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerParametersCountTest.java new file mode 100644 index 0000000..a04b0af --- /dev/null +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerParametersCountTest.java @@ -0,0 +1,82 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.sql; + +import java.util.List; +import java.util.Map; + +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; +import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; +import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; + +/** + * @version + */ +public class SqlProducerParametersCountTest extends CamelTestSupport { + + private EmbeddedDatabase db; + + @Before + public void setUp() throws Exception { + db = new EmbeddedDatabaseBuilder() + .setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build(); + + super.setUp(); + } + + @After + public void tearDown() throws Exception { + super.tearDown(); + + db.shutdown(); + } + + @Test + public void testExplicitParametersCount() throws Exception { + MockEndpoint mock = getMockEndpoint("mock:result"); + mock.expectedMessageCount(1); + + template.sendBodyAndHeader("direct:start", null, "lic", "ASF"); + + List<?> received = assertIsInstanceOf(List.class, mock.getReceivedExchanges().get(0).getIn().getBody()); + assertEquals(2, received.size()); + Map<?, ?> row = assertIsInstanceOf(Map.class, received.get(0)); + assertEquals("Camel", row.get("PROJECT")); + + row = assertIsInstanceOf(Map.class, received.get(1)); + assertEquals("AMQ", row.get("PROJECT")); + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + public void configure() { + getContext().getComponent("sql", SqlComponent.class).setDataSource(db); + + from("direct:start") + .to("sql:select * from projects where license = :#lic order by id?parametersCount=1") + .to("mock:result"); + } + }; + } +}
