You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2025/08/03 17:42:36 UTC
(camel) 01/01: CAMEL-22312: Stopping routes should not remove its processor mbeans - those should stay so you can use the data for trouble shooting and management. Only when route is removed then the processors should be removed as well.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch jmxproc
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f560e144eaa105b4f4d12fec83b4e0c9280af7f3
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Aug 3 19:38:06 2025 +0200
CAMEL-22312: Stopping routes should not remove its processor mbeans - those should stay so you can use the data for trouble shooting and management. Only when route is removed then the processors should be removed as well.
---
.../org/apache/camel/spi/LifecycleStrategy.java | 12 ++++
.../org/apache/camel/impl/engine/RouteService.java | 2 +-
.../apache/camel/impl/console/RouteDevConsole.java | 2 +
.../management/mbean/ManagedProcessorAware.java} | 32 +++++----
.../management/JmxManagementLifecycleStrategy.java | 17 ++++-
.../mbean/ManagedAggregateProcessor.java | 78 +++++++++++-----------
.../camel/management/mbean/ManagedChoice.java | 13 ++--
.../camel/management/mbean/ManagedClaimCheck.java | 13 ++--
.../camel/management/mbean/ManagedConvertBody.java | 11 +--
.../management/mbean/ManagedConvertHeader.java | 15 +++--
.../management/mbean/ManagedConvertVariable.java | 15 +++--
.../mbean/ManagedCustomLoadBalancer.java | 11 +--
.../camel/management/mbean/ManagedDelayer.java | 17 +++--
.../camel/management/mbean/ManagedDisabled.java | 9 ++-
.../camel/management/mbean/ManagedDoCatch.java | 14 ++--
.../camel/management/mbean/ManagedDoTry.java | 70 ++++++++++---------
.../management/mbean/ManagedDynamicRouter.java | 20 +++---
.../camel/management/mbean/ManagedEnricher.java | 31 +++++----
.../mbean/ManagedFailoverLoadBalancer.java | 24 ++++---
.../camel/management/mbean/ManagedFilter.java | 11 +--
.../apache/camel/management/mbean/ManagedLog.java | 19 +++---
.../apache/camel/management/mbean/ManagedLoop.java | 11 +--
.../camel/management/mbean/ManagedMarshal.java | 11 +--
.../camel/management/mbean/ManagedMulticast.java | 19 +++---
.../apache/camel/management/mbean/ManagedPoll.java | 26 ++++----
.../management/mbean/ManagedPollEnricher.java | 33 +++++----
.../camel/management/mbean/ManagedProcess.java | 5 +-
.../camel/management/mbean/ManagedProcessor.java | 13 +++-
.../mbean/ManagedRandomLoadBalancer.java | 11 +--
.../management/mbean/ManagedRecipientList.java | 30 +++++----
.../management/mbean/ManagedRemoveHeader.java | 9 ++-
.../management/mbean/ManagedRemoveHeaders.java | 10 ++-
.../management/mbean/ManagedRemoveProperties.java | 10 ++-
.../management/mbean/ManagedRemoveProperty.java | 9 ++-
.../management/mbean/ManagedRemoveVariable.java | 9 ++-
.../camel/management/mbean/ManagedResequencer.java | 55 ++++++++-------
.../camel/management/mbean/ManagedRollback.java | 13 ++--
.../mbean/ManagedRoundRobinLoadBalancer.java | 11 +--
.../camel/management/mbean/ManagedRoutingSlip.java | 20 +++---
.../management/mbean/ManagedSamplingThrottler.java | 15 +++--
.../mbean/ManagedSendDynamicProcessor.java | 30 ++++-----
.../management/mbean/ManagedSendProcessor.java | 20 +++---
.../mbean/ManagedSetExchangePattern.java | 9 ++-
.../camel/management/mbean/ManagedSetHeader.java | 9 ++-
.../camel/management/mbean/ManagedSetHeaders.java | 9 ++-
.../camel/management/mbean/ManagedSetProperty.java | 9 ++-
.../camel/management/mbean/ManagedSetVariable.java | 9 ++-
.../management/mbean/ManagedSetVariables.java | 9 ++-
.../mbean/ManagedStickyLoadBalancer.java | 11 +--
.../camel/management/mbean/ManagedThreads.java | 31 +++++----
.../camel/management/mbean/ManagedThrottler.java | 23 +++----
.../management/mbean/ManagedThroughputLogger.java | 23 +++----
.../management/mbean/ManagedThrowException.java | 17 +++--
.../management/mbean/ManagedTopicLoadBalancer.java | 9 ++-
.../camel/management/mbean/ManagedUnmarshal.java | 13 ++--
.../mbean/ManagedWeightedLoadBalancer.java | 11 +--
.../management/mbean/ManagedWireTapProcessor.java | 25 ++++---
.../management/ManagedRouteNoAutoStartupTest.java | 14 +++-
.../ManagedRouteStopAndStartCleanupTest.java | 4 +-
.../commands/process/CamelProcessorStatus.java | 16 ++++-
.../commands/process/CamelRouteGroupStatus.java | 7 ++
.../core/commands/process/CamelRouteStatus.java | 7 ++
.../jbang/core/commands/process/ListConsumer.java | 2 +-
.../jbang/core/commands/process/ListHealth.java | 2 +-
.../dsl/jbang/core/commands/process/ListKafka.java | 2 +-
65 files changed, 631 insertions(+), 446 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/LifecycleStrategy.java b/core/camel-api/src/main/java/org/apache/camel/spi/LifecycleStrategy.java
index 4b397c27f3c..607ac852680 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/LifecycleStrategy.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/LifecycleStrategy.java
@@ -154,6 +154,18 @@ public interface LifecycleStrategy {
*/
void onServiceRemove(CamelContext context, Service service, Route route);
+ /**
+ * Notification on removing a {@link Service}.
+ *
+ * @param context the camel context
+ * @param service the removed service
+ * @param route the route the service belongs to if any possible to determine
+ * @param shutdown whether camel is being shutdown
+ */
+ default void onServiceRemove(CamelContext context, Service service, Route route, boolean shutdown) {
+ onServiceRemove(context, service, route);
+ }
+
/**
* Notification on adding {@link Route}(s).
*
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/RouteService.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/RouteService.java
index 8b5abd3eb48..87f7bd2b09d 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/RouteService.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/RouteService.java
@@ -426,7 +426,7 @@ public class RouteService extends ChildServiceSupport {
protected void stopChildServices(Route route, Set<Service> services, boolean shutdown) {
for (Service service : services) {
for (LifecycleStrategy strategy : camelContext.getLifecycleStrategies()) {
- strategy.onServiceRemove(camelContext, service, route);
+ strategy.onServiceRemove(camelContext, service, route, shutdown);
}
if (shutdown) {
ServiceHelper.stopAndShutdownService(service);
diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
index b1b79884c29..5485465f352 100644
--- a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
+++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
@@ -214,6 +214,7 @@ public class RouteDevConsole extends AbstractDevConsole {
}
sb.append(String.format("\n Source: %s", loc));
}
+ sb.append(String.format("\n State: %s", mp.getState()));
sb.append(String.format("\n Total: %s", mp.getExchangesTotal()));
sb.append(String.format("\n Failed: %s", mp.getExchangesFailed()));
sb.append(String.format("\n Inflight: %s", mp.getExchangesInflight()));
@@ -378,6 +379,7 @@ public class RouteDevConsole extends AbstractDevConsole {
}
jo.put("source", loc);
}
+ jo.put("state", mp.getState());
String line = ConsoleHelper.loadSourceLine(getCamelContext(), mp.getSourceLocation(), mp.getSourceLineNumber());
if (line != null) {
JsonArray ca = new JsonArray();
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDisabled.java b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedProcessorAware.java
similarity index 50%
copy from core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDisabled.java
copy to core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedProcessorAware.java
index 74ae15bf48b..f47712c7138 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDisabled.java
+++ b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedProcessorAware.java
@@ -14,25 +14,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.management.mbean;
+package org.apache.camel.api.management.mbean;
-import org.apache.camel.CamelContext;
-import org.apache.camel.api.management.ManagedResource;
-import org.apache.camel.api.management.mbean.ManagedDisabledMBean;
-import org.apache.camel.model.ProcessorDefinition;
-import org.apache.camel.processor.DisabledProcessor;
+import org.apache.camel.Processor;
-@ManagedResource(description = "Managed Disabled Processor")
-public class ManagedDisabled extends ManagedProcessor implements ManagedDisabledMBean {
- private final DisabledProcessor processor;
+/**
+ * MBeans that manages a {@link Processor} such as all EIPs.
+ */
+public interface ManagedProcessorAware {
+
+ /**
+ * Gets the processor
+ */
+ Processor getProcessor();
- public ManagedDisabled(CamelContext context, DisabledProcessor processor, ProcessorDefinition<?> definition) {
- super(context, processor, definition);
- this.processor = processor;
- }
+ /**
+ * Sets the processor
+ */
+ void setProcessor(Processor processor);
- @Override
- public String getNodeType() {
- return processor.getNodeType();
- }
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementLifecycleStrategy.java b/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementLifecycleStrategy.java
index cbb43a8bfca..ad23ad1495b 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementLifecycleStrategy.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementLifecycleStrategy.java
@@ -47,6 +47,7 @@ import org.apache.camel.Service;
import org.apache.camel.StartupListener;
import org.apache.camel.TimerListener;
import org.apache.camel.VetoCamelContextStartException;
+import org.apache.camel.api.management.mbean.ManagedProcessorAware;
import org.apache.camel.cluster.CamelClusterService;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.debugger.BacklogTracer;
@@ -467,6 +468,10 @@ public class JmxManagementLifecycleStrategy extends ServiceSupport implements Li
// skip already managed services, for example if a route has been restarted
if (getManagementStrategy().isManaged(managedObject)) {
LOG.trace("The service is already managed: {}", service);
+ // re-attach processor on mben so we can reuse existing MBean but with newly created processor
+ if (managedObject instanceof ManagedProcessorAware mpa && service instanceof Processor processor) {
+ mpa.setProcessor(processor);
+ }
return;
}
@@ -479,10 +484,21 @@ public class JmxManagementLifecycleStrategy extends ServiceSupport implements Li
@Override
public void onServiceRemove(CamelContext context, Service service, Route route) {
+ onServiceRemove(context, service, route, true);
+ }
+
+ @Override
+ public void onServiceRemove(CamelContext context, Service service, Route route, boolean shutdown) {
// the agent hasn't been started
if (!initialized) {
return;
}
+ // always remove consumer
+ boolean consumer = service instanceof Consumer;
+ if (!consumer && !shutdown) {
+ // only remove service if being shutdown
+ return;
+ }
Object managedObject = getManagedObjectForService(context, service, route);
if (managedObject != null) {
@@ -837,7 +853,6 @@ public class JmxManagementLifecycleStrategy extends ServiceSupport implements Li
}
}
}
-
}
private void registerPerformanceCounters(
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedAggregateProcessor.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedAggregateProcessor.java
index a0049c044b9..5b196dad042 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedAggregateProcessor.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedAggregateProcessor.java
@@ -26,16 +26,14 @@ import org.apache.camel.processor.aggregate.AggregateProcessor;
@ManagedResource(description = "Managed AggregateProcessor")
public class ManagedAggregateProcessor extends ManagedProcessor implements ManagedAggregateProcessorMBean {
- private final AggregateProcessor processor;
public ManagedAggregateProcessor(CamelContext context, AggregateProcessor processor, AggregateDefinition definition) {
super(context, processor, definition);
- this.processor = processor;
}
@Override
public AggregateProcessor getProcessor() {
- return processor;
+ return (AggregateProcessor) super.getProcessor();
}
@Override
@@ -63,7 +61,7 @@ public class ManagedAggregateProcessor extends ManagedProcessor implements Manag
@Override
public long getCompletionTimeout() {
- return processor.getCompletionTimeout();
+ return getProcessor().getCompletionTimeout();
}
@Override
@@ -86,17 +84,17 @@ public class ManagedAggregateProcessor extends ManagedProcessor implements Manag
@Override
public long getCompletionInterval() {
- return processor.getCompletionInterval();
+ return getProcessor().getCompletionInterval();
}
@Override
public long getCompletionTimeoutCheckerInterval() {
- return processor.getCompletionTimeoutCheckerInterval();
+ return getProcessor().getCompletionTimeoutCheckerInterval();
}
@Override
public int getCompletionSize() {
- return processor.getCompletionSize();
+ return getProcessor().getCompletionSize();
}
@Override
@@ -119,37 +117,37 @@ public class ManagedAggregateProcessor extends ManagedProcessor implements Manag
@Override
public boolean isCompletionFromBatchConsumer() {
- return processor.isCompletionFromBatchConsumer();
+ return getProcessor().isCompletionFromBatchConsumer();
}
@Override
public boolean isCompletionOnNewCorrelationGroup() {
- return processor.isCompletionOnNewCorrelationGroup();
+ return getProcessor().isCompletionOnNewCorrelationGroup();
}
@Override
public boolean isIgnoreInvalidCorrelationKeys() {
- return processor.isIgnoreInvalidCorrelationKeys();
+ return getProcessor().isIgnoreInvalidCorrelationKeys();
}
@Override
public Integer getCloseCorrelationKeyOnCompletion() {
- return processor.getCloseCorrelationKeyOnCompletion();
+ return getProcessor().getCloseCorrelationKeyOnCompletion();
}
@Override
public boolean isParallelProcessing() {
- return processor.isParallelProcessing();
+ return getProcessor().isParallelProcessing();
}
@Override
public boolean isOptimisticLocking() {
- return processor.isOptimisticLocking();
+ return getProcessor().isOptimisticLocking();
}
@Override
public boolean isEagerCheckCompletion() {
- return processor.isEagerCheckCompletion();
+ return getProcessor().isEagerCheckCompletion();
}
@Override
@@ -172,27 +170,27 @@ public class ManagedAggregateProcessor extends ManagedProcessor implements Manag
@Override
public boolean isDiscardOnCompletionTimeout() {
- return processor.isDiscardOnCompletionTimeout();
+ return getProcessor().isDiscardOnCompletionTimeout();
}
@Override
public boolean isForceCompletionOnStop() {
- return processor.isCompletionFromBatchConsumer();
+ return getProcessor().isCompletionFromBatchConsumer();
}
@Override
public boolean isCompleteAllOnStop() {
- return processor.isCompleteAllOnStop();
+ return getProcessor().isCompleteAllOnStop();
}
@Override
public int getInProgressCompleteExchanges() {
- return processor.getInProgressCompleteExchanges();
+ return getProcessor().getInProgressCompleteExchanges();
}
@Override
public int aggregationRepositoryGroups() {
- Set<String> keys = processor.getAggregationRepository().getKeys();
+ Set<String> keys = getProcessor().getAggregationRepository().getKeys();
if (keys != null) {
return keys.size();
} else {
@@ -202,8 +200,8 @@ public class ManagedAggregateProcessor extends ManagedProcessor implements Manag
@Override
public int forceCompletionOfGroup(String key) {
- if (processor.getAggregateController() != null) {
- return processor.getAggregateController().forceCompletionOfGroup(key);
+ if (getProcessor().getAggregateController() != null) {
+ return getProcessor().getAggregateController().forceCompletionOfGroup(key);
} else {
return 0;
}
@@ -211,8 +209,8 @@ public class ManagedAggregateProcessor extends ManagedProcessor implements Manag
@Override
public int forceCompletionOfAllGroups() {
- if (processor.getAggregateController() != null) {
- return processor.getAggregateController().forceCompletionOfAllGroups();
+ if (getProcessor().getAggregateController() != null) {
+ return getProcessor().getAggregateController().forceCompletionOfAllGroups();
} else {
return 0;
}
@@ -220,8 +218,8 @@ public class ManagedAggregateProcessor extends ManagedProcessor implements Manag
@Override
public int forceDiscardingOfGroup(String key) {
- if (processor.getAggregateController() != null) {
- return processor.getAggregateController().forceDiscardingOfGroup(key);
+ if (getProcessor().getAggregateController() != null) {
+ return getProcessor().getAggregateController().forceDiscardingOfGroup(key);
} else {
return 0;
}
@@ -229,8 +227,8 @@ public class ManagedAggregateProcessor extends ManagedProcessor implements Manag
@Override
public int forceDiscardingOfAllGroups() {
- if (processor.getAggregateController() != null) {
- return processor.getAggregateController().forceDiscardingOfAllGroups();
+ if (getProcessor().getAggregateController() != null) {
+ return getProcessor().getAggregateController().forceDiscardingOfAllGroups();
} else {
return 0;
}
@@ -238,66 +236,66 @@ public class ManagedAggregateProcessor extends ManagedProcessor implements Manag
@Override
public int getClosedCorrelationKeysCacheSize() {
- return processor.getClosedCorrelationKeysCacheSize();
+ return getProcessor().getClosedCorrelationKeysCacheSize();
}
@Override
public void clearClosedCorrelationKeysCache() {
- processor.clearClosedCorrelationKeysCache();
+ getProcessor().clearClosedCorrelationKeysCache();
}
@Override
public long getTotalIn() {
- return processor.getStatistics().getTotalIn();
+ return getProcessor().getStatistics().getTotalIn();
}
@Override
public long getTotalCompleted() {
- return processor.getStatistics().getTotalCompleted();
+ return getProcessor().getStatistics().getTotalCompleted();
}
@Override
public long getCompletedBySize() {
- return processor.getStatistics().getCompletedBySize();
+ return getProcessor().getStatistics().getCompletedBySize();
}
@Override
public long getCompletedByStrategy() {
- return processor.getStatistics().getCompletedByStrategy();
+ return getProcessor().getStatistics().getCompletedByStrategy();
}
@Override
public long getCompletedByInterval() {
- return processor.getStatistics().getCompletedByInterval();
+ return getProcessor().getStatistics().getCompletedByInterval();
}
@Override
public long getCompletedByTimeout() {
- return processor.getStatistics().getCompletedByTimeout();
+ return getProcessor().getStatistics().getCompletedByTimeout();
}
@Override
public long getCompletedByPredicate() {
- return processor.getStatistics().getCompletedByPredicate();
+ return getProcessor().getStatistics().getCompletedByPredicate();
}
@Override
public long getCompletedByBatchConsumer() {
- return processor.getStatistics().getCompletedByBatchConsumer();
+ return getProcessor().getStatistics().getCompletedByBatchConsumer();
}
@Override
public long getCompletedByForce() {
- return processor.getStatistics().getCompletedByForce();
+ return getProcessor().getStatistics().getCompletedByForce();
}
@Override
public long getDiscarded() {
- return processor.getStatistics().getDiscarded();
+ return getProcessor().getStatistics().getDiscarded();
}
@Override
public void resetStatistics() {
- processor.getStatistics().reset();
+ getProcessor().getStatistics().reset();
}
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedChoice.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedChoice.java
index 2ec5fc52083..29d93aa73f0 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedChoice.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedChoice.java
@@ -37,11 +37,14 @@ import org.apache.camel.processor.FilterProcessor;
@ManagedResource(description = "Managed Choice")
public class ManagedChoice extends ManagedProcessor implements ManagedChoiceMBean {
- private final ChoiceProcessor processor;
public ManagedChoice(CamelContext context, ChoiceProcessor processor, ProcessorDefinition<?> definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public ChoiceProcessor getProcessor() {
+ return (ChoiceProcessor) super.getProcessor();
}
@Override
@@ -51,7 +54,7 @@ public class ManagedChoice extends ManagedProcessor implements ManagedChoiceMBea
@Override
public void reset() {
- processor.reset();
+ getProcessor().reset();
super.reset();
}
@@ -66,7 +69,7 @@ public class ManagedChoice extends ManagedProcessor implements ManagedChoiceMBea
TabularData answer = new TabularDataSupport(CamelOpenMBeanTypes.choiceTabularType());
List<WhenDefinition> whens = getDefinition().getWhenClauses();
- List<FilterProcessor> filters = processor.getFilters();
+ List<FilterProcessor> filters = getProcessor().getFilters();
for (int i = 0; i < filters.size(); i++) {
WhenDefinition when = whens.get(i);
@@ -87,7 +90,7 @@ public class ManagedChoice extends ManagedProcessor implements ManagedChoiceMBea
CompositeType ct = CamelOpenMBeanTypes.choiceCompositeType();
String predicate = "otherwise";
String language = "";
- long matches = processor.getNotFilteredCount();
+ long matches = getProcessor().getNotFilteredCount();
CompositeData data = new CompositeDataSupport(
ct,
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedClaimCheck.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedClaimCheck.java
index 02214ceab56..076b6dfa09f 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedClaimCheck.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedClaimCheck.java
@@ -24,25 +24,28 @@ import org.apache.camel.processor.ClaimCheckProcessor;
@ManagedResource(description = "Managed Claim Check")
public class ManagedClaimCheck extends ManagedProcessor implements ManagedClaimCheckMBean {
- private final ClaimCheckProcessor processor;
public ManagedClaimCheck(CamelContext context, ClaimCheckProcessor processor, ProcessorDefinition<?> definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public ClaimCheckProcessor getProcessor() {
+ return (ClaimCheckProcessor) super.getProcessor();
}
@Override
public String getOperation() {
- return processor.getOperation();
+ return getProcessor().getOperation();
}
@Override
public String getKey() {
- return processor.getKey();
+ return getProcessor().getKey();
}
@Override
public String getFilter() {
- return processor.getFilter();
+ return getProcessor().getFilter();
}
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedConvertBody.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedConvertBody.java
index 00a548857e5..07df5428849 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedConvertBody.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedConvertBody.java
@@ -24,20 +24,23 @@ import org.apache.camel.support.processor.ConvertBodyProcessor;
@ManagedResource(description = "Managed ConvertBody")
public class ManagedConvertBody extends ManagedProcessor implements ManagedConvertBodyMBean {
- private final ConvertBodyProcessor processor;
public ManagedConvertBody(CamelContext context, ConvertBodyProcessor processor, ProcessorDefinition<?> definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public ConvertBodyProcessor getProcessor() {
+ return (ConvertBodyProcessor) super.getProcessor();
}
@Override
public String getType() {
- return processor.getType().getCanonicalName();
+ return getProcessor().getType().getCanonicalName();
}
@Override
public String getCharset() {
- return processor.getCharset();
+ return getProcessor().getCharset();
}
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedConvertHeader.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedConvertHeader.java
index 82b1d500eb8..3961677ca11 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedConvertHeader.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedConvertHeader.java
@@ -24,30 +24,33 @@ import org.apache.camel.support.processor.ConvertHeaderProcessor;
@ManagedResource(description = "Managed ConvertHeader")
public class ManagedConvertHeader extends ManagedProcessor implements ManagedConvertHeaderMBean {
- private final ConvertHeaderProcessor processor;
public ManagedConvertHeader(CamelContext context, ConvertHeaderProcessor processor, ProcessorDefinition<?> definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public ConvertHeaderProcessor getProcessor() {
+ return (ConvertHeaderProcessor) super.getProcessor();
}
@Override
public String getName() {
- return processor.getName();
+ return getProcessor().getName();
}
@Override
public String getToName() {
- return processor.getToName();
+ return getProcessor().getToName();
}
@Override
public String getType() {
- return processor.getType().getCanonicalName();
+ return getProcessor().getType().getCanonicalName();
}
@Override
public String getCharset() {
- return processor.getCharset();
+ return getProcessor().getCharset();
}
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedConvertVariable.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedConvertVariable.java
index b8cc1c00530..6c9d2bfdf70 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedConvertVariable.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedConvertVariable.java
@@ -24,30 +24,33 @@ import org.apache.camel.support.processor.ConvertVariableProcessor;
@ManagedResource(description = "Managed ConvertVariable")
public class ManagedConvertVariable extends ManagedProcessor implements ManagedConvertVariableMBean {
- private final ConvertVariableProcessor processor;
public ManagedConvertVariable(CamelContext context, ConvertVariableProcessor processor, ProcessorDefinition<?> definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public ConvertVariableProcessor getProcessor() {
+ return (ConvertVariableProcessor) super.getProcessor();
}
@Override
public String getName() {
- return processor.getName();
+ return getProcessor().getName();
}
@Override
public String getToName() {
- return processor.getToName();
+ return getProcessor().getToName();
}
@Override
public String getType() {
- return processor.getType().getCanonicalName();
+ return getProcessor().getType().getCanonicalName();
}
@Override
public String getCharset() {
- return processor.getCharset();
+ return getProcessor().getCharset();
}
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedCustomLoadBalancer.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedCustomLoadBalancer.java
index 2b181d20e91..2c49b298375 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedCustomLoadBalancer.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedCustomLoadBalancer.java
@@ -26,11 +26,14 @@ import org.apache.camel.util.ObjectHelper;
@ManagedResource(description = "Managed Custom LoadBalancer")
public class ManagedCustomLoadBalancer extends ManagedProcessor implements ManagedCustomLoadBalancerMBean {
- private final LoadBalancer processor;
public ManagedCustomLoadBalancer(CamelContext context, LoadBalancer processor, LoadBalanceDefinition definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public LoadBalancer getProcessor() {
+ return (LoadBalancer) super.getProcessor();
}
@Override
@@ -46,11 +49,11 @@ public class ManagedCustomLoadBalancer extends ManagedProcessor implements Manag
@Override
public String getLoadBalancerClassName() {
- return ObjectHelper.className(processor);
+ return ObjectHelper.className(getProcessor());
}
@Override
public Integer getSize() {
- return processor.getProcessors().size();
+ return getProcessor().getProcessors().size();
}
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDelayer.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDelayer.java
index 87523dde714..c10e8d71668 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDelayer.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDelayer.java
@@ -26,41 +26,40 @@ import org.apache.camel.processor.Delayer;
@ManagedResource(description = "Managed Delayer")
public class ManagedDelayer extends ManagedProcessor implements ManagedDelayerMBean {
- private final Delayer delayer;
public ManagedDelayer(CamelContext context, Delayer delayer, ProcessorDefinition<?> definition) {
super(context, delayer, definition);
- this.delayer = delayer;
}
- public Delayer getDelayer() {
- return delayer;
+ @Override
+ public Delayer getProcessor() {
+ return (Delayer) super.getProcessor();
}
@Override
public Long getDelay() {
- return delayer.getDelayValue();
+ return getProcessor().getDelayValue();
}
@Override
public void constantDelay(Integer millis) {
Expression delay = ExpressionBuilder.constantExpression(millis);
- delayer.setDelay(delay);
+ getProcessor().setDelay(delay);
}
@Override
public int getDelayedCount() {
- return delayer.getDelayedCount();
+ return getProcessor().getDelayedCount();
}
@Override
public Boolean isAsyncDelayed() {
- return delayer.isAsyncDelayed();
+ return getProcessor().isAsyncDelayed();
}
@Override
public Boolean isCallerRunsWhenRejected() {
- return delayer.isCallerRunsWhenRejected();
+ return getProcessor().isCallerRunsWhenRejected();
}
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDisabled.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDisabled.java
index 74ae15bf48b..06f799bf9c0 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDisabled.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDisabled.java
@@ -24,15 +24,18 @@ import org.apache.camel.processor.DisabledProcessor;
@ManagedResource(description = "Managed Disabled Processor")
public class ManagedDisabled extends ManagedProcessor implements ManagedDisabledMBean {
- private final DisabledProcessor processor;
public ManagedDisabled(CamelContext context, DisabledProcessor processor, ProcessorDefinition<?> definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public DisabledProcessor getProcessor() {
+ return (DisabledProcessor) super.getProcessor();
}
@Override
public String getNodeType() {
- return processor.getNodeType();
+ return getProcessor().getNodeType();
}
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDoCatch.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDoCatch.java
index 05afe14c089..511491c1a71 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDoCatch.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDoCatch.java
@@ -26,11 +26,13 @@ import org.apache.camel.processor.CatchProcessor;
@ManagedResource(description = "Managed DoCatch")
public class ManagedDoCatch extends ManagedProcessor implements ManagedDoCatchMBean {
- private final CatchProcessor processor;
-
public ManagedDoCatch(CamelContext context, CatchProcessor processor, CatchDefinition definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public CatchProcessor getProcessor() {
+ return (CatchProcessor) super.getProcessor();
}
@Override
@@ -58,17 +60,17 @@ public class ManagedDoCatch extends ManagedProcessor implements ManagedDoCatchMB
@Override
public Long getCaughtCount() {
- return processor.getCaughtCount();
+ return getProcessor().getCaughtCount();
}
@Override
public Long getCaughtCount(String className) {
- return processor.getCaughtCount(className);
+ return getProcessor().getCaughtCount(className);
}
@Override
public String[] getExceptionTypes() {
- return processor.getCaughtExceptionClassNames().toArray(new String[0]);
+ return getProcessor().getCaughtExceptionClassNames().toArray(new String[0]);
}
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDoTry.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDoTry.java
index d22b878a349..22289a667b5 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDoTry.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDoTry.java
@@ -41,21 +41,14 @@ import org.apache.camel.processor.TryProcessor;
@ManagedResource(description = "Managed DoTry")
public class ManagedDoTry extends ManagedProcessor implements ManagedDoTryMBean {
- private final List<CatchProcessor> catchProcessors;
-
public ManagedDoTry(CamelContext context, TryProcessor processor, TryDefinition definition) {
super(context, processor, definition);
- if (processor.getCatchClauses() != null && !processor.getCatchClauses().isEmpty()) {
- catchProcessors = new ArrayList<>();
- for (Processor p : processor.getCatchClauses()) {
- Channel c = (Channel) p;
- CatchProcessor caught = asCatchProcessor(c);
- catchProcessors.add(caught);
- }
- } else {
- catchProcessors = null;
- }
+ }
+
+ @Override
+ public TryProcessor getProcessor() {
+ return (TryProcessor) super.getProcessor();
}
@Override
@@ -73,28 +66,27 @@ public class ManagedDoTry extends ManagedProcessor implements ManagedDoTryMBean
try {
TabularData answer = new TabularDataSupport(CamelOpenMBeanTypes.doTryTabularType());
- if (catchProcessors != null) {
- List<CatchDefinition> exceptions = getDefinition().getCatchClauses();
- for (int i = 0; i < catchProcessors.size(); i++) {
- CatchDefinition when = exceptions.get(i);
- CatchProcessor caught = catchProcessors.get(i);
- if (caught != null) {
- for (String fqn : caught.getCaughtExceptionClassNames()) {
- CompositeType ct = CamelOpenMBeanTypes.doTryCompositeType();
- String predicate = null;
- String language = null;
- if (when.getOnWhen() != null) {
- predicate = when.getOnWhen().getExpression().getExpression();
- language = when.getOnWhen().getExpression().getLanguage();
- }
- long matches = caught.getCaughtCount(fqn);
-
- CompositeData data = new CompositeDataSupport(
- ct,
- new String[] { "exception", "predicate", "language", "matches" },
- new Object[] { fqn, predicate, language, matches });
- answer.put(data);
+ var catchProcessors = getCatchProcessors();
+ List<CatchDefinition> exceptions = getDefinition().getCatchClauses();
+ for (int i = 0; i < catchProcessors.size(); i++) {
+ CatchDefinition when = exceptions.get(i);
+ CatchProcessor caught = catchProcessors.get(i);
+ if (caught != null) {
+ for (String fqn : caught.getCaughtExceptionClassNames()) {
+ CompositeType ct = CamelOpenMBeanTypes.doTryCompositeType();
+ String predicate = null;
+ String language = null;
+ if (when.getOnWhen() != null) {
+ predicate = when.getOnWhen().getExpression().getExpression();
+ language = when.getOnWhen().getExpression().getLanguage();
}
+ long matches = caught.getCaughtCount(fqn);
+
+ CompositeData data = new CompositeDataSupport(
+ ct,
+ new String[] { "exception", "predicate", "language", "matches" },
+ new Object[] { fqn, predicate, language, matches });
+ answer.put(data);
}
}
}
@@ -120,4 +112,16 @@ public class ManagedDoTry extends ManagedProcessor implements ManagedDoTryMBean
return null;
}
+ private List<CatchProcessor> getCatchProcessors() {
+ List<CatchProcessor> answer = new ArrayList<>();
+ if (getProcessor().getCatchClauses() != null && !getProcessor().getCatchClauses().isEmpty()) {
+ for (Processor p : getProcessor().getCatchClauses()) {
+ Channel c = (Channel) p;
+ CatchProcessor caught = asCatchProcessor(c);
+ answer.add(caught);
+ }
+ }
+ return answer;
+ }
+
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDynamicRouter.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDynamicRouter.java
index 47f95cb00d1..b0632f41cc3 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDynamicRouter.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDynamicRouter.java
@@ -37,13 +37,17 @@ import org.apache.camel.util.URISupport;
@ManagedResource(description = "Managed DynamicRouter")
public class ManagedDynamicRouter extends ManagedProcessor implements ManagedDynamicRouterMBean {
- private final DynamicRouter processor;
+
private String uri;
private boolean sanitize;
public ManagedDynamicRouter(CamelContext context, DynamicRouter processor, DynamicRouterDefinition<?> definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public DynamicRouter getProcessor() {
+ return (DynamicRouter) super.getProcessor();
}
@Override
@@ -64,8 +68,8 @@ public class ManagedDynamicRouter extends ManagedProcessor implements ManagedDyn
@Override
public void reset() {
super.reset();
- if (processor.getEndpointUtilizationStatistics() != null) {
- processor.getEndpointUtilizationStatistics().clear();
+ if (getProcessor().getEndpointUtilizationStatistics() != null) {
+ getProcessor().getEndpointUtilizationStatistics().clear();
}
}
@@ -86,17 +90,17 @@ public class ManagedDynamicRouter extends ManagedProcessor implements ManagedDyn
@Override
public String getUriDelimiter() {
- return processor.getUriDelimiter();
+ return getProcessor().getUriDelimiter();
}
@Override
public Integer getCacheSize() {
- return processor.getCacheSize();
+ return getProcessor().getCacheSize();
}
@Override
public Boolean isIgnoreInvalidEndpoints() {
- return processor.isIgnoreInvalidEndpoints();
+ return getProcessor().isIgnoreInvalidEndpoints();
}
@Override
@@ -104,7 +108,7 @@ public class ManagedDynamicRouter extends ManagedProcessor implements ManagedDyn
try {
TabularData answer = new TabularDataSupport(CamelOpenMBeanTypes.endpointsUtilizationTabularType());
- EndpointUtilizationStatistics stats = processor.getEndpointUtilizationStatistics();
+ EndpointUtilizationStatistics stats = getProcessor().getEndpointUtilizationStatistics();
if (stats != null) {
for (Map.Entry<String, Long> entry : stats.getStatistics().entrySet()) {
CompositeType ct = CamelOpenMBeanTypes.endpointsUtilizationCompositeType();
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedEnricher.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedEnricher.java
index 3594ea619b4..4e378e8ad69 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedEnricher.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedEnricher.java
@@ -37,13 +37,12 @@ import org.apache.camel.util.URISupport;
@ManagedResource(description = "Managed Enricher")
public class ManagedEnricher extends ManagedProcessor implements ManagedEnricherMBean {
- private final Enricher processor;
+
private String uri;
private boolean sanitize;
public ManagedEnricher(CamelContext context, Enricher processor, EnrichDefinition definition) {
super(context, processor, definition);
- this.processor = processor;
}
@Override
@@ -56,11 +55,16 @@ public class ManagedEnricher extends ManagedProcessor implements ManagedEnricher
}
}
+ @Override
+ public Enricher getProcessor() {
+ return (Enricher) super.getProcessor();
+ }
+
@Override
public void reset() {
super.reset();
- if (processor.getEndpointUtilizationStatistics() != null) {
- processor.getEndpointUtilizationStatistics().clear();
+ if (getProcessor().getEndpointUtilizationStatistics() != null) {
+ getProcessor().getEndpointUtilizationStatistics().clear();
}
}
@@ -74,11 +78,6 @@ public class ManagedEnricher extends ManagedProcessor implements ManagedEnricher
return (EnrichDefinition) super.getDefinition();
}
- @Override
- public Enricher getProcessor() {
- return processor;
- }
-
@Override
public String getExpressionLanguage() {
return getDefinition().getExpression().getLanguage();
@@ -91,32 +90,32 @@ public class ManagedEnricher extends ManagedProcessor implements ManagedEnricher
@Override
public String getVariableSend() {
- return processor.getVariableSend();
+ return getProcessor().getVariableSend();
}
@Override
public String getVariableReceive() {
- return processor.getVariableReceive();
+ return getProcessor().getVariableReceive();
}
@Override
public Integer getCacheSize() {
- return processor.getCacheSize();
+ return getProcessor().getCacheSize();
}
@Override
public Boolean isIgnoreInvalidEndpoint() {
- return processor.isIgnoreInvalidEndpoint();
+ return getProcessor().isIgnoreInvalidEndpoint();
}
@Override
public Boolean isShareUnitOfWork() {
- return processor.isShareUnitOfWork();
+ return getProcessor().isShareUnitOfWork();
}
@Override
public Boolean isAggregateOnException() {
- return processor.isAggregateOnException();
+ return getProcessor().isAggregateOnException();
}
@Override
@@ -124,7 +123,7 @@ public class ManagedEnricher extends ManagedProcessor implements ManagedEnricher
try {
TabularData answer = new TabularDataSupport(CamelOpenMBeanTypes.endpointsUtilizationTabularType());
- EndpointUtilizationStatistics stats = processor.getEndpointUtilizationStatistics();
+ EndpointUtilizationStatistics stats = getProcessor().getEndpointUtilizationStatistics();
if (stats != null) {
for (Map.Entry<String, Long> entry : stats.getStatistics().entrySet()) {
CompositeType ct = CamelOpenMBeanTypes.endpointsUtilizationCompositeType();
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedFailoverLoadBalancer.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedFailoverLoadBalancer.java
index 0523356fbd7..eed54476775 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedFailoverLoadBalancer.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedFailoverLoadBalancer.java
@@ -39,12 +39,16 @@ import org.apache.camel.util.ObjectHelper;
@ManagedResource(description = "Managed Failover LoadBalancer")
public class ManagedFailoverLoadBalancer extends ManagedProcessor implements ManagedFailoverLoadBalancerMBean {
- private final FailOverLoadBalancer processor;
+
private String exceptions;
public ManagedFailoverLoadBalancer(CamelContext context, FailOverLoadBalancer processor, LoadBalanceDefinition definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public FailOverLoadBalancer getProcessor() {
+ return (FailOverLoadBalancer) super.getProcessor();
}
@Override
@@ -55,7 +59,7 @@ public class ManagedFailoverLoadBalancer extends ManagedProcessor implements Man
@Override
public void reset() {
super.reset();
- processor.reset();
+ getProcessor().reset();
}
@Override
@@ -65,22 +69,22 @@ public class ManagedFailoverLoadBalancer extends ManagedProcessor implements Man
@Override
public Integer getSize() {
- return processor.getProcessors().size();
+ return getProcessor().getProcessors().size();
}
@Override
public Boolean isRoundRobin() {
- return processor.isRoundRobin();
+ return getProcessor().isRoundRobin();
}
@Override
public Boolean isSticky() {
- return processor.isSticky();
+ return getProcessor().isSticky();
}
@Override
public Integer getMaximumFailoverAttempts() {
- return processor.getMaximumFailoverAttempts();
+ return getProcessor().getMaximumFailoverAttempts();
}
@Override
@@ -89,7 +93,7 @@ public class ManagedFailoverLoadBalancer extends ManagedProcessor implements Man
return exceptions;
}
- List<Class<?>> classes = processor.getExceptions();
+ List<Class<?>> classes = getProcessor().getExceptions();
if (classes == null || classes.isEmpty()) {
exceptions = "";
} else {
@@ -104,7 +108,7 @@ public class ManagedFailoverLoadBalancer extends ManagedProcessor implements Man
@Override
public String getLastGoodProcessorId() {
- int idx = processor.getLastGoodIndex();
+ int idx = getProcessor().getLastGoodIndex();
if (idx != -1) {
LoadBalanceDefinition def = getDefinition();
ProcessorDefinition<?> output = def.getOutputs().get(idx);
@@ -120,7 +124,7 @@ public class ManagedFailoverLoadBalancer extends ManagedProcessor implements Man
try {
TabularData answer = new TabularDataSupport(CamelOpenMBeanTypes.loadbalancerExceptionsTabularType());
- ExceptionFailureStatistics statistics = processor.getExceptionFailureStatistics();
+ ExceptionFailureStatistics statistics = getProcessor().getExceptionFailureStatistics();
Iterator<Class<?>> it = statistics.getExceptions();
boolean empty = true;
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedFilter.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedFilter.java
index 42595523b89..7d433a44862 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedFilter.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedFilter.java
@@ -24,11 +24,14 @@ import org.apache.camel.processor.FilterProcessor;
@ManagedResource(description = "Managed Filter")
public class ManagedFilter extends ManagedProcessor implements ManagedFilterMBean {
- private final FilterProcessor processor;
public ManagedFilter(CamelContext context, FilterProcessor processor, ExpressionNode definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public FilterProcessor getProcessor() {
+ return (FilterProcessor) super.getProcessor();
}
@Override
@@ -38,7 +41,7 @@ public class ManagedFilter extends ManagedProcessor implements ManagedFilterMBea
@Override
public void reset() {
- processor.reset();
+ getProcessor().reset();
super.reset();
}
@@ -54,6 +57,6 @@ public class ManagedFilter extends ManagedProcessor implements ManagedFilterMBea
@Override
public Long getFilteredCount() {
- return processor.getFilteredCount();
+ return getProcessor().getFilteredCount();
}
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedLog.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedLog.java
index bce924c6e80..c5b9ff11abf 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedLog.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedLog.java
@@ -26,36 +26,39 @@ import org.slf4j.Marker;
@ManagedResource(description = "Managed Log")
public class ManagedLog extends ManagedProcessor implements ManagedLogMBean {
- private final LogProcessor processor;
public ManagedLog(CamelContext context, LogProcessor processor, ProcessorDefinition<?> definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public LogProcessor getProcessor() {
+ return (LogProcessor) super.getProcessor();
}
@Override
public String getMessage() {
- if (processor.getExpression() != null) {
- return processor.getExpression().toString();
+ if (getProcessor().getExpression() != null) {
+ return getProcessor().getExpression().toString();
} else {
- return processor.getMessage();
+ return getProcessor().getMessage();
}
}
@Override
public String getLoggingLevel() {
- LoggingLevel level = processor.getLogger().getLevel();
+ LoggingLevel level = getProcessor().getLogger().getLevel();
return level != null ? level.name() : null;
}
@Override
public String getLogName() {
- return processor.getLogger().getLog().getName();
+ return getProcessor().getLogger().getLog().getName();
}
@Override
public String getMarker() {
- Marker marker = processor.getLogger().getMarker();
+ Marker marker = getProcessor().getLogger().getMarker();
return marker != null ? marker.getName() : null;
}
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedLoop.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedLoop.java
index eb2dea9b7e7..9506e83b66f 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedLoop.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedLoop.java
@@ -24,11 +24,14 @@ import org.apache.camel.processor.LoopProcessor;
@ManagedResource(description = "Managed Loop")
public class ManagedLoop extends ManagedProcessor implements ManagedLoopMBean {
- private final LoopProcessor processor;
public ManagedLoop(CamelContext context, LoopProcessor processor, LoopDefinition definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public LoopProcessor getProcessor() {
+ return (LoopProcessor) super.getProcessor();
}
@Override
@@ -48,11 +51,11 @@ public class ManagedLoop extends ManagedProcessor implements ManagedLoopMBean {
@Override
public Boolean isCopy() {
- return processor.isCopy();
+ return getProcessor().isCopy();
}
@Override
public Boolean isBreakOnShutdown() {
- return processor.isBreakOnShutdown();
+ return getProcessor().isBreakOnShutdown();
}
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedMarshal.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedMarshal.java
index 1722cc94c80..319435f3831 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedMarshal.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedMarshal.java
@@ -24,11 +24,14 @@ import org.apache.camel.support.processor.MarshalProcessor;
@ManagedResource(description = "Managed Marshal")
public class ManagedMarshal extends ManagedProcessor implements ManagedMarshalMBean {
- private final MarshalProcessor processor;
public ManagedMarshal(CamelContext context, MarshalProcessor processor, MarshalDefinition definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public MarshalProcessor getProcessor() {
+ return (MarshalProcessor) super.getProcessor();
}
@Override
@@ -47,11 +50,11 @@ public class ManagedMarshal extends ManagedProcessor implements ManagedMarshalMB
@Override
public String getVariableSend() {
- return processor.getVariableSend();
+ return getProcessor().getVariableSend();
}
@Override
public String getVariableReceive() {
- return processor.getVariableReceive();
+ return getProcessor().getVariableReceive();
}
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedMulticast.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedMulticast.java
index 25f1156ed13..8222f67d1b3 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedMulticast.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedMulticast.java
@@ -24,40 +24,43 @@ import org.apache.camel.processor.MulticastProcessor;
@ManagedResource(description = "Managed Multicast")
public class ManagedMulticast extends ManagedProcessor implements ManagedMulticastMBean {
- private final MulticastProcessor processor;
public ManagedMulticast(CamelContext context, MulticastProcessor processor, ProcessorDefinition<?> definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public MulticastProcessor getProcessor() {
+ return (MulticastProcessor) super.getProcessor();
}
@Override
public Boolean isParallelAggregate() {
- return processor.isParallelAggregate();
+ return getProcessor().isParallelAggregate();
}
@Override
public Boolean isParallelProcessing() {
- return processor.isParallelProcessing();
+ return getProcessor().isParallelProcessing();
}
@Override
public Boolean isStreaming() {
- return processor.isStreaming();
+ return getProcessor().isStreaming();
}
@Override
public Boolean isStopOnException() {
- return processor.isStopOnException();
+ return getProcessor().isStopOnException();
}
@Override
public Boolean isShareUnitOfWork() {
- return processor.isShareUnitOfWork();
+ return getProcessor().isShareUnitOfWork();
}
@Override
public Long getTimeout() {
- return processor.getTimeout();
+ return getProcessor().getTimeout();
}
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedPoll.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedPoll.java
index 7f1d9c95646..fc11ccaa826 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedPoll.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedPoll.java
@@ -30,7 +30,6 @@ import org.apache.camel.api.management.ManagedResource;
import org.apache.camel.api.management.mbean.CamelOpenMBeanTypes;
import org.apache.camel.api.management.mbean.ManagedPollMBean;
import org.apache.camel.model.PollDefinition;
-import org.apache.camel.processor.PollEnricher;
import org.apache.camel.processor.PollProcessor;
import org.apache.camel.spi.EndpointUtilizationStatistics;
import org.apache.camel.spi.ManagementStrategy;
@@ -38,30 +37,34 @@ import org.apache.camel.util.URISupport;
@ManagedResource(description = "Managed Poll")
public class ManagedPoll extends ManagedProcessor implements ManagedPollMBean {
- private final PollProcessor processor;
+
private String uri;
private boolean sanitize;
public ManagedPoll(CamelContext context, PollProcessor processor, PollDefinition definition) {
super(context, processor, definition);
- this.processor = processor;
}
@Override
public void init(ManagementStrategy strategy) {
super.init(strategy);
sanitize = strategy.getManagementAgent().getMask() != null ? strategy.getManagementAgent().getMask() : true;
- uri = processor.getUri();
+ uri = getProcessor().getUri();
if (sanitize) {
uri = URISupport.sanitizeUri(uri);
}
}
+ @Override
+ public PollProcessor getProcessor() {
+ return (PollProcessor) super.getProcessor();
+ }
+
@Override
public void reset() {
super.reset();
- if (processor.getEndpointUtilizationStatistics() != null) {
- processor.getEndpointUtilizationStatistics().clear();
+ if (getProcessor().getEndpointUtilizationStatistics() != null) {
+ getProcessor().getEndpointUtilizationStatistics().clear();
}
}
@@ -75,11 +78,6 @@ public class ManagedPoll extends ManagedProcessor implements ManagedPollMBean {
return (PollDefinition) super.getDefinition();
}
- @Override
- public PollEnricher getProcessor() {
- return processor;
- }
-
@Override
public String getDestination() {
return uri;
@@ -87,12 +85,12 @@ public class ManagedPoll extends ManagedProcessor implements ManagedPollMBean {
@Override
public String getVariableReceive() {
- return processor.getVariableReceive();
+ return getProcessor().getVariableReceive();
}
@Override
public Long getTimeout() {
- return processor.getTimeout();
+ return getProcessor().getTimeout();
}
@Override
@@ -100,7 +98,7 @@ public class ManagedPoll extends ManagedProcessor implements ManagedPollMBean {
try {
TabularData answer = new TabularDataSupport(CamelOpenMBeanTypes.endpointsUtilizationTabularType());
- EndpointUtilizationStatistics stats = processor.getEndpointUtilizationStatistics();
+ EndpointUtilizationStatistics stats = getProcessor().getEndpointUtilizationStatistics();
if (stats != null) {
for (Map.Entry<String, Long> entry : stats.getStatistics().entrySet()) {
CompositeType ct = CamelOpenMBeanTypes.endpointsUtilizationCompositeType();
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedPollEnricher.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedPollEnricher.java
index db939964dc0..ae229749b09 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedPollEnricher.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedPollEnricher.java
@@ -37,13 +37,12 @@ import org.apache.camel.util.URISupport;
@ManagedResource(description = "Managed PollEnricher")
public class ManagedPollEnricher extends ManagedProcessor implements ManagedPollEnricherMBean {
- private final PollEnricher processor;
+
private String uri;
private boolean sanitize;
public ManagedPollEnricher(CamelContext context, PollEnricher processor, PollEnrichDefinition definition) {
super(context, processor, definition);
- this.processor = processor;
}
@Override
@@ -56,11 +55,16 @@ public class ManagedPollEnricher extends ManagedProcessor implements ManagedPoll
}
}
+ @Override
+ public PollEnricher getProcessor() {
+ return (PollEnricher) super.getProcessor();
+ }
+
@Override
public void reset() {
super.reset();
- if (processor.getEndpointUtilizationStatistics() != null) {
- processor.getEndpointUtilizationStatistics().clear();
+ if (getProcessor().getEndpointUtilizationStatistics() != null) {
+ getProcessor().getEndpointUtilizationStatistics().clear();
}
}
@@ -74,11 +78,6 @@ public class ManagedPollEnricher extends ManagedProcessor implements ManagedPoll
return (PollEnrichDefinition) super.getDefinition();
}
- @Override
- public PollEnricher getProcessor() {
- return processor;
- }
-
@Override
public String getExpressionLanguage() {
return getDefinition().getExpression().getLanguage();
@@ -91,37 +90,37 @@ public class ManagedPollEnricher extends ManagedProcessor implements ManagedPoll
@Override
public String getVariableReceive() {
- return processor.getVariableReceive();
+ return getProcessor().getVariableReceive();
}
@Override
public Long getTimeout() {
- return processor.getTimeout();
+ return getProcessor().getTimeout();
}
@Override
public Integer getCacheSize() {
- return processor.getCacheSize();
+ return getProcessor().getCacheSize();
}
@Override
public Boolean isIgnoreInvalidEndpoint() {
- return processor.isIgnoreInvalidEndpoint();
+ return getProcessor().isIgnoreInvalidEndpoint();
}
@Override
public Boolean isAggregateOnException() {
- return processor.isAggregateOnException();
+ return getProcessor().isAggregateOnException();
}
@Override
public Boolean isAllowOptimisedComponents() {
- return processor.isAllowOptimisedComponents();
+ return getProcessor().isAllowOptimisedComponents();
}
@Override
public Boolean isOptimised() {
- return processor.getDynamicAware() != null;
+ return getProcessor().getDynamicAware() != null;
}
@Override
@@ -129,7 +128,7 @@ public class ManagedPollEnricher extends ManagedProcessor implements ManagedPoll
try {
TabularData answer = new TabularDataSupport(CamelOpenMBeanTypes.endpointsUtilizationTabularType());
- EndpointUtilizationStatistics stats = processor.getEndpointUtilizationStatistics();
+ EndpointUtilizationStatistics stats = getProcessor().getEndpointUtilizationStatistics();
if (stats != null) {
for (Map.Entry<String, Long> entry : stats.getStatistics().entrySet()) {
CompositeType ct = CamelOpenMBeanTypes.endpointsUtilizationCompositeType();
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedProcess.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedProcess.java
index 3f34d3c0369..b912127812d 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedProcess.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedProcess.java
@@ -26,12 +26,11 @@ import org.apache.camel.util.ObjectHelper;
@ManagedResource(description = "Managed Process")
public class ManagedProcess extends ManagedProcessor implements ManagedProcessMBean {
- private final Processor processor;
+
private String processorClassName;
public ManagedProcess(CamelContext context, Processor processor, ProcessDefinition definition) {
super(context, processor, definition);
- this.processor = processor;
}
@Override
@@ -49,7 +48,7 @@ public class ManagedProcess extends ManagedProcessor implements ManagedProcessMB
if (processorClassName != null) {
return processorClassName;
}
- Processor target = processor;
+ Processor target = getProcessor();
if (target instanceof DelegateProcessor delegateProcessor) {
target = delegateProcessor.getProcessor();
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java
index 1ec1da3624b..ac5dd613174 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java
@@ -23,6 +23,7 @@ import org.apache.camel.ServiceStatus;
import org.apache.camel.StatefulService;
import org.apache.camel.api.management.ManagedInstance;
import org.apache.camel.api.management.ManagedResource;
+import org.apache.camel.api.management.mbean.ManagedProcessorAware;
import org.apache.camel.api.management.mbean.ManagedProcessorMBean;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.ProcessorDefinitionHelper;
@@ -35,10 +36,11 @@ import org.apache.camel.support.PluginHelper;
import org.apache.camel.support.service.ServiceHelper;
@ManagedResource(description = "Managed Processor")
-public class ManagedProcessor extends ManagedPerformanceCounter implements ManagedInstance, ManagedProcessorMBean {
+public class ManagedProcessor extends ManagedPerformanceCounter
+ implements ManagedInstance, ManagedProcessorMBean, ManagedProcessorAware {
private final CamelContext context;
- private final Processor processor;
+ private Processor processor;
private final ProcessorDefinition<?> definition;
private final String id;
private final int nodeLevel;
@@ -80,13 +82,18 @@ public class ManagedProcessor extends ManagedPerformanceCounter implements Manag
@Override
public Object getInstance() {
- return processor;
+ return getProcessor();
}
public Processor getProcessor() {
return processor;
}
+ @Override
+ public void setProcessor(Processor processor) {
+ this.processor = processor;
+ }
+
public ProcessorDefinition<?> getDefinition() {
return definition;
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRandomLoadBalancer.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRandomLoadBalancer.java
index 94a303b3832..2bcaa723cea 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRandomLoadBalancer.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRandomLoadBalancer.java
@@ -25,11 +25,14 @@ import org.apache.camel.processor.loadbalancer.RandomLoadBalancer;
@ManagedResource(description = "Managed Random LoadBalancer")
public class ManagedRandomLoadBalancer extends ManagedProcessor implements ManagedRandomLoadBalancerMBean {
- private final RandomLoadBalancer processor;
public ManagedRandomLoadBalancer(CamelContext context, RandomLoadBalancer processor, LoadBalanceDefinition definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public RandomLoadBalancer getProcessor() {
+ return (RandomLoadBalancer) super.getProcessor();
}
@Override
@@ -39,12 +42,12 @@ public class ManagedRandomLoadBalancer extends ManagedProcessor implements Manag
@Override
public Integer getSize() {
- return processor.getProcessors().size();
+ return getProcessor().getProcessors().size();
}
@Override
public String getLastChosenProcessorId() {
- int idx = processor.getLastChosenProcessorIndex();
+ int idx = getProcessor().getLastChosenProcessorIndex();
if (idx != -1) {
LoadBalanceDefinition def = getDefinition();
ProcessorDefinition<?> output = def.getOutputs().get(idx);
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRecipientList.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRecipientList.java
index 4746b11cd5e..a3f43483486 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRecipientList.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRecipientList.java
@@ -37,13 +37,12 @@ import org.apache.camel.util.URISupport;
@ManagedResource(description = "Managed RecipientList")
public class ManagedRecipientList extends ManagedProcessor implements ManagedRecipientListMBean {
- private final RecipientList processor;
+
private String uri;
private boolean sanitize;
public ManagedRecipientList(CamelContext context, RecipientList processor, RecipientListDefinition<?> definition) {
super(context, processor, definition);
- this.processor = processor;
}
@Override
@@ -56,11 +55,16 @@ public class ManagedRecipientList extends ManagedProcessor implements ManagedRec
}
}
+ @Override
+ public RecipientList getProcessor() {
+ return (RecipientList) super.getProcessor();
+ }
+
@Override
public void reset() {
super.reset();
- if (processor.getEndpointUtilizationStatistics() != null) {
- processor.getEndpointUtilizationStatistics().clear();
+ if (getProcessor().getEndpointUtilizationStatistics() != null) {
+ getProcessor().getEndpointUtilizationStatistics().clear();
}
}
@@ -86,42 +90,42 @@ public class ManagedRecipientList extends ManagedProcessor implements ManagedRec
@Override
public String getUriDelimiter() {
- return processor.getDelimiter();
+ return getProcessor().getDelimiter();
}
@Override
public Integer getCacheSize() {
- return processor.getCacheSize();
+ return getProcessor().getCacheSize();
}
@Override
public Boolean isParallelAggregate() {
- return processor.isParallelAggregate();
+ return getProcessor().isParallelAggregate();
}
@Override
public Boolean isParallelProcessing() {
- return processor.isParallelProcessing();
+ return getProcessor().isParallelProcessing();
}
@Override
public Boolean isStreaming() {
- return processor.isStreaming();
+ return getProcessor().isStreaming();
}
@Override
public Boolean isStopOnException() {
- return processor.isStopOnException();
+ return getProcessor().isStopOnException();
}
@Override
public Boolean isShareUnitOfWork() {
- return processor.isShareUnitOfWork();
+ return getProcessor().isShareUnitOfWork();
}
@Override
public Long getTimeout() {
- return processor.getTimeout();
+ return getProcessor().getTimeout();
}
@Override
@@ -129,7 +133,7 @@ public class ManagedRecipientList extends ManagedProcessor implements ManagedRec
try {
TabularData answer = new TabularDataSupport(CamelOpenMBeanTypes.endpointsUtilizationTabularType());
- EndpointUtilizationStatistics stats = processor.getEndpointUtilizationStatistics();
+ EndpointUtilizationStatistics stats = getProcessor().getEndpointUtilizationStatistics();
if (stats != null) {
for (Map.Entry<String, Long> entry : stats.getStatistics().entrySet()) {
CompositeType ct = CamelOpenMBeanTypes.endpointsUtilizationCompositeType();
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRemoveHeader.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRemoveHeader.java
index 184e06fd7f8..b195868219a 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRemoveHeader.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRemoveHeader.java
@@ -24,16 +24,19 @@ import org.apache.camel.processor.RemoveHeaderProcessor;
@ManagedResource(description = "Managed RemoveHeader")
public class ManagedRemoveHeader extends ManagedProcessor implements ManagedRemoveHeaderMBean {
- private final RemoveHeaderProcessor processor;
public ManagedRemoveHeader(CamelContext context, RemoveHeaderProcessor processor, ProcessorDefinition<?> definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public RemoveHeaderProcessor getProcessor() {
+ return (RemoveHeaderProcessor) super.getProcessor();
}
@Override
public String getHeaderName() {
- return processor.getHeaderName();
+ return getProcessor().getHeaderName();
}
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRemoveHeaders.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRemoveHeaders.java
index ee21ba68f75..47b8cceb093 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRemoveHeaders.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRemoveHeaders.java
@@ -26,12 +26,11 @@ import org.apache.camel.processor.RemoveHeadersProcessor;
@ManagedResource(description = "Managed RemoveHeaders")
public class ManagedRemoveHeaders extends ManagedProcessor implements ManagedRemoveHeadersMBean {
- private final RemoveHeadersProcessor processor;
+
private final String exclude;
public ManagedRemoveHeaders(CamelContext context, RemoveHeadersProcessor processor, ProcessorDefinition<?> definition) {
super(context, processor, definition);
- this.processor = processor;
if (processor.getExcludePattern() != null) {
exclude = Arrays.toString(processor.getExcludePattern());
} else {
@@ -39,9 +38,14 @@ public class ManagedRemoveHeaders extends ManagedProcessor implements ManagedRem
}
}
+ @Override
+ public RemoveHeadersProcessor getProcessor() {
+ return (RemoveHeadersProcessor) super.getProcessor();
+ }
+
@Override
public String getPattern() {
- return processor.getPattern();
+ return getProcessor().getPattern();
}
@Override
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRemoveProperties.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRemoveProperties.java
index 22083f2a06d..2b816af2638 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRemoveProperties.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRemoveProperties.java
@@ -26,13 +26,12 @@ import org.apache.camel.processor.RemovePropertiesProcessor;
@ManagedResource(description = "Managed RemoveProperties")
public class ManagedRemoveProperties extends ManagedProcessor implements ManagedRemovePropertiesMBean {
- private final RemovePropertiesProcessor processor;
+
private final String exclude;
public ManagedRemoveProperties(CamelContext context, RemovePropertiesProcessor processor,
ProcessorDefinition<?> definition) {
super(context, processor, definition);
- this.processor = processor;
if (processor.getExcludePattern() != null) {
exclude = Arrays.toString(processor.getExcludePattern());
} else {
@@ -40,9 +39,14 @@ public class ManagedRemoveProperties extends ManagedProcessor implements Managed
}
}
+ @Override
+ public RemovePropertiesProcessor getProcessor() {
+ return (RemovePropertiesProcessor) super.getProcessor();
+ }
+
@Override
public String getPattern() {
- return processor.getPattern();
+ return getProcessor().getPattern();
}
@Override
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRemoveProperty.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRemoveProperty.java
index ef13c838cb5..b3fa1111c4e 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRemoveProperty.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRemoveProperty.java
@@ -24,15 +24,18 @@ import org.apache.camel.processor.RemovePropertyProcessor;
@ManagedResource(description = "Managed RemoveProperty")
public class ManagedRemoveProperty extends ManagedProcessor implements ManagedRemovePropertyMBean {
- private final RemovePropertyProcessor processor;
public ManagedRemoveProperty(CamelContext context, RemovePropertyProcessor processor, ProcessorDefinition<?> definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public RemovePropertyProcessor getProcessor() {
+ return (RemovePropertyProcessor) super.getProcessor();
}
@Override
public String getPropertyName() {
- return processor.getPropertyName();
+ return getProcessor().getPropertyName();
}
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRemoveVariable.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRemoveVariable.java
index 7bfa2310c87..c2a6d3bfca5 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRemoveVariable.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRemoveVariable.java
@@ -24,15 +24,18 @@ import org.apache.camel.processor.RemoveVariableProcessor;
@ManagedResource(description = "Managed RemoveVariable")
public class ManagedRemoveVariable extends ManagedProcessor implements ManagedRemoveVariableMBean {
- private final RemoveVariableProcessor processor;
public ManagedRemoveVariable(CamelContext context, RemoveVariableProcessor processor, ProcessorDefinition<?> definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public RemoveVariableProcessor getProcessor() {
+ return (RemoveVariableProcessor) super.getProcessor();
}
@Override
public String getVariableName() {
- return processor.getVariableName();
+ return getProcessor().getVariableName();
}
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedResequencer.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedResequencer.java
index 15cc87aeb20..f93f4983ea0 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedResequencer.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedResequencer.java
@@ -25,22 +25,17 @@ import org.apache.camel.processor.StreamResequencer;
@ManagedResource(description = "Managed Resequencer")
public class ManagedResequencer extends ManagedProcessor implements ManagedResequencerMBean {
- private final Resequencer processor;
- private final StreamResequencer streamProcessor;
+
private final String expression;
public ManagedResequencer(CamelContext context, Resequencer processor, ProcessorDefinition<?> definition) {
super(context, processor, definition);
- this.processor = processor;
- this.streamProcessor = null;
this.expression = processor.getExpression().toString();
}
public ManagedResequencer(CamelContext context, StreamResequencer processor, ProcessorDefinition<?> definition) {
super(context, processor, definition);
- this.processor = null;
- this.streamProcessor = processor;
- this.expression = streamProcessor.getExpression().toString();
+ this.expression = processor.getExpression().toString();
}
@Override
@@ -48,10 +43,24 @@ public class ManagedResequencer extends ManagedProcessor implements ManagedReseq
return expression;
}
+ private Resequencer getResequencer() {
+ if (getProcessor() instanceof Resequencer r) {
+ return r;
+ }
+ return null;
+ }
+
+ private StreamResequencer getStreamResequencer() {
+ if (getProcessor() instanceof StreamResequencer r) {
+ return r;
+ }
+ return null;
+ }
+
@Override
public Integer getBatchSize() {
- if (processor != null) {
- return processor.getBatchSize();
+ if (getResequencer() != null) {
+ return getResequencer().getBatchSize();
} else {
return null;
}
@@ -59,17 +68,17 @@ public class ManagedResequencer extends ManagedProcessor implements ManagedReseq
@Override
public Long getTimeout() {
- if (processor != null) {
- return processor.getBatchTimeout();
+ if (getResequencer() != null) {
+ return getResequencer().getBatchTimeout();
} else {
- return streamProcessor.getTimeout();
+ return getStreamResequencer().getTimeout();
}
}
@Override
public Boolean isAllowDuplicates() {
- if (processor != null) {
- return processor.isAllowDuplicates();
+ if (getResequencer() != null) {
+ return getResequencer().isAllowDuplicates();
} else {
return null;
}
@@ -77,8 +86,8 @@ public class ManagedResequencer extends ManagedProcessor implements ManagedReseq
@Override
public Boolean isReverse() {
- if (processor != null) {
- return processor.isReverse();
+ if (getResequencer() != null) {
+ return getResequencer().isReverse();
} else {
return null;
}
@@ -86,28 +95,28 @@ public class ManagedResequencer extends ManagedProcessor implements ManagedReseq
@Override
public Boolean isIgnoreInvalidExchanges() {
- if (processor != null) {
- return processor.isIgnoreInvalidExchanges();
+ if (getResequencer() != null) {
+ return getResequencer().isIgnoreInvalidExchanges();
} else {
- return streamProcessor.isIgnoreInvalidExchanges();
+ return getStreamResequencer().isIgnoreInvalidExchanges();
}
}
@Override
public Integer getCapacity() {
- if (processor != null) {
+ if (getResequencer() != null) {
return null;
} else {
- return streamProcessor.getCapacity();
+ return getStreamResequencer().getCapacity();
}
}
@Override
public Boolean isRejectOld() {
- if (processor != null) {
+ if (getResequencer() != null) {
return null;
} else {
- return streamProcessor.isRejectOld();
+ return getStreamResequencer().isRejectOld();
}
}
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRollback.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRollback.java
index 46e905bf366..8eb0f6f0568 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRollback.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRollback.java
@@ -24,25 +24,28 @@ import org.apache.camel.processor.RollbackProcessor;
@ManagedResource(description = "Managed Rollback")
public class ManagedRollback extends ManagedProcessor implements ManagedRollbackMBean {
- private final RollbackProcessor processor;
public ManagedRollback(CamelContext context, RollbackProcessor processor, ProcessorDefinition<?> definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public RollbackProcessor getProcessor() {
+ return (RollbackProcessor) super.getProcessor();
}
@Override
public String getMessage() {
- return processor.getMessage();
+ return getProcessor().getMessage();
}
@Override
public Boolean isMarkRollbackOnly() {
- return processor.isMarkRollbackOnly();
+ return getProcessor().isMarkRollbackOnly();
}
@Override
public Boolean isMarkRollbackOnlyLast() {
- return processor.isMarkRollbackOnlyLast();
+ return getProcessor().isMarkRollbackOnlyLast();
}
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRoundRobinLoadBalancer.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRoundRobinLoadBalancer.java
index ab2e808076f..970940e3b0a 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRoundRobinLoadBalancer.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRoundRobinLoadBalancer.java
@@ -25,12 +25,15 @@ import org.apache.camel.processor.loadbalancer.RoundRobinLoadBalancer;
@ManagedResource(description = "Managed RoundRobin LoadBalancer")
public class ManagedRoundRobinLoadBalancer extends ManagedProcessor implements ManagedRoundRobinLoadBalancerMBean {
- private final RoundRobinLoadBalancer processor;
public ManagedRoundRobinLoadBalancer(CamelContext context, RoundRobinLoadBalancer processor,
LoadBalanceDefinition definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public RoundRobinLoadBalancer getProcessor() {
+ return (RoundRobinLoadBalancer) super.getProcessor();
}
@Override
@@ -40,12 +43,12 @@ public class ManagedRoundRobinLoadBalancer extends ManagedProcessor implements M
@Override
public Integer getSize() {
- return processor.getProcessors().size();
+ return getProcessor().getProcessors().size();
}
@Override
public String getLastChosenProcessorId() {
- int idx = processor.getLastChosenProcessorIndex();
+ int idx = getProcessor().getLastChosenProcessorIndex();
if (idx != -1) {
LoadBalanceDefinition def = getDefinition();
ProcessorDefinition<?> output = def.getOutputs().get(idx);
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRoutingSlip.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRoutingSlip.java
index 21e1a25476b..d62a5f1acfb 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRoutingSlip.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRoutingSlip.java
@@ -37,13 +37,12 @@ import org.apache.camel.util.URISupport;
@ManagedResource(description = "Managed RoutingSlip")
public class ManagedRoutingSlip extends ManagedProcessor implements ManagedRoutingSlipMBean {
- private final RoutingSlip processor;
+
private String uri;
private boolean sanitize;
public ManagedRoutingSlip(CamelContext context, RoutingSlip processor, RoutingSlipDefinition<?> definition) {
super(context, processor, definition);
- this.processor = processor;
}
@Override
@@ -56,11 +55,16 @@ public class ManagedRoutingSlip extends ManagedProcessor implements ManagedRouti
}
}
+ @Override
+ public RoutingSlip getProcessor() {
+ return (RoutingSlip) super.getProcessor();
+ }
+
@Override
public void reset() {
super.reset();
- if (processor.getEndpointUtilizationStatistics() != null) {
- processor.getEndpointUtilizationStatistics().clear();
+ if (getProcessor().getEndpointUtilizationStatistics() != null) {
+ getProcessor().getEndpointUtilizationStatistics().clear();
}
}
@@ -86,17 +90,17 @@ public class ManagedRoutingSlip extends ManagedProcessor implements ManagedRouti
@Override
public String getUriDelimiter() {
- return processor.getUriDelimiter();
+ return getProcessor().getUriDelimiter();
}
@Override
public Integer getCacheSize() {
- return processor.getCacheSize();
+ return getProcessor().getCacheSize();
}
@Override
public Boolean isIgnoreInvalidEndpoints() {
- return processor.isIgnoreInvalidEndpoints();
+ return getProcessor().isIgnoreInvalidEndpoints();
}
@Override
@@ -104,7 +108,7 @@ public class ManagedRoutingSlip extends ManagedProcessor implements ManagedRouti
try {
TabularData answer = new TabularDataSupport(CamelOpenMBeanTypes.endpointsUtilizationTabularType());
- EndpointUtilizationStatistics stats = processor.getEndpointUtilizationStatistics();
+ EndpointUtilizationStatistics stats = getProcessor().getEndpointUtilizationStatistics();
if (stats != null) {
for (Map.Entry<String, Long> entry : stats.getStatistics().entrySet()) {
CompositeType ct = CamelOpenMBeanTypes.endpointsUtilizationCompositeType();
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSamplingThrottler.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSamplingThrottler.java
index 51698f0d4a5..a91a2a2e43c 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSamplingThrottler.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSamplingThrottler.java
@@ -26,27 +26,30 @@ import org.apache.camel.processor.SamplingThrottler;
@ManagedResource(description = "Managed SamplingThrottler")
public class ManagedSamplingThrottler extends ManagedProcessor implements ManagedSamplingThrottlerMBean {
- private final SamplingThrottler processor;
public ManagedSamplingThrottler(CamelContext context, SamplingThrottler processor, ProcessorDefinition<?> definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public SamplingThrottler getProcessor() {
+ return (SamplingThrottler) super.getProcessor();
}
@Override
public Long getSamplePeriod() {
- return processor.getSamplePeriod();
+ return getProcessor().getSamplePeriod();
}
@Override
public Long getMessageFrequency() {
- return processor.getMessageFrequency();
+ return getProcessor().getMessageFrequency();
}
@Override
public String getTimeUnit() {
- if (processor.getUnits() != null) {
- return processor.getUnits().toString().toLowerCase(Locale.ENGLISH);
+ if (getProcessor().getUnits() != null) {
+ return getProcessor().getUnits().toString().toLowerCase(Locale.ENGLISH);
} else {
return null;
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSendDynamicProcessor.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSendDynamicProcessor.java
index d52c898c7fe..b8d3078fd88 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSendDynamicProcessor.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSendDynamicProcessor.java
@@ -37,14 +37,12 @@ import org.apache.camel.util.URISupport;
@ManagedResource(description = "Managed SendDynamicProcessor")
public class ManagedSendDynamicProcessor extends ManagedProcessor implements ManagedSendDynamicProcessorMBean {
- private final SendDynamicProcessor processor;
private String uri;
private boolean sanitize;
public ManagedSendDynamicProcessor(CamelContext context, SendDynamicProcessor processor,
ProcessorDefinition<?> definition) {
super(context, processor, definition);
- this.processor = processor;
}
@Override
@@ -52,17 +50,17 @@ public class ManagedSendDynamicProcessor extends ManagedProcessor implements Man
super.init(strategy);
this.sanitize = strategy.getManagementAgent().getMask() != null ? strategy.getManagementAgent().getMask() : true;
if (sanitize) {
- uri = URISupport.sanitizeUri(processor.getUri());
+ uri = URISupport.sanitizeUri(getProcessor().getUri());
} else {
- uri = processor.getUri();
+ uri = getProcessor().getUri();
}
}
@Override
public void reset() {
super.reset();
- if (processor.getEndpointUtilizationStatistics() != null) {
- processor.getEndpointUtilizationStatistics().clear();
+ if (getProcessor().getEndpointUtilizationStatistics() != null) {
+ getProcessor().getEndpointUtilizationStatistics().clear();
}
}
@@ -73,7 +71,7 @@ public class ManagedSendDynamicProcessor extends ManagedProcessor implements Man
@Override
public SendDynamicProcessor getProcessor() {
- return processor;
+ return (SendDynamicProcessor) super.getProcessor();
}
@Override
@@ -83,18 +81,18 @@ public class ManagedSendDynamicProcessor extends ManagedProcessor implements Man
@Override
public String getVariableSend() {
- return processor.getVariableSend();
+ return getProcessor().getVariableSend();
}
@Override
public String getVariableReceive() {
- return processor.getVariableReceive();
+ return getProcessor().getVariableReceive();
}
@Override
public String getMessageExchangePattern() {
- if (processor.getPattern() != null) {
- return processor.getPattern().name();
+ if (getProcessor().getPattern() != null) {
+ return getProcessor().getPattern().name();
} else {
return null;
}
@@ -102,22 +100,22 @@ public class ManagedSendDynamicProcessor extends ManagedProcessor implements Man
@Override
public Integer getCacheSize() {
- return processor.getCacheSize();
+ return getProcessor().getCacheSize();
}
@Override
public Boolean isIgnoreInvalidEndpoint() {
- return processor.isIgnoreInvalidEndpoint();
+ return getProcessor().isIgnoreInvalidEndpoint();
}
@Override
public Boolean isAllowOptimisedComponents() {
- return processor.isAllowOptimisedComponents();
+ return getProcessor().isAllowOptimisedComponents();
}
@Override
public Boolean isOptimised() {
- return processor.getDynamicAware() != null;
+ return getProcessor().getDynamicAware() != null;
}
@Override
@@ -125,7 +123,7 @@ public class ManagedSendDynamicProcessor extends ManagedProcessor implements Man
try {
TabularData answer = new TabularDataSupport(CamelOpenMBeanTypes.endpointsUtilizationTabularType());
- EndpointUtilizationStatistics stats = processor.getEndpointUtilizationStatistics();
+ EndpointUtilizationStatistics stats = getProcessor().getEndpointUtilizationStatistics();
if (stats != null) {
for (Map.Entry<String, Long> entry : stats.getStatistics().entrySet()) {
CompositeType ct = CamelOpenMBeanTypes.endpointsUtilizationCompositeType();
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSendProcessor.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSendProcessor.java
index cc4fa85ef44..aa9b5a1d4f5 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSendProcessor.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSendProcessor.java
@@ -34,12 +34,10 @@ import org.apache.camel.util.URISupport;
@ManagedResource(description = "Managed SendProcessor")
public class ManagedSendProcessor extends ManagedProcessor implements ManagedSendProcessorMBean {
- private final SendProcessor processor;
private String destination;
public ManagedSendProcessor(CamelContext context, SendProcessor processor, ProcessorDefinition<?> definition) {
super(context, processor, definition);
- this.processor = processor;
}
@Override
@@ -47,9 +45,9 @@ public class ManagedSendProcessor extends ManagedProcessor implements ManagedSen
super.init(strategy);
boolean sanitize = strategy.getManagementAgent().getMask() != null ? strategy.getManagementAgent().getMask() : true;
if (sanitize) {
- destination = URISupport.sanitizeUri(processor.getDestination().getEndpointUri());
+ destination = URISupport.sanitizeUri(getProcessor().getDestination().getEndpointUri());
} else {
- destination = processor.getDestination().getEndpointUri();
+ destination = getProcessor().getDestination().getEndpointUri();
}
}
@@ -61,12 +59,12 @@ public class ManagedSendProcessor extends ManagedProcessor implements ManagedSen
@Override
public void reset() {
super.reset();
- processor.reset();
+ getProcessor().reset();
}
@Override
public SendProcessor getProcessor() {
- return processor;
+ return (SendProcessor) super.getProcessor();
}
@Override
@@ -76,18 +74,18 @@ public class ManagedSendProcessor extends ManagedProcessor implements ManagedSen
@Override
public String getVariableSend() {
- return processor.getVariableSend();
+ return getProcessor().getVariableSend();
}
@Override
public String getVariableReceive() {
- return processor.getVariableReceive();
+ return getProcessor().getVariableReceive();
}
@Override
public String getMessageExchangePattern() {
- if (processor.getPattern() != null) {
- return processor.getPattern().name();
+ if (getProcessor().getPattern() != null) {
+ return getProcessor().getPattern().name();
} else {
return null;
}
@@ -101,7 +99,7 @@ public class ManagedSendProcessor extends ManagedProcessor implements ManagedSen
// we only have 1 endpoint
CompositeType ct = CamelOpenMBeanTypes.endpointsUtilizationCompositeType();
String url = getDestination();
- long hits = processor.getCounter();
+ long hits = getProcessor().getCounter();
CompositeData data = new CompositeDataSupport(ct, new String[] { "url", "hits" }, new Object[] { url, hits });
answer.put(data);
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSetExchangePattern.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSetExchangePattern.java
index c60d12a5866..a3db296af88 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSetExchangePattern.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSetExchangePattern.java
@@ -24,16 +24,19 @@ import org.apache.camel.processor.ExchangePatternProcessor;
@ManagedResource(description = "Managed SetExchangePattern")
public class ManagedSetExchangePattern extends ManagedProcessor implements ManagedSetExchangePatternMBean {
- private final ExchangePatternProcessor processor;
public ManagedSetExchangePattern(CamelContext context, ExchangePatternProcessor processor,
ProcessorDefinition<?> definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public ExchangePatternProcessor getProcessor() {
+ return (ExchangePatternProcessor) super.getProcessor();
}
@Override
public String getPattern() {
- return processor.getExchangePattern().name();
+ return getProcessor().getExchangePattern().name();
}
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSetHeader.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSetHeader.java
index a85f3171c89..253cd18db49 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSetHeader.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSetHeader.java
@@ -24,11 +24,14 @@ import org.apache.camel.processor.SetHeaderProcessor;
@ManagedResource(description = "Managed SetHeader")
public class ManagedSetHeader extends ManagedProcessor implements ManagedSetHeaderMBean {
- private final SetHeaderProcessor processor;
public ManagedSetHeader(CamelContext context, SetHeaderProcessor processor, SetHeaderDefinition definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public SetHeaderProcessor getProcessor() {
+ return (SetHeaderProcessor) super.getProcessor();
}
@Override
@@ -38,7 +41,7 @@ public class ManagedSetHeader extends ManagedProcessor implements ManagedSetHead
@Override
public String getHeaderName() {
- return processor.getHeaderName();
+ return getProcessor().getHeaderName();
}
@Override
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSetHeaders.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSetHeaders.java
index 16fd30bffe0..1bec777c4a0 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSetHeaders.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSetHeaders.java
@@ -24,11 +24,14 @@ import org.apache.camel.processor.SetHeadersProcessor;
@ManagedResource(description = "Managed SetHeaders")
public class ManagedSetHeaders extends ManagedProcessor implements ManagedSetHeadersMBean {
- private final SetHeadersProcessor processor;
public ManagedSetHeaders(CamelContext context, SetHeadersProcessor processor, SetHeadersDefinition definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public SetHeadersProcessor getProcessor() {
+ return (SetHeadersProcessor) super.getProcessor();
}
@Override
@@ -38,7 +41,7 @@ public class ManagedSetHeaders extends ManagedProcessor implements ManagedSetHea
@Override
public String[] getHeaderNames() {
- return processor.getHeaderNames()
+ return getProcessor().getHeaderNames()
.stream().map(Object::toString).distinct().toArray(String[]::new);
}
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSetProperty.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSetProperty.java
index b0326330ee5..8b417e2a5bf 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSetProperty.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSetProperty.java
@@ -24,11 +24,14 @@ import org.apache.camel.processor.SetPropertyProcessor;
@ManagedResource(description = "Managed SetProperty")
public class ManagedSetProperty extends ManagedProcessor implements ManagedSetPropertyMBean {
- private final SetPropertyProcessor processor;
public ManagedSetProperty(CamelContext context, SetPropertyProcessor processor, SetPropertyDefinition definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public SetPropertyProcessor getProcessor() {
+ return (SetPropertyProcessor) super.getProcessor();
}
@Override
@@ -38,7 +41,7 @@ public class ManagedSetProperty extends ManagedProcessor implements ManagedSetPr
@Override
public String getPropertyName() {
- return processor.getPropertyName();
+ return getProcessor().getPropertyName();
}
@Override
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSetVariable.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSetVariable.java
index ad039eb96cc..acdb95efaf2 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSetVariable.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSetVariable.java
@@ -24,11 +24,14 @@ import org.apache.camel.processor.SetVariableProcessor;
@ManagedResource(description = "Managed SetVariable")
public class ManagedSetVariable extends ManagedProcessor implements ManagedSetVariableMBean {
- private final SetVariableProcessor processor;
public ManagedSetVariable(CamelContext context, SetVariableProcessor processor, SetVariableDefinition definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public SetVariableProcessor getProcessor() {
+ return (SetVariableProcessor) super.getProcessor();
}
@Override
@@ -38,7 +41,7 @@ public class ManagedSetVariable extends ManagedProcessor implements ManagedSetVa
@Override
public String getVariableName() {
- return processor.getVariableName();
+ return getProcessor().getVariableName();
}
@Override
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSetVariables.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSetVariables.java
index c9370cfec7a..222fb814633 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSetVariables.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSetVariables.java
@@ -24,11 +24,14 @@ import org.apache.camel.processor.SetVariablesProcessor;
@ManagedResource(description = "Managed SetVariables")
public class ManagedSetVariables extends ManagedProcessor implements ManagedSetVariablesMBean {
- private final SetVariablesProcessor processor;
public ManagedSetVariables(CamelContext context, SetVariablesProcessor processor, SetVariablesDefinition definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public SetVariablesProcessor getProcessor() {
+ return (SetVariablesProcessor) super.getProcessor();
}
@Override
@@ -38,7 +41,7 @@ public class ManagedSetVariables extends ManagedProcessor implements ManagedSetV
@Override
public String[] getVariableNames() {
- return processor.getVariableNames()
+ return getProcessor().getVariableNames()
.stream().map(Object::toString).distinct().toArray(String[]::new);
}
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedStickyLoadBalancer.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedStickyLoadBalancer.java
index 1321857bc7e..8354be8ab70 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedStickyLoadBalancer.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedStickyLoadBalancer.java
@@ -26,11 +26,14 @@ import org.apache.camel.processor.loadbalancer.StickyLoadBalancer;
@ManagedResource(description = "Managed Sticky LoadBalancer")
public class ManagedStickyLoadBalancer extends ManagedProcessor implements ManagedStickyLoadBalancerMBean {
- private final StickyLoadBalancer processor;
public ManagedStickyLoadBalancer(CamelContext context, StickyLoadBalancer processor, LoadBalanceDefinition definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public StickyLoadBalancer getProcessor() {
+ return (StickyLoadBalancer) super.getProcessor();
}
@Override
@@ -52,12 +55,12 @@ public class ManagedStickyLoadBalancer extends ManagedProcessor implements Manag
@Override
public Integer getSize() {
- return processor.getProcessors().size();
+ return getProcessor().getProcessors().size();
}
@Override
public String getLastChosenProcessorId() {
- int idx = processor.getLastChosenProcessorIndex();
+ int idx = getProcessor().getLastChosenProcessorIndex();
if (idx != -1) {
LoadBalanceDefinition def = getDefinition();
ProcessorDefinition<?> output = def.getOutputs().get(idx);
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedThreads.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedThreads.java
index 0fe59a7e77b..f91a102ed8d 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedThreads.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedThreads.java
@@ -28,16 +28,19 @@ import org.apache.camel.processor.ThreadsProcessor;
@ManagedResource(description = "Managed Threads")
public class ManagedThreads extends ManagedProcessor implements ManagedThreadsMBean {
- private final ThreadsProcessor processor;
public ManagedThreads(CamelContext context, ThreadsProcessor processor, ProcessorDefinition<?> definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public ThreadsProcessor getProcessor() {
+ return (ThreadsProcessor) super.getProcessor();
}
@Override
public Boolean isCallerRunsWhenRejected() {
- if (processor.getExecutorService() instanceof ThreadPoolExecutor) {
+ if (getProcessor().getExecutorService() instanceof ThreadPoolExecutor) {
String name = getRejectedPolicy();
return "CallerRuns".equals(name);
} else {
@@ -47,7 +50,7 @@ public class ManagedThreads extends ManagedProcessor implements ManagedThreadsMB
@Override
public String getRejectedPolicy() {
- if (processor.getExecutorService() instanceof ThreadPoolExecutor threadPoolExecutor) {
+ if (getProcessor().getExecutorService() instanceof ThreadPoolExecutor threadPoolExecutor) {
return threadPoolExecutor.getRejectedExecutionHandler().toString();
} else {
return null;
@@ -56,7 +59,7 @@ public class ManagedThreads extends ManagedProcessor implements ManagedThreadsMB
@Override
public int getCorePoolSize() {
- if (processor.getExecutorService() instanceof ThreadPoolExecutor threadPoolExecutor) {
+ if (getProcessor().getExecutorService() instanceof ThreadPoolExecutor threadPoolExecutor) {
return threadPoolExecutor.getCorePoolSize();
} else {
return 0;
@@ -65,7 +68,7 @@ public class ManagedThreads extends ManagedProcessor implements ManagedThreadsMB
@Override
public int getPoolSize() {
- if (processor.getExecutorService() instanceof ThreadPoolExecutor threadPoolExecutor) {
+ if (getProcessor().getExecutorService() instanceof ThreadPoolExecutor threadPoolExecutor) {
return threadPoolExecutor.getPoolSize();
} else {
return 0;
@@ -74,7 +77,7 @@ public class ManagedThreads extends ManagedProcessor implements ManagedThreadsMB
@Override
public int getMaximumPoolSize() {
- if (processor.getExecutorService() instanceof ThreadPoolExecutor threadPoolExecutor) {
+ if (getProcessor().getExecutorService() instanceof ThreadPoolExecutor threadPoolExecutor) {
return threadPoolExecutor.getMaximumPoolSize();
} else {
return 0;
@@ -83,7 +86,7 @@ public class ManagedThreads extends ManagedProcessor implements ManagedThreadsMB
@Override
public int getLargestPoolSize() {
- if (processor.getExecutorService() instanceof ThreadPoolExecutor threadPoolExecutor) {
+ if (getProcessor().getExecutorService() instanceof ThreadPoolExecutor threadPoolExecutor) {
return threadPoolExecutor.getLargestPoolSize();
} else {
return 0;
@@ -92,7 +95,7 @@ public class ManagedThreads extends ManagedProcessor implements ManagedThreadsMB
@Override
public int getActiveCount() {
- if (processor.getExecutorService() instanceof ThreadPoolExecutor threadPoolExecutor) {
+ if (getProcessor().getExecutorService() instanceof ThreadPoolExecutor threadPoolExecutor) {
return threadPoolExecutor.getActiveCount();
} else {
return 0;
@@ -101,7 +104,7 @@ public class ManagedThreads extends ManagedProcessor implements ManagedThreadsMB
@Override
public long getTaskCount() {
- if (processor.getExecutorService() instanceof ThreadPoolExecutor threadPoolExecutor) {
+ if (getProcessor().getExecutorService() instanceof ThreadPoolExecutor threadPoolExecutor) {
return threadPoolExecutor.getTaskCount();
} else {
return 0;
@@ -110,7 +113,7 @@ public class ManagedThreads extends ManagedProcessor implements ManagedThreadsMB
@Override
public long getCompletedTaskCount() {
- if (processor.getExecutorService() instanceof ThreadPoolExecutor threadPoolExecutor) {
+ if (getProcessor().getExecutorService() instanceof ThreadPoolExecutor threadPoolExecutor) {
return threadPoolExecutor.getCompletedTaskCount();
} else {
return 0;
@@ -119,7 +122,7 @@ public class ManagedThreads extends ManagedProcessor implements ManagedThreadsMB
@Override
public long getTaskQueueSize() {
- if (processor.getExecutorService() instanceof ThreadPoolExecutor threadPoolExecutor) {
+ if (getProcessor().getExecutorService() instanceof ThreadPoolExecutor threadPoolExecutor) {
BlockingQueue<Runnable> queue = threadPoolExecutor.getQueue();
return queue != null ? queue.size() : 0;
} else {
@@ -129,7 +132,7 @@ public class ManagedThreads extends ManagedProcessor implements ManagedThreadsMB
@Override
public long getKeepAliveTime() {
- if (processor.getExecutorService() instanceof ThreadPoolExecutor threadPoolExecutor) {
+ if (getProcessor().getExecutorService() instanceof ThreadPoolExecutor threadPoolExecutor) {
return threadPoolExecutor.getKeepAliveTime(TimeUnit.SECONDS);
} else {
return 0;
@@ -138,7 +141,7 @@ public class ManagedThreads extends ManagedProcessor implements ManagedThreadsMB
@Override
public boolean isAllowCoreThreadTimeout() {
- if (processor.getExecutorService() instanceof ThreadPoolExecutor threadPoolExecutor) {
+ if (getProcessor().getExecutorService() instanceof ThreadPoolExecutor threadPoolExecutor) {
return threadPoolExecutor.allowsCoreThreadTimeOut();
} else {
return false;
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedThrottler.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedThrottler.java
index 90dd38e8d55..4ca928de9db 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedThrottler.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedThrottler.java
@@ -27,31 +27,30 @@ import static org.apache.camel.builder.Builder.constant;
@ManagedResource(description = "Managed Concurrent Requests Throttler")
public class ManagedThrottler extends ManagedProcessor implements ManagedThrottlerMBean {
- private final Throttler throttler;
public ManagedThrottler(CamelContext context, Throttler throttler,
ProcessorDefinition<?> definition) {
super(context, throttler, definition);
- this.throttler = throttler;
}
- public Throttler getThrottler() {
- return throttler;
+ @Override
+ public Throttler getProcessor() {
+ return (Throttler) super.getProcessor();
}
@Override
public long getMaximumRequests() {
- return throttler.getCurrentMaximumRequests();
+ return getProcessor().getCurrentMaximumRequests();
}
@Override
public void setMaximumRequests(long maximumConcurrentRequests) {
- throttler.setMaximumRequestsExpression(constant(maximumConcurrentRequests));
+ getProcessor().setMaximumRequestsExpression(constant(maximumConcurrentRequests));
}
@Override
public long getTimePeriodMillis() {
- if (throttler instanceof TotalRequestsThrottler t) {
+ if (getProcessor() instanceof TotalRequestsThrottler t) {
return t.getTimePeriodMillis();
}
@@ -60,28 +59,28 @@ public class ManagedThrottler extends ManagedProcessor implements ManagedThrottl
@Override
public void setTimePeriodMillis(long timePeriodMillis) {
- if (throttler instanceof TotalRequestsThrottler t) {
+ if (getProcessor() instanceof TotalRequestsThrottler t) {
t.setTimePeriodMillis(timePeriodMillis);
}
}
@Override
public String getMode() {
- return throttler.getMode();
+ return getProcessor().getMode();
}
@Override
public Boolean isAsyncDelayed() {
- return throttler.isAsyncDelayed();
+ return getProcessor().isAsyncDelayed();
}
@Override
public Boolean isCallerRunsWhenRejected() {
- return throttler.isCallerRunsWhenRejected();
+ return getProcessor().isCallerRunsWhenRejected();
}
@Override
public Boolean isRejectExecution() {
- return throttler.isRejectExecution();
+ return getProcessor().isRejectExecution();
}
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedThroughputLogger.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedThroughputLogger.java
index 1aacb8784f6..7e38d0c97c8 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedThroughputLogger.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedThroughputLogger.java
@@ -22,51 +22,46 @@ import org.apache.camel.api.management.mbean.ManagedThroughputLoggerMBean;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.support.processor.ThroughputLogger;
-/**
- *
- */
@ManagedResource(description = "Managed ThroughputLogger")
public class ManagedThroughputLogger extends ManagedProcessor implements ManagedThroughputLoggerMBean {
- private final ThroughputLogger logger;
-
public ManagedThroughputLogger(CamelContext context, ThroughputLogger logger, ProcessorDefinition<?> definition) {
super(context, logger, definition);
- this.logger = logger;
}
- public ThroughputLogger getLogger() {
- return logger;
+ @Override
+ public ThroughputLogger getProcessor() {
+ return (ThroughputLogger) super.getProcessor();
}
@Override
public void reset() {
super.reset();
- logger.reset();
+ getProcessor().reset();
}
@Override
public long getReceivedCounter() {
- return logger.getReceivedCounter();
+ return getProcessor().getReceivedCounter();
}
@Override
public double getAverage() {
- return logger.getAverage();
+ return getProcessor().getAverage();
}
@Override
public double getRate() {
- return logger.getRate();
+ return getProcessor().getRate();
}
@Override
public String getLastLogMessage() {
- return logger.getLastLogMessage();
+ return getProcessor().getLastLogMessage();
}
@Override
public void resetThroughputLogger() {
- logger.reset();
+ getProcessor().reset();
}
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedThrowException.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedThrowException.java
index 1f6b9fc67ae..02fa6d46793 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedThrowException.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedThrowException.java
@@ -25,24 +25,27 @@ import org.apache.camel.util.ObjectHelper;
@ManagedResource(description = "Managed ThrowException")
public class ManagedThrowException extends ManagedProcessor implements ManagedThrowExceptionMBean {
- private final ThrowExceptionProcessor processor;
public ManagedThrowException(CamelContext context, ThrowExceptionProcessor processor, ProcessorDefinition<?> definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public ThrowExceptionProcessor getProcessor() {
+ return (ThrowExceptionProcessor) super.getProcessor();
}
@Override
public String getMessage() {
- return processor.getMessage();
+ return getProcessor().getMessage();
}
@Override
public String getExceptionType() {
- if (processor.getType() != null) {
- return ObjectHelper.name(processor.getType());
- } else if (processor.getException() != null) {
- return ObjectHelper.className(processor.getException());
+ if (getProcessor().getType() != null) {
+ return ObjectHelper.name(getProcessor().getType());
+ } else if (getProcessor().getException() != null) {
+ return ObjectHelper.className(getProcessor().getException());
} else {
return null;
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedTopicLoadBalancer.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedTopicLoadBalancer.java
index ae9148e3e87..4107e616944 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedTopicLoadBalancer.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedTopicLoadBalancer.java
@@ -24,15 +24,18 @@ import org.apache.camel.processor.loadbalancer.TopicLoadBalancer;
@ManagedResource(description = "Managed Topic LoadBalancer")
public class ManagedTopicLoadBalancer extends ManagedProcessor implements ManagedTopicLoadBalancerMBean {
- private final TopicLoadBalancer processor;
public ManagedTopicLoadBalancer(CamelContext context, TopicLoadBalancer processor, LoadBalanceDefinition definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public TopicLoadBalancer getProcessor() {
+ return (TopicLoadBalancer) super.getProcessor();
}
@Override
public Integer getSize() {
- return processor.getProcessors().size();
+ return getProcessor().getProcessors().size();
}
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedUnmarshal.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedUnmarshal.java
index 90159743815..5ab9bea4de5 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedUnmarshal.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedUnmarshal.java
@@ -24,11 +24,14 @@ import org.apache.camel.support.processor.UnmarshalProcessor;
@ManagedResource(description = "Managed Unmarshal")
public class ManagedUnmarshal extends ManagedProcessor implements ManagedUnmarshalMBean {
- private final UnmarshalProcessor processor;
public ManagedUnmarshal(CamelContext context, UnmarshalProcessor processor, UnmarshalDefinition definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public UnmarshalProcessor getProcessor() {
+ return (UnmarshalProcessor) super.getProcessor();
}
@Override
@@ -47,16 +50,16 @@ public class ManagedUnmarshal extends ManagedProcessor implements ManagedUnmarsh
@Override
public String getVariableSend() {
- return processor.getVariableSend();
+ return getProcessor().getVariableSend();
}
@Override
public String getVariableReceive() {
- return processor.getVariableReceive();
+ return getProcessor().getVariableReceive();
}
@Override
public boolean isAllowNullBody() {
- return processor.isAllowNullBody();
+ return getProcessor().isAllowNullBody();
}
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedWeightedLoadBalancer.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedWeightedLoadBalancer.java
index 6883f662422..51b2172e381 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedWeightedLoadBalancer.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedWeightedLoadBalancer.java
@@ -26,16 +26,19 @@ import org.apache.camel.processor.loadbalancer.WeightedLoadBalancer;
@ManagedResource(description = "Managed Weighted LoadBalancer")
public class ManagedWeightedLoadBalancer extends ManagedProcessor implements ManagedWeightedBalancerMBean {
- private final WeightedLoadBalancer processor;
public ManagedWeightedLoadBalancer(CamelContext context, WeightedLoadBalancer processor, LoadBalanceDefinition definition) {
super(context, processor, definition);
- this.processor = processor;
+ }
+
+ @Override
+ public WeightedLoadBalancer getProcessor() {
+ return (WeightedLoadBalancer) super.getProcessor();
}
@Override
public Integer getSize() {
- return processor.getProcessors().size();
+ return getProcessor().getProcessors().size();
}
@Override
@@ -75,7 +78,7 @@ public class ManagedWeightedLoadBalancer extends ManagedProcessor implements Man
@Override
public String getLastChosenProcessorId() {
- int idx = processor.getLastChosenProcessorIndex();
+ int idx = getProcessor().getLastChosenProcessorIndex();
if (idx != -1) {
LoadBalanceDefinition def = getDefinition();
ProcessorDefinition<?> output = def.getOutputs().get(idx);
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedWireTapProcessor.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedWireTapProcessor.java
index f4033082f2c..cab972b04a0 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedWireTapProcessor.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedWireTapProcessor.java
@@ -37,13 +37,12 @@ import org.apache.camel.util.URISupport;
@ManagedResource(description = "Managed WireTapProcessor")
public class ManagedWireTapProcessor extends ManagedProcessor implements ManagedWireTapMBean {
- private final WireTapProcessor processor;
+
private String uri;
private boolean sanitize;
public ManagedWireTapProcessor(CamelContext context, WireTapProcessor processor, ProcessorDefinition<?> definition) {
super(context, processor, definition);
- this.processor = processor;
}
@Override
@@ -51,17 +50,17 @@ public class ManagedWireTapProcessor extends ManagedProcessor implements Managed
super.init(strategy);
sanitize = strategy.getManagementAgent().getMask() != null ? strategy.getManagementAgent().getMask() : true;
if (sanitize) {
- uri = URISupport.sanitizeUri(processor.getUri());
+ uri = URISupport.sanitizeUri(getProcessor().getUri());
} else {
- uri = processor.getUri();
+ uri = getProcessor().getUri();
}
}
@Override
public void reset() {
super.reset();
- if (processor.getEndpointUtilizationStatistics() != null) {
- processor.getEndpointUtilizationStatistics().clear();
+ if (getProcessor().getEndpointUtilizationStatistics() != null) {
+ getProcessor().getEndpointUtilizationStatistics().clear();
}
}
@@ -72,7 +71,7 @@ public class ManagedWireTapProcessor extends ManagedProcessor implements Managed
@Override
public WireTapProcessor getProcessor() {
- return processor;
+ return (WireTapProcessor) super.getProcessor();
}
@Override
@@ -82,27 +81,27 @@ public class ManagedWireTapProcessor extends ManagedProcessor implements Managed
@Override
public Integer getCacheSize() {
- return processor.getCacheSize();
+ return getProcessor().getCacheSize();
}
@Override
public Boolean isIgnoreInvalidEndpoint() {
- return processor.isIgnoreInvalidEndpoint();
+ return getProcessor().isIgnoreInvalidEndpoint();
}
@Override
public Boolean isCopy() {
- return processor.isCopy();
+ return getProcessor().isCopy();
}
@Override
public Boolean isDynamicUri() {
- return processor.isDynamicUri();
+ return getProcessor().isDynamicUri();
}
@Override
public Integer getTaskSize() {
- return processor.getPendingExchangesSize();
+ return getProcessor().getPendingExchangesSize();
}
@Override
@@ -110,7 +109,7 @@ public class ManagedWireTapProcessor extends ManagedProcessor implements Managed
try {
TabularData answer = new TabularDataSupport(CamelOpenMBeanTypes.endpointsUtilizationTabularType());
- EndpointUtilizationStatistics stats = processor.getEndpointUtilizationStatistics();
+ EndpointUtilizationStatistics stats = getProcessor().getEndpointUtilizationStatistics();
if (stats != null) {
for (Map.Entry<String, Long> entry : stats.getStatistics().entrySet()) {
CompositeType ct = CamelOpenMBeanTypes.endpointsUtilizationCompositeType();
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteNoAutoStartupTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteNoAutoStartupTest.java
index 1f687c8b31e..add5290b9fb 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteNoAutoStartupTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteNoAutoStartupTest.java
@@ -95,12 +95,22 @@ public class ManagedRouteNoAutoStartupTest extends ManagementTestSupport {
state = (String) mbeanServer.getAttribute(on, "State");
assertEquals(ServiceStatus.Stopped.name(), state, "Should be stopped");
- // should be 0 consumer and 0 processor
+ // should be 0 consumer and 1 processor
set = mbeanServer.queryNames(new ObjectName("*:type=consumers,*"), null);
assertEquals(0, set.size(), "Should be 0 consumer");
set = mbeanServer.queryNames(new ObjectName("*:type=processors,*"), null);
- assertEquals(0, set.size(), "Should be 0 processor");
+ assertEquals(1, set.size(), "Should be 1 processor");
+
+ // remove
+ mbeanServer.invoke(on, "remove", null, null);
+
+ // should be 0 consumer and 0 processor
+ set = mbeanServer.queryNames(new ObjectName("*:type=consumers,*"), null);
+ assertEquals(0, set.size(), "Should be 1 consumer");
+
+ set = mbeanServer.queryNames(new ObjectName("*:type=processors,*"), null);
+ assertEquals(0, set.size(), "Should be 1 processor");
}
}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteStopAndStartCleanupTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteStopAndStartCleanupTest.java
index a199398ccda..affd644039a 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteStopAndStartCleanupTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteStopAndStartCleanupTest.java
@@ -77,12 +77,12 @@ public class ManagedRouteStopAndStartCleanupTest extends ManagedRouteStopAndStar
state = (String) mbeanServer.getAttribute(on, "State");
assertEquals(ServiceStatus.Stopped.name(), state, "Should be stopped");
- // should be 0 consumer and 0 processor
+ // should be 0 consumer and 1 processor
set = mbeanServer.queryNames(new ObjectName("*:type=consumers,*"), null);
assertEquals(0, set.size(), "Should be 0 consumer");
set = mbeanServer.queryNames(new ObjectName("*:type=processors,*"), null);
- assertEquals(0, set.size(), "Should be 0 processor");
+ assertEquals(2, set.size(), "Should be 2 processor");
mock.reset();
mock.expectedBodiesReceived("Bye World");
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelProcessorStatus.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelProcessorStatus.java
index 63fb725a98a..8d0658cdeec 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelProcessorStatus.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelProcessorStatus.java
@@ -77,6 +77,10 @@ public class CamelProcessorStatus extends ProcessWatchCommand {
description = "Filter processors that must be slower than the given time (ms)")
long mean;
+ @CommandLine.Option(names = { "--running" },
+ description = "Only include running processors")
+ boolean running;
+
@CommandLine.Option(names = { "--filter" },
description = "Filter processors by id")
String[] filter;
@@ -194,7 +198,7 @@ public class CamelProcessorStatus extends ProcessWatchCommand {
});
// filter rows
- if (filter != null || group != null) {
+ if (running || filter != null || group != null) {
rows.removeIf(r -> {
boolean keep = true;
if (filter != null) {
@@ -212,6 +216,9 @@ public class CamelProcessorStatus extends ProcessWatchCommand {
if (keep && group != null) {
keep = PatternHelper.matchPatterns(r.group, group);
}
+ if (keep && running) {
+ keep = "Started".equals(r.state);
+ }
return !keep;
});
}
@@ -240,6 +247,7 @@ public class CamelProcessorStatus extends ProcessWatchCommand {
row.description = o.getString("description");
row.level = o.getIntegerOrDefault("level", 0);
row.source = o.getString("source");
+ row.state = o.getString("state");
Map<String, ?> stats = o.getMap("statistics");
if (stats != null) {
row.total = stats.get("exchangesTotal").toString();
@@ -304,6 +312,8 @@ public class CamelProcessorStatus extends ProcessWatchCommand {
new Column().header("PROCESSOR").dataAlign(HorizontalAlign.LEFT).minWidth(25)
.maxWidth(45, OverflowBehaviour.ELLIPSIS_RIGHT)
.with(this::getProcessor),
+ new Column().header("STATUS").dataAlign(HorizontalAlign.LEFT).headerAlign(HorizontalAlign.CENTER)
+ .with(this::getStatus),
new Column().header("TOTAL").with(this::getTotal),
new Column().header("FAIL").with(this::getFailed),
new Column().header("INFLIGHT").with(this::getInflight),
@@ -418,6 +428,10 @@ public class CamelProcessorStatus extends ProcessWatchCommand {
}
}
+ protected String getStatus(Row r) {
+ return r.state;
+ }
+
protected String getProcessor(Row r) {
String answer = r.processor;
if (source) {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteGroupStatus.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteGroupStatus.java
index b8b003aa274..e2b50186fc3 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteGroupStatus.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteGroupStatus.java
@@ -67,6 +67,10 @@ public class CamelRouteGroupStatus extends ProcessWatchCommand {
description = "Filter groups that must be slower than the given time (ms)")
long mean;
+ @CommandLine.Option(names = { "--running" },
+ description = "Only include running groups")
+ boolean running;
+
@CommandLine.Option(names = { "--filter" },
description = "Filter groups by name")
String[] filter;
@@ -179,6 +183,9 @@ public class CamelRouteGroupStatus extends ProcessWatchCommand {
add = false;
}
}
+ if (add && running) {
+ add = "Started".equals(row.state);
+ }
if (add) {
rows.add(row);
}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteStatus.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteStatus.java
index 8f604136b8e..eb3b14cbc57 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteStatus.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteStatus.java
@@ -69,6 +69,10 @@ public class CamelRouteStatus extends ProcessWatchCommand {
description = "Filter routes that must be slower than the given time (ms)")
long mean;
+ @CommandLine.Option(names = { "--running" },
+ description = "Only include running routes")
+ boolean running;
+
@CommandLine.Option(names = { "--filter" },
description = "Filter routes by id, or url")
String[] filter;
@@ -218,6 +222,9 @@ public class CamelRouteStatus extends ProcessWatchCommand {
if (add && group != null) {
add = PatternHelper.matchPatterns(row.group, group);
}
+ if (add && running) {
+ add = "Started".equals(row.state);
+ }
if (add) {
rows.add(row);
}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListConsumer.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListConsumer.java
index c2f02b0f842..45498ab0d39 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListConsumer.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListConsumer.java
@@ -174,7 +174,7 @@ public class ListConsumer extends ProcessWatchCommand {
new Column().header("AGE").headerAlign(HorizontalAlign.CENTER).with(r -> r.age),
new Column().header("ID").dataAlign(HorizontalAlign.LEFT).maxWidth(20, OverflowBehaviour.ELLIPSIS_RIGHT)
.with(r -> r.id),
- new Column().header("STATE").headerAlign(HorizontalAlign.CENTER).with(this::getState),
+ new Column().header("STATUS").headerAlign(HorizontalAlign.CENTER).with(this::getState),
new Column().header("TYPE").dataAlign(HorizontalAlign.LEFT).maxWidth(20, OverflowBehaviour.ELLIPSIS_RIGHT)
.with(this::getType),
new Column().header("INFLIGHT").with(r -> Integer.toString(r.inflight)),
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListHealth.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListHealth.java
index bcd87ed8911..a9d75a60379 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListHealth.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListHealth.java
@@ -199,7 +199,7 @@ public class ListHealth extends ProcessWatchCommand {
.maxWidth(40, OverflowBehaviour.ELLIPSIS_RIGHT)
.with(this::getId),
new Column().header("RL").minWidth(4).maxWidth(4).with(this::getLR),
- new Column().header("STATE").headerAlign(HorizontalAlign.CENTER)
+ new Column().header("STATUS").headerAlign(HorizontalAlign.CENTER)
.dataAlign(HorizontalAlign.CENTER)
.with(r -> r.state),
new Column().header("RATE").headerAlign(HorizontalAlign.CENTER)
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListKafka.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListKafka.java
index 7171ff326d7..7b22f9da27a 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListKafka.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListKafka.java
@@ -184,7 +184,7 @@ public class ListKafka extends ProcessWatchCommand {
new Column().header("NAME").dataAlign(HorizontalAlign.LEFT).maxWidth(30, OverflowBehaviour.ELLIPSIS_RIGHT)
.with(r -> r.name),
new Column().header("ROUTE").dataAlign(HorizontalAlign.LEFT).with(this::getRouteId),
- new Column().header("STATE").dataAlign(HorizontalAlign.LEFT).with(this::getState),
+ new Column().header("STATUS").dataAlign(HorizontalAlign.LEFT).with(this::getState),
new Column().header("GROUP-ID").dataAlign(HorizontalAlign.LEFT).with(r -> r.groupId),
new Column().header("TOPIC").dataAlign(HorizontalAlign.RIGHT).with(r -> r.lastTopic),
new Column().header("PARTITION").dataAlign(HorizontalAlign.RIGHT).with(r -> "" + r.lastPartition),