[camel] branch main updated: CAMEL-16629: camel-core - InterceptSendToEndpoint - AfterUri should only trigger if when was true

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new 3781b4e  CAMEL-16629: camel-core - InterceptSendToEndpoint - AfterUri 
should only trigger if when was true
3781b4e is described below

commit 3781b4e7e548d9146ee15c0db352ec89d564173d
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed May 19 07:33:24 2021 +0200

    CAMEL-16629: camel-core - InterceptSendToEndpoint - AfterUri should only 
trigger if when was true
---
 .../InterceptSendToEndpointProcessor.java          | 20 ++++++++++++++++---
 .../InterceptSendToEndpointAfterTest.java          | 23 ++++++++++++++++++++++
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git 
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/InterceptSendToEndpointProcessor.java
 
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/InterceptSendToEndpointProcessor.java
index 0dcd860..17e7bf1 100644
--- 
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/InterceptSendToEndpointProcessor.java
+++ 
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/InterceptSendToEndpointProcessor.java
@@ -25,6 +25,7 @@ import org.apache.camel.CamelContextAware;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePropertyKey;
+import org.apache.camel.Predicate;
 import org.apache.camel.spi.InterceptSendToEndpoint;
 import org.apache.camel.support.AsyncProcessorConverterHelper;
 import org.apache.camel.support.AsyncProcessorSupport;
@@ -94,7 +95,14 @@ public class InterceptSendToEndpointProcessor extends 
DefaultAsyncProducer {
         boolean shouldSkip = skip;
 
         // if then interceptor had a when predicate, then we should only skip 
if it matched
-        Boolean whenMatches = (Boolean) 
exchange.removeProperty(ExchangePropertyKey.INTERCEPT_SEND_TO_ENDPOINT_WHEN_MATCHED);
+        Boolean whenMatches;
+        if (endpoint.getAfter() != null) {
+            // only get the property as after also needs to check this property
+            whenMatches = (Boolean) 
exchange.getProperty(ExchangePropertyKey.INTERCEPT_SEND_TO_ENDPOINT_WHEN_MATCHED);
+        } else {
+            // remove property as its not longer needed
+            whenMatches = (Boolean) 
exchange.removeProperty(ExchangePropertyKey.INTERCEPT_SEND_TO_ENDPOINT_WHEN_MATCHED);
+        }
         if (whenMatches != null) {
             shouldSkip = skip && whenMatches;
         }
@@ -142,12 +150,18 @@ public class InterceptSendToEndpointProcessor extends 
DefaultAsyncProducer {
                     return callback(exchange, callback, true);
                 }
             };
+            // only execute the after if the intercept when predicate matches
+            Predicate predicate = exchange -> {
+                Boolean whenMatches
+                        = (Boolean) 
exchange.removeProperty(ExchangePropertyKey.INTERCEPT_SEND_TO_ENDPOINT_WHEN_MATCHED);
+                return whenMatches == null || whenMatches;
+            };
             AsyncProcessor after = null;
             if (endpoint.getAfter() != null) {
                 after = 
AsyncProcessorConverterHelper.convert(endpoint.getAfter());
             }
-
-            pipeline = new Pipeline(getEndpoint().getCamelContext(), 
Arrays.asList(before, ascb, after));
+            FilterProcessor filter = new 
FilterProcessor(getEndpoint().getCamelContext(), predicate, after);
+            pipeline = new Pipeline(getEndpoint().getCamelContext(), 
Arrays.asList(before, ascb, filter));
         }
 
         ServiceHelper.buildService(producer, pipeline);
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSendToEndpointAfterTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSendToEndpointAfterTest.java
index 32630a8..4a5852c 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSendToEndpointAfterTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSendToEndpointAfterTest.java
@@ -100,4 +100,27 @@ public class InterceptSendToEndpointAfterTest extends 
ContextTestSupport {
         assertMockEndpointsSatisfied();
     }
 
+    @Test
+    public void testInterceptEndpointWhen() throws Exception {
+        context.addRoutes(new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                interceptSendToEndpoint("direct:start").when(simple("${body} 
contains 'World'")).to("mock:detour")
+                        .afterUrl("mock:after");
+
+                from("direct:start").to("mock:foo").transform().constant("Bye 
World");
+            }
+        });
+        context.start();
+
+        getMockEndpoint("mock:detour").expectedBodiesReceived("Hello World");
+        getMockEndpoint("mock:foo").expectedBodiesReceived("Hello World", "Hi 
Camel");
+        getMockEndpoint("mock:after").expectedBodiesReceived("Bye World");
+
+        template.sendBody("direct:start", "Hello World");
+        template.sendBody("direct:start", "Hi Camel");
+
+        assertMockEndpointsSatisfied();
+    }
+
 }