Skip to content

Fix BuiltInFunctionResolver #1812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 15, 2025
Merged

Fix BuiltInFunctionResolver #1812

merged 5 commits into from
Apr 15, 2025

Conversation

t-burch
Copy link
Collaborator

@t-burch t-burch commented Apr 15, 2025

Summary by CodeRabbit

  • Bug Fixes

    • Improved reliability when invoking built-in functions and SpEL methods by refining how functions are retrieved and called.
  • Tests

    • Added new tests to verify correct behavior of built-in function invocation, list membership checks, and SpEL string methods.
    • Updated existing tests to reflect the improved two-step function retrieval and invocation process.

…text

- Replace direct method invocation calls in unit tests with a new `invokeFunction` utility method for cleaner code and better readability.
- Update the `SpELExchangeEvaluationContext` to use `addMethodResolver` instead of `setMethodResolvers` for adding built-in functions.
- Adjust `ReflectiveMethodHandler` to provide a clearer separation between retrieving methods and invoking them.
- Remove unused `jsonPath` method from `BuiltInFunctions`.
- Enhance the `BuiltInFunctionResolver` to utilize the new method handling approach in resolving function calls.
@t-burch t-burch requested a review from predic8 April 15, 2025 13:33
Copy link
Contributor

coderabbitai bot commented Apr 15, 2025

Caution

Review failed

The pull request is closed.

Walkthrough

The changes refactor the handling of function resolution and invocation in the SpEL (Spring Expression Language) integration. The process of retrieving and invoking built-in functions is now separated into distinct steps, with new methods introduced to handle retrieval and invocation individually. Error handling is adjusted to fail early if a method cannot be retrieved. Corresponding updates are made to the registration of method resolvers and to the unit tests, which are adapted to the new two-step function handling process and expanded to cover additional scenarios.

Changes

File(s) Change Summary
core/src/main/java/com/predic8/membrane/core/lang/spel/SpELExchangeEvaluationContext.java Updated constructor to use addMethodResolver instead of setMethodResolvers, now adding the built-in function resolver to the existing set rather than replacing the entire list.
core/src/main/java/com/predic8/membrane/core/lang/spel/functions/BuiltInFunctionResolver.java Refactored resolve to separate method retrieval and invocation; now retrieves the method first, returns null on retrieval failure, and uses a static helper for invocation, improving control flow and error handling.
core/src/main/java/com/predic8/membrane/core/lang/spel/functions/ReflectiveMethodHandler.java Split the combined invokeFunction method into two: retrieveFunction for method lookup and invokeFunction (static) for invocation, decoupling retrieval from invocation responsibilities.
core/src/test/java/com/predic8/membrane/core/lang/spel/SpELExchangeExpressionTest.java Added three new tests: callBuiltInFunction for built-in function invocation, listContainsTest for list membership, and callSpELMethod for SpEL string method invocation, enhancing test coverage.
core/src/test/java/com/predic8/membrane/core/lang/spel/functions/ReflectiveMethodHandlerTest.java Refactored tests to use the new two-step function handling: methods are now retrieved before being invoked, aligning tests with the refactored implementation.

Sequence Diagram(s)

sequenceDiagram
    participant Test as Test
    participant Resolver as BuiltInFunctionResolver
    participant Handler as ReflectiveMethodHandler
    participant Method as Java Method

    Test->>Resolver: resolve(functionName, argumentTypes)
    Resolver->>Handler: retrieveFunction(functionName, argumentTypes)
    alt method found
        Handler-->>Resolver: Method
        Resolver-->>Test: MethodExecutor lambda
        Test->>MethodExecutor: execute(context, arguments)
        MethodExecutor->>Handler: invokeFunction(Method, context, arguments)
        Handler->>Method: invoke(arguments)
        Method-->>Handler: result
        Handler-->>MethodExecutor: TypedValue
        MethodExecutor-->>Test: TypedValue
    else method not found
        Handler-->>Resolver: null
        Resolver-->>Test: null
    end
Loading

Poem

In the warren of code, a new path is drawn,
Retrieval and invocation, now separately spawn.
Tests hop along, with coverage anew,
Functions and methods—each gets their due.
With resolvers aligned and errors caught right,
The SpEL bunnies leap with delight!
🐇✨

Tip

⚡💬 Agentic Chat (Pro Plan, General Availability)
  • We're introducing multi-step agentic chat in review comments and issue comments, within and outside of PR's. This feature enhances review and issue discussions with the CodeRabbit agentic chat by enabling advanced interactions, including the ability to create pull requests directly from comments and add commits to existing pull requests.

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between a9df45e and 59f8149.

📒 Files selected for processing (2)
  • core/src/main/java/com/predic8/membrane/core/lang/spel/functions/BuiltInFunctionResolver.java (2 hunks)
  • core/src/main/java/com/predic8/membrane/core/lang/spel/functions/ReflectiveMethodHandler.java (1 hunks)

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

t-burch added 2 commits April 15, 2025 15:39
Add a new method `jsonPath` to the `BuiltInFunctions` class for parsing JSON based on a given path. Enhance `BuiltInFunctionsTest` with a test case to validate the functionality, ensuring it returns correct values for existing and non-existing paths.
Remove duplicate test for built-in function and consolidate to a single test case that validates the evaluation of the `weight` function.
…t for list contains functionality

- Update BuiltInFunctionResolver to clarify null return is required by the interface specification.
- Add a new unit test to verify the list contains functionality in SpELExchangeExpressionTest.
@t-burch t-burch requested a review from predic8 April 15, 2025 14:07
…signature

Remove unnecessary exceptions from retrieveFunction method in ReflectiveMethodHandler. Update BuiltInFunctionResolver to handle fewer exceptions during method resolution and improve clarity with added documentation.
@predic8 predic8 merged commit a4dbf19 into master Apr 15, 2025
2 of 4 checks passed
@predic8 predic8 deleted the builtinfunctionresolver-fix branch April 15, 2025 14:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants