Skip to content

Comments

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

Merged
pull[bot] merged 14 commits intoStars1233:mainfrom
spring-projects:main
Jun 4, 2025
Merged

[pull] main from spring-projects:main#13
pull[bot] merged 14 commits intoStars1233:mainfrom
spring-projects:main

Conversation

@pull
Copy link

@pull pull bot commented Jun 4, 2025

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

Integrate Error-Prone static analysis into the build and modernize the codebase with Java language enhancements, enforce optimistic locking in JDBC DAOs, refactor SQL schemas for consistency, and update tests to use modern JUnit and collection APIs.

Bug Fixes:

  • Include version checks in DELETE statements for job, step, and instance DAOs to prevent stale-data deletions and throw OptimisticLockingFailureException on mismatch.
  • Adjust update statements to increment version atomically for job and step executions.

Enhancements:

  • Refactor JDBC DAOs to use queryForStream and Java Stream API for single-result retrieval.
  • Normalize SQL schema scripts across all database platforms by removing trailing commas and standardizing formatting.
  • Modernize Java codebase with lambda expressions, pattern-matching instanceof, List.of, and array cloning.
  • Embed a Testcontainers MongoDBContainer bean for MongoDB integration tests.

Build:

  • Add Error-Prone plugin to Maven compiler configuration with fail-on-warning and annotation processor setup.

Tests:

  • Update tests to use JUnit 5 assertions (assertInstanceOf), List.of, lambdas, and remove outdated anonymous inner classes.
  • Suppress deprecation warnings where applicable and update test utilities to handle optimistic locking exceptions.

Chores:

  • Bump copyright years to 2006–2025 across source files.

fmbenhassine and others added 14 commits June 3, 2025 22:53
`JOB_EXECUTION_ID = ?` in where clause is unnecessary since `STEP_EXECUTION_ID` is primary key.

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
Move MongoDB container setup from tests to centralized configuration

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
1. `\s+,\s*$` -> `,`
2. `\s+\(\s*$` -> ` (`

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
The version to be updated could be computed at server side instead of client side, it will save one parameter of prepared statement.

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
Signed-off-by: Stefano Cordio <stefano.cordio@gmail.com>
Signed-off-by: Stefano Cordio <stefano.cordio@gmail.com>
  - JdbcCursorItemReaderBuilder.queryTimeout(int) -> milliseconds
  - but, AbstractCursorItemReader.setQueryTimeout(int) -> seconds

Signed-off-by: Jisu Lee <itis821@gmail.com>
Signed-off-by: jbotuck <jbotuck@gmail.com>
@pull pull bot added the ⤵️ pull label Jun 4, 2025
@sourcery-ai
Copy link

sourcery-ai bot commented Jun 4, 2025

Reviewer's Guide

This pull request modernizes and refactors the Spring Batch codebase by adopting Java’s latest language features and build-time checks, cleaning up SQL schema scripts, and strengthening DAO implementations with optimistic locking and stream-based retrieval.

Sequence Diagram for Data Retrieval using JdbcTemplate.queryForStream

sequenceDiagram
    participant Client
    participant Dao as DAO Component (e.g., JdbcJobExecutionDao)
    participant JdbcTemplate
    participant Database

    Client->>Dao: getEntityList() or getSingleEntity()
    Dao->>JdbcTemplate: queryForStream(SQL, rowMapper, params)
    JdbcTemplate->>Database: Execute SQL Query
    Database-->>JdbcTemplate: Streamable ResultSet
    JdbcTemplate-->>Dao: Stream~Entity~
    Dao->>Dao: Process stream (e.g., findFirst(), collect())
    Dao-->>Client: Entity / List~Entity~ / Optional~Entity~
Loading

Updated Class Diagram for JdbcJobExecutionDao

classDiagram
    class JdbcJobExecutionDao {
        <<Modified>>
        +updateJobExecution(JobExecution jobExecution)  // Optimistic locking: VERSION = VERSION + 1 in SQL query
        +deleteJobExecution(JobExecution jobExecution) // Optimistic locking: checks VERSION in WHERE clause
        +getLastJobExecution(JobInstance jobInstance) JobExecution // Now uses JdbcTemplate.queryForStream
        +getJobExecution(Long executionId) JobExecution // Underlying SQL query structure potentially changed
        +findJobExecutions(JobInstance jobInstance) List~JobExecution~ // Underlying SQL query structure potentially changed
    }
    JdbcJobExecutionDao --|> AbstractJdbcBatchMetadataDao
    JdbcJobExecutionDao ..|> JobExecutionDao
Loading

Updated Class Diagram for JdbcJobInstanceDao

classDiagram
    class JdbcJobInstanceDao {
        <<Modified>>
        +getJobInstance(String jobName, JobParameters jobParameters) JobInstance // Now uses JdbcTemplate.queryForStream
        +deleteJobInstance(JobInstance jobInstance) // Optimistic locking: checks VERSION in WHERE clause
    }
    JdbcJobInstanceDao --|> AbstractJdbcBatchMetadataDao
    JdbcJobInstanceDao ..|> JobInstanceDao
Loading

Updated Class Diagram for JdbcStepExecutionDao

classDiagram
    class JdbcStepExecutionDao {
        <<Modified>>
        +updateStepExecution(StepExecution stepExecution)  // Optimistic locking: VERSION = VERSION + 1 in SQL query
        +getStepExecution(JobExecution jobExecution, Long stepExecutionId) StepExecution // Now uses JdbcTemplate.queryForStream
        +deleteStepExecution(StepExecution stepExecution) // Optimistic locking: checks VERSION in WHERE clause
    }
    JdbcStepExecutionDao --|> AbstractJdbcBatchMetadataDao
    JdbcStepExecutionDao ..|> StepExecutionDao
Loading

Updated Class Diagram for JdbcExecutionContextDao

classDiagram
    class JdbcExecutionContextDao {
        <<Modified>>
        +getExecutionContext(JobExecution jobExecution) ExecutionContext // Now uses JdbcTemplate.queryForStream
        +getExecutionContext(StepExecution stepExecution) ExecutionContext // Now uses JdbcTemplate.queryForStream
    }
    JdbcExecutionContextDao --|> AbstractJdbcBatchMetadataDao
    JdbcExecutionContextDao ..|> ExecutionContextDao
Loading

Updated Class Diagram for Builder Classes

classDiagram
    class JobBuilderHelper {
      +JobBuilderHelper(JobRepository jobRepository) // New constructor
      +JobBuilderHelper(String name, JobRepository jobRepository)
    }
    class JobBuilder {
      +JobBuilder(JobRepository jobRepository) // New constructor
      +JobBuilder(String name, JobRepository jobRepository)
    }
    JobBuilder --|> JobBuilderHelper

    class StepBuilderHelper {
      +StepBuilderHelper(JobRepository jobRepository) // New constructor
      +StepBuilderHelper(String name, JobRepository jobRepository)
    }
    class StepBuilder {
      +StepBuilder(JobRepository jobRepository) // New constructor
      +StepBuilder(String name, JobRepository jobRepository)
    }
    StepBuilder --|> StepBuilderHelper
Loading

File-Level Changes

Change Details Files
Unified and cleaned up SQL schema scripts
  • Normalized spacing around commas and parentheses
  • Removed trailing commas and extra blank lines
  • Applied consistent formatting across all platform schema files
*/schema-*.sql
Modernized Java code with lambdas, patterns, and collections
  • Replaced anonymous ItemReader/ItemWriter/Listener classes with lambda expressions
  • Swapped Arrays.asList for List.of for fixed-size lists
  • Upgraded tests to use assertInstanceOf and reordered assertEquals parameters
  • Applied Java 16+ pattern matching in instanceof and switch expressions
**/src/test/java/**/*.java
**/src/main/java/**/*.java
Integrated Error Prone into the Maven build
  • Added Error Prone plugin and fail-on-warning configuration
  • Suppressed and documented rule set via -Xep:*=OFF flags
pom.xml
Refactored JDBC DAOs for optimistic locking and query reuse
  • Incremented VERSION in UPDATE statements and added version condition to DELETE
  • Consolidated repetitive SELECT fragments into base constants
  • Threw OptimisticLockingFailureException when DELETE update count is zero
JdbcJobExecutionDao.java
JdbcJobInstanceDao.java
JdbcStepExecutionDao.java
Switched DAO lookups to stream-based single-result retrieval
  • Replaced List-based query and size checks with queryForStream().findFirst()
  • Returned default objects via orElseGet where applicable
JdbcJobExecutionDao.java
JdbcJobInstanceDao.java
JdbcExecutionContextDao.java
Managed deprecation and warning suppression
  • Annotated deprecated methods and classes with @SuppressWarnings("removal")
  • Cleaned up deprecated API calls removed in v6.2
**/src/main/java/**/*.java
**/src/test/java/**/*.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
Copy link

coderabbitai bot commented Jun 4, 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.
    • Explain this complex logic.
    • 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 explain this code block.
    • @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 explain its main purpose.
    • @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.

@pull pull bot merged commit b9b08bf into Stars1233:main Jun 4, 2025
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants