Repository: camel Updated Branches: refs/heads/master d663114ac -> 2ed525a0d
CAMEL-8992: EIP mbeans should output better expression/preidcate. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/14e018cd Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/14e018cd Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/14e018cd Branch: refs/heads/master Commit: 14e018cd6d06f04146b8bca3befc9f42722baaf8 Parents: 7c0cc37 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Jul 22 17:45:11 2015 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Jul 22 19:54:18 2015 +0200 ---------------------------------------------------------------------- .../management/mbean/ManagedDynamicRouterMBean.java | 3 +++ .../api/management/mbean/ManagedEnricherMBean.java | 3 +++ .../api/management/mbean/ManagedFilterMBean.java | 2 +- .../management/mbean/ManagedPollEnricherMBean.java | 3 +++ .../management/DefaultManagementObjectStrategy.java | 6 +++--- .../management/mbean/ManagedDynamicRouter.java | 15 +++++++++++++-- .../camel/management/mbean/ManagedEnricher.java | 16 +++++++++++++--- .../camel/management/mbean/ManagedPollEnricher.java | 16 +++++++++++++--- .../camel/management/ManagedDynamicRouterTest.java | 5 ++++- .../camel/management/ManagedEnricherTest.java | 5 ++++- .../camel/management/ManagedPollEnricherTest.java | 5 ++++- 11 files changed, 64 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/14e018cd/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedDynamicRouterMBean.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedDynamicRouterMBean.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedDynamicRouterMBean.java index 7a6abf3..8901525 100644 --- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedDynamicRouterMBean.java +++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedDynamicRouterMBean.java @@ -20,6 +20,9 @@ import org.apache.camel.api.management.ManagedAttribute; public interface ManagedDynamicRouterMBean extends ManagedProcessorMBean { + @ManagedAttribute(description = "The language for the expression") + String getExpressionLanguage(); + @ManagedAttribute(description = "Expression to call that returns the endpoint(s) to route to in the dynamic routing", mask = true) String getExpression(); http://git-wip-us.apache.org/repos/asf/camel/blob/14e018cd/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedEnricherMBean.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedEnricherMBean.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedEnricherMBean.java index a20447c..58666dd 100644 --- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedEnricherMBean.java +++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedEnricherMBean.java @@ -20,6 +20,9 @@ import org.apache.camel.api.management.ManagedAttribute; public interface ManagedEnricherMBean extends ManagedProcessorMBean { + @ManagedAttribute(description = "The language for the expression") + String getExpressionLanguage(); + @ManagedAttribute(description = "Expression that computes the endpoint uri to use as the resource endpoint to enrich from", mask = true) String getExpression(); http://git-wip-us.apache.org/repos/asf/camel/blob/14e018cd/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedFilterMBean.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedFilterMBean.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedFilterMBean.java index bf3145f..1531bbd 100644 --- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedFilterMBean.java +++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedFilterMBean.java @@ -20,7 +20,7 @@ import org.apache.camel.api.management.ManagedAttribute; public interface ManagedFilterMBean extends ManagedProcessorMBean { - @ManagedAttribute(description = "The language used for the predicate to determine if the message should be filtered or not") + @ManagedAttribute(description = "The language for the predicate") String getPredicateLanguage(); @ManagedAttribute(description = "Predicate to determine if the message should be filtered or not") http://git-wip-us.apache.org/repos/asf/camel/blob/14e018cd/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedPollEnricherMBean.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedPollEnricherMBean.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedPollEnricherMBean.java index 830225b..623b85c 100644 --- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedPollEnricherMBean.java +++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedPollEnricherMBean.java @@ -20,6 +20,9 @@ import org.apache.camel.api.management.ManagedAttribute; public interface ManagedPollEnricherMBean extends ManagedProcessorMBean { + @ManagedAttribute(description = "The language for the expression") + String getExpressionLanguage(); + @ManagedAttribute(description = "Expression that computes the endpoint uri to use as the resource endpoint to poll enrich from", mask = true) String getExpression(); http://git-wip-us.apache.org/repos/asf/camel/blob/14e018cd/camel-core/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java index b2e55b1..97804eb 100644 --- a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java +++ b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java @@ -272,7 +272,7 @@ public class DefaultManagementObjectStrategy implements ManagementObjectStrategy } else if (target instanceof Throttler) { answer = new ManagedThrottler(context, (Throttler) target, definition); } else if (target instanceof DynamicRouter) { - answer = new ManagedDynamicRouter(context, (DynamicRouter) target, definition); + answer = new ManagedDynamicRouter(context, (DynamicRouter) target, (org.apache.camel.model.DynamicRouterDefinition) definition); } else if (target instanceof RoutingSlip) { answer = new ManagedRoutingSlip(context, (RoutingSlip) target, definition); } else if (target instanceof FilterProcessor) { @@ -352,9 +352,9 @@ public class DefaultManagementObjectStrategy implements ManagementObjectStrategy } else if (target instanceof AggregateProcessor) { answer = new ManagedAggregateProcessor(context, (AggregateProcessor) target, (org.apache.camel.model.AggregateDefinition) definition); } else if (target instanceof Enricher) { - answer = new ManagedEnricher(context, (Enricher) target, definition); + answer = new ManagedEnricher(context, (Enricher) target, (org.apache.camel.model.EnrichDefinition) definition); } else if (target instanceof PollEnricher) { - answer = new ManagedPollEnricher(context, (PollEnricher) target, definition); + answer = new ManagedPollEnricher(context, (PollEnricher) target, (org.apache.camel.model.PollEnrichDefinition) definition); } else if (target instanceof org.apache.camel.spi.ManagementAware) { return ((org.apache.camel.spi.ManagementAware<Processor>) target).getManagedObject(processor); } http://git-wip-us.apache.org/repos/asf/camel/blob/14e018cd/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDynamicRouter.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDynamicRouter.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDynamicRouter.java index 9da30d6..5d371a9 100644 --- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDynamicRouter.java +++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDynamicRouter.java @@ -19,6 +19,7 @@ package org.apache.camel.management.mbean; import org.apache.camel.CamelContext; import org.apache.camel.api.management.ManagedResource; import org.apache.camel.api.management.mbean.ManagedDynamicRouterMBean; +import org.apache.camel.model.DynamicRouterDefinition; import org.apache.camel.model.ProcessorDefinition; import org.apache.camel.processor.DynamicRouter; import org.apache.camel.spi.ManagementStrategy; @@ -32,16 +33,21 @@ public class ManagedDynamicRouter extends ManagedProcessor implements ManagedDyn private final DynamicRouter processor; private String uri; - public ManagedDynamicRouter(CamelContext context, DynamicRouter processor, ProcessorDefinition<?> definition) { + public ManagedDynamicRouter(CamelContext context, DynamicRouter processor, DynamicRouterDefinition definition) { super(context, processor, definition); this.processor = processor; } @Override + public DynamicRouterDefinition getDefinition() { + return (DynamicRouterDefinition) super.getDefinition(); + } + + @Override public void init(ManagementStrategy strategy) { super.init(strategy); boolean sanitize = strategy.getManagementAgent().getMask() != null ? strategy.getManagementAgent().getMask() : false; - uri = processor.getExpression().toString(); + uri = getDefinition().getExpression().getExpression(); if (sanitize) { uri = URISupport.sanitizeUri(uri); } @@ -53,6 +59,11 @@ public class ManagedDynamicRouter extends ManagedProcessor implements ManagedDyn } @Override + public String getExpressionLanguage() { + return getDefinition().getExpression().getLanguage(); + } + + @Override public String getUriDelimiter() { return processor.getUriDelimiter(); } http://git-wip-us.apache.org/repos/asf/camel/blob/14e018cd/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEnricher.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEnricher.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEnricher.java index de01f56..12451ac 100644 --- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEnricher.java +++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEnricher.java @@ -19,7 +19,7 @@ package org.apache.camel.management.mbean; import org.apache.camel.CamelContext; import org.apache.camel.api.management.ManagedResource; import org.apache.camel.api.management.mbean.ManagedEnricherMBean; -import org.apache.camel.model.ProcessorDefinition; +import org.apache.camel.model.EnrichDefinition; import org.apache.camel.processor.Enricher; import org.apache.camel.spi.ManagementStrategy; import org.apache.camel.util.URISupport; @@ -32,7 +32,7 @@ public class ManagedEnricher extends ManagedProcessor implements ManagedEnricher private final Enricher processor; private String uri; - public ManagedEnricher(CamelContext context, Enricher processor, ProcessorDefinition<?> definition) { + public ManagedEnricher(CamelContext context, Enricher processor, EnrichDefinition definition) { super(context, processor, definition); this.processor = processor; } @@ -40,18 +40,28 @@ public class ManagedEnricher extends ManagedProcessor implements ManagedEnricher public void init(ManagementStrategy strategy) { super.init(strategy); boolean sanitize = strategy.getManagementAgent().getMask() != null ? strategy.getManagementAgent().getMask() : false; - uri = processor.getExpression().toString(); + uri = getDefinition().getExpression().getExpression(); if (sanitize) { uri = URISupport.sanitizeUri(uri); } } @Override + public EnrichDefinition getDefinition() { + return (EnrichDefinition) super.getDefinition(); + } + + @Override public Enricher getProcessor() { return processor; } @Override + public String getExpressionLanguage() { + return getDefinition().getExpression().getLanguage(); + } + + @Override public String getExpression() { return uri; } http://git-wip-us.apache.org/repos/asf/camel/blob/14e018cd/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedPollEnricher.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedPollEnricher.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedPollEnricher.java index 8519219..0b71e8f 100644 --- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedPollEnricher.java +++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedPollEnricher.java @@ -19,7 +19,7 @@ package org.apache.camel.management.mbean; import org.apache.camel.CamelContext; import org.apache.camel.api.management.ManagedResource; import org.apache.camel.api.management.mbean.ManagedPollEnricherMBean; -import org.apache.camel.model.ProcessorDefinition; +import org.apache.camel.model.PollEnrichDefinition; import org.apache.camel.processor.PollEnricher; import org.apache.camel.spi.ManagementStrategy; import org.apache.camel.util.URISupport; @@ -32,7 +32,7 @@ public class ManagedPollEnricher extends ManagedProcessor implements ManagedPoll private final PollEnricher processor; private String uri; - public ManagedPollEnricher(CamelContext context, PollEnricher processor, ProcessorDefinition<?> definition) { + public ManagedPollEnricher(CamelContext context, PollEnricher processor, PollEnrichDefinition definition) { super(context, processor, definition); this.processor = processor; } @@ -40,18 +40,28 @@ public class ManagedPollEnricher extends ManagedProcessor implements ManagedPoll public void init(ManagementStrategy strategy) { super.init(strategy); boolean sanitize = strategy.getManagementAgent().getMask() != null ? strategy.getManagementAgent().getMask() : false; - uri = processor.getExpression().toString(); + uri = getDefinition().getExpression().getExpression(); if (sanitize) { uri = URISupport.sanitizeUri(uri); } } @Override + public PollEnrichDefinition getDefinition() { + return (PollEnrichDefinition) super.getDefinition(); + } + + @Override public PollEnricher getProcessor() { return processor; } @Override + public String getExpressionLanguage() { + return getDefinition().getExpression().getLanguage(); + } + + @Override public String getExpression() { return uri; } http://git-wip-us.apache.org/repos/asf/camel/blob/14e018cd/camel-core/src/test/java/org/apache/camel/management/ManagedDynamicRouterTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedDynamicRouterTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedDynamicRouterTest.java index 10432b9..a3407ba 100644 --- a/camel-core/src/test/java/org/apache/camel/management/ManagedDynamicRouterTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/ManagedDynamicRouterTest.java @@ -58,8 +58,11 @@ public class ManagedDynamicRouterTest extends ManagementTestSupport { String state = (String) mbeanServer.getAttribute(on, "State"); assertEquals(ServiceStatus.Started.name(), state); + String lan = (String) mbeanServer.getAttribute(on, "ExpressionLanguage"); + assertEquals("header", lan); + String uri = (String) mbeanServer.getAttribute(on, "Expression"); - assertEquals("header(whereTo)", uri); + assertEquals("whereTo", uri); TabularData data = (TabularData) mbeanServer.invoke(on, "explain", new Object[]{false}, new String[]{"boolean"}); assertNotNull(data); http://git-wip-us.apache.org/repos/asf/camel/blob/14e018cd/camel-core/src/test/java/org/apache/camel/management/ManagedEnricherTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedEnricherTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedEnricherTest.java index 52c68bc..782e899 100644 --- a/camel-core/src/test/java/org/apache/camel/management/ManagedEnricherTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/ManagedEnricherTest.java @@ -58,8 +58,11 @@ public class ManagedEnricherTest extends ManagementTestSupport { String state = (String) mbeanServer.getAttribute(on, "State"); assertEquals(ServiceStatus.Started.name(), state); + String lan = (String) mbeanServer.getAttribute(on, "ExpressionLanguage"); + assertEquals("simple", lan); + String uri = (String) mbeanServer.getAttribute(on, "Expression"); - assertEquals("Simple: direct:${header.whereto}", uri); + assertEquals("direct:${header.whereto}", uri); TabularData data = (TabularData) mbeanServer.invoke(on, "explain", new Object[]{false}, new String[]{"boolean"}); assertNotNull(data); http://git-wip-us.apache.org/repos/asf/camel/blob/14e018cd/camel-core/src/test/java/org/apache/camel/management/ManagedPollEnricherTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedPollEnricherTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedPollEnricherTest.java index f679941..657a374 100644 --- a/camel-core/src/test/java/org/apache/camel/management/ManagedPollEnricherTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/ManagedPollEnricherTest.java @@ -62,8 +62,11 @@ public class ManagedPollEnricherTest extends ManagementTestSupport { Long timout = (Long) mbeanServer.getAttribute(on, "Timeout"); assertEquals(1000, timout.longValue()); + String lan = (String) mbeanServer.getAttribute(on, "ExpressionLanguage"); + assertEquals("simple", lan); + String uri = (String) mbeanServer.getAttribute(on, "Expression"); - assertEquals("Simple: seda:${header.whereto}", uri); + assertEquals("seda:${header.whereto}", uri); TabularData data = (TabularData) mbeanServer.invoke(on, "explain", new Object[]{false}, new String[]{"boolean"}); assertNotNull(data);
