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 caf1c7d6113 (chores) convert core/camel-main to use pattern matching
for instanceof
caf1c7d6113 is described below
commit caf1c7d6113207a66c62b7c21664ddf0763e4d49
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Wed Aug 21 10:49:06 2024 +0200
(chores) convert core/camel-main to use pattern matching for instanceof
---
.../src/main/java/org/apache/camel/main/MainHelper.java | 15 +++++++--------
.../java/org/apache/camel/main/MainPropertiesReload.java | 3 +--
.../main/java/org/apache/camel/main/RoutesConfigurer.java | 10 ++++------
.../camel/main/MainIoCBeanConfigInjectConfigurerTest.java | 3 +--
4 files changed, 13 insertions(+), 18 deletions(-)
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/MainHelper.java
b/core/camel-main/src/main/java/org/apache/camel/main/MainHelper.java
index ea02aeccc3a..2eef2577a6b 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/MainHelper.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/MainHelper.java
@@ -259,10 +259,10 @@ public final class MainHelper {
boolean rc = false;
PropertyConfigurer targetConfigurer = null;
- if (target instanceof Component) {
+ if (target instanceof Component component) {
// the component needs to be initialized to have the configurer
ready
ServiceHelper.initService(target);
- targetConfigurer = ((Component)
target).getComponentPropertyConfigurer();
+ targetConfigurer = component.getComponentPropertyConfigurer();
}
if (targetConfigurer == null) {
String name = target.getClass().getName();
@@ -271,10 +271,10 @@ public final class MainHelper {
}
PropertyConfigurer sourceConfigurer = null;
- if (source instanceof Component) {
+ if (source instanceof Component component) {
// the component needs to be initialized to have the configurer
ready
ServiceHelper.initService(source);
- sourceConfigurer = ((Component)
source).getComponentPropertyConfigurer();
+ sourceConfigurer = component.getComponentPropertyConfigurer();
}
if (sourceConfigurer == null) {
String name = source.getClass().getName();
@@ -282,8 +282,7 @@ public final class MainHelper {
sourceConfigurer =
PluginHelper.getConfigurerResolver(context).resolvePropertyConfigurer(name,
context);
}
- if (targetConfigurer != null && sourceConfigurer instanceof
ExtendedPropertyConfigurerGetter) {
- ExtendedPropertyConfigurerGetter getter =
(ExtendedPropertyConfigurerGetter) sourceConfigurer;
+ if (targetConfigurer != null && sourceConfigurer instanceof
ExtendedPropertyConfigurerGetter getter) {
for (String key : getter.getAllOptions(source).keySet()) {
Object value = getter.getOptionValue(source, key, true);
if (value != null) {
@@ -305,10 +304,10 @@ public final class MainHelper {
boolean rc = false;
PropertyConfigurer configurer = null;
- if (target instanceof Component) {
+ if (target instanceof Component component) {
// the component needs to be initialized to have the configurer
ready
ServiceHelper.initService(target);
- configurer = ((Component) target).getComponentPropertyConfigurer();
+ configurer = component.getComponentPropertyConfigurer();
}
if (configurer == null) {
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/MainPropertiesReload.java
b/core/camel-main/src/main/java/org/apache/camel/main/MainPropertiesReload.java
index ce2855d31a1..c02ba5a8dca 100644
---
a/core/camel-main/src/main/java/org/apache/camel/main/MainPropertiesReload.java
+++
b/core/camel-main/src/main/java/org/apache/camel/main/MainPropertiesReload.java
@@ -51,8 +51,7 @@ public class MainPropertiesReload extends ServiceSupport
@Override
public void onReload(String name, Properties properties) throws Exception {
- if (properties instanceof OrderedLocationProperties) {
- OrderedLocationProperties prop = (OrderedLocationProperties)
properties;
+ if (properties instanceof OrderedLocationProperties prop) {
main.autoConfigurationFromReloadedProperties(camelContext, prop);
main.autowireWildcardProperties(camelContext);
}
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/RoutesConfigurer.java
b/core/camel-main/src/main/java/org/apache/camel/main/RoutesConfigurer.java
index d63373a46d2..f2e7dbe0a3f 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/RoutesConfigurer.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/RoutesConfigurer.java
@@ -182,8 +182,8 @@ public class RoutesConfigurer {
.findImplementations(RoutesBuilder.class, pkgs);
for (Class<?> routeClazz : set) {
Object builder =
camelContext.getInjector().newInstance(routeClazz);
- if (builder instanceof RoutesBuilder) {
- routes.add((RoutesBuilder) builder);
+ if (builder instanceof RoutesBuilder routesBuilder) {
+ routes.add(routesBuilder);
} else {
LOG.warn("Class {} is not a RouteBuilder class",
routeClazz);
}
@@ -242,8 +242,7 @@ public class RoutesConfigurer {
// first add the routes configurations as they are globally for all
routes
for (RoutesBuilder builder : routes) {
- if (builder instanceof RouteConfigurationsBuilder) {
- RouteConfigurationsBuilder rcb = (RouteConfigurationsBuilder)
builder;
+ if (builder instanceof RouteConfigurationsBuilder rcb) {
LOG.debug("Adding routes configurations into CamelContext from
RouteConfigurationsBuilder: {}", rcb);
camelContext.addRoutesConfigurations(rcb);
}
@@ -355,9 +354,8 @@ public class RoutesConfigurer {
// the resource may also have additional configurations which we need
to detect via pre-parsing
for (Map.Entry<RoutesBuilderLoader, List<Resource>> entry :
groups.entrySet()) {
RoutesBuilderLoader loader = entry.getKey();
- if (loader instanceof ExtendedRoutesBuilderLoader) {
+ if (loader instanceof ExtendedRoutesBuilderLoader extLoader) {
// extended loader can pre-parse all resources ine one unit
- ExtendedRoutesBuilderLoader extLoader =
(ExtendedRoutesBuilderLoader) loader;
List<Resource> files = entry.getValue();
try {
extLoader.preParseRoutes(files);
diff --git
a/core/camel-main/src/test/java/org/apache/camel/main/MainIoCBeanConfigInjectConfigurerTest.java
b/core/camel-main/src/test/java/org/apache/camel/main/MainIoCBeanConfigInjectConfigurerTest.java
index b872237f9d7..d3c4f5a76f0 100644
---
a/core/camel-main/src/test/java/org/apache/camel/main/MainIoCBeanConfigInjectConfigurerTest.java
+++
b/core/camel-main/src/test/java/org/apache/camel/main/MainIoCBeanConfigInjectConfigurerTest.java
@@ -90,8 +90,7 @@ public class MainIoCBeanConfigInjectConfigurerTest {
@Override
public boolean configure(CamelContext camelContext, Object target,
String name, Object value, boolean ignoreCase) {
- if (target instanceof MyBarConfig) {
- MyBarConfig config = (MyBarConfig) target;
+ if (target instanceof MyBarConfig config) {
if ("name".equals(name)) {
// ensure the configurer was in use by prefix
config.setName("The " + value.toString());
