Skip to content

Skip IfElseIfConstructToSwitch when instanceof types are missing - #1095

Merged
timtebeek merged 4 commits into
mainfrom
tim/fix-ifelseif-to-switch
May 18, 2026
Merged

Skip IfElseIfConstructToSwitch when instanceof types are missing#1095
timtebeek merged 4 commits into
mainfrom
tim/fix-ifelseif-to-switch

Conversation

@timtebeek

@timtebeek timtebeek commented May 12, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

Summary

  • A user reported IfElseIfConstructToSwitch emitting broken output with leaked JavaTemplate parameter stubs (__P__./*__pN__*/voidp()) and mis-parsed pattern-switch syntax. The reporter suspected missing type information.
  • I could not reproduce the failure in a test, so rather than speculate at the precise template parser interaction, this PR stays conservative: add a precondition that all instanceof types are well-formed (TypeUtils.isWellFormedType). When types are unresolvable, the if-chain is now left unchanged.
  • This reverses the prior behavior of unresolvableTypesKeepCaseSpacing (Missing whitespace on case in zuul-core/.../Http2MetricsChannelHandlers.java with If-else-if-else to switch rewrite#7458), which previously produced a switch even with unresolvable types. The test is renamed and inverted to assert no-change.

Test plan

  • ./gradlew test --tests "*IfElseIfConstructToSwitchTest*" (all 25 tests pass)

@timtebeek
Use contextSensitive() template in IfElseIfConstructToSwitch
b48ed21 
The template references symbols visible from its insertion scope
(variables, types, methods), so parsing outside that context can fail
on Java 21 pattern-switch syntax and leak `__P__` parameter stubs into
the result.
@github-project-automation github-project-automation Bot moved this to In Progress in OpenRewrite May 12, 2026
@timtebeek
timtebeek marked this pull request as draft May 12, 2026 16:46
@timtebeek
Require well-formed instanceof types in IfElseIfConstructToSwitch
40da3fd 
Replace the speculative `contextSensitive()` template change with a
precondition: skip the conversion when any `instanceof`'s type is
missing or unknown. A reporter observed JavaTemplate parameter stubs
(`__P__./*__pN__*/voidp()`) leaking into the generated switch when types
were unresolved; staying conservative avoids the broken output without
guessing at the precise template parser interaction.
@timtebeek timtebeek changed the title Use contextSensitive() template in IfElseIfConstructToSwitch Skip IfElseIfConstructToSwitch when instanceof types are missing May 18, 2026
@timtebeek
timtebeek marked this pull request as ready for review May 18, 2026 08:41
@timtebeek
timtebeek requested a review from MBoegers May 18, 2026 08:41
@timtebeek
Pass parent cursor when invoking RemoveAnnotation visitor
6142b72 
`RemoveAnnotationVisitor.maybeRemoveBlankLines` walks up to the
enclosing `JavaSourceFile`, but the visitor was invoked without a
parent cursor, causing `IllegalStateException: Expected to find
enclosing JavaSourceFile` after a recent framework change.
@timtebeek
timtebeek merged commit d6ec0b8 into main May 18, 2026
1 check passed
@timtebeek
timtebeek deleted the tim/fix-ifelseif-to-switch branch May 18, 2026 09:20
@github-project-automation github-project-automation Bot moved this from In Progress to Done in OpenRewrite May 18, 2026
mergify Bot added a commit to robfrank/linklift that referenced this pull request Jun 4, 2026
@mergify
chore(deps): bump org.openrewrite.recipe:rewrite-migrate-java from 3.…
b60e1b8 
…34.0 to 3.36.0 [skip ci]

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

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

> 3.36.0
> ------
>
> What's Changed
> --------------
>
> * Move StringFormatted recipe from Java 17 upgrade to Java best practices by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1106](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1106)
> * Skip `IfElseIfConstructToSwitch` when a trailing non-`== null` binary check is present by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1109](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1109)
> * Skip `UseTextBlocks` when literal value matches its source by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1111](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1111)
> * Skip `UseMapOf` for `HashMap` subclasses like `LinkedHashMap` and `TreeMap` by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1113](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1113)
> * Skip `RenameUnderscoreIdentifier` on Kotlin and Groovy sources by [`@​MBoegers`](https://github.com/MBoegers) in [openrewrite/rewrite-migrate-java#1114](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1114)
> * Do not add `java.io.IO` import in `ReplaceSystemOutWithIOPrint` by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1118](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1118)
> * fix: do not replace lambda params with underscore when used as assignment target by [`@​darrencilia`](https://github.com/darrencilia) in [openrewrite/rewrite-migrate-java#1117](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1117)
> * Route WSS4J message.token classes to their real 2.x packages by [`@​Jenson3210`](https://github.com/Jenson3210) in [openrewrite/rewrite-migrate-java#1122](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1122)
> * Migrate `com.sun.xml.bind.marshaller.NamespacePrefixMapper` to `org.glassfish.jaxb.runtime.marshaller.NamespacePrefixMapper` by [`@​Jenson3210`](https://github.com/Jenson3210) in [openrewrite/rewrite-migrate-java#1121](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1121)
> * Fix `RefineSwitchCases` generating invalid guard on enum constant labels by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1124](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1124)
> * Skip unparseable Java versions in FindJavaVersion instead of reporting -1 by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1125](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1125)
>
> New Contributors
> ----------------
>
> * [`@​darrencilia`](https://github.com/darrencilia) made their first contribution in [openrewrite/rewrite-migrate-java#1117](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1117)
>
> **Full Changelog**: <openrewrite/rewrite-migrate-java@v3.35.0...v3.36.0>
>
> 3.35.0
> ------
>
> What's Changed
> --------------
>
> * Add `java.io.IO` import in `ReplaceSystemOutWithIOPrint` by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1093](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1093)
> * Skip `UseMapOf` when `put()` argument is a null literal by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1094](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1094)
> * Migrate JAXB XJC binding files declaring version 2.0/2.1/2.2 by [`@​MBoegers`](https://github.com/MBoegers) in [openrewrite/rewrite-migrate-java#1098](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1098)
> * Preserve explicit type arguments in MigrateCollections\* recipes by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1099](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1099)
> * Route Maven through Moderne Artifactory cache to avoid HTTP 429 by [`@​Jenson3210`](https://github.com/Jenson3210) in [openrewrite/rewrite-migrate-java#1096](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1096)
> * Load sun.internal.new[Class].jar directly to fix CI test failures by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1101](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1101)
> * Skip explicit type arguments containing wildcards in `UseVarForGenericMethodInvocations` by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1102](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1102)
> * Skip `var` when target type inference widens a generic argument by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1103](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1103)
> * Skip `IfElseIfConstructToSwitch` when `instanceof` types are missing by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1095](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1095)
> * Revert inline Maven mirror (now in gh-automation#95) by [`@​Jenson3210`](https://github.com/Jenson3210) in [openrewrite/rewrite-migrate-java#1104](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1104)
> * Aggregate FindJavaVersion to one row per repository by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1105](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1105)
>
> **Full Changelog**: <openrewrite/rewrite-migrate-java@v3.34.1...v3.35.0>
>
> v3.34.1
> -------
>
> What's Changed
> --------------
>
> * OpenRewrite [v8.81.6](https://github.com/openrewrite/rewrite/releases/tag/v8.81.6)
> * Refresh UpdateSdkManTest fixtures after SDKMAN CSV update by [`@​steve-aom-elliott`](https://github.com/steve-aom-elliott) in [openrewrite/rewrite-migrate-java#1073](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1073)
> * Add more static analysis recipes to java-best-practices by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1075](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1075)
> * OpenRewrite recipe best practices by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1074](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1074)
> * Add jspecify hyperlink by [`@​sullis`](https://github.com/sullis) in [openrewrite/rewrite-migrate-java#1076](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1076)
> * Skip `var` when reassignment relies on declared supertype by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1078](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1078)
> * Keep parentheses when renaming typed lambda parameter to underscore by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1082](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1082)
> * Document null-probing semantic differences in singleton migrations by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1081](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1081)
> * Skip main migration when referenced as static API by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1084](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1084)
> * Skip `Immutable*.copyOf` rewrite when argument is not a `Collection` by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1089](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1089)
> * Keep block body when refined switch arm contains an if statement by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1088](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1088)

... (truncated)


Commits

* [`d4df178`](openrewrite/rewrite-migrate-java@d4df178) Skip unparseable Java versions in FindJavaVersion instead of reporting -1 ([#1](https://redirect.github.com/openrewrite/rewrite-migrate-java/issues/1)...
* [`b8a298e`](openrewrite/rewrite-migrate-java@b8a298e) Fix `RefineSwitchCases` generating invalid guard on enum constant labels ([#1124](https://redirect.github.com/openrewrite/rewrite-migrate-java/issues/1124))
* [`c7f400b`](openrewrite/rewrite-migrate-java@c7f400b) [Auto] SDKMAN! Java candidates as of 2026-06-01T1550
* [`fca7c7c`](openrewrite/rewrite-migrate-java@fca7c7c) Migrate `com.sun.xml.bind.marshaller.NamespacePrefixMapper` to `org.glassfish...
* [`74017b2`](openrewrite/rewrite-migrate-java@74017b2) Route WSS4J message.token classes to their real 2.x packages ([#1122](https://redirect.github.com/openrewrite/rewrite-migrate-java/issues/1122))
* [`52b0808`](openrewrite/rewrite-migrate-java@52b0808) OpenRewrite recipe best practices
* [`23e5804`](openrewrite/rewrite-migrate-java@23e5804) Update Gradle wrapper 9.5.1
* [`21548bd`](openrewrite/rewrite-migrate-java@21548bd) fix: do not replace lambda params with underscore when used as assignment tar...
* [`61e7d90`](openrewrite/rewrite-migrate-java@61e7d90) Do not add `java.io.IO` import in `ReplaceSystemOutWithIOPrint` ([#1118](https://redirect.github.com/openrewrite/rewrite-migrate-java/issues/1118))
* [`dec86d0`](openrewrite/rewrite-migrate-java@dec86d0) Skip `RenameUnderscoreIdentifier` on Kotlin and Groovy sources ([#1114](https://redirect.github.com/openrewrite/rewrite-migrate-java/issues/1114))
* Additional commits viewable in [compare view](openrewrite/rewrite-migrate-java@v3.34.0...v3.36.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.34.0&new-version=3.36.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

Reviewers

@MBoegers MBoegers Awaiting requested review from MBoegers

Assignees

@timtebeek timtebeek

Labels

None yet

Projects

OpenRewrite
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@timtebeek