Skip to content

Fix AnnotateRequiredParameters to handle Objects.requireNonNull in assignments#793

Merged
timtebeek merged 1 commit intomainfrom
fix-792-requirenonnull-in-assignment
Nov 26, 2025
Merged

Fix AnnotateRequiredParameters to handle Objects.requireNonNull in assignments#793
timtebeek merged 1 commit intomainfrom
fix-792-requirenonnull-in-assignment

Conversation

@timtebeek
Copy link
Copy Markdown
Member

@timtebeek timtebeek commented Nov 26, 2025

Summary

  • Fix AnnotateRequiredParameters to correctly handle Objects.requireNonNull when used in assignment expressions
  • When the method invocation is a standalone statement, it is removed entirely
  • When it is part of a larger expression (e.g., assignment), it is replaced with the first argument to preserve valid syntax

Problem

The recipe incorrectly transformed:

this.field = Objects.requireNonNull(bar, "bar may not be null");

into:

this.field;

instead of the expected:

this.field = bar;

Test plan

🤖 Generated with Claude Code

…n assignments

When `Objects.requireNonNull(bar, "message")` was used in an assignment like
`this.field = Objects.requireNonNull(bar, "message")`, the recipe incorrectly
produced `this.field;` instead of `this.field = bar`.

The fix checks whether the method invocation is a standalone statement (parent
is `J.Block`) or part of a larger expression (e.g., assignment). Standalone
statements are removed entirely, while expressions are replaced with the first
argument to preserve valid syntax.

Fixes #792

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
@github-project-automation github-project-automation bot moved this to In Progress in OpenRewrite Nov 26, 2025
@timtebeek timtebeek merged commit 65b6188 into main Nov 26, 2025
2 checks passed
@timtebeek timtebeek deleted the fix-792-requirenonnull-in-assignment branch November 26, 2025 11:51
@github-project-automation github-project-automation bot moved this from In Progress to Done in OpenRewrite Nov 26, 2025
@timtebeek timtebeek added the bug Something isn't working label Nov 26, 2025
mergify bot added a commit to robfrank/linklift that referenced this pull request Dec 14, 2025
… 2.22.0 to 2.23.0 [skip ci]

Bumps [org.openrewrite.recipe:rewrite-static-analysis](https://github.com/openrewrite/rewrite-static-analysis) from 2.22.0 to 2.23.0.
Release notes

*Sourced from [org.openrewrite.recipe:rewrite-static-analysis's releases](https://github.com/openrewrite/rewrite-static-analysis/releases).*

> 2.23.0
> ------
>
> What's Changed
> --------------
>
> * Prepare formatting refactor by [`@​Jenson3210`](https://github.com/Jenson3210) in [openrewrite/rewrite-static-analysis#790](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/790)
> * Fix `AnnotateRequiredParameters` to handle `Objects.requireNonNull` in assignments by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#793](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/793)
> * `AnnotateRequiredParameters` should not remove nested if blocks by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#794](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/794)
> * Fix RemoveUnusedLocalVariables to delete unused local variables inside method invocation argument blocks by [`@​Jenson3210`](https://github.com/Jenson3210) in [openrewrite/rewrite-static-analysis#795](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/795)
>
> **Full Changelog**: <openrewrite/rewrite-static-analysis@v2.22.0...v2.23.0>


Commits

* [`cc90fe8`](openrewrite/rewrite-static-analysis@cc90fe8) Fix RemoveUnusedLocalVariables to delete unused local variables inside method...
* [`e98aef6`](openrewrite/rewrite-static-analysis@e98aef6) `AnnotateRequiredParameters` should not remove nested if blocks ([#794](https://redirect.github.com/openrewrite/rewrite-static-analysis/issues/794))
* [`65b6188`](openrewrite/rewrite-static-analysis@65b6188) Fix `AnnotateRequiredParameters` to handle `Objects.requireNonNull` in assign...
* [`df434ea`](openrewrite/rewrite-static-analysis@df434ea) Gradle wrapper 9.2.1
* [`6eab4c9`](openrewrite/rewrite-static-analysis@6eab4c9) Prepare formatting refactor ([#790](https://redirect.github.com/openrewrite/rewrite-static-analysis/issues/790))
* See full diff in [compare view](openrewrite/rewrite-static-analysis@v2.22.0...v2.23.0)
  
[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility\_score?dependency-name=org.openrewrite.recipe:rewrite-static-analysis&package-manager=maven&previous-version=2.22.0&new-version=2.23.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
  
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot show  ignore conditions` will show all of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

org.openrewrite.staticanalysis.AnnotateRequiredParameters rewrites Objects.requireNonNull wrong

1 participant