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/02/04 08:57:13 UTC
[camel] branch master updated (24ce7c0 -> d041748)
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 24ce7c0 Regen for commit c564264bbca93b625bf654be170e3c890152352c
new 5c7798a CAMEL-16083: Route Scoped OnCompletion After Consumer routeId check.
new d041748 CAMEL-16083: Route Scoped OnCompletion After Consumer routeId check
The 2 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:
.../org/apache/camel/ExchangeConstantProvider.java | 3 +-
.../src/main/java/org/apache/camel/Exchange.java | 1 +
.../camel/processor/OnCompletionProcessor.java | 27 ++++-
.../OnCompletionAfterConsumerModeIssueTest.java | 133 +++++++++++++++++++++
4 files changed, 162 insertions(+), 2 deletions(-)
create mode 100644 core/camel-core/src/test/java/org/apache/camel/issues/OnCompletionAfterConsumerModeIssueTest.java
[camel] 01/02: CAMEL-16083: Route Scoped OnCompletion After
Consumer routeId check.
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 5c7798aea1ce28de37973b5cae495d6bde079175
Author: Bob Paulin <bo...@bobpaulin.com>
AuthorDate: Tue Jan 26 15:32:23 2021 -0600
CAMEL-16083: Route Scoped OnCompletion After Consumer routeId check.
---
.../src/main/java/org/apache/camel/Exchange.java | 1 +
.../camel/processor/OnCompletionProcessor.java | 24 +++-
.../OnCompletionAfterConsumerModeIssueTest.java | 133 +++++++++++++++++++++
3 files changed, 157 insertions(+), 1 deletion(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/Exchange.java b/core/camel-api/src/main/java/org/apache/camel/Exchange.java
index 07bf559..7630c65 100644
--- a/core/camel-api/src/main/java/org/apache/camel/Exchange.java
+++ b/core/camel-api/src/main/java/org/apache/camel/Exchange.java
@@ -190,6 +190,7 @@ public interface Exchange {
String NOTIFY_EVENT = "CamelNotifyEvent";
String ON_COMPLETION = "CamelOnCompletion";
+ String ON_COMPLETION_ROUTE_IDS = "CamelOnCompletionRouteIds";
String OVERRULE_FILE_NAME = "CamelOverruleFileName";
String PARENT_UNIT_OF_WORK = "CamelParentUnitOfWork";
diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
index d6de01b..3083c9c 100644
--- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
+++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.processor;
+import java.util.ArrayList;
+import java.util.List;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
@@ -250,9 +252,29 @@ public class OnCompletionProcessor extends AsyncProcessorSupport implements Trac
}
@Override
+ public void onAfterRoute(Route route, Exchange exchange) {
+ // route scope = should be from this route
+ if (routeScoped && route.getRouteId().equals(routeId)) {
+ List routeIds = exchange.getProperty(Exchange.ON_COMPLETION_ROUTE_IDS, List.class);
+ if (routeIds == null) {
+ routeIds = new ArrayList<>();
+ exchange.setProperty(Exchange.ON_COMPLETION_ROUTE_IDS, routeIds);
+ }
+ routeIds.add(route.getRouteId());
+
+ }
+ }
+
+ @Override
public void onComplete(final Exchange exchange) {
String currentRouteId = ExchangeHelper.getRouteId(exchange);
- if (currentRouteId != null && !routeId.equals(currentRouteId)) {
+ if (!routeScoped && currentRouteId != null && !routeId.equals(currentRouteId)) {
+ return;
+ }
+
+ List routeIds = exchange.getProperty(Exchange.ON_COMPLETION_ROUTE_IDS, List.class);
+
+ if (routeScoped && (routeIds == null || !routeIds.contains(routeId))) {
return;
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/OnCompletionAfterConsumerModeIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/OnCompletionAfterConsumerModeIssueTest.java
new file mode 100644
index 0000000..361d8f5
--- /dev/null
+++ b/core/camel-core/src/test/java/org/apache/camel/issues/OnCompletionAfterConsumerModeIssueTest.java
@@ -0,0 +1,133 @@
+/*
+ * 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.issues;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.junit.jupiter.api.Test;
+
+public class OnCompletionAfterConsumerModeIssueTest extends ContextTestSupport {
+
+ @Override
+ public boolean isUseRouteBuilder() {
+ return false;
+ }
+
+ @Test
+ public void testOnCompletionInSub() throws Exception {
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start")
+ .transform(constant("a"))
+ .to("mock:a")
+ .to("direct:sub")
+ .transform(constant("c"))
+ .to("mock:c");
+
+ from("direct:sub")
+ .transform(constant("b"))
+ .to("mock:b")
+ .onCompletion()
+ .to("mock:end")
+ .end();
+ }
+ });
+ context.start();
+
+ getMockEndpoint("mock:a").expectedBodiesReceived("a");
+ getMockEndpoint("mock:b").expectedBodiesReceived("b");
+ getMockEndpoint("mock:c").expectedBodiesReceived("c");
+ getMockEndpoint("mock:end").expectedBodiesReceived("c");
+
+ template.sendBody("direct:start", "Hello World");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Test
+ public void testOnCompletionInMainAndSub() throws Exception {
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+
+ from("direct:start")
+ .transform(constant("a"))
+ .to("mock:a")
+ .to("direct:sub")
+ .transform(constant("c"))
+ .to("mock:c")
+ .onCompletion()
+ .to("mock:end")
+ .end();
+
+ from("direct:sub")
+ .transform(constant("b"))
+ .to("mock:b")
+ .onCompletion()
+ .to("mock:end")
+ .end();
+ }
+ });
+ context.start();
+
+ getMockEndpoint("mock:a").expectedBodiesReceived("a");
+ getMockEndpoint("mock:b").expectedBodiesReceived("b");
+ getMockEndpoint("mock:c").expectedBodiesReceived("c");
+ getMockEndpoint("mock:end").expectedBodiesReceived("c", "c");
+
+ template.sendBody("direct:start", "Hello World");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Test
+ public void testOnCompletionInGlobalAndSub() throws Exception {
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+
+ onCompletion().to("mock:end");
+
+ from("direct:start")
+ .transform(constant("a"))
+ .to("mock:a")
+ .to("direct:sub")
+ .transform(constant("c"))
+ .to("mock:c");
+
+ from("direct:sub")
+ .transform(constant("b"))
+ .to("mock:b")
+ .onCompletion()
+ .to("mock:end")
+ .end();
+ }
+ });
+ context.start();
+
+ getMockEndpoint("mock:a").expectedBodiesReceived("a");
+ getMockEndpoint("mock:b").expectedBodiesReceived("b");
+ getMockEndpoint("mock:c").expectedBodiesReceived("c");
+ getMockEndpoint("mock:end").expectedBodiesReceived("c", "c");
+
+ template.sendBody("direct:start", "Hello World");
+
+ assertMockEndpointsSatisfied();
+ }
+
+}
[camel] 02/02: CAMEL-16083: Route Scoped OnCompletion After
Consumer routeId check
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 d0417481e191ee08ddf591583bba2ac298d153da
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Feb 4 09:26:01 2021 +0100
CAMEL-16083: Route Scoped OnCompletion After Consumer routeId check
---
.../java/org/apache/camel/ExchangeConstantProvider.java | 3 ++-
.../apache/camel/processor/OnCompletionProcessor.java | 17 ++++++++++-------
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/core/camel-api/src/generated/java/org/apache/camel/ExchangeConstantProvider.java b/core/camel-api/src/generated/java/org/apache/camel/ExchangeConstantProvider.java
index a1380d5..0c541a8 100644
--- a/core/camel-api/src/generated/java/org/apache/camel/ExchangeConstantProvider.java
+++ b/core/camel-api/src/generated/java/org/apache/camel/ExchangeConstantProvider.java
@@ -11,7 +11,7 @@ public class ExchangeConstantProvider {
private static final Map<String, String> MAP;
static {
- Map<String, String> map = new HashMap<>(149);
+ Map<String, String> map = new HashMap<>(150);
map.put("ACCEPT_CONTENT_TYPE", "CamelAcceptContentType");
map.put("AGGREGATED_COLLECTION_GUARD", "CamelAggregatedCollectionGuard");
map.put("AGGREGATED_COMPLETED_BY", "CamelAggregatedCompletedBy");
@@ -113,6 +113,7 @@ public class ExchangeConstantProvider {
map.put("MULTICAST_INDEX", "CamelMulticastIndex");
map.put("NOTIFY_EVENT", "CamelNotifyEvent");
map.put("ON_COMPLETION", "CamelOnCompletion");
+ map.put("ON_COMPLETION_ROUTE_IDS", "CamelOnCompletionRouteIds");
map.put("OVERRULE_FILE_NAME", "CamelOverruleFileName");
map.put("PARENT_UNIT_OF_WORK", "CamelParentUnitOfWork");
map.put("RECEIVED_TIMESTAMP", "CamelReceivedTimestamp");
diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
index 3083c9c..6101e8c 100644
--- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
+++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
@@ -252,30 +252,33 @@ public class OnCompletionProcessor extends AsyncProcessorSupport implements Trac
}
@Override
+ @SuppressWarnings("unchecked")
public void onAfterRoute(Route route, Exchange exchange) {
- // route scope = should be from this route
+ // route scope = remember we have been at this route
if (routeScoped && route.getRouteId().equals(routeId)) {
- List routeIds = exchange.getProperty(Exchange.ON_COMPLETION_ROUTE_IDS, List.class);
+ List<String> routeIds = exchange.getProperty(Exchange.ON_COMPLETION_ROUTE_IDS, List.class);
if (routeIds == null) {
routeIds = new ArrayList<>();
exchange.setProperty(Exchange.ON_COMPLETION_ROUTE_IDS, routeIds);
}
routeIds.add(route.getRouteId());
-
}
}
@Override
+ @SuppressWarnings("unchecked")
public void onComplete(final Exchange exchange) {
String currentRouteId = ExchangeHelper.getRouteId(exchange);
if (!routeScoped && currentRouteId != null && !routeId.equals(currentRouteId)) {
return;
}
- List routeIds = exchange.getProperty(Exchange.ON_COMPLETION_ROUTE_IDS, List.class);
-
- if (routeScoped && (routeIds == null || !routeIds.contains(routeId))) {
- return;
+ if (routeScoped) {
+ // check if we visited the route
+ List<String> routeIds = exchange.getProperty(Exchange.ON_COMPLETION_ROUTE_IDS, List.class);
+ if (routeIds == null || !routeIds.contains(routeId)) {
+ return;
+ }
}
if (onFailureOnly) {