Skip to content

NullCheckAsSwitchCase should only add null case if the switch is exhaustive #769

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 13 commits into from
Jul 10, 2025
Merged

NullCheckAsSwitchCase should only add null case if the switch is exhaustive #769

merged 13 commits into from
Jul 10, 2025

Conversation

Jenson3210
Copy link
Contributor

@Jenson3210 Jenson3210 commented Jun 19, 2025 •
edited
Loading

What's changed?

We now only add the null case if all possible input values are covered to avoid compilation issues
We also distinguish between switch statements and switch expressions syntax-wise.

What's your motivation?

Missed this in the original PR casuign compilation to break.

Anyone you would like to review specifically?

@knutwannheden

Checklist

  • I've added unit tests to cover both positive and negative cases
  • I've read and applied the recipe conventions and best practices
  • I've used the IntelliJ IDEA auto-formatter on affected files

@Jenson3210 Jenson3210 self-assigned this Jun 19, 2025
@github-project-automation github-project-automation bot moved this to In Progress in OpenRewrite Jun 19, 2025
@Jenson3210 Jenson3210 added the bug Something isn't working label Jun 19, 2025
@Jenson3210 Jenson3210 requested a review from knutwannheden June 19, 2025 10:40
@github-project-automation github-project-automation bot moved this from In Progress to Ready to Review in OpenRewrite Jun 19, 2025
@Jenson3210 Jenson3210 changed the title Only add null case when all values covered NullCheckAsSwitchCase recipe enhancements Jun 19, 2025
Jenson3210 and others added 4 commits June 19, 2025 15:48
@Jenson3210 @github-actions
Update src/main/java/org/openrewrite/java/migrate/lang/NullCheckAsSwi…
6069ba6 
…tchCase.java

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@Jenson3210
Add Precondition and test to run them
5ca6592
@Jenson3210
Merge remote-tracking branch 'origin/add-null-case-only-when-all-valu…
55c8580 
…es-covered' into add-null-case-only-when-all-values-covered
@Jenson3210
Add Precondition and test to run them
c4c7483
@Jenson3210
Copy link
Contributor Author

Validated with cli that the null branch is no longer (falsely) being created with the metacat repo

@Jenson3210
Merge branch 'refs/heads/main' into add-null-case-only-when-all-value…
38a6cd3 
…s-covered

# Conflicts:
#	src/main/resources/META-INF/rewrite/java-version-21.yml
github-actions[bot]
github-actions bot reviewed Jun 23, 2025
View reviewed changes
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some suggestions could not be made:

  • src/test/java/org/openrewrite/java/migrate/util/MigrateCollectionsSingletonMapTest.java
    • lines 108-108

@pdelagrave
Merge branch 'main' into add-null-case-only-when-all-values-covered
a911e69 
# Conflicts:
#	src/main/java/org/openrewrite/java/migrate/lang/NullCheckAsSwitchCase.java
#	src/main/resources/META-INF/rewrite/java-version-21.yml
#	src/test/java/org/openrewrite/java/migrate/lang/NullCheckAsSwitchCaseTest.java
@pdelagrave pdelagrave mentioned this pull request Jul 9, 2025
Closed
@pdelagrave
Copy link
Contributor

Will fix #785 and #786

@timtebeek timtebeek self-requested a review July 10, 2025 13:08
github-actions[bot]
github-actions bot reviewed Jul 10, 2025
View reviewed changes
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some suggestions could not be made:

  • src/main/java/org/openrewrite/java/migrate/lang/NullCheckAsSwitchCase.java
    • lines 32-33

@timtebeek timtebeek changed the title NullCheckAsSwitchCase recipe enhancements NullCheckAsSwitchCase should only add null case if the switch is exhaustive Jul 10, 2025
@timtebeek timtebeek merged commit 0c6efc9 into main Jul 10, 2025
2 checks passed
@timtebeek timtebeek deleted the add-null-case-only-when-all-values-covered branch July 10, 2025 15:26
@github-project-automation github-project-automation bot moved this from Ready to Review to Done in OpenRewrite Jul 10, 2025
mergify bot added a commit to robfrank/linklift that referenced this pull request Aug 15, 2025
@mergify
chore(deps): bump org.openrewrite.recipe:rewrite-migrate-java from 3.…
35ffbcf 
…12.0 to 3.15.0 [skip ci]

Bumps [org.openrewrite.recipe:rewrite-migrate-java](https://github.com/openrewrite/rewrite-migrate-java) from 3.12.0 to 3.15.0.
Release notes

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

> 3.15.0
> ------
>
> What's Changed
> --------------
>
> * Convert assigning Switch statements to Switch expressions by [`@​pdelagrave`](https://github.com/pdelagrave) in [openrewrite/rewrite-migrate-java#795](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/795)
> * Convert switch expressions to arrows where possible by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#801](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/801)
> * Convert switch cases with returns to returned switch expression by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#802](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/802)
> * `ReplaceStreamCollectWithToList` should look at return type by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#803](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/803)
> * New recipe to adopt Lombok setter method names by [`@​timo-a`](https://github.com/timo-a) in [openrewrite/rewrite-migrate-java#632](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/632)
> * refactor: Static imports for Collections and Collectors by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#804](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/804)
> * Preserve whitespace in `MigrateCollectionsUnmodifiableList` by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#806](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/806)
> * rename settings.local.json to settings.json by [`@​zieka`](https://github.com/zieka) in [openrewrite/rewrite-migrate-java#808](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/808)
> * The quick fix for the tests for Jaxws Dependencies by [`@​steve-aom-elliott`](https://github.com/steve-aom-elliott) in [openrewrite/rewrite-migrate-java#809](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/809)
> * Refactor RewriteTest to use defaults method by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#814](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/814)
> * Create `is` methods for boolean fields in `LombokValueToRecord` by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#813](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/813)
> * Joda-time: Make safe migration optional by [`@​amishra-u`](https://github.com/amishra-u) in [openrewrite/rewrite-migrate-java#811](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/811)
> * Improve "Add explicit Common Annotations dependencies" in "Migrate to Java 11" by [`@​jevanlingen`](https://github.com/jevanlingen) in [openrewrite/rewrite-migrate-java#816](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/816)
> * chore(ci): bump actions/checkout from 4 to 5 by [`@​dependabot`](https://github.com/dependabot)[bot] in [openrewrite/rewrite-migrate-java#817](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/817)
>
> **Full Changelog**: <openrewrite/rewrite-migrate-java@v3.14.0...v3.15.0>
>
> 3.14.1
> ------
>
> What's Changed
> --------------
>
> * OpenRewrite v8.59.1: <https://github.com/openrewrite/rewrite>
>
> **Full Changelog**: <https://github.com/openrewrite/rewrite-migrate-java>
>
> 3.14.0
> ------
>
> What's Changed
> --------------
>
> * `NullCheckAsSwitchCase` should only add `null` case if the switch is exhaustive by [`@​Jenson3210`](https://github.com/Jenson3210) in [openrewrite/rewrite-migrate-java#769](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/769)
> * Let all change-to-var recipes use a created var-Identifier instead of using a JavaTemplate by [`@​jevanlingen`](https://github.com/jevanlingen) in [openrewrite/rewrite-migrate-java#793](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/793)
> * Fix NPE in IteratorNext recipe when iterator() has no explicit receiver by [`@​jkschneider`](https://github.com/jkschneider) in [openrewrite/rewrite-migrate-java#796](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/796)
> * `LombokValueToRecord` should rewrite method references too by [`@​holgpar`](https://github.com/holgpar) in [openrewrite/rewrite-migrate-java#469](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/469)
> * Update test expectations to now finish idempotent `ChangeTagAttribute` in a single cycle by [`@​pdelagrave`](https://github.com/pdelagrave) in [openrewrite/rewrite-migrate-java#797](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/797)
> * refactor: Unwrap else block after return or throw statement by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#798](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/798)
>
> **Full Changelog**: <openrewrite/rewrite-migrate-java@v3.13.0...v3.14.0>
>
> 3.13.0
> ------
>
> What's Changed
> --------------
>
> * refactor: org.openrewrite.mavencentral by [`@​Laurens-W`](https://github.com/Laurens-W) in [openrewrite/rewrite-migrate-java#778](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/778)
> * Do not add explicit `Record` class import if using `var` keyword by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#781](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/781)
> * Correct groupId for `jakarta.annotation:jakarta.annotation-api` upgrade by [`@​steve-aom-elliott`](https://github.com/steve-aom-elliott) in [openrewrite/rewrite-migrate-java#784](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/784)
> * Keep `jakarta.annotation-api` dependency when moving to Jakarta with Spring Boot project and Jakarta annotations are used by [`@​jevanlingen`](https://github.com/jevanlingen) in [openrewrite/rewrite-migrate-java#782](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/782)
> * Add Bouncy Castle upgrade recipe for Java < 8 by [`@​pdelagrave`](https://github.com/pdelagrave) in [openrewrite/rewrite-migrate-java#790](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/790)
> * Fix `LombokValToFinalVar` in loops by [`@​MBoegers`](https://github.com/MBoegers) in [openrewrite/rewrite-migrate-java#768](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/768)
> * Replace JavaTemplate by a `var` identifier element for UseVarForGenericsConstructors recipe by [`@​jevanlingen`](https://github.com/jevanlingen) in [openrewrite/rewrite-migrate-java#789](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/789)
> * Add missing type table entries by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#792](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/792)
> * Migrate Lombok's `@__` syntax to `onX_` for Java 8+ by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#794](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/794)

... (truncated)


Commits

* [`f65c067`](openrewrite/rewrite-migrate-java@f65c067) Restore `UpdateJakartaAnnotations2` as a deprecated placeholder
* [`aa973e9`](openrewrite/rewrite-migrate-java@aa973e9) chore(ci): bump actions/checkout from 4 to 5 ([#817](https://redirect.github.com/openrewrite/rewrite-migrate-java/issues/817))
* [`a6a509e`](openrewrite/rewrite-migrate-java@a6a509e) Improve "Add explicit Common Annotations dependencies" in "Migrate to Java 11...
* [`cbe5ca5`](openrewrite/rewrite-migrate-java@cbe5ca5) [Auto] SDKMAN! Java candidates as of 2025-08-11T1018
* [`180b215`](openrewrite/rewrite-migrate-java@180b215) Revert "Joda-time: Make safe migration optional ([#811](https://redirect.github.com/openrewrite/rewrite-migrate-java/issues/811))"
* [`531270b`](openrewrite/rewrite-migrate-java@531270b) Joda-time: Make safe migration optional ([#811](https://redirect.github.com/openrewrite/rewrite-migrate-java/issues/811))
* [`9f029e3`](openrewrite/rewrite-migrate-java@9f029e3) Create `is` methods for boolean fields in `LombokValueToRecord` ([#813](https://redirect.github.com/openrewrite/rewrite-migrate-java/issues/813))
* [`bc6f9dc`](openrewrite/rewrite-migrate-java@bc6f9dc) Allow BouncyCastleTest to match in any order
* [`eef26e4`](openrewrite/rewrite-migrate-java@eef26e4) Refactor RewriteTest to use defaults method ([#814](https://redirect.github.com/openrewrite/rewrite-migrate-java/issues/814))
* [`d9674d1`](openrewrite/rewrite-migrate-java@d9674d1) Delegate from `RemoveIllegalSemicolons` to `RemoveExtraSemicolons`
* Additional commits viewable in [compare view](openrewrite/rewrite-migrate-java@v3.12.0...v3.15.0)
  
[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility\_score?dependency-name=org.openrewrite.recipe:rewrite-migrate-java&package-manager=maven&previous-version=3.12.0&new-version=3.15.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
Reviewers

@github-actions github-actions[bot] github-actions[bot] left review comments

@knutwannheden knutwannheden knutwannheden approved these changes

@timtebeek timtebeek timtebeek approved these changes

Assignees

@Jenson3210 Jenson3210

Labels
bug Something isn't working
Projects
OpenRewrite
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Jenson3210 @pdelagrave @knutwannheden @timtebeek