CAMEL-8256: Include deadLetterUri in ExchangeFailureHandledEvent
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/37d4914e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/37d4914e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/37d4914e Branch: refs/heads/master Commit: 37d4914eab4ba9e0bbcde98bba53c1a87e34245b Parents: 77851e1 Author: Claus Ibsen <[email protected]> Authored: Sun Jan 18 16:40:37 2015 +0100 Committer: Claus Ibsen <[email protected]> Committed: Sun Jan 18 16:40:37 2015 +0100 ---------------------------------------------------------------------- .../management/event/DefaultEventFactory.java | 5 +++-- .../event/ExchangeFailureHandledEvent.java | 18 +++++++++++++----- .../camel/processor/RedeliveryErrorHandler.java | 2 +- .../java/org/apache/camel/spi/EventFactory.java | 4 +++- .../java/org/apache/camel/util/EventHelper.java | 4 ++-- .../EventNotifierFailureHandledEventsTest.java | 1 + 6 files changed, 23 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/37d4914e/camel-core/src/main/java/org/apache/camel/management/event/DefaultEventFactory.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/event/DefaultEventFactory.java b/camel-core/src/main/java/org/apache/camel/management/event/DefaultEventFactory.java index c018b11..0f78475 100644 --- a/camel-core/src/main/java/org/apache/camel/management/event/DefaultEventFactory.java +++ b/camel-core/src/main/java/org/apache/camel/management/event/DefaultEventFactory.java @@ -93,13 +93,14 @@ public class DefaultEventFactory implements EventFactory { return new ExchangeFailedEvent(exchange); } - public EventObject createExchangeFailureHandledEvent(Exchange exchange, Processor failureHandler, boolean deadLetterChannel) { + public EventObject createExchangeFailureHandledEvent(Exchange exchange, Processor failureHandler, + boolean deadLetterChannel, String deadLetterUri) { // unwrap delegate processor Processor handler = failureHandler; if (handler instanceof DelegateProcessor) { handler = ((DelegateProcessor) handler).getProcessor(); } - return new ExchangeFailureHandledEvent(exchange, handler, deadLetterChannel); + return new ExchangeFailureHandledEvent(exchange, handler, deadLetterChannel, deadLetterUri); } public EventObject createExchangeRedeliveryEvent(Exchange exchange, int attempt) { http://git-wip-us.apache.org/repos/asf/camel/blob/37d4914e/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureHandledEvent.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureHandledEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureHandledEvent.java index 0f799c9..2c0dd7d 100644 --- a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureHandledEvent.java +++ b/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureHandledEvent.java @@ -18,21 +18,24 @@ package org.apache.camel.management.event; import org.apache.camel.Exchange; import org.apache.camel.Processor; +import org.apache.camel.util.URISupport; /** * @version */ public class ExchangeFailureHandledEvent extends AbstractExchangeEvent { - private static final long serialVersionUID = -7554809462006009547L; + private static final long serialVersionUID = -7554809462006009548L; - private final Processor failureHandler; + private final transient Processor failureHandler; private final boolean deadLetterChannel; + private final String deadLetterUri; private final boolean handled; - public ExchangeFailureHandledEvent(Exchange source, Processor failureHandler, boolean deadLetterChannel) { + public ExchangeFailureHandledEvent(Exchange source, Processor failureHandler, boolean deadLetterChannel, String deadLetterUri) { super(source); this.failureHandler = failureHandler; this.deadLetterChannel = deadLetterChannel; + this.deadLetterUri = deadLetterUri; this.handled = source.getProperty(Exchange.ERRORHANDLER_HANDLED, false, Boolean.class); } @@ -44,6 +47,10 @@ public class ExchangeFailureHandledEvent extends AbstractExchangeEvent { return deadLetterChannel; } + public String getDeadLetterUri() { + return deadLetterUri; + } + public boolean isHandled() { return handled; } @@ -51,9 +58,10 @@ public class ExchangeFailureHandledEvent extends AbstractExchangeEvent { @Override public String toString() { if (isDeadLetterChannel()) { - return getExchange().getExchangeId() + " exchange failed: " + getExchange() + " but was handled by dead letter channel: " + failureHandler; + String uri = URISupport.sanitizeUri(deadLetterUri); + return getExchange().getExchangeId() + " exchange failed: " + getExchange() + " but was handled by dead letter channel: " + uri; } else { - return getExchange().getExchangeId() + " exchange failed: " + getExchange() + " but was processed by: " + failureHandler; + return getExchange().getExchangeId() + " exchange failed: " + getExchange() + " but was processed by failure processor: " + failureHandler; } } } http://git-wip-us.apache.org/repos/asf/camel/blob/37d4914e/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java b/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java index dbe3760..9fcfc0f 100644 --- a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java +++ b/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java @@ -896,7 +896,7 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme prepareExchangeAfterFailure(exchange, data, isDeadLetterChannel, shouldHandle, shouldContinue); // fire event as we had a failure processor to handle it, which there is a event for boolean deadLetterChannel = processor == data.deadLetterProcessor; - EventHelper.notifyExchangeFailureHandled(exchange.getContext(), exchange, processor, deadLetterChannel); + EventHelper.notifyExchangeFailureHandled(exchange.getContext(), exchange, processor, deadLetterChannel, deadLetterUri); } finally { // if the fault was handled asynchronously, this should be reflected in the callback as well data.sync &= sync; http://git-wip-us.apache.org/repos/asf/camel/blob/37d4914e/camel-core/src/main/java/org/apache/camel/spi/EventFactory.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/spi/EventFactory.java b/camel-core/src/main/java/org/apache/camel/spi/EventFactory.java index feeb9d1..25c9578 100644 --- a/camel-core/src/main/java/org/apache/camel/spi/EventFactory.java +++ b/camel-core/src/main/java/org/apache/camel/spi/EventFactory.java @@ -166,9 +166,11 @@ public interface EventFactory { * @param exchange the exchange * @param failureHandler the failure handler such as moving the message to a dead letter queue * @param deadLetterChannel whether it was a dead letter channel or not handling the failure + * @param deadLetterUri the dead letter uri, if its a dead letter channel * @return the created event */ - EventObject createExchangeFailureHandledEvent(Exchange exchange, Processor failureHandler, boolean deadLetterChannel); + EventObject createExchangeFailureHandledEvent(Exchange exchange, Processor failureHandler, + boolean deadLetterChannel, String deadLetterUri); /** * Creates an {@link EventObject} when an {@link org.apache.camel.Exchange} is about to be redelivered http://git-wip-us.apache.org/repos/asf/camel/blob/37d4914e/camel-core/src/main/java/org/apache/camel/util/EventHelper.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/util/EventHelper.java b/camel-core/src/main/java/org/apache/camel/util/EventHelper.java index f80983a..cabe364 100644 --- a/camel-core/src/main/java/org/apache/camel/util/EventHelper.java +++ b/camel-core/src/main/java/org/apache/camel/util/EventHelper.java @@ -479,7 +479,7 @@ public final class EventHelper { } public static void notifyExchangeFailureHandled(CamelContext context, Exchange exchange, Processor failureHandler, - boolean deadLetterChannel) { + boolean deadLetterChannel, String deadLetterUri) { if (exchange.getProperty(Exchange.NOTIFY_EVENT, false, Boolean.class)) { // do not generate events for an notify event return; @@ -504,7 +504,7 @@ public final class EventHelper { if (factory == null) { return; } - EventObject event = factory.createExchangeFailureHandledEvent(exchange, failureHandler, deadLetterChannel); + EventObject event = factory.createExchangeFailureHandledEvent(exchange, failureHandler, deadLetterChannel, deadLetterUri); if (event == null) { return; } http://git-wip-us.apache.org/repos/asf/camel/blob/37d4914e/camel-core/src/test/java/org/apache/camel/management/EventNotifierFailureHandledEventsTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/EventNotifierFailureHandledEventsTest.java b/camel-core/src/test/java/org/apache/camel/management/EventNotifierFailureHandledEventsTest.java index 5888018..f7db679 100644 --- a/camel-core/src/test/java/org/apache/camel/management/EventNotifierFailureHandledEventsTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/EventNotifierFailureHandledEventsTest.java @@ -106,6 +106,7 @@ public class EventNotifierFailureHandledEventsTest extends ContextTestSupport { assertEquals("should be DLC", true, e.isDeadLetterChannel()); SendProcessor send = assertIsInstanceOf(SendProcessor.class, e.getFailureHandler()); assertEquals("mock://dead", send.getDestination().getEndpointUri()); + assertEquals("mock://dead", e.getDeadLetterUri()); // dead letter channel will mark the exchange as completed assertIsInstanceOf(ExchangeCompletedEvent.class, events.get(9));
