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 2021/03/19 13:57:01 UTC
[camel] branch master updated (655d7f2 -> 96c8a29)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 655d7f2 Avoid catching Throwable (#5246)
new d995615 CAMEL-16339: camel-seda - Optimize to avoid unnesssary exchange copy
new ec642cd CAMEL-16339: camel-seda - Optimize to avoid unnesssary exchange copy
new 96c8a29 Added unit test based on user question
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/camel/component/seda/SedaConsumer.java | 23 ++++++++-----------
.../apache/camel/component/seda/SedaProducer.java | 3 ---
.../org/apache/camel/component/vm/VmConsumer.java | 6 +++--
...dToIssue.java => InterceptSendToIssueTest.java} | 4 +++-
....java => InterceptSendToRecipientListTest.java} | 26 +++++++++++-----------
5 files changed, 29 insertions(+), 33 deletions(-)
rename core/camel-core/src/test/java/org/apache/camel/processor/intercept/{InterceptSendToIssue.java => InterceptSendToIssueTest.java} (94%)
copy core/camel-core/src/test/java/org/apache/camel/processor/intercept/{InterceptSimpleRouteWhenTest.java => InterceptSendToRecipientListTest.java} (63%)
[camel] 02/03: CAMEL-16339: camel-seda - Optimize to avoid
unnesssary exchange copy
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ec642cdcff1cbaecb7e9cfc9986d80e25d614956
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Mar 19 14:39:46 2021 +0100
CAMEL-16339: camel-seda - Optimize to avoid unnesssary exchange copy
---
.../apache/camel/component/seda/SedaConsumer.java | 20 +++++++++-----------
.../apache/camel/component/seda/SedaProducer.java | 3 ---
.../org/apache/camel/component/vm/VmConsumer.java | 6 ++++--
3 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaConsumer.java b/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
index 1d0966b..731d69a 100644
--- a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
+++ b/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
@@ -33,6 +33,7 @@ import org.apache.camel.spi.ShutdownAware;
import org.apache.camel.spi.Synchronization;
import org.apache.camel.support.DefaultConsumer;
import org.apache.camel.support.EmptyAsyncCallback;
+import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.support.UnitOfWorkHelper;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
@@ -180,19 +181,14 @@ public class SedaConsumer extends DefaultConsumer implements Runnable, ShutdownA
}
if (exchange != null) {
try {
- // send a new copied exchange with new camel context
+ // prepare the exchange before sending to consumer
Exchange newExchange = prepareExchange(exchange);
// process the exchange
sendToConsumers(newExchange);
- // copy the message back
- if (newExchange.hasOut()) {
- exchange.setOut(newExchange.getOut().copy());
- } else {
- exchange.setIn(newExchange.getIn());
- }
+ // copy result back
+ ExchangeHelper.copyResults(exchange, newExchange);
// log exception if an exception occurred and was not handled
- if (newExchange.getException() != null) {
- exchange.setException(newExchange.getException());
+ if (exchange.getException() != null) {
getExceptionHandler().handleException("Error processing exchange", exchange,
exchange.getException());
}
@@ -224,8 +220,10 @@ public class SedaConsumer extends DefaultConsumer implements Runnable, ShutdownA
* @return the exchange to process by this consumer.
*/
protected Exchange prepareExchange(Exchange exchange) {
- // this consumer grabbed the exchange so mark its from this route
- exchange.adapt(ExtendedExchange.class).setFromRouteId(getRouteId());
+ // this consumer grabbed the exchange so mark its from this route/endpoint
+ ExtendedExchange ee = exchange.adapt(ExtendedExchange.class);
+ ee.setFromEndpoint(getEndpoint());
+ ee.setFromRouteId(getRouteId());
return exchange;
}
diff --git a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaProducer.java b/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaProducer.java
index 2293e79..e3294a3 100644
--- a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaProducer.java
+++ b/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaProducer.java
@@ -162,13 +162,10 @@ public class SedaProducer extends DefaultAsyncProducer {
protected Exchange prepareCopy(Exchange exchange, boolean handover) {
// use a new copy of the exchange to route async (and use same message id)
-
// if handover we need to do special handover to avoid handing over
// RestBindingMarshalOnCompletion as it should not be handed over with SEDA
Exchange copy = ExchangeHelper.createCorrelatedCopy(exchange, handover, true,
synchronization -> !synchronization.getClass().getName().contains("RestBindingMarshalOnCompletion"));
- // set a new from endpoint to be the seda queue
- copy.adapt(ExtendedExchange.class).setFromEndpoint(endpoint);
return copy;
}
diff --git a/components/camel-vm/src/main/java/org/apache/camel/component/vm/VmConsumer.java b/components/camel-vm/src/main/java/org/apache/camel/component/vm/VmConsumer.java
index 9f36dbb..66f8228 100644
--- a/components/camel-vm/src/main/java/org/apache/camel/component/vm/VmConsumer.java
+++ b/components/camel-vm/src/main/java/org/apache/camel/component/vm/VmConsumer.java
@@ -52,8 +52,10 @@ public class VmConsumer extends SedaConsumer implements CamelContextAware {
protected Exchange prepareExchange(Exchange exchange) {
// send a new copied exchange with the camel context from this consumer
Exchange newExchange = ExchangeHelper.copyExchangeAndSetCamelContext(exchange, getCamelContext());
- // set the from endpoint
- newExchange.adapt(ExtendedExchange.class).setFromEndpoint(getEndpoint());
+ // this consumer grabbed the exchange so mark its from this route/endpoint
+ ExtendedExchange ee = newExchange.adapt(ExtendedExchange.class);
+ ee.setFromEndpoint(getEndpoint());
+ ee.setFromRouteId(getRouteId());
return newExchange;
}
[camel] 01/03: CAMEL-16339: camel-seda - Optimize to avoid
unnesssary exchange copy
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d99561591005fc5296780e42f257d23ae22770ea
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Mar 19 14:28:47 2021 +0100
CAMEL-16339: camel-seda - Optimize to avoid unnesssary exchange copy
---
.../main/java/org/apache/camel/component/seda/SedaConsumer.java | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaConsumer.java b/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
index 536a4ad..1d0966b 100644
--- a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
+++ b/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
@@ -33,7 +33,6 @@ import org.apache.camel.spi.ShutdownAware;
import org.apache.camel.spi.Synchronization;
import org.apache.camel.support.DefaultConsumer;
import org.apache.camel.support.EmptyAsyncCallback;
-import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.support.UnitOfWorkHelper;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
@@ -225,11 +224,9 @@ public class SedaConsumer extends DefaultConsumer implements Runnable, ShutdownA
* @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, getEndpoint().getCamelContext());
- // set the from endpoint
- newExchange.adapt(ExtendedExchange.class).setFromEndpoint(getEndpoint());
- return newExchange;
+ // this consumer grabbed the exchange so mark its from this route
+ exchange.adapt(ExtendedExchange.class).setFromRouteId(getRouteId());
+ return exchange;
}
/**
[camel] 03/03: Added unit test based on user question
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 96c8a291cae8f3e70b23de80ee3b9ad55003afbe
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Mar 19 14:52:33 2021 +0100
Added unit test based on user question
---
...dToIssue.java => InterceptSendToIssueTest.java} | 4 +++-
....java => InterceptSendToRecipientListTest.java} | 28 ++++++++++------------
2 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSendToIssue.java b/core/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSendToIssueTest.java
similarity index 94%
copy from core/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSendToIssue.java
copy to core/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSendToIssueTest.java
index fc06dbe..c0bd8ef 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSendToIssue.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSendToIssueTest.java
@@ -20,14 +20,16 @@ import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Based on an issue on the camel user forum.
*/
-public class InterceptSendToIssue extends ContextTestSupport {
+public class InterceptSendToIssueTest extends ContextTestSupport {
+ @Test
public void testInterceptSendTo() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:foo");
mock.expectedMessageCount(1);
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSendToIssue.java b/core/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSendToRecipientListTest.java
similarity index 59%
rename from core/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSendToIssue.java
rename to core/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSendToRecipientListTest.java
index fc06dbe..e393708 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSendToIssue.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSendToRecipientListTest.java
@@ -17,28 +17,23 @@
package org.apache.camel.processor.intercept;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
/**
* Based on an issue on the camel user forum.
*/
-public class InterceptSendToIssue extends ContextTestSupport {
+public class InterceptSendToRecipientListTest extends ContextTestSupport {
- public void testInterceptSendTo() throws Exception {
- MockEndpoint mock = getMockEndpoint("mock:foo");
- mock.expectedMessageCount(1);
- mock.expectedHeaderReceived(Exchange.INTERCEPTED_ENDPOINT, "direct://foo");
+ @Test
+ public void testInterceptSendToRecipientList() throws Exception {
+ getMockEndpoint("mock:result").expectedMessageCount(2);
+ getMockEndpoint("mock:intercepted").expectedBodiesReceived("Hello Bar");
- template.sendBody("direct:start", "Hello World");
+ template.sendBodyAndHeader("direct:start", "Hello Bar", "whereTo", "seda:beer");
+ template.sendBodyAndHeader("direct:start", "Hello Home", "whereTo", "seda:home");
assertMockEndpointsSatisfied();
-
- Exchange exchange = mock.getReceivedExchanges().get(0);
- assertEquals("direct://start", exchange.getFromEndpoint().getEndpointUri());
}
@Override
@@ -46,10 +41,11 @@ public class InterceptSendToIssue extends ContextTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- interceptSendToEndpoint("direct:foo").to("mock:foo");
+ interceptSendToEndpoint("seda:b*").skipSendToOriginalEndpoint().to("mock:intercepted");
+
+ from("direct:start")
+ .recipientList().header("whereTo").to("mock:result");
- from("direct:start").setHeader(Exchange.FILE_NAME, constant("hello.txt")).to("direct:foo");
- from("direct:foo").log("Dummy");
}
};
}