[camel] 01/02: CAMEL-17594: Add endDoCatch to go back to doCatch block. Thanks to Yasser Zamani for unit test.

[da...@apache.org]

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

commit 4d4837d5f73c4e984c7703eccfada3e84e231f40
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Feb 3 12:40:16 2022 +0100

    CAMEL-17594: Add endDoCatch to go back to doCatch block. Thanks to Yasser Zamani for unit test.
---
 .../apache/camel/model/ProcessorDefinition.java    | 18 +++++++
 .../camel/issues/TryCatchWireTapOnPrepareTest.java | 59 ++++++++++++++++++++++
 2 files changed, 77 insertions(+)

diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
index 9f5cba5..b362783f 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
@@ -1152,6 +1152,24 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
     }
 
     /**
+     * Ends the current block and returns back to the {@link CatchDefinition doCatch()} DSL.
+     *
+     * @return the builder
+     */
+    public CatchDefinition endDoCatch() {
+        ProcessorDefinition<?> def = this;
+
+        // are we already a doCatch?
+        if (def instanceof CatchDefinition) {
+            return (CatchDefinition) def;
+        }
+
+        // okay end this and get back to the try
+        def = end();
+        return (CatchDefinition) def;
+    }
+
+    /**
      * Ends the current block and returns back to the {@link CircuitBreakerDefinition circuitBreaker()} DSL.
      *
      * @return the builder
diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/TryCatchWireTapOnPrepareTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/TryCatchWireTapOnPrepareTest.java
new file mode 100644
index 0000000..9277d1f
--- /dev/null
+++ b/core/camel-core/src/test/java/org/apache/camel/issues/TryCatchWireTapOnPrepareTest.java
@@ -0,0 +1,59 @@
+/*
+ * 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.apache.camel.component.mock.MockEndpoint;
+import org.junit.jupiter.api.Test;
+
+public class TryCatchWireTapOnPrepareTest extends ContextTestSupport {
+
+    @Test
+    public void testTryCatchWireTapOnPrepare() throws Exception {
+        MockEndpoint wireTapMockEndpoint = getMockEndpoint("mock:wireTap");
+        wireTapMockEndpoint.expectedMessageCount(1);
+        wireTapMockEndpoint.expectedPropertyReceived("valid", "false");
+        getMockEndpoint("mock:valid").expectedMessageCount(0);
+        getMockEndpoint("mock:invalid").expectedMessageCount(1);
+
+        template.sendBody("direct:start", "Hello World");
+
+        assertMockEndpointsSatisfied();
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start")
+                    .doTry()
+                        .to("direct:validator")
+                        .wireTap("mock:wireTap").onPrepare(exchange -> exchange.setProperty("valid", "true")).endDoTry()
+                        .to("mock:valid")
+                    .doCatch(IllegalArgumentException.class)
+                        .wireTap("mock:wireTap").onPrepare(exchange -> exchange.setProperty("valid", "false")).endDoCatch()
+                        .to("mock:invalid")
+                    .end();
+
+                from("direct:validator")
+                        .throwException(new IllegalArgumentException("Not Valid"));
+            }
+        };
+    }
+}