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 2016/02/10 14:17:17 UTC
[1/2] camel git commit: Added test based on user forum
Repository: camel
Updated Branches:
refs/heads/master 0ea358af2 -> 9dc9c974d
Added test based on user forum
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8406bc3e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8406bc3e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8406bc3e
Branch: refs/heads/master
Commit: 8406bc3e1671d546f8fdc988a19760f45f5e6529
Parents: 0ea358a
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Feb 10 14:15:03 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Feb 10 14:15:03 2016 +0100
----------------------------------------------------------------------
.../onexception/RedeliverEntireRouteTest.java | 62 ++++++++++++++++++++
1 file changed, 62 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8406bc3e/camel-core/src/test/java/org/apache/camel/processor/onexception/RedeliverEntireRouteTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/onexception/RedeliverEntireRouteTest.java b/camel-core/src/test/java/org/apache/camel/processor/onexception/RedeliverEntireRouteTest.java
new file mode 100644
index 0000000..bc27e06
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/processor/onexception/RedeliverEntireRouteTest.java
@@ -0,0 +1,62 @@
+/**
+ * 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.onexception;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+
+public class RedeliverEntireRouteTest extends ContextTestSupport {
+
+ public void testRedeliverEntireRoute() throws Exception {
+ getMockEndpoint("mock:a").expectedMessageCount(1);
+ getMockEndpoint("mock:result").expectedMessageCount(0);
+ getMockEndpoint("mock:b").expectedMessageCount(3 + 1);
+
+ try {
+ template.sendBody("direct:start", "Hello World");
+ fail("Should fail");
+ } catch (Exception e) {
+ // expected
+ }
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ onException(IllegalArgumentException.class)
+ .maximumRedeliveries(3).redeliveryDelay(0);
+
+ from("direct:start")
+ .to("mock:a")
+ // this route has error handler, so any exception will redeliver (eg calling the foo route again)
+ .to("direct:foo")
+ .to("mock:result");
+
+ // this route has no error handler, so any exception will not be redelivered
+ from("direct:foo")
+ .errorHandler(noErrorHandler())
+ .log("Calling foo route redelivery count: ${header.CamelRedeliveryCounter}")
+ .to("mock:b")
+ .throwException(new IllegalArgumentException("Forced"));
+ }
+ };
+ }
+}
[2/2] camel git commit: Fixed CS
Posted by da...@apache.org.
Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9dc9c974
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9dc9c974
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9dc9c974
Branch: refs/heads/master
Commit: 9dc9c974dc5e752726f0a09346dbd8975aeb2a24
Parents: 8406bc3
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Feb 10 14:17:05 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Feb 10 14:17:05 2016 +0100
----------------------------------------------------------------------
...lticastShareUnitOfWorkOnExceptionHandledFalseIssueTest.java | 6 +++---
.../processor/DeadLetterChannelHandleNewExceptionTest.java | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9dc9c974/camel-core/src/test/java/org/apache/camel/issues/MulticastShareUnitOfWorkOnExceptionHandledFalseIssueTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/issues/MulticastShareUnitOfWorkOnExceptionHandledFalseIssueTest.java b/camel-core/src/test/java/org/apache/camel/issues/MulticastShareUnitOfWorkOnExceptionHandledFalseIssueTest.java
index bb9f88f..d9cc5c0 100644
--- a/camel-core/src/test/java/org/apache/camel/issues/MulticastShareUnitOfWorkOnExceptionHandledFalseIssueTest.java
+++ b/camel-core/src/test/java/org/apache/camel/issues/MulticastShareUnitOfWorkOnExceptionHandledFalseIssueTest.java
@@ -5,9 +5,9 @@
* 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ * 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.
http://git-wip-us.apache.org/repos/asf/camel/blob/9dc9c974/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelHandleNewExceptionTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelHandleNewExceptionTest.java b/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelHandleNewExceptionTest.java
index 8770099..98e19a9 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelHandleNewExceptionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelHandleNewExceptionTest.java
@@ -5,9 +5,9 @@
* 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ * 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.