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 a8ad4f11142945a95d21f39cb6b74f068b06a211 Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Wed Aug 21 08:49:33 2024 +0200 (chores) convert core/camel-core-languages to use pattern matching for instanceof --- .../org/apache/camel/language/ref/RefLanguage.java | 28 +++++++++++----------- .../camel/language/simple/BaseSimpleParser.java | 8 +++---- .../language/simple/SimplePredicateParser.java | 8 ++----- .../language/simple/ast/SimpleFunctionStart.java | 16 ++++++------- 4 files changed, 27 insertions(+), 33 deletions(-) diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/ref/RefLanguage.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/ref/RefLanguage.java index 1656fb00380..ce6d6381cfb 100644 --- a/core/camel-core-languages/src/main/java/org/apache/camel/language/ref/RefLanguage.java +++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/ref/RefLanguage.java @@ -54,11 +54,11 @@ public class RefLanguage extends TypedLanguageSupport { protected Expression createStaticExpression(String expression) { Expression answer; - Object exp = getCamelContext().getRegistry().lookupByName(expression); - if (exp instanceof Expression) { - answer = (Expression) exp; - } else if (exp instanceof Predicate) { - answer = PredicateToExpressionAdapter.toExpression((Predicate) exp); + Object obj = getCamelContext().getRegistry().lookupByName(expression); + if (obj instanceof Expression exp) { + answer = exp; + } else if (obj instanceof Predicate predicate) { + answer = PredicateToExpressionAdapter.toExpression(predicate); } else { throw new IllegalArgumentException( "Cannot find expression or predicate in registry with ref: " + expression); @@ -71,11 +71,11 @@ public class RefLanguage extends TypedLanguageSupport { protected Predicate createStaticPredicate(String expression) { Predicate answer; - Object exp = getCamelContext().getRegistry().lookupByName(expression); - if (exp instanceof Expression) { - answer = ExpressionToPredicateAdapter.toPredicate((Expression) exp); - } else if (exp instanceof Predicate) { - answer = (Predicate) exp; + Object obj = getCamelContext().getRegistry().lookupByName(expression); + if (obj instanceof Expression exp) { + answer = ExpressionToPredicateAdapter.toPredicate(exp); + } else if (obj instanceof Predicate predicate) { + answer = predicate; } else { throw new IllegalArgumentException( "Cannot find expression or predicate in registry with ref: " + expression); @@ -106,10 +106,10 @@ public class RefLanguage extends TypedLanguageSupport { Object lookup = ref != null ? registry.lookupByName(ref) : null; // must favor expression over predicate - if (lookup instanceof Expression) { - target = (Expression) lookup; - } else if (lookup instanceof Predicate) { - target = PredicateToExpressionAdapter.toExpression((Predicate) lookup); + if (lookup instanceof Expression exp) { + target = exp; + } else if (lookup instanceof Predicate predicate) { + target = PredicateToExpressionAdapter.toExpression(predicate); } if (target != null) { diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/BaseSimpleParser.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/BaseSimpleParser.java index 01f2080a7c2..863714d5eb4 100644 --- a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/BaseSimpleParser.java +++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/BaseSimpleParser.java @@ -131,9 +131,9 @@ public abstract class BaseSimpleParser { Deque<Block> stack = new ArrayDeque<>(); for (SimpleNode token : nodes) { - if (token instanceof BlockStart) { + if (token instanceof BlockStart blockStart) { // a new block is started, so push on the stack - stack.push((Block) token); + stack.push(blockStart); } else if (token instanceof BlockEnd) { // end block is just an abstract mode, so we should not add it if (stack.isEmpty()) { @@ -183,9 +183,7 @@ public abstract class BaseSimpleParser { Deque<SimpleNode> stack = new ArrayDeque<>(); for (SimpleNode node : nodes) { - if (node instanceof UnaryExpression) { - UnaryExpression token = (UnaryExpression) node; - + if (node instanceof UnaryExpression token) { // remember the logical operator String operator = token.getOperator().toString(); diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java index 75173661213..0b82018c935 100644 --- a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java +++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java @@ -400,9 +400,7 @@ public class SimplePredicateParser extends BaseSimpleParser { SimpleNode token = nodes.get(i); SimpleNode right = i < nodes.size() - 1 ? nodes.get(i + 1) : null; - if (token instanceof BinaryExpression) { - BinaryExpression binary = (BinaryExpression) token; - + if (token instanceof BinaryExpression binary) { // remember the binary operator String operator = binary.getOperator().toString(); @@ -465,9 +463,7 @@ public class SimplePredicateParser extends BaseSimpleParser { SimpleNode token = nodes.get(i); SimpleNode right = i < nodes.size() - 1 ? nodes.get(i + 1) : null; - if (token instanceof LogicalExpression) { - LogicalExpression logical = (LogicalExpression) token; - + if (token instanceof LogicalExpression logical) { // remember the logical operator String operator = logical.getOperator().toString(); diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionStart.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionStart.java index d62a9cd7fc0..625a747c378 100644 --- a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionStart.java +++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionStart.java @@ -86,13 +86,13 @@ public class SimpleFunctionStart extends BaseSimpleNode implements BlockStart { for (SimpleNode child : block.getChildren()) { // whether a nested function should be lazy evaluated or not boolean lazy = true; - if (child instanceof SimpleFunctionStart) { - lazy = ((SimpleFunctionStart) child).lazyEval(child); + if (child instanceof SimpleFunctionStart simpleFunctionStart) { + lazy = simpleFunctionStart.lazyEval(child); } - if (child instanceof LiteralNode) { - String text = ((LiteralNode) child).getText(); + if (child instanceof LiteralNode literal) { + String text = literal.getText(); sb.append(text); - quoteEmbeddedFunctions |= ((LiteralNode) child).quoteEmbeddedNodes(); + quoteEmbeddedFunctions |= literal.quoteEmbeddedNodes(); // if its quoted literal then embed that as text } else if (!lazy || child instanceof SingleQuoteStart || child instanceof DoubleQuoteStart) { try { @@ -173,10 +173,10 @@ public class SimpleFunctionStart extends BaseSimpleNode implements BlockStart { // we need to concat the block, so we have the expression for (SimpleNode child : block.getChildren()) { - if (child instanceof LiteralNode) { - String text = ((LiteralNode) child).getText(); + if (child instanceof LiteralNode literal) { + String text = literal.getText(); sb.append(text); - quoteEmbeddedFunctions |= ((LiteralNode) child).quoteEmbeddedNodes(); + quoteEmbeddedFunctions |= literal.quoteEmbeddedNodes(); // if its quoted literal then embed that as text } else if (child instanceof SingleQuoteStart || child instanceof DoubleQuoteStart) { try {
