CAMEL-24376: Allow boolean-zen operands in Simple logical expressions - #25450
Merged
davsclaus merged 1 commit intoAug 12, 2026
Merged
Conversation
Logical AND/OR parsing rejected standalone Simple function tokens used as implicit boolean predicates (boolean zen). Accept SimpleFunctionStart as a valid logical operand and wrap boolean-zen csimple codegen with matchesValue() for valid Java boolean expressions. Co-authored-by: Cursor <cursoragent@cursor.com>
Contributor
Author
|
Branch rebased on latest upstream/main (cd29991). Bugbot findings addressed: narrowed allowlist to SimpleFunctionStart only; csimple codegen wraps boolean-zen operands with matchesValue(). Branch renamed from AI-generated comment on behalf of atiaomar1978-hub |
atiaomar1978-hub
marked this pull request as ready for review
August 12, 2026 04:15
Contributor
|
🌟 Thank you for your contribution to the Apache Camel project! 🌟 🐫 Apache Camel Committers, please review the following items:
|
davsclaus
approved these changes
Aug 12, 2026
davsclaus
left a comment
davsclaus
left a comment
Contributor
There was a problem hiding this comment.
Looks good — well-scoped fix for boolean-zen shorthand in logical expressions.
What's good:
SimpleFunctionStartis correctly accepted as a valid logical operand via the newisValidPredicateOperand()helper, eliminating the duplicated instanceof check- Runtime path works out of the box:
ExpressionToPredicateAdapter.toPredicate()already delegates toObjectHelper.evaluateValuePredicate()for boolean-zen truthiness - Codegen path (csimple):
matchesValue(exchange, ...)delegates to the sameevaluateValuePredicate()— consistent with runtime semantics - Comprehensive tests: 5 new scenarios covering boolean-zen on left, right, and both sides of
&&/||, false-case, and standalone regression, plus a csimple parser test - Existing tests migrated to AssertJ and package-private — follows project conventions
Minor observations (non-blocking):
- The Javadoc on
isValidPredicateOperand()could be trimmed to a single line, but the boolean-zen context is useful - No unit tests for csimple runtime execution of boolean-zen logical expressions — understandable given csimple is deprecated
This review does not replace specialized review tools (CodeRabbit, Sourcery) or static analysis (SonarCloud).
This review was generated by an AI agent and may contain inaccuracies. Please verify all suggestions before applying.
Contributor
|
🧪 CI tested the following changed modules:
🔬 Scalpel shadow comparison — Scalpel: 477 tested, 29 compile-only — current: 477 all testedMaveniverse Scalpel detected 506 affected modules (current approach: 477).
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Fixes https://issues.apache.org/jira/browse/CAMEL-24376
Simple language boolean-zen shorthand (standalone
${header.foo}/${exchangeProperty.foo}as implicit boolean predicates) fails when combined with logical operators||/&&.Example that previously threw
SimpleIllegalSyntaxException:Workaround was to write
${exchangeProperty.forceNewSessionToken} == trueon the RHS.Root cause:
LogicalExpression.acceptLeftNode()/acceptRightNode()only acceptedBinaryExpressionandLogicalExpression, rejectingSimpleFunctionStartused by boolean zen.Fix:
SimpleFunctionStartas a valid logical operand (alongside existing binary/logical nodes)matchesValue(exchange, …)so generated Java uses valid boolean expressionsTests:
SimplePredicateParserLogicalTestwith CAMEL-24376 scenariosCSimplePredicateParserTest.testParseBooleanZenLogicalOrTarget
mainbranch)Tracking
Apache Camel coding standards and style
mvn clean install -DskipTestslocally from root folder and I have committed all auto-generated changes.AI-assisted contributions
Co-authored-bytrailers) and the PR description identifies the AI tool used.AI-generated PR description on behalf of atiaomar1978-hub (Cursor Cloud Agent)