CAMEL-9014: Add api for extended JMX information so we can easier know which EIPs support that or not.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1fb2b49a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1fb2b49a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1fb2b49a Branch: refs/heads/master Commit: 1fb2b49a52147374fae3b6572353f39b440deac2 Parents: 9ad5602 Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Jul 26 12:37:05 2015 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Jul 26 13:34:13 2015 +0200 ---------------------------------------------------------------------- .../mbean/ManagedDynamicRouterMBean.java | 4 ++-- .../management/mbean/ManagedEnricherMBean.java | 4 ++-- .../mbean/ManagedExtendedInformation.java | 25 ++++++++++++++++++++ .../management/mbean/ManagedProcessorMBean.java | 3 +++ .../mbean/ManagedRecipientListMBean.java | 4 ++-- .../mbean/ManagedRoutingSlipMBean.java | 4 ++-- .../mbean/ManagedSendDynamicProcessorMBean.java | 4 ++-- .../management/mbean/ManagedWireTapMBean.java | 4 ++-- .../camel/management/mbean/ManagedChoice.java | 5 ++++ .../ManagedCircuitBreakerLoadBalancer.java | 5 ++++ .../management/mbean/ManagedDynamicRouter.java | 7 +++++- .../camel/management/mbean/ManagedEnricher.java | 7 +++++- .../mbean/ManagedFailoverLoadBalancer.java | 5 ++++ .../management/mbean/ManagedProcessor.java | 4 ++++ .../management/mbean/ManagedRecipientList.java | 7 +++++- .../management/mbean/ManagedRoutingSlip.java | 7 +++++- .../mbean/ManagedSendDynamicProcessor.java | 7 +++++- .../mbean/ManagedWireTapProcessor.java | 7 +++++- .../management/ManagedDynamicRouterTest.java | 2 +- .../camel/management/ManagedEnricherTest.java | 2 +- .../management/ManagedRecipientListTest.java | 2 +- .../management/ManagedRoutingSlipTest.java | 2 +- .../ManagedSendDynamicProcessorTest.java | 2 +- .../camel/management/ManagedWireTapTest.java | 2 +- 24 files changed, 101 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/1fb2b49a/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 a07347f..9900a71 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 @@ -21,7 +21,7 @@ import javax.management.openmbean.TabularData; import org.apache.camel.api.management.ManagedAttribute; import org.apache.camel.api.management.ManagedOperation; -public interface ManagedDynamicRouterMBean extends ManagedProcessorMBean { +public interface ManagedDynamicRouterMBean extends ManagedProcessorMBean, ManagedExtendedInformation { @ManagedAttribute(description = "The language for the expression") String getExpressionLanguage(); @@ -39,6 +39,6 @@ public interface ManagedDynamicRouterMBean extends ManagedProcessorMBean { Boolean isIgnoreInvalidEndpoints(); @ManagedOperation(description = "Statistics of the endpoints which has been sent to") - TabularData endpointStatistics(); + TabularData extendedInformation(); } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/1fb2b49a/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 f6bd8be..3ba3968 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 @@ -21,7 +21,7 @@ import javax.management.openmbean.TabularData; import org.apache.camel.api.management.ManagedAttribute; import org.apache.camel.api.management.ManagedOperation; -public interface ManagedEnricherMBean extends ManagedProcessorMBean { +public interface ManagedEnricherMBean extends ManagedProcessorMBean, ManagedExtendedInformation { @ManagedAttribute(description = "The language for the expression") String getExpressionLanguage(); @@ -42,6 +42,6 @@ public interface ManagedEnricherMBean extends ManagedProcessorMBean { Boolean isAggregateOnException(); @ManagedOperation(description = "Statistics of the endpoints that has been enriched from") - TabularData endpointStatistics(); + TabularData extendedInformation(); } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/1fb2b49a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedExtendedInformation.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedExtendedInformation.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedExtendedInformation.java new file mode 100644 index 0000000..33547bb --- /dev/null +++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedExtendedInformation.java @@ -0,0 +1,25 @@ +/** + * 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.api.management.mbean; + +import javax.management.openmbean.TabularData; + +public interface ManagedExtendedInformation { + + TabularData extendedInformation(); + +} http://git-wip-us.apache.org/repos/asf/camel/blob/1fb2b49a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedProcessorMBean.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedProcessorMBean.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedProcessorMBean.java index bacb515..bc5753d 100644 --- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedProcessorMBean.java +++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedProcessorMBean.java @@ -41,6 +41,9 @@ public interface ManagedProcessorMBean extends ManagedPerformanceCounterMBean { @ManagedAttribute(description = "Processor Index") Integer getIndex(); + @ManagedAttribute(description = "Whether this processor supports extended JMX information") + Boolean isSupportExtendedInformation(); + @ManagedOperation(description = "Start Processor") void start() throws Exception; http://git-wip-us.apache.org/repos/asf/camel/blob/1fb2b49a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedRecipientListMBean.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedRecipientListMBean.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedRecipientListMBean.java index 4e02bcc..cc5e577 100644 --- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedRecipientListMBean.java +++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedRecipientListMBean.java @@ -21,7 +21,7 @@ import javax.management.openmbean.TabularData; import org.apache.camel.api.management.ManagedAttribute; import org.apache.camel.api.management.ManagedOperation; -public interface ManagedRecipientListMBean extends ManagedProcessorMBean { +public interface ManagedRecipientListMBean extends ManagedProcessorMBean, ManagedExtendedInformation { @ManagedAttribute(description = "The language for the expression") String getExpressionLanguage(); @@ -54,6 +54,6 @@ public interface ManagedRecipientListMBean extends ManagedProcessorMBean { Long getTimeout(); @ManagedOperation(description = "Statistics of the endpoints which has been sent to") - TabularData endpointStatistics(); + TabularData extendedInformation(); } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/1fb2b49a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedRoutingSlipMBean.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedRoutingSlipMBean.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedRoutingSlipMBean.java index 7a660ed..120651d 100644 --- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedRoutingSlipMBean.java +++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedRoutingSlipMBean.java @@ -21,7 +21,7 @@ import javax.management.openmbean.TabularData; import org.apache.camel.api.management.ManagedAttribute; import org.apache.camel.api.management.ManagedOperation; -public interface ManagedRoutingSlipMBean extends ManagedProcessorMBean { +public interface ManagedRoutingSlipMBean extends ManagedProcessorMBean, ManagedExtendedInformation { @ManagedAttribute(description = "The language for the expression") String getExpressionLanguage(); @@ -39,6 +39,6 @@ public interface ManagedRoutingSlipMBean extends ManagedProcessorMBean { Boolean isIgnoreInvalidEndpoints(); @ManagedOperation(description = "Statistics of the endpoints which has been sent to") - TabularData endpointStatistics(); + TabularData extendedInformation(); } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/1fb2b49a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedSendDynamicProcessorMBean.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedSendDynamicProcessorMBean.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedSendDynamicProcessorMBean.java index 2d8d662..d880980 100644 --- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedSendDynamicProcessorMBean.java +++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedSendDynamicProcessorMBean.java @@ -21,7 +21,7 @@ import javax.management.openmbean.TabularData; import org.apache.camel.api.management.ManagedAttribute; import org.apache.camel.api.management.ManagedOperation; -public interface ManagedSendDynamicProcessorMBean extends ManagedProcessorMBean { +public interface ManagedSendDynamicProcessorMBean extends ManagedProcessorMBean, ManagedExtendedInformation { @ManagedAttribute(description = "The uri of the endpoint to send to. The uri can be dynamic computed using the expressions.", mask = true) String getUri(); @@ -36,6 +36,6 @@ public interface ManagedSendDynamicProcessorMBean extends ManagedProcessorMBean Boolean isIgnoreInvalidEndpoint(); @ManagedOperation(description = "Statistics of the endpoints which has been sent to") - TabularData endpointStatistics(); + TabularData extendedInformation(); } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/1fb2b49a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedWireTapMBean.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedWireTapMBean.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedWireTapMBean.java index 6010c35..ac86d53 100644 --- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedWireTapMBean.java +++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedWireTapMBean.java @@ -21,7 +21,7 @@ import javax.management.openmbean.TabularData; import org.apache.camel.api.management.ManagedAttribute; import org.apache.camel.api.management.ManagedOperation; -public interface ManagedWireTapMBean extends ManagedProcessorMBean { +public interface ManagedWireTapMBean extends ManagedProcessorMBean, ManagedExtendedInformation { @ManagedAttribute(description = "The uri of the endpoint to wiretap to. The uri can be dynamic computed using the expressions.", mask = true) String getUri(); @@ -36,6 +36,6 @@ public interface ManagedWireTapMBean extends ManagedProcessorMBean { Boolean isCopy(); @ManagedOperation(description = "Statistics of the endpoints which has been sent to") - TabularData endpointStatistics(); + TabularData extendedInformation(); } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/1fb2b49a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedChoice.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedChoice.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedChoice.java index 09aaf1a..a9e0e2f 100644 --- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedChoice.java +++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedChoice.java @@ -58,6 +58,11 @@ public class ManagedChoice extends ManagedProcessor implements ManagedChoiceMBea } @Override + public Boolean isSupportExtendedInformation() { + return true; + } + + @Override public TabularData choiceStatistics() { try { TabularData answer = new TabularDataSupport(CamelOpenMBeanTypes.choiceTabularType()); http://git-wip-us.apache.org/repos/asf/camel/blob/1fb2b49a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCircuitBreakerLoadBalancer.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCircuitBreakerLoadBalancer.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCircuitBreakerLoadBalancer.java index f0a8389..3fbf7b3 100644 --- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCircuitBreakerLoadBalancer.java +++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCircuitBreakerLoadBalancer.java @@ -49,6 +49,11 @@ public class ManagedCircuitBreakerLoadBalancer extends ManagedProcessor implemen } @Override + public Boolean isSupportExtendedInformation() { + return true; + } + + @Override public Integer getSize() { return processor.getProcessors().size(); } http://git-wip-us.apache.org/repos/asf/camel/blob/1fb2b49a/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 c085d28..704a2c8 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 @@ -72,6 +72,11 @@ public class ManagedDynamicRouter extends ManagedProcessor implements ManagedDyn } @Override + public Boolean isSupportExtendedInformation() { + return true; + } + + @Override public String getExpression() { return uri; } @@ -97,7 +102,7 @@ public class ManagedDynamicRouter extends ManagedProcessor implements ManagedDyn } @Override - public TabularData endpointStatistics() { + public TabularData extendedInformation() { try { TabularData answer = new TabularDataSupport(CamelOpenMBeanTypes.endpointsUtilizationTabularType()); http://git-wip-us.apache.org/repos/asf/camel/blob/1fb2b49a/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 7b480ce..68081d67 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 @@ -66,6 +66,11 @@ public class ManagedEnricher extends ManagedProcessor implements ManagedEnricher } @Override + public Boolean isSupportExtendedInformation() { + return true; + } + + @Override public EnrichDefinition getDefinition() { return (EnrichDefinition) super.getDefinition(); } @@ -106,7 +111,7 @@ public class ManagedEnricher extends ManagedProcessor implements ManagedEnricher } @Override - public TabularData endpointStatistics() { + public TabularData extendedInformation() { try { TabularData answer = new TabularDataSupport(CamelOpenMBeanTypes.endpointsUtilizationTabularType()); http://git-wip-us.apache.org/repos/asf/camel/blob/1fb2b49a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedFailoverLoadBalancer.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedFailoverLoadBalancer.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedFailoverLoadBalancer.java index d51972c..58a39ee 100644 --- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedFailoverLoadBalancer.java +++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedFailoverLoadBalancer.java @@ -60,6 +60,11 @@ public class ManagedFailoverLoadBalancer extends ManagedProcessor implements Man } @Override + public Boolean isSupportExtendedInformation() { + return true; + } + + @Override public Integer getSize() { return processor.getProcessors().size(); } http://git-wip-us.apache.org/repos/asf/camel/blob/1fb2b49a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java index 4106dc0..4043299 100644 --- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java +++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java @@ -90,6 +90,10 @@ public class ManagedProcessor extends ManagedPerformanceCounter implements Manag return definition.getIndex(); } + public Boolean isSupportExtendedInformation() { + return false; + } + public Route getRoute() { return route; } http://git-wip-us.apache.org/repos/asf/camel/blob/1fb2b49a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRecipientList.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRecipientList.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRecipientList.java index 8cca08d..23dfd5f 100644 --- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRecipientList.java +++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRecipientList.java @@ -67,6 +67,11 @@ public class ManagedRecipientList extends ManagedProcessor implements ManagedRec } @Override + public Boolean isSupportExtendedInformation() { + return true; + } + + @Override public RecipientListDefinition getDefinition() { return (RecipientListDefinition) super.getDefinition(); } @@ -122,7 +127,7 @@ public class ManagedRecipientList extends ManagedProcessor implements ManagedRec } @Override - public TabularData endpointStatistics() { + public TabularData extendedInformation() { try { TabularData answer = new TabularDataSupport(CamelOpenMBeanTypes.endpointsUtilizationTabularType()); http://git-wip-us.apache.org/repos/asf/camel/blob/1fb2b49a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoutingSlip.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoutingSlip.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoutingSlip.java index 430a025..9f77530 100644 --- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoutingSlip.java +++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoutingSlip.java @@ -67,6 +67,11 @@ public class ManagedRoutingSlip extends ManagedProcessor implements ManagedRouti } @Override + public Boolean isSupportExtendedInformation() { + return true; + } + + @Override public RoutingSlipDefinition getDefinition() { return (RoutingSlipDefinition) super.getDefinition(); } @@ -97,7 +102,7 @@ public class ManagedRoutingSlip extends ManagedProcessor implements ManagedRouti } @Override - public TabularData endpointStatistics() { + public TabularData extendedInformation() { try { TabularData answer = new TabularDataSupport(CamelOpenMBeanTypes.endpointsUtilizationTabularType()); http://git-wip-us.apache.org/repos/asf/camel/blob/1fb2b49a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSendDynamicProcessor.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSendDynamicProcessor.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSendDynamicProcessor.java index fcc168d..47709ae 100644 --- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSendDynamicProcessor.java +++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSendDynamicProcessor.java @@ -66,6 +66,11 @@ public class ManagedSendDynamicProcessor extends ManagedProcessor implements Man } } + @Override + public Boolean isSupportExtendedInformation() { + return true; + } + public SendDynamicProcessor getProcessor() { return processor; } @@ -91,7 +96,7 @@ public class ManagedSendDynamicProcessor extends ManagedProcessor implements Man } @Override - public TabularData endpointStatistics() { + public TabularData extendedInformation() { try { TabularData answer = new TabularDataSupport(CamelOpenMBeanTypes.endpointsUtilizationTabularType()); http://git-wip-us.apache.org/repos/asf/camel/blob/1fb2b49a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedWireTapProcessor.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedWireTapProcessor.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedWireTapProcessor.java index d4856ad..e64fe71 100644 --- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedWireTapProcessor.java +++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedWireTapProcessor.java @@ -66,6 +66,11 @@ public class ManagedWireTapProcessor extends ManagedProcessor implements Managed } } + @Override + public Boolean isSupportExtendedInformation() { + return true; + } + public WireTapProcessor getProcessor() { return processor; } @@ -87,7 +92,7 @@ public class ManagedWireTapProcessor extends ManagedProcessor implements Managed } @Override - public TabularData endpointStatistics() { + public TabularData extendedInformation() { try { TabularData answer = new TabularDataSupport(CamelOpenMBeanTypes.endpointsUtilizationTabularType()); http://git-wip-us.apache.org/repos/asf/camel/blob/1fb2b49a/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 5775132..8c96c2b 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 @@ -78,7 +78,7 @@ public class ManagedDynamicRouterTest extends ManagementTestSupport { String uri = (String) mbeanServer.getAttribute(on, "Expression"); assertEquals("whereTo", uri); - TabularData data = (TabularData) mbeanServer.invoke(on, "endpointStatistics", null, null); + TabularData data = (TabularData) mbeanServer.invoke(on, "extendedInformation", null, null); assertNotNull(data); assertEquals(2, data.size()); http://git-wip-us.apache.org/repos/asf/camel/blob/1fb2b49a/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 23c1596..672541a 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 @@ -78,7 +78,7 @@ public class ManagedEnricherTest extends ManagementTestSupport { String uri = (String) mbeanServer.getAttribute(on, "Expression"); assertEquals("direct:${header.whereto}", uri); - TabularData data = (TabularData) mbeanServer.invoke(on, "endpointStatistics", null, null); + TabularData data = (TabularData) mbeanServer.invoke(on, "extendedInformation", null, null); assertNotNull(data); assertEquals(2, data.size()); http://git-wip-us.apache.org/repos/asf/camel/blob/1fb2b49a/camel-core/src/test/java/org/apache/camel/management/ManagedRecipientListTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedRecipientListTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedRecipientListTest.java index 5daadd7..0e041e3 100644 --- a/camel-core/src/test/java/org/apache/camel/management/ManagedRecipientListTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/ManagedRecipientListTest.java @@ -81,7 +81,7 @@ public class ManagedRecipientListTest extends ManagementTestSupport { String uri = (String) mbeanServer.getAttribute(on, "Expression"); assertEquals("whereto", uri); - TabularData data = (TabularData) mbeanServer.invoke(on, "endpointStatistics", null, null); + TabularData data = (TabularData) mbeanServer.invoke(on, "extendedInformation", null, null); assertNotNull(data); assertEquals(2, data.size()); http://git-wip-us.apache.org/repos/asf/camel/blob/1fb2b49a/camel-core/src/test/java/org/apache/camel/management/ManagedRoutingSlipTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedRoutingSlipTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedRoutingSlipTest.java index c830354..eefa086 100644 --- a/camel-core/src/test/java/org/apache/camel/management/ManagedRoutingSlipTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/ManagedRoutingSlipTest.java @@ -76,7 +76,7 @@ public class ManagedRoutingSlipTest extends ManagementTestSupport { String uri = (String) mbeanServer.getAttribute(on, "Expression"); assertEquals("whereTo", uri); - TabularData data = (TabularData) mbeanServer.invoke(on, "endpointStatistics", null, null); + TabularData data = (TabularData) mbeanServer.invoke(on, "extendedInformation", null, null); assertNotNull(data); assertEquals(2, data.size()); http://git-wip-us.apache.org/repos/asf/camel/blob/1fb2b49a/camel-core/src/test/java/org/apache/camel/management/ManagedSendDynamicProcessorTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedSendDynamicProcessorTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedSendDynamicProcessorTest.java index eb7ff51..2963ff4 100644 --- a/camel-core/src/test/java/org/apache/camel/management/ManagedSendDynamicProcessorTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/ManagedSendDynamicProcessorTest.java @@ -78,7 +78,7 @@ public class ManagedSendDynamicProcessorTest extends ManagementTestSupport { String pattern = (String) mbeanServer.getAttribute(on, "MessageExchangePattern"); assertNull(pattern); - TabularData data = (TabularData) mbeanServer.invoke(on, "endpointStatistics", null, null); + TabularData data = (TabularData) mbeanServer.invoke(on, "extendedInformation", null, null); assertNotNull(data); assertEquals(2, data.size()); http://git-wip-us.apache.org/repos/asf/camel/blob/1fb2b49a/camel-core/src/test/java/org/apache/camel/management/ManagedWireTapTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedWireTapTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedWireTapTest.java index c87f78f..42f53d8 100644 --- a/camel-core/src/test/java/org/apache/camel/management/ManagedWireTapTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/ManagedWireTapTest.java @@ -75,7 +75,7 @@ public class ManagedWireTapTest extends ManagementTestSupport { String uri = (String) mbeanServer.getAttribute(on, "Uri"); assertEquals("direct:${header.whereto}", uri); - TabularData data = (TabularData) mbeanServer.invoke(on, "endpointStatistics", null, null); + TabularData data = (TabularData) mbeanServer.invoke(on, "extendedInformation", null, null); assertNotNull(data); assertEquals(2, data.size());
