(camel) 14/41: (chores): modernize instanceof checks in camel-core-model

[or...@apache.org]

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 7fc42d6e99bddb325aca0796c7c3e4fa87ffe46a
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Jan 26 10:49:45 2026 +0000

    (chores): modernize instanceof checks in camel-core-model
---
 .../main/java/org/apache/camel/model/ExpressionNodeHelper.java |  6 ++----
 .../java/org/apache/camel/model/OnCompletionDefinition.java    |  4 ++--
 .../main/java/org/apache/camel/model/ResequenceDefinition.java | 10 ++++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/ExpressionNodeHelper.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ExpressionNodeHelper.java
index 9c1051394f15..3a0f85781e19 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/ExpressionNodeHelper.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/ExpressionNodeHelper.java
@@ -43,9 +43,8 @@ public final class ExpressionNodeHelper {
      */
     public static ExpressionDefinition toExpressionDefinition(Expression expression) {
         // NOTE: XPathBuilder class is not available at compilation time.
-        if (expression instanceof ExpressionResultTypeAware
+        if (expression instanceof ExpressionResultTypeAware aware
                 && expression.getClass().getName().equals("org.apache.camel.language.xpath.XPathBuilder")) { // NOSONAR
-            ExpressionResultTypeAware aware = (ExpressionResultTypeAware) expression;
             // we keep the original expression by using the constructor that
             // accepts an expression
             XPathExpression answer = new XPathExpression(expression);
@@ -74,9 +73,8 @@ public final class ExpressionNodeHelper {
      */
     public static ExpressionDefinition toExpressionDefinition(Predicate predicate) {
         // NOTE: XPathBuilder class is not available at compilation time.
-        if (predicate instanceof ExpressionResultTypeAware
+        if (predicate instanceof ExpressionResultTypeAware aware
                 && predicate.getClass().getName().equals("org.apache.camel.language.xpath.XPathBuilder")) { // NOSONAR
-            ExpressionResultTypeAware aware = (ExpressionResultTypeAware) predicate;
             Expression expression = (Expression) predicate;
             // we keep the original expression by using the constructor that
             // accepts an expression
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/OnCompletionDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
index 2a30286bfca6..bec792c32a2a 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
@@ -141,8 +141,8 @@ public class OnCompletionDefinition extends OutputDefinition<OnCompletionDefinit
      * @param definition the parent definition that is the route
      */
     public void removeAllOnCompletionDefinition(ProcessorDefinition<?> definition) {
-        definition.getOutputs().removeIf(out -> out instanceof OnCompletionDefinition &&
-                !((OnCompletionDefinition) out).isRouteScoped());
+        definition.getOutputs().removeIf(out -> out instanceof OnCompletionDefinition oncompletiondefinition &&
+                !oncompletiondefinition.isRouteScoped());
     }
 
     @Override
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/ResequenceDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ResequenceDefinition.java
index 078f1e727271..af4b976c609c 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/ResequenceDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/ResequenceDefinition.java
@@ -331,15 +331,17 @@ public class ResequenceDefinition extends OutputDefinition<ResequenceDefinition>
     }
 
     public BatchResequencerConfig getBatchConfig() {
-        if (batchConfig == null && resequencerConfig != null && resequencerConfig instanceof BatchResequencerConfig) {
-            return (BatchResequencerConfig) resequencerConfig;
+        if (batchConfig == null && resequencerConfig != null
+                && resequencerConfig instanceof BatchResequencerConfig batchresequencerconfig) {
+            return batchresequencerconfig;
         }
         return batchConfig;
     }
 
     public StreamResequencerConfig getStreamConfig() {
-        if (streamConfig == null && resequencerConfig != null && resequencerConfig instanceof StreamResequencerConfig) {
-            return (StreamResequencerConfig) resequencerConfig;
+        if (streamConfig == null && resequencerConfig != null
+                && resequencerConfig instanceof StreamResequencerConfig streamresequencerconfig) {
+            return streamresequencerconfig;
         }
         return streamConfig;
     }