You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/12/25 09:53:04 UTC
svn commit: r893846 - in /camel/trunk/components/camel-jdbc/src:
main/java/org/apache/camel/component/jdbc/JdbcProducer.java
test/java/org/apache/camel/component/jdbc/JdbcPreserveHeadersTest.java
Author: davsclaus
Date: Fri Dec 25 08:53:03 2009
New Revision: 893846
URL: http://svn.apache.org/viewvc?rev=893846&view=rev
Log:
CAMEL-2320: camel-jdbc now preserves headers. Applied patch with thanks to Pradeep Elankumaran.
Added:
camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcPreserveHeadersTest.java (with props)
Modified:
camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
Modified: camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java?rev=893846&r1=893845&r2=893846&view=diff
==============================================================================
--- camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java (original)
+++ camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java Fri Dec 25 08:53:03 2009
@@ -69,6 +69,10 @@
if (LOG.isDebugEnabled()) {
LOG.debug("Executing JDBC statement: " + sql);
}
+
+ // preserve headers, but allow overwriting
+ exchange.getOut().setHeaders(exchange.getIn().getHeaders());
+
if (stmt.execute(sql)) {
rs = stmt.getResultSet();
setResultSet(exchange, rs);
Added: camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcPreserveHeadersTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcPreserveHeadersTest.java?rev=893846&view=auto
==============================================================================
--- camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcPreserveHeadersTest.java (added)
+++ camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcPreserveHeadersTest.java Fri Dec 25 08:53:03 2009
@@ -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.jdbc;
+
+import javax.sql.DataSource;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.DriverManagerDataSource;
+
+/**
+ * Unit test based on user forum request about this component
+ */
+public class JdbcPreserveHeadersTest extends CamelTestSupport {
+ private String driverClass = "org.hsqldb.jdbcDriver";
+ private String url = "jdbc:hsqldb:mem:camel_jdbc";
+ private String user = "sa";
+ private String password = "";
+ private DataSource ds;
+
+ @Test
+ public void testPreserveHeaders() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+ mock.expectedHeaderReceived("ONE", 1);
+ mock.expectedHeaderReceived("TWO", 2);
+ mock.assertIsSatisfied();
+ }
+
+ protected JndiRegistry createRegistry() throws Exception {
+ JndiRegistry reg = super.createRegistry();
+ reg.bind("testdb", ds);
+ return reg;
+ }
+
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() throws Exception {
+ from("timer://kickoff?period=10000").
+ process(new Processor() {
+ public void process(Exchange e) throws Exception {
+ e.getIn().setHeader("ONE", 1);
+ e.getIn().setHeader("TWO", 2);
+ }
+ }).
+ setBody(constant("select * from customer")).
+ to("jdbc:testdb").
+ to("mock:result");
+ }
+ };
+ }
+
+ @Before
+ public void setUp() throws Exception {
+ DriverManagerDataSource dataSource = new DriverManagerDataSource(url, user, password);
+ dataSource.setDriverClassName(driverClass);
+ ds = dataSource;
+
+ JdbcTemplate jdbc = new JdbcTemplate(ds);
+ jdbc.execute("create table customer (id varchar(15), name varchar(10))");
+ jdbc.execute("insert into customer values('cust1','jstrachan')");
+ jdbc.execute("insert into customer values('cust2','nsandhu')");
+ super.setUp();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ super.tearDown();
+ JdbcTemplate jdbc = new JdbcTemplate(ds);
+ jdbc.execute("drop table customer");
+ }
+
+}
Propchange: camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcPreserveHeadersTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcPreserveHeadersTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date