Author: davsclaus
Date: Thu Mar 21 09:17:00 2013
New Revision: 1459198
URL: http://svn.apache.org/r1459198
Log:
CAMEL-6168: Fixed sql producer to support null message body.
Added:
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyHeaderTest.java
- copied, changed from r1459175,
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParameterTest.java
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyTest.java
(with props)
Modified:
camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java
Modified:
camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java?rev=1459198&r1=1459197&r2=1459198&view=diff
==============================================================================
---
camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java
(original)
+++
camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java
Thu Mar 21 09:17:00 2013
@@ -57,19 +57,17 @@ public class SqlProducer extends Default
int expected = ps.getParameterMetaData().getParameterCount();
// transfer incoming message body data to prepared statement
parameters, if necessary
- if (exchange.getIn().getBody() != null) {
- if (batch) {
- Iterator<?> iterator =
exchange.getIn().getBody(Iterator.class);
- while (iterator != null && iterator.hasNext()) {
- Object value = iterator.next();
- Iterator<?> i =
getEndpoint().getPrepareStatementStrategy().createPopulateIterator(sql,
preparedQuery, expected, exchange, value);
-
getEndpoint().getPrepareStatementStrategy().populateStatement(ps, i, expected);
- ps.addBatch();
- }
- } else {
- Iterator<?> i =
getEndpoint().getPrepareStatementStrategy().createPopulateIterator(sql,
preparedQuery, expected, exchange, exchange.getIn().getBody());
+ if (batch) {
+ Iterator<?> iterator =
exchange.getIn().getBody(Iterator.class);
+ while (iterator != null && iterator.hasNext()) {
+ Object value = iterator.next();
+ Iterator<?> i =
getEndpoint().getPrepareStatementStrategy().createPopulateIterator(sql,
preparedQuery, expected, exchange, value);
getEndpoint().getPrepareStatementStrategy().populateStatement(ps, i, expected);
+ ps.addBatch();
}
+ } else {
+ Iterator<?> i =
getEndpoint().getPrepareStatementStrategy().createPopulateIterator(sql,
preparedQuery, expected, exchange, exchange.getIn().getBody());
+
getEndpoint().getPrepareStatementStrategy().populateStatement(ps, i, expected);
}
// execute the prepared statement and populate the outgoing
message
Copied:
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyHeaderTest.java
(from r1459175,
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParameterTest.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyHeaderTest.java?p2=camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyHeaderTest.java&p1=camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParameterTest.java&r1=1459175&r2=1459198&rev=1459198&view=diff
==============================================================================
---
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParameterTest.java
(original)
+++
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyHeaderTest.java
Thu Mar 21 09:17:00 2013
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.sql;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -33,7 +32,7 @@ import org.springframework.jdbc.datasour
/**
* @version
*/
-public class SqlProducerNamedParameterTest extends CamelTestSupport {
+public class SqlProducerNullBodyHeaderTest extends CamelTestSupport {
private EmbeddedDatabase db;
@@ -53,32 +52,11 @@ public class SqlProducerNamedParameterTe
}
@Test
- public void testNamedParameterFromBody() throws Exception {
+ public void testNullBody() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
- Map<String, Object> map = new HashMap<String, Object>();
- map.put("lic", "ASF");
-
- template.sendBody("direct:start", map);
-
- mock.assertIsSatisfied();
-
- 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"));
- }
-
- @Test
- public void testNamedParameterFromHeaders() throws Exception {
- MockEndpoint mock = getMockEndpoint("mock:result");
- mock.expectedMessageCount(1);
-
- template.sendBodyAndHeader("direct:start", "This is a dummy body",
"lic", "ASF");
+ template.sendBodyAndHeader("direct:start", null, "lic", "ASF");
mock.assertIsSatisfied();
Added:
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyTest.java?rev=1459198&view=auto
==============================================================================
---
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyTest.java
(added)
+++
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyTest.java
Thu Mar 21 09:17:00 2013
@@ -0,0 +1,84 @@
+/**
+ * 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 SqlProducerNullBodyTest 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 testNullBody() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+
+ template.sendBody("direct:start", null);
+
+ mock.assertIsSatisfied();
+
+ 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 = 'ASF'
order by id")
+ .to("mock:result");
+ }
+ };
+ }
+}
Propchange:
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyTest.java
------------------------------------------------------------------------------
svn:executable = *
