Polished JMX
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f51df703 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f51df703 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f51df703 Branch: refs/heads/master Commit: f51df703981165aed4e4af14ce20d1c0dd4a11a6 Parents: 6135ba9 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Mar 9 17:49:07 2017 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Mar 9 17:49:07 2017 +0100 ---------------------------------------------------------------------- .../apache/camel/impl/ThrottlingInflightRoutePolicy.java | 3 +-- .../management/DefaultManagementLifecycleStrategy.java | 10 ++++++---- .../apache/camel/impl/MultipleLifecycleStrategyTest.java | 6 ++++-- .../ManagedThrottlingExceptionRoutePolicyTest.java | 2 ++ 4 files changed, 13 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f51df703/camel-core/src/main/java/org/apache/camel/impl/ThrottlingInflightRoutePolicy.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/ThrottlingInflightRoutePolicy.java b/camel-core/src/main/java/org/apache/camel/impl/ThrottlingInflightRoutePolicy.java index 6250e96..a0a1914 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/ThrottlingInflightRoutePolicy.java +++ b/camel-core/src/main/java/org/apache/camel/impl/ThrottlingInflightRoutePolicy.java @@ -27,7 +27,6 @@ import org.apache.camel.CamelContextAware; import org.apache.camel.Consumer; import org.apache.camel.Exchange; import org.apache.camel.LoggingLevel; -import org.apache.camel.NonManagedService; import org.apache.camel.Route; import org.apache.camel.management.event.ExchangeCompletedEvent; import org.apache.camel.support.EventNotifierSupport; @@ -50,7 +49,7 @@ import org.slf4j.LoggerFactory; * * @version */ -public class ThrottlingInflightRoutePolicy extends RoutePolicySupport implements CamelContextAware, NonManagedService { +public class ThrottlingInflightRoutePolicy extends RoutePolicySupport implements CamelContextAware { public enum ThrottlingScope { Context, Route http://git-wip-us.apache.org/repos/asf/camel/blob/f51df703/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java index e9e8bb8..a09ff7d 100644 --- a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java +++ b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java @@ -103,8 +103,10 @@ import org.apache.camel.spi.RestRegistry; import org.apache.camel.spi.RouteContext; import org.apache.camel.spi.RuntimeEndpointRegistry; import org.apache.camel.spi.StreamCachingStrategy; +import org.apache.camel.spi.TransformerRegistry; import org.apache.camel.spi.TypeConverterRegistry; import org.apache.camel.spi.UnitOfWork; +import org.apache.camel.spi.ValidatorRegistry; import org.apache.camel.support.ServiceSupport; import org.apache.camel.support.TimerListenerManager; import org.apache.camel.util.KeyValueHolder; @@ -497,10 +499,10 @@ public class DefaultManagementLifecycleStrategy extends ServiceSupport implement answer = new ManagedStreamCachingStrategy(context, (StreamCachingStrategy) service); } else if (service instanceof EventNotifier) { answer = getManagementObjectStrategy().getManagedObjectForEventNotifier(context, (EventNotifier) service); - } else if (service instanceof DefaultTransformerRegistry) { - answer = new ManagedTransformerRegistry(context, (DefaultTransformerRegistry)service); - } else if (service instanceof DefaultValidatorRegistry) { - answer = new ManagedValidatorRegistry(context, (DefaultValidatorRegistry)service); + } else if (service instanceof TransformerRegistry) { + answer = new ManagedTransformerRegistry(context, (TransformerRegistry)service); + } else if (service instanceof ValidatorRegistry) { + answer = new ManagedValidatorRegistry(context, (ValidatorRegistry)service); } else if (service instanceof RuntimeCamelCatalog) { answer = new ManagedRuntimeCamelCatalog(context, (RuntimeCamelCatalog) service); } else if (service != null) { http://git-wip-us.apache.org/repos/asf/camel/blob/f51df703/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java b/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java index 40ef701..fd77a36 100644 --- a/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java +++ b/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java @@ -50,8 +50,10 @@ public class MultipleLifecycleStrategyTest extends TestSupport { context.removeComponent("log"); context.stop(); - List<String> expectedEvents = Arrays.asList("onContextStart", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", - "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onComponentAdd", "onEndpointAdd", "onComponentRemove", "onContextStop"); + List<String> expectedEvents = Arrays.asList("onContextStart", + "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", + "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", + "onComponentAdd", "onEndpointAdd", "onComponentRemove", "onContextStop"); assertEquals(expectedEvents, dummy1.getEvents()); assertEquals(expectedEvents, dummy2.getEvents()); http://git-wip-us.apache.org/repos/asf/camel/blob/f51df703/camel-core/src/test/java/org/apache/camel/management/ManagedThrottlingExceptionRoutePolicyTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedThrottlingExceptionRoutePolicyTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedThrottlingExceptionRoutePolicyTest.java index eab7635..222f3b6 100644 --- a/camel-core/src/test/java/org/apache/camel/management/ManagedThrottlingExceptionRoutePolicyTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/ManagedThrottlingExceptionRoutePolicyTest.java @@ -126,6 +126,8 @@ public class ManagedThrottlingExceptionRoutePolicyTest extends ManagementTestSu // the route has 1 failure val = proxy.getCurrentFailures(); assertEquals(1, val.intValue()); + + Thread.sleep(200); // the route has 1 failure X mills ago lastFail = proxy.getLastFailure();
