Author: davsclaus
Date: Wed Dec 21 14:14:42 2011
New Revision: 1221737
URL: http://svn.apache.org/viewvc?rev=1221737&view=rev
Log:
CAMEL-4806: Added strategy method in seda consumer to allow custom preparation
for exchange.
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaFromRouteIdTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java?rev=1221737&r1=1221736&r2=1221737&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
Wed Dec 21 14:14:42 2011
@@ -155,9 +155,8 @@ public class SedaConsumer extends Servic
if (exchange != null) {
try {
// send a new copied exchange with new camel context
- Exchange newExchange =
ExchangeHelper.copyExchangeAndSetCamelContext(exchange,
endpoint.getCamelContext());
- // set the fromEndpoint
- newExchange.setFromEndpoint(endpoint);
+ Exchange newExchange = prepareExchange(exchange);
+ // process the exchange
sendToConsumers(newExchange);
// copy the message back
if (newExchange.hasOut()) {
@@ -195,6 +194,20 @@ public class SedaConsumer extends Servic
}
/**
+ * Strategy to prepare exchange for being processed by this consumer
+ *
+ * @param exchange the exchange
+ * @return the exchange to process by this consumer.
+ */
+ protected Exchange prepareExchange(Exchange exchange) {
+ // send a new copied exchange with new camel context
+ Exchange newExchange =
ExchangeHelper.copyExchangeAndSetCamelContext(exchange,
endpoint.getCamelContext());
+ // set the from endpoint
+ newExchange.setFromEndpoint(endpoint);
+ return newExchange;
+ }
+
+ /**
* Send the given {@link Exchange} to the consumer(s).
* <p/>
* If multiple consumers then they will each receive a copy of the
Exchange.
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaFromRouteIdTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaFromRouteIdTest.java?rev=1221737&view=auto
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaFromRouteIdTest.java
(added)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaFromRouteIdTest.java
Wed Dec 21 14:14:42 2011
@@ -0,0 +1,58 @@
+/**
+ * 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.seda;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+
+/**
+ *
+ */
+public class SedaFromRouteIdTest extends ContextTestSupport {
+
+ public void testSedaFromRouteId() throws Exception {
+ MockEndpoint foo = getMockEndpoint("mock:foo");
+ foo.expectedMessageCount(1);
+
+ MockEndpoint bar = getMockEndpoint("mock:bar");
+ bar.expectedMessageCount(1);
+
+ template.sendBody("seda:foo", "Hello World");
+
+ assertMockEndpointsSatisfied();
+
+ assertEquals("foo",
foo.getReceivedExchanges().get(0).getFromRouteId());
+ assertEquals("seda://foo",
foo.getReceivedExchanges().get(0).getFromEndpoint().getEndpointUri());
+ assertEquals("bar",
bar.getReceivedExchanges().get(0).getFromRouteId());
+ assertEquals("seda://bar",
bar.getReceivedExchanges().get(0).getFromEndpoint().getEndpointUri());
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("seda:foo").routeId("foo")
+ .to("mock:foo").to("seda:bar");
+
+ from("seda:bar").routeId("bar")
+ .to("mock:bar");
+ }
+ };
+ }
+}
