camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [4/7] git commit: CAMEL-6537: Fixed RoutingSlip EIP to call done on callback for sync case which was missing.
Date Wed, 10 Jul 2013 14:10:26 GMT
CAMEL-6537: Fixed RoutingSlip EIP to call done on callback for sync case which was missing.


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

Branch: refs/heads/camel-2.11.x
Commit: 305aac7283704f3e2125731ee3f7ca07d9c34590
Parents: 82130fd
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Wed Jul 10 15:48:38 2013 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Wed Jul 10 16:08:18 2013 +0200

----------------------------------------------------------------------
 .../org/apache/camel/processor/RoutingSlip.java |  1 +
 .../RoutingSlipEventNotifierTest.java           | 98 ++++++++++++++++++++
 2 files changed, 99 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/305aac72/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java b/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
index 546e061..da638ad 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
@@ -348,6 +348,7 @@ public class RoutingSlip extends ServiceSupport implements AsyncProcessor,
Trace
                     }
                 });
 
+                callback.done(sync);
                 return sync;
             }
         });

http://git-wip-us.apache.org/repos/asf/camel/blob/305aac72/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipEventNotifierTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipEventNotifierTest.java
b/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipEventNotifierTest.java
new file mode 100644
index 0000000..064cd51
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipEventNotifierTest.java
@@ -0,0 +1,98 @@
+/**
+ * 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.routingslip;
+
+import java.util.EventObject;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.management.event.ExchangeSendingEvent;
+import org.apache.camel.management.event.ExchangeSentEvent;
+import org.apache.camel.support.EventNotifierSupport;
+
+public class RoutingSlipEventNotifierTest extends ContextTestSupport {
+
+    private MyEventNotifier notifier = new MyEventNotifier();
+
+    @Override
+    protected CamelContext createCamelContext() throws Exception {
+        CamelContext context = super.createCamelContext();
+        context.getManagementStrategy().addEventNotifier(notifier);
+        return context;
+    }
+
+    public void testRoutingSlipEventNotifier() throws Exception {
+        getMockEndpoint("mock:x").expectedMessageCount(1);
+        getMockEndpoint("mock:y").expectedMessageCount(1);
+        getMockEndpoint("mock:z").expectedMessageCount(1);
+        getMockEndpoint("mock:end").expectedMessageCount(1);
+
+        template.sendBodyAndHeader("direct:start", "Hello World", "myHeader", "mock:x,mock:y,mock:z");
+
+        assertMockEndpointsSatisfied();
+
+        assertEquals("Should have 5 sending events", 5, notifier.getSending());
+        assertEquals("Should have 5 sent events", 5, notifier.getSent());
+    }
+
+    protected RouteBuilder createRouteBuilder() {
+        return new RouteBuilder() {
+            public void configure() {
+                from("direct:start").routingSlip(header("myHeader")).to("mock:end");
+            }
+        };
+    }
+
+    private final class MyEventNotifier extends EventNotifierSupport {
+
+        private int sending;
+        private int sent;
+
+        @Override
+        public void notify(EventObject event) throws Exception {
+            if (event instanceof ExchangeSendingEvent) {
+                sending++;
+            } else {
+                sent++;
+            }
+        }
+
+        @Override
+        public boolean isEnabled(EventObject event) {
+            return event instanceof ExchangeSendingEvent || event instanceof ExchangeSentEvent;
+        }
+
+        @Override
+        protected void doStart() throws Exception {
+            // noop
+        }
+
+        @Override
+        protected void doStop() throws Exception {
+            // noop
+        }
+
+        public int getSending() {
+            return sending;
+        }
+
+        public int getSent() {
+            return sent;
+        }
+    }
+}


Mime
View raw message