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 26a9aa91a2b (chores) convert core/camel-base-engine to use pattern
matching for instanceof
26a9aa91a2b is described below
commit 26a9aa91a2bbb741c948ca8c943a0989da2986fd
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Mon Aug 19 13:27:46 2024 +0200
(chores) convert core/camel-base-engine to use pattern matching for
instanceof
---
.../camel/impl/engine/AbstractCamelContext.java | 55 ++++++++++------------
.../camel/impl/engine/AbstractDynamicRegistry.java | 8 ++--
.../impl/engine/BaseExecutorServiceManager.java | 30 ++++++------
.../impl/engine/BootstrapConfigurerResolver.java | 4 +-
.../camel/impl/engine/CamelInternalProcessor.java | 12 ++---
.../impl/engine/CamelPostProcessorHelper.java | 11 ++---
.../impl/engine/DefaultCamelContextExtension.java | 4 +-
.../apache/camel/impl/engine/DefaultChannel.java | 3 +-
.../impl/engine/DefaultContextPluginManager.java | 4 +-
.../camel/impl/engine/DefaultEndpointRegistry.java | 4 +-
.../impl/engine/DefaultExecutorServiceManager.java | 5 +-
.../impl/engine/DefaultPeriodTaskScheduler.java | 4 +-
.../impl/engine/DefaultResourceResolvers.java | 12 ++---
.../org/apache/camel/impl/engine/DefaultRoute.java | 37 +++++++--------
.../camel/impl/engine/DefaultRouteController.java | 4 +-
.../camel/impl/engine/DefaultRoutesLoader.java | 13 ++---
.../engine/DefaultRuntimeEndpointRegistry.java | 12 ++---
.../engine/DefaultServiceBootstrapCloseable.java | 16 +++----
.../camel/impl/engine/DefaultShutdownStrategy.java | 12 ++---
.../impl/engine/DefaultTransformerRegistry.java | 4 +-
.../camel/impl/engine/DefaultUnitOfWork.java | 9 ++--
.../impl/engine/DeferServiceStartupListener.java | 3 +-
.../impl/engine/InternalRouteStartupManager.java | 12 ++---
.../camel/impl/engine/InternalServiceManager.java | 27 +++++------
.../camel/impl/engine/IntrospectionSupport.java | 4 +-
.../org/apache/camel/impl/engine/RouteService.java | 36 +++++++-------
.../camel/impl/engine/SimpleCamelContext.java | 4 +-
.../camel/impl/engine/StreamCachingHelper.java | 3 +-
28 files changed, 164 insertions(+), 188 deletions(-)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index 86e6930702a..de111c097a8 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -854,8 +854,8 @@ public abstract class AbstractCamelContext extends
BaseService
if (endpoint == null) {
throw new NoSuchEndpointException(name);
}
- if (endpoint instanceof InterceptSendToEndpoint) {
- endpoint = ((InterceptSendToEndpoint)
endpoint).getOriginalEndpoint();
+ if (endpoint instanceof InterceptSendToEndpoint
interceptSendToEndpoint) {
+ endpoint = interceptSendToEndpoint.getOriginalEndpoint();
}
if (endpointType.isInstance(endpoint)) {
return endpointType.cast(endpoint);
@@ -986,8 +986,8 @@ public abstract class AbstractCamelContext extends
BaseService
public void addRoutes(RoutesBuilder builder) throws Exception {
// in case the builder is also a route configuration builder
// then we need to add the configuration first
- if (builder instanceof RouteConfigurationsBuilder) {
- addRoutesConfigurations((RouteConfigurationsBuilder) builder);
+ if (builder instanceof RouteConfigurationsBuilder rcBuilder) {
+ addRoutesConfigurations(rcBuilder);
}
try (LifecycleHelper helper = new LifecycleHelper()) {
build();
@@ -1336,8 +1336,8 @@ public abstract class AbstractCamelContext extends
BaseService
// must suspend route service as well
suspendRouteService(routeService);
// must suspend the route as well
- if (route instanceof SuspendableService) {
- ((SuspendableService) route).suspend();
+ if (route instanceof SuspendableService
suspendableService) {
+ suspendableService.suspend();
}
}
} catch (Exception e) {
@@ -1371,12 +1371,11 @@ public abstract class AbstractCamelContext extends
BaseService
@Override
public boolean removeService(Object object) throws Exception {
- if (object instanceof Endpoint) {
- removeEndpoint((Endpoint) object);
+ if (object instanceof Endpoint endpoint) {
+ removeEndpoint(endpoint);
return true;
}
- if (object instanceof Service) {
- Service service = (Service) object;
+ if (object instanceof Service service) {
for (LifecycleStrategy strategy : lifecycleStrategies) {
strategy.onServiceRemove(this, service, null);
}
@@ -1592,9 +1591,8 @@ public abstract class AbstractCamelContext extends
BaseService
}
if (language != null) {
- if (language instanceof Service) {
+ if (language instanceof Service service) {
try {
- Service service = (Service) language;
// init service first
CamelContextAware.trySetCamelContext(service,
camelContext);
ServiceHelper.initService(service);
@@ -2065,8 +2063,8 @@ public abstract class AbstractCamelContext extends
BaseService
try {
super.init();
} catch (RuntimeCamelException e) {
- if (e.getCause() instanceof VetoCamelContextStartException) {
- vetoed = (VetoCamelContextStartException) e.getCause();
+ if (e.getCause() instanceof VetoCamelContextStartException veto) {
+ vetoed = veto;
} else {
throw e;
}
@@ -2259,9 +2257,9 @@ public abstract class AbstractCamelContext extends
BaseService
// ensure additional type converters is loaded (either if enabled or
we should use package scanning from the base)
boolean load = loadTypeConverters ||
camelContextExtension.getBasePackageScan() != null;
final TypeConverter typeConverter =
camelContextExtension.getTypeConverter();
- if (load && typeConverter instanceof AnnotationScanTypeConverters) {
+ if (load && typeConverter instanceof AnnotationScanTypeConverters
annotationScanTypeConverters) {
StartupStep step2 =
startupStepRecorder.beginStep(CamelContext.class, null, "Scan TypeConverters");
- ((AnnotationScanTypeConverters)
typeConverter).scanTypeConverters();
+ annotationScanTypeConverters.scanTypeConverters();
startupStepRecorder.endStep(step2);
}
@@ -2365,8 +2363,7 @@ public abstract class AbstractCamelContext extends
BaseService
// start notifiers as services
for (EventNotifier notifier :
getManagementStrategy().getEventNotifiers()) {
- if (notifier instanceof Service) {
- Service service = (Service) notifier;
+ if (notifier instanceof Service service) {
for (LifecycleStrategy strategy : lifecycleStrategies) {
strategy.onServiceAdd(getCamelContextReference(), service,
null);
}
@@ -2820,8 +2817,8 @@ public abstract class AbstractCamelContext extends
BaseService
// start notifiers as services
for (EventNotifier notifier :
getManagementStrategy().getEventNotifiers()) {
- if (notifier instanceof Service) {
- startService((Service) notifier);
+ if (notifier instanceof Service service) {
+ startService(service);
}
}
@@ -3203,8 +3200,7 @@ public abstract class AbstractCamelContext extends
BaseService
void startService(Service service) throws Exception {
// and register startup aware so they can be notified when
// camel context has been started
- if (service instanceof StartupListener) {
- StartupListener listener = (StartupListener) service;
+ if (service instanceof StartupListener listener) {
addStartupListener(listener);
}
@@ -3214,8 +3210,8 @@ public abstract class AbstractCamelContext extends
BaseService
private void startServices(Collection<?> services) throws Exception {
for (Object element : services) {
- if (element instanceof Service) {
- startService((Service) element);
+ if (element instanceof Service service) {
+ startService(service);
}
}
}
@@ -3438,10 +3434,10 @@ public abstract class AbstractCamelContext extends
BaseService
*/
protected Endpoint createEndpoint(String uri) {
Object value = camelContextExtension.getRegistry().lookupByName(uri);
- if (value instanceof Endpoint) {
- return (Endpoint) value;
- } else if (value instanceof Processor) {
- return new ProcessorEndpoint(uri, getCamelContextReference(),
(Processor) value);
+ if (value instanceof Endpoint endpoint) {
+ return endpoint;
+ } else if (value instanceof Processor processor) {
+ return new ProcessorEndpoint(uri, getCamelContextReference(),
processor);
} else if (value != null) {
return convertBeanToEndpoint(uri, value);
}
@@ -4008,8 +4004,7 @@ public abstract class AbstractCamelContext extends
BaseService
}
protected void failOnStartup(Exception e) {
- if (e instanceof VetoCamelContextStartException) {
- VetoCamelContextStartException vetoException =
(VetoCamelContextStartException) e;
+ if (e instanceof VetoCamelContextStartException vetoException) {
if (vetoException.isRethrowException()) {
fail(e);
} else {
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractDynamicRegistry.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractDynamicRegistry.java
index 7cbb9b109ce..a6e93b1ce93 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractDynamicRegistry.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractDynamicRegistry.java
@@ -60,8 +60,8 @@ public class AbstractDynamicRegistry<K, V> extends
AbstractMap<K, V> implements
@Override
public void start() {
- if (dynamicMap instanceof LRUCache) {
- ((LRUCache<K, V>) dynamicMap).resetStatistics();
+ if (dynamicMap instanceof LRUCache<K, V> lruCache) {
+ lruCache.resetStatistics();
}
}
@@ -174,8 +174,8 @@ public class AbstractDynamicRegistry<K, V> extends
AbstractMap<K, V> implements
}
public void cleanUp() {
- if (dynamicMap instanceof LRUCache) {
- ((LRUCache<K, V>) dynamicMap).cleanUp();
+ if (dynamicMap instanceof LRUCache<K, V> cache) {
+ cache.cleanUp();
}
}
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/BaseExecutorServiceManager.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/BaseExecutorServiceManager.java
index 9780fe60ecd..7aae8d9e463 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/BaseExecutorServiceManager.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/BaseExecutorServiceManager.java
@@ -356,10 +356,10 @@ public class BaseExecutorServiceManager extends
ServiceSupport implements Execut
private void doRemove(ExecutorService executorService, boolean failSafe) {
// let lifecycle strategy be notified as well which can let it be
managed in JMX as well
ThreadPoolExecutor threadPool = null;
- if (executorService instanceof ThreadPoolExecutor) {
- threadPool = (ThreadPoolExecutor) executorService;
- } else if (executorService instanceof SizedScheduledExecutorService) {
- threadPool = ((SizedScheduledExecutorService)
executorService).getScheduledThreadPoolExecutor();
+ if (executorService instanceof ThreadPoolExecutor threadPoolExecutor) {
+ threadPool = threadPoolExecutor;
+ } else if (executorService instanceof SizedScheduledExecutorService
sizedScheduledExecutorService) {
+ threadPool =
sizedScheduledExecutorService.getScheduledThreadPoolExecutor();
}
if (threadPool != null) {
for (LifecycleStrategy lifecycle :
camelContext.getLifecycleStrategies()) {
@@ -524,12 +524,12 @@ public class BaseExecutorServiceManager extends
ServiceSupport implements Execut
String routeId = null;
// extract id from source
- if (source instanceof NamedNode) {
- id = ((NamedNode) source).getId();
+ if (source instanceof NamedNode namedNode) {
+ id = namedNode.getId();
// and let source be the short name of the pattern
- sourceId = ((NamedNode) source).getShortName();
- } else if (source instanceof String) {
- id = (String) source;
+ sourceId = namedNode.getShortName();
+ } else if (source instanceof String str) {
+ id = str;
} else if (source != null) {
if (source instanceof StaticService) {
// the source is static service so its name would be unique
@@ -547,16 +547,16 @@ public class BaseExecutorServiceManager extends
ServiceSupport implements Execut
StringHelper.notEmpty(id, "id for thread pool " + executorService);
// extract route id if possible
- if (source instanceof NamedNode) {
- routeId = CamelContextHelper.getRouteId((NamedNode) source);
+ if (source instanceof NamedNode namedNode) {
+ routeId = CamelContextHelper.getRouteId(namedNode);
}
// let lifecycle strategy be notified as well which can let it be
managed in JMX as well
ThreadPoolExecutor threadPool = null;
- if (executorService instanceof ThreadPoolExecutor) {
- threadPool = (ThreadPoolExecutor) executorService;
- } else if (executorService instanceof SizedScheduledExecutorService) {
- threadPool = ((SizedScheduledExecutorService)
executorService).getScheduledThreadPoolExecutor();
+ if (executorService instanceof ThreadPoolExecutor threadPoolExecutor) {
+ threadPool = threadPoolExecutor;
+ } else if (executorService instanceof SizedScheduledExecutorService
scheduledExecutorService) {
+ threadPool =
scheduledExecutorService.getScheduledThreadPoolExecutor();
}
if (threadPool != null) {
for (LifecycleStrategy lifecycle :
camelContext.getLifecycleStrategies()) {
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/BootstrapConfigurerResolver.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/BootstrapConfigurerResolver.java
index 2aa463b8f23..f9d61c55a18 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/BootstrapConfigurerResolver.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/BootstrapConfigurerResolver.java
@@ -33,8 +33,8 @@ public class BootstrapConfigurerResolver extends
DefaultConfigurerResolver imple
@Override
public void close() throws IOException {
- if (factoryFinder instanceof BootstrapCloseable) {
- ((BootstrapCloseable) factoryFinder).close();
+ if (factoryFinder instanceof BootstrapCloseable bootstrapCloseable) {
+ bootstrapCloseable.close();
}
factoryFinder = null;
}
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
index 1e49cd39a6d..b482484e0db 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
@@ -608,8 +608,8 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor implements In
private TraceAdviceEventNotifier getOrCreateEventNotifier(CamelContext
camelContext) {
// use a single instance of this event notifier
for (EventNotifier en :
camelContext.getManagementStrategy().getEventNotifiers()) {
- if (en instanceof TraceAdviceEventNotifier) {
- return (TraceAdviceEventNotifier) en;
+ if (en instanceof TraceAdviceEventNotifier
traceAdviceEventNotifier) {
+ return traceAdviceEventNotifier;
}
}
TraceAdviceEventNotifier answer = new TraceAdviceEventNotifier();
@@ -1111,8 +1111,8 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor implements In
private TraceAdviceEventNotifier getOrCreateEventNotifier(CamelContext
camelContext) {
// use a single instance of this event notifier
for (EventNotifier en :
camelContext.getManagementStrategy().getEventNotifiers()) {
- if (en instanceof TraceAdviceEventNotifier) {
- return (TraceAdviceEventNotifier) en;
+ if (en instanceof TraceAdviceEventNotifier
traceAdviceEventNotifier) {
+ return traceAdviceEventNotifier;
}
}
TraceAdviceEventNotifier answer = new TraceAdviceEventNotifier();
@@ -1207,8 +1207,8 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor implements In
* Wrap an InstrumentationProcessor into a CamelInternalProcessorAdvice
*/
public static <T> CamelInternalProcessorAdvice<T>
wrap(InstrumentationProcessor<T> instrumentationProcessor) {
- if (instrumentationProcessor instanceof CamelInternalProcessor) {
- return (CamelInternalProcessorAdvice<T>) instrumentationProcessor;
+ if (instrumentationProcessor instanceof CamelInternalProcessorAdvice
camelInternalProcessor) {
+ return camelInternalProcessor;
} else {
return new
CamelInternalProcessorAdviceWrapper<>(instrumentationProcessor);
}
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java
index deb27fc3825..f62fb3f1ece 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java
@@ -106,8 +106,8 @@ public class CamelPostProcessorHelper implements
CamelContextAware {
Endpoint endpoint = getEndpointInjection(bean, endpointUri,
endpointProperty, injectionPointName, true);
if (endpoint != null) {
boolean multipleConsumer = false;
- if (endpoint instanceof MultipleConsumersSupport) {
- multipleConsumer = ((MultipleConsumersSupport)
endpoint).isMultipleConsumersSupported();
+ if (endpoint instanceof MultipleConsumersSupport consumersSupport)
{
+ multipleConsumer =
consumersSupport.isMultipleConsumersSupported();
}
try {
SubscribeMethodProcessor processor =
getConsumerProcessor(endpoint);
@@ -170,8 +170,8 @@ public class CamelPostProcessorHelper implements
CamelContextAware {
answer = doGetEndpointInjection(uri, injectionPointName,
mandatory);
}
// it may be a delegate endpoint via ref component
- if (answer instanceof DelegateEndpoint) {
- answer = ((DelegateEndpoint) answer).getEndpoint();
+ if (answer instanceof DelegateEndpoint delegateEndpoint) {
+ answer = delegateEndpoint.getEndpoint();
}
return answer;
}
@@ -691,8 +691,7 @@ public class CamelPostProcessorHelper implements
CamelContextAware {
* @return <tt>true</tt> if its singleton scoped, for prototype
scoped <tt>false</tt> is returned.
*/
protected boolean isSingleton(Object bean, String beanName) {
- if (bean instanceof IsSingleton) {
- IsSingleton singleton = (IsSingleton) bean;
+ if (bean instanceof IsSingleton singleton) {
return singleton.isSingleton();
}
return true;
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java
index 90b6992ca76..5650e78344e 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java
@@ -500,8 +500,8 @@ class DefaultCamelContextExtension implements
ExtendedCamelContext {
FactoryFinder finder =
camelContext.createFactoryFinder("META-INF/services/org/apache/camel/management/");
if (finder != null) {
Object object =
finder.newInstance("ManagementStrategyFactory").orElse(null);
- if (object instanceof ManagementStrategyFactory) {
- factory = (ManagementStrategyFactory) object;
+ if (object instanceof ManagementStrategyFactory
managementStrategyFactory) {
+ factory = managementStrategyFactory;
}
}
} catch (Exception e) {
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java
index a3b3c2d878d..e86f4a199d5 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java
@@ -276,8 +276,7 @@ public class DefaultChannel extends CamelInternalProcessor
implements Channel {
// on the error handler. See more details in the class javadoc of
InstrumentationProcessor
if (instrumentationProcessor != null) {
boolean redeliveryPossible = false;
- if (errorHandler instanceof ErrorHandlerRedeliveryCustomizer) {
- ErrorHandlerRedeliveryCustomizer erh =
(ErrorHandlerRedeliveryCustomizer) errorHandler;
+ if (errorHandler instanceof ErrorHandlerRedeliveryCustomizer erh) {
redeliveryPossible = erh.determineIfRedeliveryIsEnabled();
if (redeliveryPossible) {
// okay we can redeliver then we need to change the output
in the error handler
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultContextPluginManager.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultContextPluginManager.java
index f33ad017b61..89998e9ecc1 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultContextPluginManager.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultContextPluginManager.java
@@ -39,8 +39,8 @@ public class DefaultContextPluginManager implements
PluginManager {
}
}
}
- if (extension instanceof Supplier) {
- extension = ((Supplier) extension).get();
+ if (extension instanceof Supplier supplier) {
+ extension = supplier.get();
addContextPlugin(type, (T) extension);
}
return (T) extension;
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultEndpointRegistry.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultEndpointRegistry.java
index 09f3d7858ac..06a3c81d2ac 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultEndpointRegistry.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultEndpointRegistry.java
@@ -57,8 +57,8 @@ public class DefaultEndpointRegistry extends
AbstractDynamicRegistry<NormalizedE
@Override
public boolean containsKey(Object key) {
- if (key instanceof String) {
- key = NormalizedUri.newNormalizedUri(key.toString(), false);
+ if (key instanceof String str) {
+ key = NormalizedUri.newNormalizedUri(str, false);
}
return super.containsKey(key);
}
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultExecutorServiceManager.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultExecutorServiceManager.java
index dfb6c06acf7..281c8e55ce3 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultExecutorServiceManager.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultExecutorServiceManager.java
@@ -50,13 +50,12 @@ public class DefaultExecutorServiceManager extends
BaseExecutorServiceManager {
}
protected Object forceId(Object source) {
- if (source instanceof NamedNode && source instanceof IdAware) {
- NamedNode node = (NamedNode) source;
+ if (source instanceof NamedNode node && source instanceof IdAware
idAware) {
NodeIdFactory factory =
getCamelContext().getCamelContextExtension().getContextPlugin(NodeIdFactory.class);
if (node.getId() == null) {
String id = factory.createId(node);
// we auto generated an id to be assigned
- ((IdAware) source).setGeneratedId(id);
+ idAware.setGeneratedId(id);
}
}
return source;
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultPeriodTaskScheduler.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultPeriodTaskScheduler.java
index 948f9c5b92e..c9bf0faa0ea 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultPeriodTaskScheduler.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultPeriodTaskScheduler.java
@@ -39,8 +39,8 @@ public final class DefaultPeriodTaskScheduler extends
TimerListenerManager imple
public <T> T getTaskByType(Class<T> type) {
for (TimerListener listener : getListeners()) {
Object task = listener;
- if (listener instanceof TaskWrapper) {
- task = ((TaskWrapper) listener).getTask();
+ if (listener instanceof TaskWrapper wrapper) {
+ task = wrapper.getTask();
}
if (type.isInstance(task)) {
return type.cast(task);
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultResourceResolvers.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultResourceResolvers.java
index 21f85c3239d..73b15cd28c7 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultResourceResolvers.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultResourceResolvers.java
@@ -299,8 +299,8 @@ public final class DefaultResourceResolvers {
URLConnection connection = null;
try {
connection = new URL(getLocation()).openConnection();
- if (connection instanceof HttpURLConnection) {
- return ((HttpURLConnection) connection).getResponseCode()
== HttpURLConnection.HTTP_OK;
+ if (connection instanceof HttpURLConnection httpURLConnection)
{
+ return httpURLConnection.getResponseCode() ==
HttpURLConnection.HTTP_OK;
}
return connection.getContentLengthLong() > 0;
} catch (IOException e) {
@@ -308,8 +308,8 @@ public final class DefaultResourceResolvers {
} finally {
// close the http connection to avoid
// leaking gaps in case of an exception
- if (connection instanceof HttpURLConnection) {
- ((HttpURLConnection) connection).disconnect();
+ if (connection instanceof HttpURLConnection httpURLConnection)
{
+ httpURLConnection.disconnect();
}
}
}
@@ -324,8 +324,8 @@ public final class DefaultResourceResolvers {
} catch (IOException e) {
// close the http connection to avoid
// leaking gaps in case of an exception
- if (con instanceof HttpURLConnection) {
- ((HttpURLConnection) con).disconnect();
+ if (con instanceof HttpURLConnection httpURLConnection) {
+ httpURLConnection.disconnect();
}
throw e;
}
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoute.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoute.java
index 01adf488554..567443d3302 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoute.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoute.java
@@ -670,34 +670,34 @@ public class DefaultRoute extends ServiceSupport
implements Route {
consumer = endpoint.createConsumer(processor);
if (consumer != null) {
services.add(consumer);
- if (consumer instanceof RouteAware) {
- ((RouteAware) consumer).setRoute(this);
+ if (consumer instanceof RouteAware routeAware) {
+ routeAware.setRoute(this);
}
- if (consumer instanceof RouteIdAware) {
- ((RouteIdAware) consumer).setRouteId(this.getId());
+ if (consumer instanceof RouteIdAware routeIdAware) {
+ routeIdAware.setRouteId(this.getId());
}
- if (consumer instanceof ResumeAware<?> && resumeStrategy != null) {
- ResumeAdapter resumeAdapter =
AdapterHelper.eval(getCamelContext(), (ResumeAware<?>) consumer,
resumeStrategy);
+ if (consumer instanceof ResumeAware resumeAware && resumeStrategy
!= null) {
+ ResumeAdapter resumeAdapter =
AdapterHelper.eval(getCamelContext(), resumeAware, resumeStrategy);
resumeStrategy.setAdapter(resumeAdapter);
- ((ResumeAware) consumer).setResumeStrategy(resumeStrategy);
+ resumeAware.setResumeStrategy(resumeStrategy);
}
- if (consumer instanceof ConsumerListenerAware<?>) {
- ((ConsumerListenerAware)
consumer).setConsumerListener(consumerListener);
+ if (consumer instanceof ConsumerListenerAware
consumerListenerAware) {
+ consumerListenerAware.setConsumerListener(consumerListener);
}
}
- if (processor instanceof Service) {
- services.add((Service) processor);
+ if (processor instanceof Service service) {
+ services.add(service);
}
for (Processor p : onCompletions.values()) {
- if (processor instanceof Service) {
- services.add((Service) p);
+ if (processor instanceof Service service) {
+ services.add(service);
}
}
for (Processor p : onExceptions.values()) {
- if (processor instanceof Service) {
- services.add((Service) p);
+ if (processor instanceof Service service) {
+ services.add(service);
}
}
}
@@ -709,8 +709,7 @@ public class DefaultRoute extends ServiceSupport implements
Route {
// we want to navigate routes to be easy, so skip the initial channel
// and navigate to its output where it all starts from end user point
of view
- if (answer instanceof Navigate) {
- Navigate<Processor> nav = (Navigate<Processor>) answer;
+ if (answer instanceof Navigate nav) {
if (nav.next().size() == 1) {
Object first = nav.next().get(0);
if (first instanceof Navigate) {
@@ -735,8 +734,8 @@ public class DefaultRoute extends ServiceSupport implements
Route {
if (list != null) {
for (Processor proc : list) {
String id = null;
- if (proc instanceof IdAware) {
- id = ((IdAware) proc).getId();
+ if (proc instanceof IdAware idAware) {
+ id = idAware.getId();
}
if (PatternHelper.matchPattern(id, pattern)) {
match.add(proc);
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRouteController.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRouteController.java
index 4376d8332fd..d2480f031d4 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRouteController.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRouteController.java
@@ -179,8 +179,8 @@ public class DefaultRouteController extends ServiceSupport
implements RouteContr
@Override
public SupervisingRouteController supervising() {
- if (this instanceof SupervisingRouteController) {
- return (SupervisingRouteController) this;
+ if (this instanceof SupervisingRouteController src) {
+ return src;
} else {
// change current route controller to be supervising
SupervisingRouteController src = new
DefaultSupervisingRouteController();
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java
index 7b3590d0189..309d8bb4047 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java
@@ -143,9 +143,8 @@ public class DefaultRoutesLoader extends ServiceSupport
implements RoutesLoader,
// then pre-parse routes
for (Map.Entry<RoutesBuilderLoader, List<Resource>> entry :
groups.entrySet()) {
RoutesBuilderLoader loader = entry.getKey();
- if (loader instanceof ExtendedRoutesBuilderLoader) {
- // extended loader can load all resources ine one unit
- ExtendedRoutesBuilderLoader extLoader =
(ExtendedRoutesBuilderLoader) loader;
+ // the extended loader can load all resources in one unit
+ if (loader instanceof ExtendedRoutesBuilderLoader extLoader) {
// pre-parse before loading
List<Resource> files = entry.getValue();
try {
@@ -176,9 +175,8 @@ public class DefaultRoutesLoader extends ServiceSupport
implements RoutesLoader,
// now load all the same resources for each loader
for (Map.Entry<RoutesBuilderLoader, List<Resource>> entry :
groups.entrySet()) {
RoutesBuilderLoader loader = entry.getKey();
- if (loader instanceof ExtendedRoutesBuilderLoader) {
- // extended loader can load all resources ine one unit
- ExtendedRoutesBuilderLoader extLoader =
(ExtendedRoutesBuilderLoader) loader;
+ // the extended loader can load all resources in one unit
+ if (loader instanceof ExtendedRoutesBuilderLoader extLoader) {
List<Resource> files = entry.getValue();
try {
Collection<RoutesBuilder> builders =
extLoader.loadRoutesBuilders(files);
@@ -294,8 +292,7 @@ public class DefaultRoutesLoader extends ServiceSupport
implements RoutesLoader,
Collection<RoutesBuilder> builders = findRoutesBuilders(resources);
for (RoutesBuilder builder : builders) {
// update any existing route configurations first
- if (builder instanceof RouteConfigurationsBuilder) {
- RouteConfigurationsBuilder rcb = (RouteConfigurationsBuilder)
builder;
+ if (builder instanceof RouteConfigurationsBuilder rcb) {
rcb.updateRouteConfigurationsToCamelContext(getCamelContext());
}
}
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRuntimeEndpointRegistry.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRuntimeEndpointRegistry.java
index bcc5cc6592a..f81b1f14d61 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRuntimeEndpointRegistry.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRuntimeEndpointRegistry.java
@@ -212,8 +212,7 @@ public class DefaultRuntimeEndpointRegistry extends
EventNotifierSupport impleme
@Override
public void notify(CamelEvent event) throws Exception {
- if (event instanceof RouteAddedEvent) {
- RouteAddedEvent rse = (RouteAddedEvent) event;
+ if (event instanceof RouteAddedEvent rse) {
Endpoint endpoint = rse.getRoute().getEndpoint();
String routeId = rse.getRoute().getId();
@@ -224,8 +223,7 @@ public class DefaultRuntimeEndpointRegistry extends
EventNotifierSupport impleme
// use a LRUCache for outputs as we could potential have unlimited
uris if dynamic routing is in use
// and therefore need to have the limit in use
outputs.put(routeId, LRUCacheFactory.newLRUCache(limit));
- } else if (event instanceof RouteRemovedEvent) {
- RouteRemovedEvent rse = (RouteRemovedEvent) event;
+ } else if (event instanceof RouteRemovedEvent rse) {
String routeId = rse.getRoute().getId();
inputs.remove(routeId);
outputs.remove(routeId);
@@ -236,9 +234,8 @@ public class DefaultRuntimeEndpointRegistry extends
EventNotifierSupport impleme
inputUtilization.remove(key);
}
}
- } else if (extended && event instanceof ExchangeCreatedEvent) {
+ } else if (extended && event instanceof ExchangeCreatedEvent ece) {
// we only capture details in extended mode
- ExchangeCreatedEvent ece = (ExchangeCreatedEvent) event;
Endpoint endpoint = ece.getExchange().getFromEndpoint();
if (endpoint != null) {
String routeId = ece.getExchange().getFromRouteId();
@@ -248,8 +245,7 @@ public class DefaultRuntimeEndpointRegistry extends
EventNotifierSupport impleme
inputUtilization.onHit(key);
}
}
- } else if (event instanceof ExchangeSendingEvent) {
- ExchangeSendingEvent ese = (ExchangeSendingEvent) event;
+ } else if (event instanceof ExchangeSendingEvent ese) {
Endpoint endpoint = ese.getEndpoint();
String routeId = ExchangeHelper.getRouteId(ese.getExchange());
String uri = endpoint.getEndpointUri();
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultServiceBootstrapCloseable.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultServiceBootstrapCloseable.java
index b85463f9ac1..4011e88bc9f 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultServiceBootstrapCloseable.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultServiceBootstrapCloseable.java
@@ -58,8 +58,8 @@ public class DefaultServiceBootstrapCloseable implements
BootstrapCloseable {
// its a bootstrap service
for (Service service : set) {
try {
- if (service instanceof BootstrapCloseable) {
- ((BootstrapCloseable) service).close();
+ if (service instanceof BootstrapCloseable closeable) {
+ closeable.close();
}
// service is no longer needed as it was only intended during
bootstrap
camelContext.removeService(service);
@@ -70,9 +70,9 @@ public class DefaultServiceBootstrapCloseable implements
BootstrapCloseable {
// clear bootstrap configurer resolver
ConfigurerResolver cr =
PluginHelper.getBootstrapConfigurerResolver(camelContextExtension);
- if (cr instanceof BootstrapCloseable) {
+ if (cr instanceof BootstrapCloseable closeable) {
try {
- ((BootstrapCloseable) cr).close();
+ closeable.close();
} catch (Exception e) {
LOG.warn("Error during closing bootstrap service. This
exception is ignored", e);
}
@@ -80,9 +80,9 @@ public class DefaultServiceBootstrapCloseable implements
BootstrapCloseable {
// clear processor factory
ProcessorFactory pf =
PluginHelper.getProcessorFactory(camelContextExtension);
- if (pf instanceof BootstrapCloseable) {
+ if (pf instanceof BootstrapCloseable closeable) {
try {
- ((BootstrapCloseable) pf).close();
+ closeable.close();
} catch (Exception e) {
LOG.warn("Error during closing bootstrap service. This
exception is ignored", e);
}
@@ -90,9 +90,9 @@ public class DefaultServiceBootstrapCloseable implements
BootstrapCloseable {
// clear bootstrap factory finder
FactoryFinder ff = camelContextExtension.getBootstrapFactoryFinder();
- if (ff instanceof BootstrapCloseable) {
+ if (ff instanceof BootstrapCloseable closeable) {
try {
- ((BootstrapCloseable) ff).close();
+ closeable.close();
} catch (Exception e) {
LOG.warn("Error during closing bootstrap service. This
exception is ignored", e);
}
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java
index c22432843c0..f86fe19d300 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java
@@ -503,10 +503,10 @@ public class DefaultShutdownStrategy extends
ServiceSupport implements ShutdownS
}
for (Service child : list) {
- if (child instanceof ShutdownPrepared) {
+ if (child instanceof ShutdownPrepared shutdownPrepared) {
try {
LOG.trace("Preparing (forced: {}) shutdown on: {}",
forced, child);
- ((ShutdownPrepared) child).prepareShutdown(suspendOnly,
forced);
+ shutdownPrepared.prepareShutdown(suspendOnly, forced);
} catch (Exception e) {
if (suppressLogging) {
LOG.trace("Error during prepare shutdown on {}. This
exception will be ignored.", child, e);
@@ -606,8 +606,8 @@ public class DefaultShutdownStrategy extends ServiceSupport
implements ShutdownS
// some consumers do not support shutting down so let them
decide
// if a consumer is suspendable then prefer to use that
and then shutdown later
- if (consumer instanceof ShutdownAware) {
- shutdown = !((ShutdownAware)
consumer).deferShutdown(shutdownRunningTask);
+ if (consumer instanceof ShutdownAware shutdownAware) {
+ shutdown =
!shutdownAware.deferShutdown(shutdownRunningTask);
}
if (shutdown && consumer instanceof Suspendable) {
// we prefer to suspend over shutdown
@@ -773,8 +773,8 @@ public class DefaultShutdownStrategy extends ServiceSupport
implements ShutdownS
for (Service service : order.getServices()) {
Set<Service> children = ServiceHelper.getChildServices(service);
for (Service child : children) {
- if (child instanceof ShutdownAware) {
- inflight += ((ShutdownAware)
child).getPendingExchangesSize();
+ if (child instanceof ShutdownAware shutdownAware) {
+ inflight += shutdownAware.getPendingExchangesSize();
}
}
}
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultTransformerRegistry.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultTransformerRegistry.java
index 59412c00285..6db39ccbbfe 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultTransformerRegistry.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultTransformerRegistry.java
@@ -167,8 +167,8 @@ public class DefaultTransformerRegistry extends
AbstractDynamicRegistry<Transfor
// ensure transformer is started before its being used
ServiceHelper.startService(obj);
- if (obj instanceof TransformerLoader) {
- ((TransformerLoader) obj).load(this);
+ if (obj instanceof TransformerLoader transformerLoader) {
+ transformerLoader.load(this);
return obj;
} else {
if (LOG.isDebugEnabled()) {
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
index b32b21cb8ba..dd50277f558 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
@@ -239,8 +239,8 @@ public class DefaultUnitOfWork implements UnitOfWork {
boolean handover = true;
SynchronizationVetoable veto = null;
- if (synchronization instanceof SynchronizationVetoable) {
- veto = (SynchronizationVetoable) synchronization;
+ if (synchronization instanceof SynchronizationVetoable v) {
+ veto = v;
handover = veto.allowHandover();
}
@@ -287,14 +287,13 @@ public class DefaultUnitOfWork implements UnitOfWork {
}
// the exchange is now done
- if (exchange instanceof PooledExchange) {
+ if (exchange instanceof PooledExchange pooled) {
// pooled exchange has its own done logic which will reset this
uow for reuse
// so do not call onDone
try {
- PooledExchange pooled = (PooledExchange) exchange;
// only trigger done if we should auto-release
if (pooled.isAutoRelease()) {
- ((PooledExchange) exchange).done();
+ pooled.done();
}
} catch (Exception e) {
// must catch exceptions to ensure synchronizations is also
invoked
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DeferServiceStartupListener.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DeferServiceStartupListener.java
index 8e8e109e87b..4a8139dd88e 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DeferServiceStartupListener.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DeferServiceStartupListener.java
@@ -62,8 +62,7 @@ public class DeferServiceStartupListener implements
StartupListener, Ordered {
try {
ServiceHelper.startService(service);
} catch (Exception e) {
- if (service instanceof Endpoint) {
- Endpoint endpoint = (Endpoint) service;
+ if (service instanceof Endpoint endpoint) {
throw new
ResolveEndpointFailedException(endpoint.getEndpointUri(), e);
} else {
throw e;
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/InternalRouteStartupManager.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/InternalRouteStartupManager.java
index ae822481d7f..2c3e8de613c 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/InternalRouteStartupManager.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/InternalRouteStartupManager.java
@@ -140,16 +140,16 @@ final class InternalRouteStartupManager {
boolean startable = false;
Consumer consumer = entry.getValue().getRoute().getConsumer();
- if (consumer instanceof SuspendableService) {
+ if (consumer instanceof SuspendableService suspendableService) {
// consumer could be suspended, which is not reflected in
// the BaseRouteService status
- startable = ((SuspendableService) consumer).isSuspended();
+ startable = suspendableService.isSuspended();
}
- if (!startable && consumer instanceof StatefulService) {
+ if (!startable && consumer instanceof StatefulService statefulService)
{
// consumer could be stopped, which is not reflected in the
// BaseRouteService status
- startable = ((StatefulService) consumer).getStatus().isStartable();
+ startable = statefulService.getStatus().isStartable();
} else if (!startable) {
// no consumer so use state from route service
startable = entry.getValue().getStatus().isStartable();
@@ -478,8 +478,8 @@ final class InternalRouteStartupManager {
private boolean doCheckMultipleConsumerSupportClash(Endpoint endpoint,
List<Endpoint> routeInputs) {
// is multiple consumers supported
boolean multipleConsumersSupported = false;
- if (endpoint instanceof MultipleConsumersSupport) {
- multipleConsumersSupported = ((MultipleConsumersSupport)
endpoint).isMultipleConsumersSupported();
+ if (endpoint instanceof MultipleConsumersSupport consumersSupport) {
+ multipleConsumersSupported =
consumersSupport.isMultipleConsumersSupported();
}
if (multipleConsumersSupported) {
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/InternalServiceManager.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/InternalServiceManager.java
index affe6b7677c..a55d55d62f3 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/InternalServiceManager.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/InternalServiceManager.java
@@ -95,18 +95,16 @@ final class InternalServiceManager {
// inject CamelContext
CamelContextAware.trySetCamelContext(object, camelContext);
- if (object instanceof Service) {
- Service service = (Service) object;
-
+ if (object instanceof Service service) {
if (useLifecycleStrategies) {
for (LifecycleStrategy strategy :
camelContext.getLifecycleStrategies()) {
- if (service instanceof Endpoint) {
+ if (service instanceof Endpoint endpoint) {
// use specialized endpoint add
- strategy.onEndpointAdd((Endpoint) service);
+ strategy.onEndpointAdd(endpoint);
} else {
Route route;
- if (service instanceof RouteAware) {
- route = ((RouteAware) service).getRoute();
+ if (service instanceof RouteAware routeAware) {
+ route = routeAware.getRoute();
} else {
// if the service is added while creating a new
route then grab the route from the startup manager
route =
internalRouteStartupManager.getSetupRoute();
@@ -126,8 +124,8 @@ final class InternalServiceManager {
// otherwise we could for example end up with a lot of
prototype
// scope endpoints
boolean singleton = true; // assume singleton by default
- if (object instanceof IsSingleton) {
- singleton = ((IsSingleton) service).isSingleton();
+ if (service instanceof IsSingleton singletonService) {
+ singleton = singletonService.isSingleton();
}
// do not add endpoints as they have their own list
if (singleton && !(service instanceof Endpoint)) {
@@ -154,15 +152,13 @@ final class InternalServiceManager {
}
public void deferStartService(CamelContext camelContext, Object object,
boolean stopOnShutdown, boolean startEarly) {
- if (object instanceof Service) {
- Service service = (Service) object;
-
+ if (object instanceof Service service) {
// only add to services to close if its a singleton
// otherwise we could for example end up with a lot of prototype
// scope endpoints
boolean singleton = true; // assume singleton by default
- if (object instanceof IsSingleton) {
- singleton = ((IsSingleton) service).isSingleton();
+ if (service instanceof IsSingleton singletonService) {
+ singleton = singletonService.isSingleton();
}
// do not add endpoints as they have their own list
if (singleton && !(service instanceof Endpoint)) {
@@ -203,8 +199,7 @@ final class InternalServiceManager {
if (services.isEmpty()) {
return false;
}
- if (object instanceof Service) {
- Service service = (Service) object;
+ if (object instanceof Service service) {
return services.contains(service);
}
return false;
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/IntrospectionSupport.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/IntrospectionSupport.java
index d691fdd09c9..bd8ca3c7af3 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/IntrospectionSupport.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/IntrospectionSupport.java
@@ -643,8 +643,8 @@ final class IntrospectionSupport {
} catch (InvocationTargetException e) {
// lets unwrap the exception
Throwable throwable = e.getCause();
- if (throwable instanceof Exception) {
- throw (Exception) throwable;
+ if (throwable instanceof Exception exception) {
+ throw exception;
} else {
throw (Error) throwable;
}
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 6345b5c4a64..c9f6698b7b2 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
@@ -96,8 +96,8 @@ public class RouteService extends ChildServiceSupport {
Set<Endpoint> answer = new LinkedHashSet<>();
Set<Service> services = gatherChildServices();
for (Service service : services) {
- if (service instanceof EndpointAware) {
- Endpoint endpoint = ((EndpointAware) service).getEndpoint();
+ if (service instanceof EndpointAware endpointAware) {
+ Endpoint endpoint = endpointAware.getEndpoint();
if (endpoint != null) {
answer.add(endpoint);
}
@@ -161,17 +161,17 @@ public class RouteService extends ChildServiceSupport {
for (Service service : services) {
// inject the route
- if (service instanceof RouteAware) {
- ((RouteAware) service).setRoute(route);
+ if (service instanceof RouteAware routeAware) {
+ routeAware.setRoute(route);
}
- if (service instanceof RouteIdAware) {
- ((RouteIdAware) service).setRouteId(route.getId());
+ if (service instanceof RouteIdAware routeIdAware) {
+ routeIdAware.setRouteId(route.getId());
}
// inject camel context
CamelContextAware.trySetCamelContext(service,
camelContext);
- if (service instanceof Consumer) {
- this.input = (Consumer) service;
+ if (service instanceof Consumer consumer) {
+ this.input = consumer;
} else {
list.add(service);
}
@@ -369,8 +369,8 @@ public class RouteService extends ChildServiceSupport {
Class<?> type = service instanceof Processor ? Processor.class :
Service.class;
description = description + " " + service.getClass().getSimpleName();
String id = null;
- if (service instanceof IdAware) {
- id = ((IdAware) service).getId();
+ if (service instanceof IdAware idAware) {
+ id = idAware.getId();
}
return startupStepRecorder.beginStep(type, id, description);
}
@@ -449,10 +449,10 @@ public class RouteService extends ChildServiceSupport {
// only include error handlers if they are route scoped
List<Service> extra = new ArrayList<>();
for (Service service : services) {
- if (service instanceof Channel) {
- Processor eh = ((Channel) service).getErrorHandler();
- if (eh instanceof Service) {
- extra.add((Service) eh);
+ if (service instanceof Channel channel) {
+ Processor eh = channel.getErrorHandler();
+ if (eh instanceof Service s) {
+ extra.add(s);
}
}
}
@@ -466,13 +466,13 @@ public class RouteService extends ChildServiceSupport {
*/
protected void doGetRouteServices(List<Service> services) {
for (Processor proc : getRoute().getOnExceptions()) {
- if (proc instanceof Service) {
- services.add((Service) proc);
+ if (proc instanceof Service service) {
+ services.add(service);
}
}
for (Processor proc : getRoute().getOnCompletions()) {
- if (proc instanceof Service) {
- services.add((Service) proc);
+ if (proc instanceof Service service) {
+ services.add(service);
}
}
}
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
index ab4bd5e14c0..a91093d3b3c 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
@@ -177,8 +177,8 @@ public class SimpleCamelContext extends
AbstractCamelContext {
if (typeConverter == null) {
typeConverter = createTypeConverter();
}
- if (typeConverter instanceof TypeConverterRegistry) {
- return (TypeConverterRegistry) typeConverter;
+ if (typeConverter instanceof TypeConverterRegistry
typeConverterRegistry) {
+ return typeConverterRegistry;
}
return null;
}
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/StreamCachingHelper.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/StreamCachingHelper.java
index d9ba7c9e0b2..20d19a56b2f 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/StreamCachingHelper.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/StreamCachingHelper.java
@@ -38,8 +38,7 @@ final class StreamCachingHelper {
Object body = message.getBody();
if (body == null) {
return null;
- } else if (body instanceof StreamCache) {
- StreamCache sc = (StreamCache) body;
+ } else if (body instanceof StreamCache sc) {
// reset so the cache is ready to be used before processing
sc.reset();
return sc;
