This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 513ddae6d8a (chores) convert core/camel-management to use pattern
matching for instanceof
513ddae6d8a is described below
commit 513ddae6d8af8f04a00b7302383d82f577008bb7
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Wed Aug 21 11:01:55 2024 +0200
(chores) convert core/camel-management to use pattern matching for
instanceof
---
.../DefaultInstrumentationProcessor.java | 12 +--
.../DefaultManagementObjectNameStrategy.java | 64 ++++++---------
.../DefaultManagementObjectStrategy.java | 12 +--
.../management/JmxManagementLifecycleStrategy.java | 91 +++++++++++-----------
.../camel/management/JmxManagementStrategy.java | 4 +-
.../management/JmxManagementStrategyFactory.java | 3 +-
.../management/mbean/ManagedClusterService.java | 4 +-
.../camel/management/mbean/ManagedComponent.java | 12 +--
.../camel/management/mbean/ManagedDataFormat.java | 8 +-
.../camel/management/mbean/ManagedDoTry.java | 4 +-
.../camel/management/mbean/ManagedEndpoint.java | 4 +-
.../management/mbean/ManagedEventNotifier.java | 4 +-
.../camel/management/mbean/ManagedProcess.java | 4 +-
.../camel/management/mbean/ManagedProcessor.java | 12 +--
.../camel/management/mbean/ManagedService.java | 13 ++--
.../camel/management/mbean/ManagedThreads.java | 44 +++++------
16 files changed, 135 insertions(+), 160 deletions(-)
diff --git
a/core/camel-management/src/main/java/org/apache/camel/management/DefaultInstrumentationProcessor.java
b/core/camel-management/src/main/java/org/apache/camel/management/DefaultInstrumentationProcessor.java
index a514d59de60..520e76f94dd 100644
---
a/core/camel-management/src/main/java/org/apache/camel/management/DefaultInstrumentationProcessor.java
+++
b/core/camel-management/src/main/java/org/apache/camel/management/DefaultInstrumentationProcessor.java
@@ -55,16 +55,16 @@ public class DefaultInstrumentationProcessor extends
DelegateAsyncProcessor
@Override
public void setCounter(Object counter) {
ManagedPerformanceCounter mpc = null;
- if (counter instanceof ManagedPerformanceCounter) {
- mpc = (ManagedPerformanceCounter) counter;
+ if (counter instanceof ManagedPerformanceCounter
managedPerformanceCounter) {
+ mpc = managedPerformanceCounter;
}
- if (this.counter instanceof DelegatePerformanceCounter) {
- ((DelegatePerformanceCounter) this.counter).setCounter(mpc);
+ if (this.counter instanceof DelegatePerformanceCounter
delegatePerformanceCounter) {
+ delegatePerformanceCounter.setCounter(mpc);
} else if (mpc != null) {
this.counter = mpc;
- } else if (counter instanceof PerformanceCounter) {
- this.counter = (PerformanceCounter) counter;
+ } else if (counter instanceof PerformanceCounter performanceCounter) {
+ this.counter = performanceCounter;
}
}
diff --git
a/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectNameStrategy.java
b/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectNameStrategy.java
index 55b0a3cec69..2225bf603b0 100644
---
a/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectNameStrategy.java
+++
b/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectNameStrategy.java
@@ -120,68 +120,48 @@ public class DefaultManagementObjectNameStrategy
implements ManagementObjectName
return null;
}
ObjectName objectName = null;
- if (managedObject instanceof ManagedCamelContext) {
- ManagedCamelContext mcc = (ManagedCamelContext) managedObject;
+ if (managedObject instanceof ManagedCamelContext mcc) {
objectName = getObjectNameForCamelContext(mcc.getContext());
- } else if (managedObject instanceof ManagedCamelHealth) {
- ManagedCamelHealth mch = (ManagedCamelHealth) managedObject;
+ } else if (managedObject instanceof ManagedCamelHealth mch) {
objectName = getObjectNameForCamelHealth(mch.getContext());
- } else if (managedObject instanceof ManagedRouteController) {
- ManagedRouteController mrc = (ManagedRouteController)
managedObject;
+ } else if (managedObject instanceof ManagedRouteController mrc) {
objectName = getObjectNameForRouteController(mrc.getContext(),
mrc.getRouteController());
- } else if (managedObject instanceof ManagedSupervisingRouteController)
{
- ManagedSupervisingRouteController mrc =
(ManagedSupervisingRouteController) managedObject;
+ } else if (managedObject instanceof ManagedSupervisingRouteController
mrc) {
objectName = getObjectNameForRouteController(mrc.getContext(),
mrc.getRouteController());
- } else if (managedObject instanceof ManagedComponent) {
- ManagedComponent mc = (ManagedComponent) managedObject;
+ } else if (managedObject instanceof ManagedComponent mc) {
objectName = getObjectNameForComponent(mc.getComponent(),
mc.getComponentName());
- } else if (managedObject instanceof ManagedDataFormat) {
- ManagedDataFormat md = (ManagedDataFormat) managedObject;
+ } else if (managedObject instanceof ManagedDataFormat md) {
objectName = getObjectNameForDataFormat(md.getContext(),
md.getDataFormat());
- } else if (managedObject instanceof ManagedEndpoint) {
- ManagedEndpoint me = (ManagedEndpoint) managedObject;
+ } else if (managedObject instanceof ManagedEndpoint me) {
objectName = getObjectNameForEndpoint(me.getEndpoint());
- } else if (managedObject instanceof Endpoint) {
- objectName = getObjectNameForEndpoint((Endpoint) managedObject);
- } else if (managedObject instanceof ManagedRoute) {
- ManagedRoute mr = (ManagedRoute) managedObject;
+ } else if (managedObject instanceof Endpoint endpoint) {
+ objectName = getObjectNameForEndpoint(endpoint);
+ } else if (managedObject instanceof ManagedRoute mr) {
objectName = getObjectNameForRoute(mr.getRoute());
- } else if (managedObject instanceof ManagedStep) {
- ManagedStep mp = (ManagedStep) managedObject;
+ } else if (managedObject instanceof ManagedStep mp) {
objectName = getObjectNameForStep(mp.getContext(),
mp.getProcessor(), mp.getDefinition());
- } else if (managedObject instanceof ManagedProcessor) {
- ManagedProcessor mp = (ManagedProcessor) managedObject;
+ } else if (managedObject instanceof ManagedProcessor mp) {
objectName = getObjectNameForProcessor(mp.getContext(),
mp.getProcessor(), mp.getDefinition());
- } else if (managedObject instanceof ManagedConsumer) {
- ManagedConsumer ms = (ManagedConsumer) managedObject;
+ } else if (managedObject instanceof ManagedConsumer ms) {
objectName = getObjectNameForConsumer(ms.getContext(),
ms.getConsumer());
- } else if (managedObject instanceof ManagedProducer) {
- ManagedProducer ms = (ManagedProducer) managedObject;
+ } else if (managedObject instanceof ManagedProducer ms) {
objectName = getObjectNameForProducer(ms.getContext(),
ms.getProducer());
- } else if (managedObject instanceof ManagedBacklogTracer) {
- ManagedBacklogTracer mt = (ManagedBacklogTracer) managedObject;
+ } else if (managedObject instanceof ManagedBacklogTracer mt) {
objectName = getObjectNameForTracer(mt.getContext(),
mt.getBacklogTracer());
- } else if (managedObject instanceof ManagedBacklogDebugger) {
- ManagedBacklogDebugger md = (ManagedBacklogDebugger) managedObject;
+ } else if (managedObject instanceof ManagedBacklogDebugger md) {
objectName = getObjectNameForTracer(md.getContext(),
md.getBacklogDebugger());
- } else if (managedObject instanceof ManagedDumpRouteStrategy) {
- ManagedDumpRouteStrategy md = (ManagedDumpRouteStrategy)
managedObject;
+ } else if (managedObject instanceof ManagedDumpRouteStrategy md) {
objectName = getObjectNameForService(md.getContext(),
md.getDumpRoutesStrategy());
- } else if (managedObject instanceof ManagedEventNotifier) {
- ManagedEventNotifier men = (ManagedEventNotifier) managedObject;
+ } else if (managedObject instanceof ManagedEventNotifier men) {
objectName = getObjectNameForEventNotifier(men.getContext(),
men.getEventNotifier());
- } else if (managedObject instanceof ManagedTracer) {
- ManagedTracer mt = (ManagedTracer) managedObject;
+ } else if (managedObject instanceof ManagedTracer mt) {
objectName = getObjectNameForTracer(mt.getContext(),
mt.getTracer());
- } else if (managedObject instanceof ManagedThreadPool) {
- ManagedThreadPool mes = (ManagedThreadPool) managedObject;
+ } else if (managedObject instanceof ManagedThreadPool mes) {
objectName = getObjectNameForThreadPool(mes.getContext(),
mes.getThreadPool(), mes.getId(), mes.getSourceId());
- } else if (managedObject instanceof ManagedClusterService) {
- ManagedClusterService mcs = (ManagedClusterService) managedObject;
+ } else if (managedObject instanceof ManagedClusterService mcs) {
objectName = getObjectNameForClusterService(mcs.getContext(),
mcs.getService());
- } else if (managedObject instanceof ManagedService) {
+ } else if (managedObject instanceof ManagedService ms) {
// check for managed service should be last
- ManagedService ms = (ManagedService) managedObject;
// skip endpoints as they are already managed
if (ms.getService() instanceof Endpoint) {
return null;
diff --git
a/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java
b/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java
index 81766d3fe11..574791fa37b 100644
---
a/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java
+++
b/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java
@@ -229,8 +229,8 @@ public class DefaultManagementObjectStrategy implements
ManagementObjectStrategy
return null;
}
- if (endpoint instanceof BrowsableEndpoint) {
- ManagedBrowsableEndpoint me = new
ManagedBrowsableEndpoint((BrowsableEndpoint) endpoint);
+ if (endpoint instanceof BrowsableEndpoint browsableEndpoint) {
+ ManagedBrowsableEndpoint me = new
ManagedBrowsableEndpoint(browsableEndpoint);
me.init(context.getManagementStrategy());
return me;
} else {
@@ -243,8 +243,8 @@ public class DefaultManagementObjectStrategy implements
ManagementObjectStrategy
@Override
public Object getManagedObjectForRouteController(CamelContext context,
RouteController routeController) {
ManagedService mrc;
- if (routeController instanceof SupervisingRouteController) {
- mrc = new ManagedSupervisingRouteController(context,
(SupervisingRouteController) routeController);
+ if (routeController instanceof SupervisingRouteController
supervisingRouteController) {
+ mrc = new ManagedSupervisingRouteController(context,
supervisingRouteController);
} else {
mrc = new ManagedRouteController(context, routeController);
}
@@ -283,8 +283,8 @@ public class DefaultManagementObjectStrategy implements
ManagementObjectStrategy
@Override
public Object getManagedObjectForConsumer(CamelContext context, Consumer
consumer) {
ManagedConsumer mc;
- if (consumer instanceof ScheduledPollConsumer) {
- mc = new ManagedScheduledPollConsumer(context,
(ScheduledPollConsumer) consumer);
+ if (consumer instanceof ScheduledPollConsumer scheduledPollConsumer) {
+ mc = new ManagedScheduledPollConsumer(context,
scheduledPollConsumer);
} else {
mc = new ManagedConsumer(context, consumer);
}
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 858c056f46e..b7f80401711 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
@@ -238,8 +238,8 @@ public class JmxManagementLifecycleStrategy extends
ServiceSupport implements Li
throw RuntimeCamelException.wrapRuntimeCamelException(e);
}
- if (mc instanceof ManagedCamelContext) {
- camelContextMBean = (ManagedCamelContext) mc;
+ if (mc instanceof ManagedCamelContext managedCamelContext) {
+ camelContextMBean = managedCamelContext;
}
// register any pre-registered now that we are initialized
@@ -520,61 +520,61 @@ public class JmxManagementLifecycleStrategy extends
ServiceSupport implements Li
managedBacklogDebuggers.put(backlogDebugger, md);
}
return md;
- } else if (service instanceof Tracer) {
- ManagedTracer mt = new ManagedTracer(camelContext, (Tracer)
service);
+ } else if (service instanceof Tracer tracer) {
+ ManagedTracer mt = new ManagedTracer(camelContext, tracer);
mt.init(getManagementStrategy());
answer = mt;
- } else if (service instanceof DumpRoutesStrategy) {
- ManagedDumpRouteStrategy mdrs = new
ManagedDumpRouteStrategy(camelContext, (DumpRoutesStrategy) service);
+ } else if (service instanceof DumpRoutesStrategy dumpRoutesStrategy) {
+ ManagedDumpRouteStrategy mdrs = new
ManagedDumpRouteStrategy(camelContext, dumpRoutesStrategy);
mdrs.init(getManagementStrategy());
answer = mdrs;
- } else if (service instanceof DataFormat) {
- answer =
getManagementObjectStrategy().getManagedObjectForDataFormat(context,
(DataFormat) service);
- } else if (service instanceof Producer) {
- answer =
getManagementObjectStrategy().getManagedObjectForProducer(context, (Producer)
service);
- } else if (service instanceof Consumer) {
- answer =
getManagementObjectStrategy().getManagedObjectForConsumer(context, (Consumer)
service);
- } else if (service instanceof Processor) {
+ } else if (service instanceof DataFormat dataFormat) {
+ answer =
getManagementObjectStrategy().getManagedObjectForDataFormat(context,
dataFormat);
+ } else if (service instanceof Producer producer) {
+ answer =
getManagementObjectStrategy().getManagedObjectForProducer(context, producer);
+ } else if (service instanceof Consumer consumer) {
+ answer =
getManagementObjectStrategy().getManagedObjectForConsumer(context, consumer);
+ } else if (service instanceof Processor processor) {
// special for processors as we need to do some extra work
- return getManagedObjectForProcessor(context, (Processor) service,
route);
- } else if (service instanceof ThrottlingInflightRoutePolicy) {
- answer = new ManagedThrottlingInflightRoutePolicy(context,
(ThrottlingInflightRoutePolicy) service);
- } else if (service instanceof ThrottlingExceptionRoutePolicy) {
- answer = new ManagedThrottlingExceptionRoutePolicy(context,
(ThrottlingExceptionRoutePolicy) service);
- } else if (service instanceof ConsumerCache) {
- answer = new ManagedConsumerCache(context, (ConsumerCache)
service);
- } else if (service instanceof ProducerCache) {
- answer = new ManagedProducerCache(context, (ProducerCache)
service);
- } else if (service instanceof ExchangeFactoryManager) {
- answer = new ManagedExchangeFactoryManager(context,
(ExchangeFactoryManager) service);
+ return getManagedObjectForProcessor(context, processor, route);
+ } else if (service instanceof ThrottlingInflightRoutePolicy
throttlingInflightRoutePolicy) {
+ answer = new ManagedThrottlingInflightRoutePolicy(context,
throttlingInflightRoutePolicy);
+ } else if (service instanceof ThrottlingExceptionRoutePolicy
throttlingExceptionRoutePolicy) {
+ answer = new ManagedThrottlingExceptionRoutePolicy(context,
throttlingExceptionRoutePolicy);
+ } else if (service instanceof ConsumerCache consumerCache) {
+ answer = new ManagedConsumerCache(context, consumerCache);
+ } else if (service instanceof ProducerCache producerCache) {
+ answer = new ManagedProducerCache(context, producerCache);
+ } else if (service instanceof ExchangeFactoryManager
exchangeFactoryManager) {
+ answer = new ManagedExchangeFactoryManager(context,
exchangeFactoryManager);
} else if (service instanceof EndpointRegistry endpointRegistry) {
answer = new ManagedEndpointRegistry(context, endpointRegistry);
- } else if (service instanceof BeanIntrospection) {
- answer = new ManagedBeanIntrospection(context, (BeanIntrospection)
service);
- } else if (service instanceof TypeConverterRegistry) {
- answer = new ManagedTypeConverterRegistry(context,
(TypeConverterRegistry) service);
- } else if (service instanceof RestRegistry) {
- answer = new ManagedRestRegistry(context, (RestRegistry) service);
- } else if (service instanceof EndpointServiceRegistry) {
- answer = new ManagedEndpointServiceRegistry(context,
(EndpointServiceRegistry) service);
- } else if (service instanceof InflightRepository) {
- answer = new ManagedInflightRepository(context,
(InflightRepository) service);
- } else if (service instanceof AsyncProcessorAwaitManager) {
- answer = new ManagedAsyncProcessorAwaitManager(context,
(AsyncProcessorAwaitManager) service);
- } else if (service instanceof RuntimeEndpointRegistry) {
- answer = new ManagedRuntimeEndpointRegistry(context,
(RuntimeEndpointRegistry) service);
- } else if (service instanceof StreamCachingStrategy) {
- answer = new ManagedStreamCachingStrategy(context,
(StreamCachingStrategy) service);
- } else if (service instanceof EventNotifier) {
+ } else if (service instanceof BeanIntrospection beanIntrospection) {
+ answer = new ManagedBeanIntrospection(context, beanIntrospection);
+ } else if (service instanceof TypeConverterRegistry
typeConverterRegistry) {
+ answer = new ManagedTypeConverterRegistry(context,
typeConverterRegistry);
+ } else if (service instanceof RestRegistry restRegistry) {
+ answer = new ManagedRestRegistry(context, restRegistry);
+ } else if (service instanceof EndpointServiceRegistry
endpointServiceRegistry) {
+ answer = new ManagedEndpointServiceRegistry(context,
endpointServiceRegistry);
+ } else if (service instanceof InflightRepository inflightRepository) {
+ answer = new ManagedInflightRepository(context,
inflightRepository);
+ } else if (service instanceof AsyncProcessorAwaitManager
asyncProcessorAwaitManager) {
+ answer = new ManagedAsyncProcessorAwaitManager(context,
asyncProcessorAwaitManager);
+ } else if (service instanceof RuntimeEndpointRegistry
runtimeEndpointRegistry) {
+ answer = new ManagedRuntimeEndpointRegistry(context,
runtimeEndpointRegistry);
+ } else if (service instanceof StreamCachingStrategy
streamCachingStrategy) {
+ answer = new ManagedStreamCachingStrategy(context,
streamCachingStrategy);
+ } else if (service instanceof EventNotifier eventNotifier)
answer =
getManagementObjectStrategy().getManagedObjectForEventNotifier(context,
(EventNotifier) service);
- } else if (service instanceof TransformerRegistry transformerRegistry)
{
+ else if (service instanceof TransformerRegistry transformerRegistry) {
answer = new ManagedTransformerRegistry(context,
transformerRegistry);
} else if (service instanceof ValidatorRegistry validatorRegistry) {
answer = new ManagedValidatorRegistry(context, validatorRegistry);
} else if (service instanceof BrowsableVariableRepository
variableRepository) {
answer = new ManagedVariableRepository(context,
variableRepository);
- } else if (service instanceof CamelClusterService) {
- answer =
getManagementObjectStrategy().getManagedObjectForClusterService(context,
(CamelClusterService) service);
+ } else if (service instanceof CamelClusterService camelClusterService)
{
+ answer =
getManagementObjectStrategy().getManagedObjectForClusterService(context,
camelClusterService);
} else if (service != null) {
// fallback as generic service
answer =
getManagementObjectStrategy().getManagedObjectForService(context, service);
@@ -898,8 +898,7 @@ public class JmxManagementLifecycleStrategy extends
ServiceSupport implements Li
* @throws Exception is thrown if error unregistering the managed object
*/
protected void unmanageObject(Object me) throws Exception {
- if (me instanceof TimerListener) {
- TimerListener timer = (TimerListener) me;
+ if (me instanceof TimerListener timer) {
loadTimer.removeTimerListener(timer);
}
getManagementStrategy().unmanageObject(me);
diff --git
a/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementStrategy.java
b/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementStrategy.java
index 56aa8ffecd8..666ee1eb14c 100644
---
a/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementStrategy.java
+++
b/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementStrategy.java
@@ -100,8 +100,8 @@ public class JmxManagementStrategy extends
DefaultManagementStrategy {
@Override
public boolean isManagedName(Object name) {
try {
- if (name instanceof ObjectName) {
- return getManagementAgent().isRegistered((ObjectName) name);
+ if (name instanceof ObjectName objectName) {
+ return getManagementAgent().isRegistered(objectName);
}
} catch (Exception e) {
LOG.warn("Cannot check whether the managed object is registered.
This exception will be ignored.", e);
diff --git
a/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementStrategyFactory.java
b/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementStrategyFactory.java
index e220dbe1f11..c6441361d8f 100644
---
a/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementStrategyFactory.java
+++
b/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementStrategyFactory.java
@@ -63,8 +63,7 @@ public class JmxManagementStrategyFactory implements
ManagementStrategyFactory {
preServices = jmx.getPreServices();
}
- if (preServices != null && !preServices.isEmpty() && lifecycle
instanceof JmxManagementLifecycleStrategy) {
- JmxManagementLifecycleStrategy existing =
(JmxManagementLifecycleStrategy) lifecycle;
+ if (preServices != null && !preServices.isEmpty() && lifecycle
instanceof JmxManagementLifecycleStrategy existing) {
for
(java.util.function.Consumer<JmxManagementLifecycleStrategy> pre : preServices)
{
existing.addPreService(pre);
}
diff --git
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedClusterService.java
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedClusterService.java
index 55f5dce7adf..1610cb78749 100644
---
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedClusterService.java
+++
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedClusterService.java
@@ -68,8 +68,8 @@ public class ManagedClusterService implements
ManagedClusterServiceMBean {
@Override
public String getState() {
// must use String type to be sure remote JMX can read the attribute
without requiring Camel classes.
- if (service instanceof StatefulService) {
- ServiceStatus status = ((StatefulService) service).getStatus();
+ if (service instanceof StatefulService statefulService) {
+ ServiceStatus status = statefulService.getStatus();
return status.name();
}
diff --git
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java
index f88ce325c62..b601bade15d 100644
---
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java
+++
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java
@@ -69,8 +69,8 @@ public class ManagedComponent implements ManagedInstance,
ManagedComponentMBean
@Override
public String getState() {
// must use String type to be sure remote JMX can read the attribute
without requiring Camel classes.
- if (component instanceof StatefulService) {
- ServiceStatus status = ((StatefulService) component).getStatus();
+ if (component instanceof StatefulService statefulService) {
+ ServiceStatus status = statefulService.getStatus();
return status.name();
}
@@ -100,16 +100,16 @@ public class ManagedComponent implements ManagedInstance,
ManagedComponentMBean
@Override
public boolean isHealthCheckConsumerEnabled() {
- if (component instanceof HealthCheckComponent) {
- return ((HealthCheckComponent)
component).isHealthCheckConsumerEnabled();
+ if (component instanceof HealthCheckComponent healthCheckComponent) {
+ return healthCheckComponent.isHealthCheckConsumerEnabled();
}
return false;
}
@Override
public boolean isHealthCheckProducerEnabled() {
- if (component instanceof HealthCheckComponent) {
- return ((HealthCheckComponent)
component).isHealthCheckProducerEnabled();
+ if (component instanceof HealthCheckComponent healthCheckComponent) {
+ return healthCheckComponent.isHealthCheckProducerEnabled();
}
return false;
}
diff --git
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDataFormat.java
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDataFormat.java
index a5070cb4a6a..6c3b23f72ea 100644
---
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDataFormat.java
+++
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDataFormat.java
@@ -50,8 +50,8 @@ public class ManagedDataFormat implements ManagedInstance,
ManagedDataFormatMBea
@Override
public String getName() {
- if (dataFormat instanceof DataFormatName) {
- return ((DataFormatName) dataFormat).getDataFormatName();
+ if (dataFormat instanceof DataFormatName dataFormatName) {
+ return dataFormatName.getDataFormatName();
}
return null;
}
@@ -69,8 +69,8 @@ public class ManagedDataFormat implements ManagedInstance,
ManagedDataFormatMBea
@Override
public String getState() {
// must use String type to be sure remote JMX can read the attribute
without requiring Camel classes.
- if (dataFormat instanceof StatefulService) {
- ServiceStatus status = ((StatefulService) dataFormat).getStatus();
+ if (dataFormat instanceof StatefulService statefulService) {
+ ServiceStatus status = statefulService.getStatus();
return status.name();
}
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 aa3d18d7583..d22b878a349 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
@@ -108,8 +108,8 @@ public class ManagedDoTry extends ManagedProcessor
implements ManagedDoTryMBean
// drill down and find
while (nav.hasNext()) {
for (Processor p : nav.next()) {
- if (p instanceof CatchProcessor) {
- return (CatchProcessor) p;
+ if (p instanceof CatchProcessor catchProcessor) {
+ return catchProcessor;
}
if (p instanceof Navigate<?>) {
Navigate<Processor> child = (Navigate<Processor>) p;
diff --git
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java
index 8db9a5cd662..6fbc9ae45d5 100644
---
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java
+++
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java
@@ -76,8 +76,8 @@ public class ManagedEndpoint implements ManagedInstance,
ManagedEndpointMBean {
@Override
public String getState() {
// must use String type to be sure remote JMX can read the attribute
without requiring Camel classes.
- if (endpoint instanceof StatefulService) {
- ServiceStatus status = ((StatefulService) endpoint).getStatus();
+ if (endpoint instanceof StatefulService statefulService) {
+ ServiceStatus status = statefulService.getStatus();
return status.name();
}
diff --git
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedEventNotifier.java
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedEventNotifier.java
index ef1b712cca9..1ccfe2c12df 100644
---
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedEventNotifier.java
+++
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedEventNotifier.java
@@ -34,8 +34,8 @@ public class ManagedEventNotifier extends
NotificationBroadcasterSupport impleme
public ManagedEventNotifier(CamelContext context, EventNotifier
eventNotifier) {
this.context = context;
this.eventNotifier = eventNotifier;
- if (eventNotifier instanceof JmxNotificationBroadcasterAware) {
- ((JmxNotificationBroadcasterAware)
eventNotifier).setNotificationBroadcaster(this);
+ if (eventNotifier instanceof JmxNotificationBroadcasterAware
jmxNotifier) {
+ jmxNotifier.setNotificationBroadcaster(this);
}
}
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 99a1f940df2..3f34d3c0369 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
@@ -50,8 +50,8 @@ public class ManagedProcess extends ManagedProcessor
implements ManagedProcessMB
return processorClassName;
}
Processor target = processor;
- if (target instanceof DelegateProcessor) {
- target = ((DelegateProcessor) target).getProcessor();
+ if (target instanceof DelegateProcessor delegateProcessor) {
+ target = delegateProcessor.getProcessor();
}
processorClassName = ObjectHelper.className(target);
return processorClassName;
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 a8e6843110e..90a8d8281b2 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
@@ -53,8 +53,8 @@ public class ManagedProcessor extends
ManagedPerformanceCounter implements Manag
this.nodeLevel = ProcessorDefinitionHelper.getNodeLevel(definition);
this.id =
definition.idOrCreate(context.getCamelContextExtension().getContextPlugin(NodeIdFactory.class));
StepDefinition step;
- if (definition instanceof StepDefinition) {
- step = (StepDefinition) definition;
+ if (definition instanceof StepDefinition stepDefinition) {
+ step = stepDefinition;
} else {
step =
ProcessorDefinitionHelper.findFirstParentOfType(StepDefinition.class,
definition, true);
}
@@ -137,8 +137,8 @@ public class ManagedProcessor extends
ManagedPerformanceCounter implements Manag
@Override
public String getState() {
// must use String type to be sure remote JMX can read the attribute
without requiring Camel classes.
- if (processor instanceof StatefulService) {
- ServiceStatus status = ((StatefulService) processor).getStatus();
+ if (processor instanceof StatefulService statefulService) {
+ ServiceStatus status = statefulService.getStatus();
return status.name();
}
@@ -160,8 +160,8 @@ public class ManagedProcessor extends
ManagedPerformanceCounter implements Manag
public String getRouteId() {
if (route != null) {
return route.getId();
- } else if (processor instanceof RouteIdAware) {
- return ((RouteIdAware) processor).getRouteId();
+ } else if (processor instanceof RouteIdAware routeIdAware) {
+ return routeIdAware.getRouteId();
}
return null;
}
diff --git
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedService.java
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedService.java
index ffd0810b671..f5b59eba80a 100644
---
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedService.java
+++
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedService.java
@@ -68,8 +68,8 @@ public class ManagedService implements ManagedInstance,
ManagedServiceMBean {
@Override
public String getState() {
// must use String type to be sure remote JMX can read the attribute
without requiring Camel classes.
- if (service instanceof StatefulService) {
- ServiceStatus status = ((StatefulService) service).getStatus();
+ if (service instanceof StatefulService statefulService) {
+ ServiceStatus status = statefulService.getStatus();
return status.name();
}
@@ -126,8 +126,7 @@ public class ManagedService implements ManagedInstance,
ManagedServiceMBean {
@Override
public boolean isSuspended() {
- if (service instanceof SuspendableService) {
- SuspendableService ss = (SuspendableService) service;
+ if (service instanceof SuspendableService ss) {
return ss.isSuspended();
} else {
return false;
@@ -139,8 +138,7 @@ public class ManagedService implements ManagedInstance,
ManagedServiceMBean {
if (!context.getStatus().isStarted()) {
throw new IllegalArgumentException("CamelContext is not started");
}
- if (service instanceof Suspendable && service instanceof
SuspendableService) {
- SuspendableService ss = (SuspendableService) service;
+ if (service instanceof Suspendable && service instanceof
SuspendableService ss) {
ss.suspend();
} else {
throw new UnsupportedOperationException("suspend() is not a
supported operation");
@@ -152,8 +150,7 @@ public class ManagedService implements ManagedInstance,
ManagedServiceMBean {
if (!context.getStatus().isStarted()) {
throw new IllegalArgumentException("CamelContext is not started");
}
- if (service instanceof SuspendableService) {
- SuspendableService ss = (SuspendableService) service;
+ if (service instanceof SuspendableService ss) {
ss.resume();
} else {
throw new UnsupportedOperationException("resume() is not a
supported operation");
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 890e65beb15..0fe59a7e77b 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
@@ -47,8 +47,8 @@ public class ManagedThreads extends ManagedProcessor
implements ManagedThreadsMB
@Override
public String getRejectedPolicy() {
- if (processor.getExecutorService() instanceof ThreadPoolExecutor) {
- return ((ThreadPoolExecutor)
processor.getExecutorService()).getRejectedExecutionHandler().toString();
+ if (processor.getExecutorService() instanceof ThreadPoolExecutor
threadPoolExecutor) {
+ return threadPoolExecutor.getRejectedExecutionHandler().toString();
} else {
return null;
}
@@ -56,8 +56,8 @@ public class ManagedThreads extends ManagedProcessor
implements ManagedThreadsMB
@Override
public int getCorePoolSize() {
- if (processor.getExecutorService() instanceof ThreadPoolExecutor) {
- return ((ThreadPoolExecutor)
processor.getExecutorService()).getCorePoolSize();
+ if (processor.getExecutorService() instanceof ThreadPoolExecutor
threadPoolExecutor) {
+ return threadPoolExecutor.getCorePoolSize();
} else {
return 0;
}
@@ -65,8 +65,8 @@ public class ManagedThreads extends ManagedProcessor
implements ManagedThreadsMB
@Override
public int getPoolSize() {
- if (processor.getExecutorService() instanceof ThreadPoolExecutor) {
- return ((ThreadPoolExecutor)
processor.getExecutorService()).getPoolSize();
+ if (processor.getExecutorService() instanceof ThreadPoolExecutor
threadPoolExecutor) {
+ return threadPoolExecutor.getPoolSize();
} else {
return 0;
}
@@ -74,8 +74,8 @@ public class ManagedThreads extends ManagedProcessor
implements ManagedThreadsMB
@Override
public int getMaximumPoolSize() {
- if (processor.getExecutorService() instanceof ThreadPoolExecutor) {
- return ((ThreadPoolExecutor)
processor.getExecutorService()).getMaximumPoolSize();
+ if (processor.getExecutorService() instanceof ThreadPoolExecutor
threadPoolExecutor) {
+ return threadPoolExecutor.getMaximumPoolSize();
} else {
return 0;
}
@@ -83,8 +83,8 @@ public class ManagedThreads extends ManagedProcessor
implements ManagedThreadsMB
@Override
public int getLargestPoolSize() {
- if (processor.getExecutorService() instanceof ThreadPoolExecutor) {
- return ((ThreadPoolExecutor)
processor.getExecutorService()).getLargestPoolSize();
+ if (processor.getExecutorService() instanceof ThreadPoolExecutor
threadPoolExecutor) {
+ return threadPoolExecutor.getLargestPoolSize();
} else {
return 0;
}
@@ -92,8 +92,8 @@ public class ManagedThreads extends ManagedProcessor
implements ManagedThreadsMB
@Override
public int getActiveCount() {
- if (processor.getExecutorService() instanceof ThreadPoolExecutor) {
- return ((ThreadPoolExecutor)
processor.getExecutorService()).getActiveCount();
+ if (processor.getExecutorService() instanceof ThreadPoolExecutor
threadPoolExecutor) {
+ return threadPoolExecutor.getActiveCount();
} else {
return 0;
}
@@ -101,8 +101,8 @@ public class ManagedThreads extends ManagedProcessor
implements ManagedThreadsMB
@Override
public long getTaskCount() {
- if (processor.getExecutorService() instanceof ThreadPoolExecutor) {
- return ((ThreadPoolExecutor)
processor.getExecutorService()).getTaskCount();
+ if (processor.getExecutorService() instanceof ThreadPoolExecutor
threadPoolExecutor) {
+ return threadPoolExecutor.getTaskCount();
} else {
return 0;
}
@@ -110,8 +110,8 @@ public class ManagedThreads extends ManagedProcessor
implements ManagedThreadsMB
@Override
public long getCompletedTaskCount() {
- if (processor.getExecutorService() instanceof ThreadPoolExecutor) {
- return ((ThreadPoolExecutor)
processor.getExecutorService()).getCompletedTaskCount();
+ if (processor.getExecutorService() instanceof ThreadPoolExecutor
threadPoolExecutor) {
+ return threadPoolExecutor.getCompletedTaskCount();
} else {
return 0;
}
@@ -119,8 +119,8 @@ public class ManagedThreads extends ManagedProcessor
implements ManagedThreadsMB
@Override
public long getTaskQueueSize() {
- if (processor.getExecutorService() instanceof ThreadPoolExecutor) {
- BlockingQueue<Runnable> queue = ((ThreadPoolExecutor)
processor.getExecutorService()).getQueue();
+ if (processor.getExecutorService() instanceof ThreadPoolExecutor
threadPoolExecutor) {
+ BlockingQueue<Runnable> queue = threadPoolExecutor.getQueue();
return queue != null ? queue.size() : 0;
} else {
return 0;
@@ -129,8 +129,8 @@ public class ManagedThreads extends ManagedProcessor
implements ManagedThreadsMB
@Override
public long getKeepAliveTime() {
- if (processor.getExecutorService() instanceof ThreadPoolExecutor) {
- return ((ThreadPoolExecutor)
processor.getExecutorService()).getKeepAliveTime(TimeUnit.SECONDS);
+ if (processor.getExecutorService() instanceof ThreadPoolExecutor
threadPoolExecutor) {
+ return threadPoolExecutor.getKeepAliveTime(TimeUnit.SECONDS);
} else {
return 0;
}
@@ -138,8 +138,8 @@ public class ManagedThreads extends ManagedProcessor
implements ManagedThreadsMB
@Override
public boolean isAllowCoreThreadTimeout() {
- if (processor.getExecutorService() instanceof ThreadPoolExecutor) {
- return ((ThreadPoolExecutor)
processor.getExecutorService()).allowsCoreThreadTimeOut();
+ if (processor.getExecutorService() instanceof ThreadPoolExecutor
threadPoolExecutor) {
+ return threadPoolExecutor.allowsCoreThreadTimeOut();
} else {
return false;
}
