8000 [pull] main from spring-projects:main by pull[bot] · Pull Request #37 · Stars1233/spring-framework · GitHub
[go: up one dir, main page]
Skip to content

[pull] main from spring-projects:main #37

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 7 commits into from
May 9, 2025
Merged

[pull] main from spring-projects:main #37

merged 7 commits into from
May 9, 2025

Conversation

pull[bot]
Copy link
@pull pull bot commented May 9, 2025 •
edited by sourcery-ai bot
Loading

See Commits and Changes for more details.

Created by pull[bot] (v2.0.0-alpha.1)

Can you help keep this open source service alive? 💖 Please sponsor : )

Summary by Sourcery

Refactor and improve parameter binding and property resolution in Spring Framework, focusing on test utilities and handling of named parameters and placeholders

Bug Fixes:

  • Fixed handling of multiple equal parameter references
  • Corrected placeholder resolution with escape characters

Enhancements:

  • Improved handling of multiple parameter references in named parameter binding
  • Enhanced property placeholder resolution with escape character support
  • Simplified test utilities for bind target tracking

Tests:

  • Added comprehensive tests for escaped placeholders
  • Improved test coverage for parameter binding scenarios

sbrannen and others added 7 commits May 9, 2025 14:04
@s 8000 brannen
Polish Javadoc and internals of R2DBC support
de97e35
@sbrannen
Properly expand reused collection parameters in R2DBC NamedParameterU…
dd6eede 
…tils

Prior to this commit, NamedParameterUtils in spring-r2dbc did not
properly expand reused collection parameters. Specifically, values in a
supplied collection were only expanded in the resulting query once, for
the first occurrence of the named parameter.

To address that, this commit effectively reinstates the original logic
for ExpandedQuery from NamedParameterUtils in the Spring Data R2DBC
project.

https://github.com/spring-projects/spring-data-relational/blob/94958f5eb66cbe2e8e025155cd99abf36f6f91f4/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/core/NamedParameterUtils.java#L486

Closes gh-34768
@sbrannen
Merge branch '6.2.x'
4f38c5b
@iifawzi @sbrannen
Test escape character support in PropertySourcesPropertyResolver
9b52cfd 
See gh-34326
See gh-34720
See gh-34861

Signed-off-by: Fawzi Essam <iifawzie@gmail.com>
@sbrannen
Polish contribution
348b4cd 
See gh-34720
@sbrannen
Polish PropertySourcesPropertyResolverTests
5a2cbc1
@sbrannen
Merge branch '6.2.x'
5fbfdbc
@pull pull bot added the ⤵️ pull label May 9, 2025
@pull pull bot merged commit 5fbfdbc into Stars1233:main May 9, 2025
@gitstream-cm gitStream.cm
Copy link
gitstream-cm bot commented May 9, 2025

🚨 gitStream Monthly Automation Limit Reached 🚨

Your organization has exceeded the number of pull requests allowed for automation with gitStream.
Monthly PRs automated: 1479/250

To continue automating your PR workflows and unlock additional features, please contact LinearB.

@sourcery-ai Sourcery AI
Copy link
sourcery-ai bot commented May 9, 2025 •
edited
Loading

Reviewer's Guide

This PR refines R2DBC parameter binding in NamedParameterUtils.ExpandedQuery for better handling of repeated and collection parameters (addressing spring-projectsgh-34768), validated by updated tests using a new TrackingBindTarget utility. It also enhances Spring Core's PropertySourcesPropertyResolverTests with new tests for escaped placeholder resolution (spring-projectsgh-34720) and general refactoring, alongside Javadoc improvements in R2DBC binding APIs.

File-Level Changes

Change Details Files
Enhanced R2DBC parameter binding for repeated/collection parameters and updated related tests. spring-r2dbc/src/main/java/org/springframework/r2dbc/core/NamedParameterUtils.java
spring-r2dbc/src/test/java/org/springframework/r2dbc/core/NamedParameterUtilsTests.java
Improved property placeholder resolution testing in Spring Core. spring-core/src/test/java/org/springframework/core/env/PropertySourcesPropertyResolverTests.java
Updated Javadoc and clarified APIs in R2DBC binding components.
  • Improved Javadoc across R2DBC binding API classes.
  • Renamed IndexedBindMarkers constructor parameter for clarity (beginWith -> beginIndex).
 spring-r2dbc/src/main/java/org/springframework/r2dbc/core/binding/BindMarker.java
spring-r2dbc/src/main/java/org/springframework/r2dbc/core/binding/BindMarkers.java
spring-r2dbc/src/main/java/org/springframework/r2dbc/core/binding/AnonymousBindMarkers.java
spring-r2dbc/src/main/java/org/springframework/r2dbc/core/binding/IndexedBindMarkers.java
spring-r2dbc/src/main/java/org/springframework/r2dbc/core/binding/BindMarkersFactoryResolver.java
Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@coderabbitai coderabbitai
Copy link
coderabbitai bot commented May 9, 2025

Important

Review skipped

Bot user detected.

To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

🪧 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.

Support

Need help? Join our Discord community for assistance with any issues or questions.

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 sequence diagram to generate a sequence diagram of the changes in 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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
⤵️ pull
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@sbrannen @iifawzi
0