Author: davsclaus
Date: Mon Mar 30 15:19:03 2009
New Revision: 760003
URL: http://svn.apache.org/viewvc?rev=760003&view=rev
Log:
CAMEL-1502: Bean component should propagate headers.
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanPropagateHeaderTest.java
(with props)
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetExchangePatternTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java?rev=760003&r1=760002&r2=760003&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
Mon Mar 30 15:19:03 2009
@@ -116,6 +116,8 @@
LOG.debug("Setting bean invocation result on the OUT
message: " + value);
}
exchange.getOut(true).setBody(value);
+ // propagate headers
+
exchange.getOut().getHeaders().putAll(exchange.getIn().getHeaders());
} else {
// if not out then set it on the in
if (LOG.isDebugEnabled()) {
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanPropagateHeaderTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanPropagateHeaderTest.java?rev=760003&view=auto
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanPropagateHeaderTest.java
(added)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanPropagateHeaderTest.java
Mon Mar 30 15:19:03 2009
@@ -0,0 +1,70 @@
+/**
+ * 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.bean;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.JndiRegistry;
+
+/**
+ * @version $Revision$
+ */
+public class BeanPropagateHeaderTest extends ContextTestSupport {
+
+ public void testBeanInOnlyPropagateHeaders() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedBodiesReceived("Order OK for id: 123");
+ mock.expectedHeaderReceived("foo", "bar");
+
+ String out = template.requestBody("direct:start", "123", String.class);
+ assertEquals("OK", out);
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected JndiRegistry createRegistry() throws Exception {
+ JndiRegistry jndi = super.createRegistry();
+ jndi.bind("order", new MyOrderService());
+ return jndi;
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start").setHeader("foo", constant("bar"))
+ .convertBodyTo(Integer.class)
+ .to("bean:order")
+ .inOnly("seda:foo")
+ .transform(constant("OK"));
+
+ from("seda:foo").to("mock:result");
+ }
+ };
+ }
+
+ public static class MyOrderService {
+
+ public String confirmOrder(int id) {
+ return "Order OK for id: " + id;
+ }
+ }
+
+}
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanPropagateHeaderTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanPropagateHeaderTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetExchangePatternTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetExchangePatternTest.java?rev=760003&r1=760002&r2=760003&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetExchangePatternTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetExchangePatternTest.java
Mon Mar 30 15:19:03 2009
@@ -73,7 +73,9 @@
MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
String expectedBody = "InOnlyMessage";
resultEndpoint.expectedBodiesReceived(expectedBody);
- template.sendBody(sendUri, sendPattern, expectedBody);
+ resultEndpoint.expectedHeaderReceived("foo", "bar");
+
+ template.sendBodyAndHeader(sendUri, sendPattern, expectedBody, "foo",
"bar");
resultEndpoint.assertIsSatisfied();
ExchangePattern actualPattern =
resultEndpoint.getExchanges().get(0).getPattern();
assertEquals("received exchange pattern", actualPattern,
expectedPattern);
