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 2013/07/10 16:10:23 UTC
[1/7] git commit: CAMEL-6537: Fixed RoutingSlip EIP to call done on
callback for sync case which was missing.
Updated Branches:
refs/heads/camel-2.10.x fdd8a1394 -> 6eb5ff0f3
refs/heads/camel-2.11.x 82130fd49 -> e86059512
refs/heads/master d7956a246 -> 6484f09d7
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/a53a8e11
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a53a8e11
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a53a8e11
Branch: refs/heads/master
Commit: a53a8e119d023a3556bbfd3f55a0f5eafde179cf
Parents: d7956a2
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jul 10 15:48:38 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jul 10 15:48:38 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/a53a8e11/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 037a4ad..ce3048d 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/a53a8e11/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;
+ }
+ }
+}
[7/7] git commit: CAMEL-6537: Fixed RoutingSlip EIP to call done on
callback for sync case which was missing.
Posted by da...@apache.org.
CAMEL-6537: Fixed RoutingSlip EIP to call done on callback for sync case which was missing.
Conflicts:
camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6eb5ff0f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6eb5ff0f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6eb5ff0f
Branch: refs/heads/camel-2.10.x
Commit: 6eb5ff0f32193e21e9331c0afce9ab96b442f56c
Parents: 64520c3
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jul 10 16:07:53 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jul 10 16:10:02 2013 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/processor/RoutingSlip.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6eb5ff0f/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 da638ad..5a50f4e 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
@@ -284,10 +284,11 @@ public class RoutingSlip extends ServiceSupport implements AsyncProcessor, Trace
exchange.setProperty(Exchange.TO_ENDPOINT, endpoint.getEndpointUri());
exchange.setProperty(Exchange.SLIP_ENDPOINT, endpoint.getEndpointUri());
- boolean sync = AsyncProcessorHelper.process(asyncProducer, exchange, new AsyncCallback() {
+ return AsyncProcessorHelper.process(asyncProducer, exchange, new AsyncCallback() {
public void done(boolean doneSync) {
// we only have to handle async completion of the routing slip
if (doneSync) {
+ callback.done(doneSync);
return;
}
@@ -347,9 +348,6 @@ public class RoutingSlip extends ServiceSupport implements AsyncProcessor, Trace
callback.done(false);
}
});
-
- callback.done(sync);
- return sync;
}
});
[3/7] git commit: CAMEL-6537: Fixed RoutingSlip EIP to call done on
callback for sync case which was missing.
Posted by da...@apache.org.
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/6484f09d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6484f09d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6484f09d
Branch: refs/heads/master
Commit: 6484f09d78b05253ad1341a94a0d735f742b59d4
Parents: f51eb9a
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jul 10 16:07:53 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jul 10 16:07:53 2013 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/processor/RoutingSlip.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6484f09d/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 ce3048d..cd4a864 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
@@ -284,10 +284,11 @@ public class RoutingSlip extends ServiceSupport implements AsyncProcessor, Trace
exchange.setProperty(Exchange.TO_ENDPOINT, endpoint.getEndpointUri());
exchange.setProperty(Exchange.SLIP_ENDPOINT, endpoint.getEndpointUri());
- boolean sync = asyncProducer.process(exchange, new AsyncCallback() {
+ return asyncProducer.process(exchange, new AsyncCallback() {
public void done(boolean doneSync) {
// we only have to handle async completion of the routing slip
if (doneSync) {
+ callback.done(doneSync);
return;
}
@@ -347,9 +348,6 @@ public class RoutingSlip extends ServiceSupport implements AsyncProcessor, Trace
callback.done(false);
}
});
-
- callback.done(sync);
- return sync;
}
});
[5/7] git commit: CAMEL-6537: Fixed RoutingSlip EIP to call done on
callback for sync case which was missing.
Posted by da...@apache.org.
CAMEL-6537: Fixed RoutingSlip EIP to call done on callback for sync case which was missing.
Conflicts:
camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e8605951
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e8605951
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e8605951
Branch: refs/heads/camel-2.11.x
Commit: e860595124f2f8c1a6abc5cc1e4c83fac3939e80
Parents: 305aac7
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jul 10 16:07:53 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jul 10 16:09:21 2013 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/processor/RoutingSlip.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e8605951/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 da638ad..5a50f4e 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
@@ -284,10 +284,11 @@ public class RoutingSlip extends ServiceSupport implements AsyncProcessor, Trace
exchange.setProperty(Exchange.TO_ENDPOINT, endpoint.getEndpointUri());
exchange.setProperty(Exchange.SLIP_ENDPOINT, endpoint.getEndpointUri());
- boolean sync = AsyncProcessorHelper.process(asyncProducer, exchange, new AsyncCallback() {
+ return AsyncProcessorHelper.process(asyncProducer, exchange, new AsyncCallback() {
public void done(boolean doneSync) {
// we only have to handle async completion of the routing slip
if (doneSync) {
+ callback.done(doneSync);
return;
}
@@ -347,9 +348,6 @@ public class RoutingSlip extends ServiceSupport implements AsyncProcessor, Trace
callback.done(false);
}
});
-
- callback.done(sync);
- return sync;
}
});
[6/7] git commit: CAMEL-6537: Fixed RoutingSlip EIP to call done on
callback for sync case which was missing.
Posted by da...@apache.org.
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/64520c34
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/64520c34
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/64520c34
Branch: refs/heads/camel-2.10.x
Commit: 64520c340689cd35562f308cb8ab01cdabad448b
Parents: fdd8a13
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jul 10 15:48:38 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jul 10 16:09:53 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/64520c34/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/64520c34/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;
+ }
+ }
+}
[2/7] git commit: Upgraded to Groovy 2.1.6
Posted by da...@apache.org.
Upgraded to Groovy 2.1.6
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f51eb9ac
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f51eb9ac
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f51eb9ac
Branch: refs/heads/master
Commit: f51eb9ac88e83bc6fe40cd3b40410c811522821d
Parents: a53a8e1
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jul 10 15:48:49 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jul 10 15:48:49 2013 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f51eb9ac/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index c03a583..d27126e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -156,7 +156,7 @@
<google-gdata-version>1.41.5.w1</google-gdata-version>
<google-gdata-bundle-version>1.41.1_1</google-gdata-bundle-version>
<google-guava-version>14.0.1</google-guava-version>
- <groovy-version>2.1.5</groovy-version>
+ <groovy-version>2.1.6</groovy-version>
<gson-version>2.2.2</gson-version>
<guice-bundle-version>3.0_1</guice-bundle-version>
<guice-version>3.0</guice-version>
[4/7] git commit: CAMEL-6537: Fixed RoutingSlip EIP to call done on
callback for sync case which was missing.
Posted by da...@apache.org.
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 <da...@apache.org>
Authored: Wed Jul 10 15:48:38 2013 +0200
Committer: Claus Ibsen <da...@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;
+ }
+ }
+}