Ensure `case` always has a space before the label in `IfElseIfConstructToSwitch`#1071

Merged

timtebeek merged 1 commit intomainfrom

tim/fix-7458-case-spacing

Apr 23, 2026

Member

timtebeek commented Apr 23, 2026 •

edited by moderne-meeseeks Bot

Loading

Summary

Guarantee a single space between case and the pattern label so the emitted switch is always well-formed (case Type name rather than caseType name).
Adds a regression test (unresolvableTypesKeepCaseSpacing) that exercises the recipe on code with unresolvable types, mirroring the failure reported on Netflix/zuul.
Reported in Missing whitespace on case in zuul-core/.../Http2MetricsChannelHandlers.java with If-else-if-else to switch rewrite#7458, where the recipe's output against Http2MetricsChannelHandlers.java collapsed case Http2ResetFrame resetFrame into caseHttp2ResetFrame resetFrame. This defensive fix wraps both branches that build the case label (JavaTemplate-resolved and manually reconstructed) with ensureLeadingSpace, so the label always has leading whitespace regardless of the incoming prefix state of the type expression.

Test plan

./gradlew test --tests "org.openrewrite.java.migrate.lang.IfElseIfConstructToSwitchTest"
./gradlew test


          Ensure case always has a space before the label in `IfElseIfConstru…

604e48e

…ctToSwitch`

Guarantee a single space between `case` and the pattern label when the
label prefix is empty and the type expression has no leading whitespace,
so the printed switch is always well-formed (e.g. `case Type name` rather
than `caseType name`).

See openrewrite/rewrite#7458

moderne-meeseeks Bot added this to OpenRewrite

moderne-meeseeks Bot assigned timtebeek

github-project-automation Bot moved this to In Progress in OpenRewrite

timtebeek merged commit a58b8b2 into main

1 check passed

timtebeek deleted the tim/fix-7458-case-spacing branch

April 23, 2026 13:45

github-project-automation Bot moved this from In Progress to Done in OpenRewrite

mergify Bot added a commit to robfrank/linklift that referenced this pull request


          chore(deps): bump org.openrewrite.recipe:rewrite-migrate-java from 3.…

0573d36

…30.1 to 3.34.0 [skip ci]

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

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

> 3.34.0
> ------
>
> What's Changed
> --------------
>
> * Ensure `case` always has a space before the label in `IfElseIfConstructToSwitch` by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1071](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1071)
> * Add `UsePredicateNot` to replace cast-and-negate with `Predicate.not(..)` by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1072](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1072)
>
> **Full Changelog**: <openrewrite/rewrite-migrate-java@v3.33.0...v3.34.0>
>
> 3.33.1
> ------
>
> **Full Changelog**: <openrewrite/rewrite-migrate-java@v3.33.0...v3.33.1>
>
> 3.33.0
> ------
>
> What's Changed
> --------------
>
> * Add URLEqualsHashCodeRecipes to Java best practices by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1058](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1058)
> * Add --add-opens JVM args to surefire/failsafe for Java 25 by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1055](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1055)
> * Collapse UpgradeDockerImageVersion cartesian via ChangeFrom capture by [`@jkschneider`](https://github.com/jkschneider) in [openrewrite/rewrite-migrate-java#1060](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1060)
> * Add NoJodaTime to Java best practices by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1061](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1061)
> * Support `copyOf` migration for Guava by [`@greg-at-moderne`](https://github.com/greg-at-moderne) in [openrewrite/rewrite-migrate-java#1062](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1062)
> * Rename `_` identifier to `__` for Java ≤ 8 source files by [`@Jenson3210`](https://github.com/Jenson3210) in [openrewrite/rewrite-migrate-java#1063](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1063)
> * Fix `ClassCastException` on parenthesized initializers in `var` recipes by [`@knutwannheden`](https://github.com/knutwannheden) in [openrewrite/rewrite-migrate-java#1064](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1064)
> * Gate Kotlin-based Java version cap on actual Kotlin sources by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1066](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1066)
> * Fix `MigrateCollections*` template errors on complex expression contexts by [`@knutwannheden`](https://github.com/knutwannheden) in [openrewrite/rewrite-migrate-java#1067](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1067)
>
> **Full Changelog**: <openrewrite/rewrite-migrate-java@v3.32.1...v3.33.0>
>
> v3.32.1
> -------
>
> What's Changed
> --------------
>
> * Remove parentheses from single unnamed lambda parameters by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1054](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1054)
> * Skip Kotlin and Groovy files in ReplaceUnusedVariablesWithUnderscore by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1056](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1056)
>
> **Full Changelog**: <openrewrite/rewrite-migrate-java@v3.32.0...v3.32.1>
>
> 3.32.0
> ------
>
> What's Changed
> --------------
>
> * Cap Java version at 24 for Kotlin <2.3 in UpgradeToJava25 by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1035](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1035)
> * Inline JavaTemplate fields at their usage sites by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1036](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1036)
> * Use `JavaTemplate.apply()` static method by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1037](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1037)
> * Fix ClassCastException in UseVarForGenericMethodInvocations by [`@knutwannheden`](https://github.com/knutwannheden) in [openrewrite/rewrite-migrate-java#1039](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1039)
> * Upgrade Mockito to 5.17.x in Java 25 migration recipe by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1041](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1041)
> * Migrate Mojarra and Glassfish JSF dependencies to Jakarta Faces by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1040](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1040)
> * Upgrade jakarta.annotation-api to 3.0.x in Jakarta EE 11 recipe by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1042](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1042)
> * Move type-use annotations to array brackets during JSpecify migration by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1038](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1038)
> * Add explicit casts for visitor visit() return type by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1049](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1049)
> * Add UseVarForTypeCast and UseVarForConstructors to UseVar recipe by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1050](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1050)
> * Replace Collections.emptyXXX with Immutable Static Factory Methods by [`@mkarg`](https://github.com/mkarg) in [openrewrite/rewrite-migrate-java#1045](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1045)
> * Fix `AddMissingMethodImplementation` generating stubs for inherited methods by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1051](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1051)
> * Add EnableLombokAnnotationProcessor to LombokBestPractices by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1052](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1052)

... (truncated)


Commits

* [`61c1777`](openrewrite/rewrite-migrate-java@61c1777) Extract documentation examples from tests
* [`95028a5`](openrewrite/rewrite-migrate-java@95028a5) Add `UsePredicateNot` to replace cast-and-negate with `Predicate.not(..)` ([#1](https://redirect.github.com/openrewrite/rewrite-migrate-java/issues/1)...
* [`a58b8b2`](openrewrite/rewrite-migrate-java@a58b8b2) Ensure `case` always has a space before the label in `IfElseIfConstructToSwit...
* [`eac4344`](openrewrite/rewrite-migrate-java@eac4344) Fix `MigrateCollections*` template errors on complex expression contexts ([#1067](https://redirect.github.com/openrewrite/rewrite-migrate-java/issues/1067))
* [`0ca5cc8`](openrewrite/rewrite-migrate-java@0ca5cc8) Extract documentation examples from tests
* [`968a22f`](openrewrite/rewrite-migrate-java@968a22f) Gate Kotlin-based Java version cap on actual Kotlin sources ([#1066](https://redirect.github.com/openrewrite/rewrite-migrate-java/issues/1066))
* [`a471dd1`](openrewrite/rewrite-migrate-java@a471dd1) [Auto] SDKMAN! Java candidates as of 2026-04-20T1116
* [`3b7b950`](openrewrite/rewrite-migrate-java@3b7b950) Fix `ClassCastException` on parenthesized initializers in `var` recipes ([#1064](https://redirect.github.com/openrewrite/rewrite-migrate-java/issues/1064))
* [`461609f`](openrewrite/rewrite-migrate-java@461609f) Rename `_` identifier to `__` for Java ≤ 8 source files ([#1063](https://redirect.github.com/openrewrite/rewrite-migrate-java/issues/1063))
* [`634e7d9`](openrewrite/rewrite-migrate-java@634e7d9) Support `copyOf` migration for Guava ([#1062](https://redirect.github.com/openrewrite/rewrite-migrate-java/issues/1062))
* Additional commits viewable in [compare view](openrewrite/rewrite-migrate-java@v3.30.1...v3.34.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.30.1&new-version=3.34.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 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

None yet

⚡