Repository: camel Updated Branches: refs/heads/master f41e484bf -> 6775b9edc
camel-sql: add outputHeader parameter (CAMEL-8142) Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6775b9ed Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6775b9ed Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6775b9ed Branch: refs/heads/master Commit: 6775b9edc56396f63e83f8d2e116a0ccb1b4fb12 Parents: f41e484 Author: Daniel Pocock <dan...@pocock.pro> Authored: Wed Dec 10 16:24:15 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Dec 16 07:33:40 2014 +0100 ---------------------------------------------------------------------- .../apache/camel/component/sql/SqlConsumer.java | 6 +- .../apache/camel/component/sql/SqlEndpoint.java | 17 +++++ .../apache/camel/component/sql/SqlProducer.java | 6 ++ .../sql/SqlProducerOutputHeaderTest.java | 73 ++++++++++++++++++++ 4 files changed, 101 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/6775b9ed/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java index 7ec7bd7..a9e4b49 100644 --- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java +++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java @@ -153,7 +153,11 @@ public class SqlConsumer extends ScheduledBatchPollingConsumer { protected Exchange createExchange(Object data) { final Exchange exchange = getEndpoint().createExchange(ExchangePattern.InOnly); Message msg = exchange.getIn(); - msg.setBody(data); + if (getEndpoint().getOutputHeader() != null) { + msg.setHeader(getEndpoint().getOutputHeader(), data); + } else { + msg.setBody(data); + } return exchange; } http://git-wip-us.apache.org/repos/asf/camel/blob/6775b9ed/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 ccd2403..d44a584 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 @@ -76,6 +76,8 @@ public class SqlEndpoint extends DefaultPollingEndpoint { private int parametersCount; @UriParam private boolean noop; + @UriParam + private String outputHeader; public SqlEndpoint() { } @@ -293,6 +295,21 @@ public class SqlEndpoint extends DefaultPollingEndpoint { this.noop = noop; } + public String getOutputHeader() { + return outputHeader; + } + + /** + * Store the query result in a header instead of the message body. + * By default, outputHeader == null and the query result is stored in the message body, + * any existing content in the message body is discarded. + * If outputHeader is set, the value is used as the name of the header to store the + * query result and the original message body is preserved. + */ + public void setOutputHeader(String outputHeader) { + this.outputHeader = outputHeader; + } + @Override protected String createEndpointUri() { // Make sure it's properly encoded http://git-wip-us.apache.org/repos/asf/camel/blob/6775b9ed/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 c7c2e60..234384b 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 @@ -132,6 +132,9 @@ public class SqlProducer extends DefaultProducer { // for noop=true we still want to enrich with the row count header if (getEndpoint().isNoop()) { exchange.getOut().setBody(exchange.getIn().getBody()); + } else if (getEndpoint().getOutputHeader() != null) { + exchange.getOut().setBody(exchange.getIn().getBody()); + exchange.getOut().setHeader(getEndpoint().getOutputHeader(), data); } else { exchange.getOut().setBody(data); } @@ -142,6 +145,9 @@ public class SqlProducer extends DefaultProducer { // for noop=true we still want to enrich with the row count header if (getEndpoint().isNoop()) { exchange.getOut().setBody(exchange.getIn().getBody()); + } else if (getEndpoint().getOutputHeader() != null) { + exchange.getOut().setBody(exchange.getIn().getBody()); + exchange.getOut().setHeader(getEndpoint().getOutputHeader(), data); } else { exchange.getOut().setBody(data); } http://git-wip-us.apache.org/repos/asf/camel/blob/6775b9ed/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputHeaderTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputHeaderTest.java new file mode 100644 index 0000000..84bd500 --- /dev/null +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputHeaderTest.java @@ -0,0 +1,73 @@ +/** + * 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 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; + +public class SqlProducerOutputHeaderTest 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 testQueryOutputHeader() throws InterruptedException { + MockEndpoint mock = getMockEndpoint("mock:query"); + mock.expectedMessageCount(1); + mock.expectedHeaderReceived(SqlConstants.SQL_ROW_COUNT, 1); + mock.expectedHeaderReceived("MaxProjectID", 3); + mock.message(0).body().isEqualTo("Hi there!"); + + template.requestBody("direct:query", "Hi there!"); + + assertMockEndpointsSatisfied(); + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + @Override + public void configure() throws Exception { + // required for the sql component + getContext().getComponent("sql", SqlComponent.class).setDataSource(db); + + from("direct:query").to("sql:select max(id) from projects?outputType=SelectOne&outputHeader=MaxProjectID").to("mock:query"); + } + }; + } +}
