Fix NPE in UseCollectionInterfaces with annotated raw collection types #717
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…and fully-qualified types This commit fixes two related issues: 1. Issue #713: NPE with annotated raw collection types When a method or field has an annotated raw collection type (e.g., `@Nullable ArrayList`), the recipe would throw a ClassCastException because it incorrectly assumed that annotated types always wrap parameterized types. Raw types are represented as `J.Identifier`, not `J.ParameterizedType`. 2. Issue #716: ClassCastException with fully-qualified type names When using fully-qualified type names (e.g., `java.util.HashSet`), the recipe would throw a ClassCastException because these are represented as `J.FieldAccess`, not `J.Identifier` or `J.ParameterizedType`. The fix adds proper handling for all these cases: - Raw types (`J.Identifier`) - Fully-qualified types (`J.FieldAccess`) - Parameterized types (`J.ParameterizedType`) - All of the above when wrapped in annotations (`J.AnnotatedType`) Fixes #713 Fixes #716 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]>
timtebeek
force-pushed
the
fix-713-use-collection-interfaces-npe
branch
from
e6a21db to
48e3f9f
Compare
Contributor
greg-at-moderne
left a comment
greg-at-moderne
left a comment
There was a problem hiding this comment.
I am not sure. Should we de-duplicate between visitVariableDeclarations and visitMethodDeclaration?
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
This reverts commit 9ba33bc.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
mergify bot
added a commit
to robfrank/linklift
that referenced
this pull request
Sep 2, 2025
… 2.15.0 to 2.16.0 [skip ci] Bumps [org.openrewrite.recipe:rewrite-static-analysis](https://github.com/openrewrite/rewrite-static-analysis) from 2.15.0 to 2.16.0. Release notes *Sourced from [org.openrewrite.recipe:rewrite-static-analysis's releases](https://github.com/openrewrite/rewrite-static-analysis/releases).* > 2.16.0 > ------ > > What's Changed > -------------- > > * fix: Enhanced UseCollectionInterfaces to prevent conversions when non interface methods are used by [`@e5LA`](https://github.com/e5LA) in [openrewrite/rewrite-static-analysis#709](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/709) > * Improve support method invocations for `RemoveRedundantTypeCast` by [`@jevanlingen`](https://github.com/jevanlingen) in [openrewrite/rewrite-static-analysis#711](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/711) > * Do not move field annotations around arrays by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#712](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/712) > * Use classpath from resource for Refaster by [`@jevanlingen`](https://github.com/jevanlingen) in [openrewrite/rewrite-static-analysis#714](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/714) > * Fix NPE in UseCollectionInterfaces with annotated raw collection types by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#717](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/717) > * Prefer `System getProperty()` over `getenv()` by [`@Akanksha928`](https://github.com/Akanksha928) in [openrewrite/rewrite-static-analysis#679](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/679) > * Expand coverage of UseCollectionInterfaces to LinkedList, Stack, TreeMap, TreeSet and PriorityQueue by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#718](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/718) > * Fix ReplaceLambdaWithMethodReference to not replace lambdas inside anonymous inner classes by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#723](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/723) > > New Contributors > ---------------- > > * [`@Akanksha928`](https://github.com/Akanksha928) made their first contribution in [openrewrite/rewrite-static-analysis#679](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/679) > > **Full Changelog**: <openrewrite/rewrite-static-analysis@v2.15.0...v2.16.0> Commits * [`53c6b3e`](openrewrite/rewrite-static-analysis@53c6b3e) Update documentation examples * [`0437c5c`](openrewrite/rewrite-static-analysis@0437c5c) Fix ReplaceLambdaWithMethodReference to not replace lambdas inside anonymous ... * [`da75646`](openrewrite/rewrite-static-analysis@da75646) Expand coverage of UseCollectionInterfaces to LinkedList, Stack, TreeMap, Tre... * [`d01363c`](openrewrite/rewrite-static-analysis@d01363c) Prefer `System getProperty()` over `getenv()` ([#679](https://redirect.github.com/openrewrite/rewrite-static-analysis/issues/679)) * [`6f8b0df`](openrewrite/rewrite-static-analysis@6f8b0df) AssertJ best practices * [`5f64939`](openrewrite/rewrite-static-analysis@5f64939) Fix NPE in UseCollectionInterfaces with annotated raw collection types ([#717](https://redirect.github.com/openrewrite/rewrite-static-analysis/issues/717)) * [`feee568`](openrewrite/rewrite-static-analysis@feee568) Fix annotation order and import * [`a51a3ba`](openrewrite/rewrite-static-analysis@a51a3ba) Use classpath from resource for Refaster ([#714](https://redirect.github.com/openrewrite/rewrite-static-analysis/issues/714)) * [`fa1d3c3`](openrewrite/rewrite-static-analysis@fa1d3c3) Fix OnlyCatchDeclaredExceptions to skip generic type variables * [`21ad269`](openrewrite/rewrite-static-analysis@21ad269) Do not move field annotations around arrays ([#712](https://redirect.github.com/openrewrite/rewrite-static-analysis/issues/712)) * Additional commits viewable in [compare view](openrewrite/rewrite-static-analysis@v2.15.0...v2.16.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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
UseCollectionInterfacesmight fail with NPE on annotated return type #713 whereUseCollectionInterfacesrecipe throwsClassCastExceptionwhen processing methods/fields with@Nullableannotated raw collection typesArrayList(without generics) areJ.Identifier, notJ.ParameterizedTypeUseCollectionInterfacesmight fail withClassCastExceptionwhen fully-qualified class names are used #716Test plan
@Nullable ArrayList)@Nullable ArrayListto@Nullable List🤖 Generated with Claude Code