camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [3/3] git commit: CAMEL-7958: Java DSL - Should support nested choice in doTry .. doCatch
Date Sat, 25 Oct 2014 11:59:51 GMT
CAMEL-7958: Java DSL - Should support nested choice in doTry .. doCatch


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/34e6970f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/34e6970f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/34e6970f

Branch: refs/heads/master
Commit: 34e6970f11a5cbd3da567ebd706744d40f0ec1c8
Parents: bc5bfe4
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Sat Oct 25 13:58:41 2014 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Sat Oct 25 13:59:38 2014 +0200

----------------------------------------------------------------------
 .../apache/camel/model/ProcessorDefinition.java | 11 ++-
 .../processor/TryCatchNestedChoiceTest.java     | 90 ++++++++++++++++++++
 2 files changed, 100 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/34e6970f/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
index 534e976..a6a8457 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
@@ -1216,7 +1216,16 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
      * @return the builder
      */
     public TryDefinition endDoTry() {
-        return (TryDefinition) end();
+        ProcessorDefinition<?> def = this;
+
+        // are we already a try?
+        if (def instanceof TryDefinition) {
+            return (TryDefinition) def;
+        }
+
+        // okay end this and get back to the try
+        def = end();
+        return (TryDefinition) def;
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/camel/blob/34e6970f/camel-core/src/test/java/org/apache/camel/processor/TryCatchNestedChoiceTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/TryCatchNestedChoiceTest.java
b/camel-core/src/test/java/org/apache/camel/processor/TryCatchNestedChoiceTest.java
new file mode 100644
index 0000000..cbfb6df
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/processor/TryCatchNestedChoiceTest.java
@@ -0,0 +1,90 @@
+/**
+ * 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.processor;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * @version 
+ */
+public class TryCatchNestedChoiceTest extends ContextTestSupport {
+
+    public void testFoo() throws Exception {
+        getMockEndpoint("mock:foo").expectedMessageCount(1);
+        getMockEndpoint("mock:other").expectedMessageCount(0);
+        getMockEndpoint("mock:catch").expectedMessageCount(0);
+
+        template.sendBodyAndHeader("direct:start", "Hello World", "foo", 123);
+
+        assertMockEndpointsSatisfied();
+    }
+
+    public void testOther() throws Exception {
+        getMockEndpoint("mock:foo").expectedMessageCount(0);
+        getMockEndpoint("mock:other").expectedMessageCount(1);
+        getMockEndpoint("mock:catch").expectedMessageCount(0);
+
+        template.sendBodyAndHeader("direct:start", "Hello Bar", "bar", 456);
+
+        assertMockEndpointsSatisfied();
+    }
+
+    public void testCatch() throws Exception {
+        getMockEndpoint("mock:foo").expectedMessageCount(0);
+        getMockEndpoint("mock:other").expectedMessageCount(0);
+        getMockEndpoint("mock:catch").expectedMessageCount(1);
+
+        template.sendBody("direct:start", "Kaboom");
+
+        assertMockEndpointsSatisfied();
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start")
+                    .doTry()
+                        .to("direct:bar")
+                        .choice()
+                            .when().simple("${header.foo} == 123")
+                                .to("mock:foo")
+                            .otherwise()
+                                .to("mock:other")
+                         .endDoTry()
+                    .doCatch(Exception.class)
+                        .to("mock:catch")
+                    .end();
+
+                from("direct:bar")
+                    .process(new Processor() {
+                        @Override
+                        public void process(Exchange exchange) throws Exception {
+                            String body = exchange.getIn().getBody(String.class);
+                            if (body.contains("Kaboom")) {
+                                throw new IllegalArgumentException("Forced error");
+                            }
+                        }
+                    });
+            }
+        };
+    }
+}


Mime
View raw message