CAMEL-11346: Optimize EventNotifierSupport to turn off completely which we can use to optimize EventHelper a bit
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/70654cb0 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/70654cb0 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/70654cb0 Branch: refs/heads/master Commit: 70654cb080b688a2007bcfdd31f679c581a16021 Parents: fdfd57d Author: Claus Ibsen <davscl...@apache.org> Authored: Sat May 27 13:57:37 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat May 27 13:57:37 2017 +0200 ---------------------------------------------------------------------- .../impl/DefaultRuntimeEndpointRegistry.java | 5 ++ .../org/apache/camel/spi/EventNotifier.java | 7 ++ .../camel/support/EventNotifierSupport.java | 5 ++ .../java/org/apache/camel/util/EventHelper.java | 75 ++++++++++++++++++++ 4 files changed, 92 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/70654cb0/camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java index 9fd4c31..4858f48 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java +++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java @@ -283,6 +283,11 @@ public class DefaultRuntimeEndpointRegistry extends EventNotifierSupport impleme } @Override + public boolean isDisabled() { + return !enabled; + } + + @Override public boolean isEnabled(EventObject event) { return enabled && event instanceof ExchangeCreatedEvent || event instanceof ExchangeSendingEvent http://git-wip-us.apache.org/repos/asf/camel/blob/70654cb0/camel-core/src/main/java/org/apache/camel/spi/EventNotifier.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/spi/EventNotifier.java b/camel-core/src/main/java/org/apache/camel/spi/EventNotifier.java index 3fe0e0f..05a97f6 100644 --- a/camel-core/src/main/java/org/apache/camel/spi/EventNotifier.java +++ b/camel-core/src/main/java/org/apache/camel/spi/EventNotifier.java @@ -44,6 +44,13 @@ public interface EventNotifier { */ boolean isEnabled(EventObject event); + /** + * Checks whether notification is disabled for all events + * + * @return <tt>true</tt> if disabled and no events is being notified. + */ + boolean isDisabled(); + boolean isIgnoreCamelContextEvents(); void setIgnoreCamelContextEvents(boolean ignoreCamelContextEvents); http://git-wip-us.apache.org/repos/asf/camel/blob/70654cb0/camel-core/src/main/java/org/apache/camel/support/EventNotifierSupport.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/support/EventNotifierSupport.java b/camel-core/src/main/java/org/apache/camel/support/EventNotifierSupport.java index 68dcc81..37d8947 100644 --- a/camel-core/src/main/java/org/apache/camel/support/EventNotifierSupport.java +++ b/camel-core/src/main/java/org/apache/camel/support/EventNotifierSupport.java @@ -42,6 +42,11 @@ public abstract class EventNotifierSupport extends ServiceSupport implements Eve return ignoreCamelContextEvents; } + @Override + public boolean isDisabled() { + return false; + } + public void setIgnoreCamelContextEvents(boolean ignoreCamelContextEvents) { this.ignoreCamelContextEvents = ignoreCamelContextEvents; } http://git-wip-us.apache.org/repos/asf/camel/blob/70654cb0/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 71458ca..66c14eb 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 @@ -62,6 +62,9 @@ public final class EventHelper { boolean answer = false; EventObject event = null; for (EventNotifier notifier : notifiers) { + if (notifier.isDisabled()) { + continue; + } if (notifier.isIgnoreCamelContextEvents()) { continue; } @@ -98,6 +101,9 @@ public final class EventHelper { boolean answer = false; EventObject event = null; for (EventNotifier notifier : notifiers) { + if (notifier.isDisabled()) { + continue; + } if (notifier.isIgnoreCamelContextEvents()) { continue; } @@ -134,6 +140,9 @@ public final class EventHelper { boolean answer = false; EventObject event = null; for (EventNotifier notifier : notifiers) { + if (notifier.isDisabled()) { + continue; + } if (notifier.isIgnoreCamelContextEvents()) { continue; } @@ -170,6 +179,9 @@ public final class EventHelper { boolean answer = false; EventObject event = null; for (EventNotifier notifier : notifiers) { + if (notifier.isDisabled()) { + continue; + } if (notifier.isIgnoreCamelContextEvents()) { continue; } @@ -206,6 +218,9 @@ public final class EventHelper { boolean answer = false; EventObject event = null; for (EventNotifier notifier : notifiers) { + if (notifier.isDisabled()) { + continue; + } if (notifier.isIgnoreCamelContextEvents()) { continue; } @@ -242,6 +257,9 @@ public final class EventHelper { boolean answer = false; EventObject event = null; for (EventNotifier notifier : notifiers) { + if (notifier.isDisabled()) { + continue; + } if (notifier.isIgnoreCamelContextEvents()) { continue; } @@ -278,6 +296,9 @@ public final class EventHelper { boolean answer = false; EventObject event = null; for (EventNotifier notifier : notifiers) { + if (notifier.isDisabled()) { + continue; + } if (notifier.isIgnoreServiceEvents()) { continue; } @@ -314,6 +335,9 @@ public final class EventHelper { boolean answer = false; EventObject event = null; for (EventNotifier notifier : notifiers) { + if (notifier.isDisabled()) { + continue; + } if (notifier.isIgnoreServiceEvents()) { continue; } @@ -350,6 +374,9 @@ public final class EventHelper { boolean answer = false; EventObject event = null; for (EventNotifier notifier : notifiers) { + if (notifier.isDisabled()) { + continue; + } if (notifier.isIgnoreRouteEvents()) { continue; } @@ -386,6 +413,9 @@ public final class EventHelper { boolean answer = false; EventObject event = null; for (EventNotifier notifier : notifiers) { + if (notifier.isDisabled()) { + continue; + } if (notifier.isIgnoreRouteEvents()) { continue; } @@ -422,6 +452,9 @@ public final class EventHelper { boolean answer = false; EventObject event = null; for (EventNotifier notifier : notifiers) { + if (notifier.isDisabled()) { + continue; + } if (notifier.isIgnoreRouteEvents()) { continue; } @@ -458,6 +491,9 @@ public final class EventHelper { boolean answer = false; EventObject event = null; for (EventNotifier notifier : notifiers) { + if (notifier.isDisabled()) { + continue; + } if (notifier.isIgnoreRouteEvents()) { continue; } @@ -499,6 +535,9 @@ public final class EventHelper { boolean answer = false; EventObject event = null; for (EventNotifier notifier : notifiers) { + if (notifier.isDisabled()) { + continue; + } if (notifier.isIgnoreExchangeEvents() || notifier.isIgnoreExchangeCreatedEvent()) { continue; } @@ -540,6 +579,9 @@ public final class EventHelper { boolean answer = false; EventObject event = null; for (EventNotifier notifier : notifiers) { + if (notifier.isDisabled()) { + continue; + } if (notifier.isIgnoreExchangeEvents() || notifier.isIgnoreExchangeCompletedEvent()) { continue; } @@ -581,6 +623,9 @@ public final class EventHelper { boolean answer = false; EventObject event = null; for (EventNotifier notifier : notifiers) { + if (notifier.isDisabled()) { + continue; + } if (notifier.isIgnoreExchangeEvents() || notifier.isIgnoreExchangeFailedEvents()) { continue; } @@ -623,6 +668,9 @@ public final class EventHelper { boolean answer = false; EventObject event = null; for (EventNotifier notifier : notifiers) { + if (notifier.isDisabled()) { + continue; + } if (notifier.isIgnoreExchangeEvents() || notifier.isIgnoreExchangeFailedEvents()) { continue; } @@ -665,6 +713,9 @@ public final class EventHelper { boolean answer = false; EventObject event = null; for (EventNotifier notifier : notifiers) { + if (notifier.isDisabled()) { + continue; + } if (notifier.isIgnoreExchangeEvents() || notifier.isIgnoreExchangeFailedEvents()) { continue; } @@ -706,6 +757,9 @@ public final class EventHelper { boolean answer = false; EventObject event = null; for (EventNotifier notifier : notifiers) { + if (notifier.isDisabled()) { + continue; + } if (notifier.isIgnoreExchangeEvents() || notifier.isIgnoreExchangeFailedEvents()) { continue; } @@ -747,6 +801,9 @@ public final class EventHelper { boolean answer = false; EventObject event = null; for (EventNotifier notifier : notifiers) { + if (notifier.isDisabled()) { + continue; + } if (notifier.isIgnoreExchangeEvents() || notifier.isIgnoreExchangeSentEvents()) { continue; } @@ -788,6 +845,9 @@ public final class EventHelper { boolean answer = false; EventObject event = null; for (EventNotifier notifier : notifiers) { + if (notifier.isDisabled()) { + continue; + } if (notifier.isIgnoreExchangeEvents() || notifier.isIgnoreExchangeSentEvents()) { continue; } @@ -824,6 +884,9 @@ public final class EventHelper { boolean answer = false; EventObject event = null; for (EventNotifier notifier : notifiers) { + if (notifier.isDisabled()) { + continue; + } if (notifier.isIgnoreCamelContextEvents()) { continue; } @@ -860,6 +923,9 @@ public final class EventHelper { boolean answer = false; EventObject event = null; for (EventNotifier notifier : notifiers) { + if (notifier.isDisabled()) { + continue; + } if (notifier.isIgnoreCamelContextEvents()) { continue; } @@ -896,6 +962,9 @@ public final class EventHelper { boolean answer = false; EventObject event = null; for (EventNotifier notifier : notifiers) { + if (notifier.isDisabled()) { + continue; + } if (notifier.isIgnoreCamelContextEvents()) { continue; } @@ -932,6 +1001,9 @@ public final class EventHelper { boolean answer = false; EventObject event = null; for (EventNotifier notifier : notifiers) { + if (notifier.isDisabled()) { + continue; + } if (notifier.isIgnoreCamelContextEvents()) { continue; } @@ -968,6 +1040,9 @@ public final class EventHelper { boolean answer = false; EventObject event = null; for (EventNotifier notifier : notifiers) { + if (notifier.isDisabled()) { + continue; + } if (notifier.isIgnoreCamelContextEvents()) { continue; }
