CAMEL-9906: camel-sql - Should allow null values as a valid value
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f72a857c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f72a857c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f72a857c Branch: refs/heads/camel-2.17.x Commit: f72a857c9dacac915e35f84307dd4242ff36b340 Parents: 1099e61 Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Apr 23 08:52:43 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Apr 23 08:53:24 2016 +0200 ---------------------------------------------------------------------- .../sql/DefaultSqlPrepareStatementStrategy.java | 29 ++++-- .../sql/SqlProducerInsertNullTest.java | 95 ++++++++++++++++++++ 2 files changed, 118 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f72a857c/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlPrepareStatementStrategy.java ---------------------------------------------------------------------- diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlPrepareStatementStrategy.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlPrepareStatementStrategy.java index ff9b98a..49655c9 100644 --- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlPrepareStatementStrategy.java +++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlPrepareStatementStrategy.java @@ -207,6 +207,21 @@ public class DefaultSqlPrepareStatementStrategy implements SqlPrepareStatementSt return answer; } + protected static boolean hasParameter(String nextParam, Exchange exchange, Object body) { + Map<?, ?> bodyMap = safeMap(exchange.getContext().getTypeConverter().tryConvertTo(Map.class, body)); + Map<?, ?> headersMap = safeMap(exchange.getIn().getHeaders()); + + if (nextParam.startsWith("${") && nextParam.endsWith("}")) { + return true; + } else if (bodyMap.containsKey(nextParam)) { + return true; + } else if (headersMap.containsKey(nextParam)) { + return true; + } + + return false; + } + private static Map<?, ?> safeMap(Map<?, ?> map) { return (map == null || map.isEmpty()) ? Collections.emptyMap() : map; } @@ -264,12 +279,14 @@ public class DefaultSqlPrepareStatementStrategy implements SqlPrepareStatementSt Object next = null; try { - next = lookupParameter(nextParam, exchange, body); - if (in && next != null) { - // if SQL IN we need to return an iterator that can iterate the parameter values - next = createInParameterIterator(next); - } - if (next == null) { + boolean hasNext = hasParameter(nextParam, exchange, body); + if (hasNext) { + next = lookupParameter(nextParam, exchange, body); + if (in && next != null) { + // if SQL IN we need to return an iterator that can iterate the parameter values + next = createInParameterIterator(next); + } + } else { throw new RuntimeExchangeException(String.format(MISSING_PARAMETER_EXCEPTION, nextParam, query), exchange); } } finally { http://git-wip-us.apache.org/repos/asf/camel/blob/f72a857c/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInsertNullTest.java ---------------------------------------------------------------------- diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInsertNullTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInsertNullTest.java new file mode 100755 index 0000000..e5926f8 --- /dev/null +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInsertNullTest.java @@ -0,0 +1,95 @@ +/** + * 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.HashMap; +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 SqlProducerInsertNullTest extends CamelTestSupport { + + private EmbeddedDatabase db; + + @Before + public void setUp() throws Exception { + db = new EmbeddedDatabaseBuilder() + .setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase2.sql").build(); + + super.setUp(); + } + + @After + public void tearDown() throws Exception { + super.tearDown(); + + db.shutdown(); + } + + @Test + public void testInsertNull() throws Exception { + Map<String, Object> map = new HashMap<String, Object>(); + map.put("id", 4); + map.put("project", "Foo"); + map.put("lic", "ASF"); + map.put("description", null); + + template.sendBody("direct:insert", map); + + MockEndpoint mock = getMockEndpoint("mock:result"); + mock.expectedMessageCount(1); + + template.sendBody("direct:start", "Foo"); + + mock.assertIsSatisfied(); + + List<?> received = assertIsInstanceOf(List.class, mock.getReceivedExchanges().get(0).getIn().getBody()); + assertEquals(1, received.size()); + Map<?, ?> row = assertIsInstanceOf(Map.class, received.get(0)); + assertEquals("Foo", row.get("project")); + assertEquals("ASF", row.get("license")); + assertEquals(null, row.get("description")); + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + public void configure() { + getContext().getComponent("sql", SqlComponent.class).setDataSource(db); + + from("direct:insert") + .to("sql:insert into projects (id, project, license, description) values (:#id, :#project, :#lic, :#description)"); + + from("direct:start") + .to("sql:select * from projects where project = #") + .to("mock:result"); + } + }; + } +}
