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
commit cd0e6dd80893614732c76ca411e8837c2951de10 Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Mon Jan 26 10:54:26 2026 +0000 (chores): modernize instanceof checks in camel-quartz --- .../main/java/org/apache/camel/component/quartz/CamelJob.java | 11 +++++------ .../org/apache/camel/component/quartz/QuartzEndpoint.java | 11 +++-------- .../pollconsumer/quartz/QuartzScheduledPollConsumerJob.java | 4 ++-- .../quartz/QuartzScheduledPollConsumerScheduler.java | 8 ++------ .../org/apache/camel/routepolicy/quartz/ScheduledJob.java | 4 ++-- 5 files changed, 14 insertions(+), 24 deletions(-) diff --git a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/CamelJob.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/CamelJob.java index d4913eb43ec0..7cd525cb5ec0 100644 --- a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/CamelJob.java +++ b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/CamelJob.java @@ -96,8 +96,8 @@ public class CamelJob implements Job, InterruptableJob { } // and rethrow to let quartz handle it - if (e instanceof JobExecutionException) { - throw (JobExecutionException) e; + if (e instanceof JobExecutionException jobexecutionexception) { + throw jobexecutionexception; } throw new JobExecutionException(e); } @@ -156,11 +156,10 @@ public class CamelJob implements Job, InterruptableJob { // as we prefer to use the existing endpoint from the routes for (Route route : camelContext.getRoutes()) { Endpoint endpoint = route.getEndpoint(); - if (endpoint instanceof DelegateEndpoint) { - endpoint = ((DelegateEndpoint) endpoint).getEndpoint(); + if (endpoint instanceof DelegateEndpoint delegateendpoint) { + endpoint = delegateendpoint.getEndpoint(); } - if (endpoint instanceof QuartzEndpoint) { - QuartzEndpoint quartzEndpoint = (QuartzEndpoint) endpoint; + if (endpoint instanceof QuartzEndpoint quartzEndpoint) { TriggerKey checkTriggerKey = quartzEndpoint.getTriggerKey(); if (LOG.isTraceEnabled()) { LOG.trace("Checking route endpoint={} with checkTriggerKey={}", quartzEndpoint, checkTriggerKey); diff --git a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java index aa228136170d..92b9dba5e2ac 100644 --- a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java +++ b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java @@ -448,13 +448,9 @@ public class QuartzEndpoint extends DefaultEndpoint { } private boolean hasTriggerChanged(Trigger oldTrigger, Trigger newTrigger) { - if (newTrigger instanceof CronTrigger && oldTrigger instanceof CronTrigger) { - CronTrigger newCron = (CronTrigger) newTrigger; - CronTrigger oldCron = (CronTrigger) oldTrigger; + if (newTrigger instanceof CronTrigger newCron && oldTrigger instanceof CronTrigger oldCron) { return !newCron.getCronExpression().equals(oldCron.getCronExpression()); - } else if (newTrigger instanceof SimpleTrigger && oldTrigger instanceof SimpleTrigger) { - SimpleTrigger newSimple = (SimpleTrigger) newTrigger; - SimpleTrigger oldSimple = (SimpleTrigger) oldTrigger; + } else if (newTrigger instanceof SimpleTrigger newSimple && oldTrigger instanceof SimpleTrigger oldSimple) { return newSimple.getRepeatInterval() != oldSimple.getRepeatInterval() || newSimple.getRepeatCount() != oldSimple.getRepeatCount(); } else { @@ -464,8 +460,7 @@ public class QuartzEndpoint extends DefaultEndpoint { private void ensureNoDupTriggerKey() { for (Route route : getCamelContext().getRoutes()) { - if (route.getEndpoint() instanceof QuartzEndpoint) { - QuartzEndpoint quartzEndpoint = (QuartzEndpoint) route.getEndpoint(); + if (route.getEndpoint() instanceof QuartzEndpoint quartzEndpoint) { TriggerKey checkTriggerKey = quartzEndpoint.getTriggerKey(); if (triggerKey.equals(checkTriggerKey)) { throw new IllegalArgumentException("Trigger key " + triggerKey + " is already in use by " + quartzEndpoint); diff --git a/components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz/QuartzScheduledPollConsumerJob.java b/components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz/QuartzScheduledPollConsumerJob.java index f60f2959703f..a90724329727 100644 --- a/components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz/QuartzScheduledPollConsumerJob.java +++ b/components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz/QuartzScheduledPollConsumerJob.java @@ -47,8 +47,8 @@ public class QuartzScheduledPollConsumerJob extends CamelJob { for (Route route : camelContext.getRoutes()) { if (route.getId().equals(routeId)) { Consumer consumer = route.getConsumer(); - if (consumer instanceof Runnable) { - task = (Runnable) consumer; + if (consumer instanceof Runnable runnable) { + task = runnable; break; } } diff --git a/components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz/QuartzScheduledPollConsumerScheduler.java b/components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz/QuartzScheduledPollConsumerScheduler.java index f6dd1f09527f..23e11316d1ee 100644 --- a/components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz/QuartzScheduledPollConsumerScheduler.java +++ b/components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz/QuartzScheduledPollConsumerScheduler.java @@ -326,13 +326,9 @@ public class QuartzScheduledPollConsumerScheduler extends ServiceSupport } private boolean hasTriggerChanged(Trigger oldTrigger, Trigger newTrigger) { - if (newTrigger instanceof CronTrigger && oldTrigger instanceof CronTrigger) { - CronTrigger newCron = (CronTrigger) newTrigger; - CronTrigger oldCron = (CronTrigger) oldTrigger; + if (newTrigger instanceof CronTrigger newCron && oldTrigger instanceof CronTrigger oldCron) { return !newCron.getCronExpression().equals(oldCron.getCronExpression()); - } else if (newTrigger instanceof SimpleTrigger && oldTrigger instanceof SimpleTrigger) { - SimpleTrigger newSimple = (SimpleTrigger) newTrigger; - SimpleTrigger oldSimple = (SimpleTrigger) oldTrigger; + } else if (newTrigger instanceof SimpleTrigger newSimple && oldTrigger instanceof SimpleTrigger oldSimple) { return newSimple.getRepeatInterval() != oldSimple.getRepeatInterval() || newSimple.getRepeatCount() != oldSimple.getRepeatCount(); } else { diff --git a/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledJob.java b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledJob.java index 48ed393d9814..e4dbd36e997d 100644 --- a/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledJob.java +++ b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledJob.java @@ -47,8 +47,8 @@ public class ScheduledJob implements Job, Serializable, ScheduledRoutePolicyCons List<RoutePolicy> policyList = storedRoute.getRoutePolicyList(); for (RoutePolicy policy : policyList) { try { - if (policy instanceof ScheduledRoutePolicy) { - ((ScheduledRoutePolicy) policy).onJobExecute(storedAction, storedRoute); + if (policy instanceof ScheduledRoutePolicy scheduledroutepolicy) { + scheduledroutepolicy.onJobExecute(storedAction, storedRoute); } } catch (Exception e) { throw new JobExecutionException(
