Improve AnnotateNullableMethods to avoid duplicate annotations and annotation placement issues#845
Conversation
|
Thanks! Can we resolve the conflicts (revert the changes) to AnnotateNullableParameters? |
|
Good catch. Haven't noticed AnnotateNullableParameter slipped through |
3cfd633 to
33c856a
Compare
| * are assumed to be TYPE_USE and will be moved to the return type position. | ||
| */ | ||
| private static final Set<String> NON_TYPE_USE_FQN = new HashSet<>(Arrays.asList( | ||
| "javax.annotation.CheckForNull" |
There was a problem hiding this comment.
It seems a bit odd to have a set of one; do we see this grow in the future? Might there be some overfit for the test cases that uses the same?
There was a problem hiding this comment.
perhaps better use TYPE_USE_NULLABLE_ANNOTATIONS as in AnnotateNullableParameters
private static final Set<String> TYPE_USE_NULLABLE_ANNOTATIONS = new HashSet<>(Arrays.asList(
"jakarta.annotation.Nullable",
"org.checkerframework.checker.nullness.qual.Nullable",
"org.eclipse.jdt.annotation.Nullable",
"org.jspecify.annotations.Nullable"
));
| private static final Set<String> NULLABLE_ANNOTATION_SIMPLE_NAMES = new HashSet<>(Arrays.asList( | ||
| "Nullable", | ||
| "CheckForNull" | ||
| )); |
There was a problem hiding this comment.
Any reason we're not using the same contains("null") as we did for parameters? it's hard to be exhaustive, and we don't know if folks have their own "@NullAllowed" annotation for instance.
There was a problem hiding this comment.
no reason tbh, I've started updating the recipe yesterday alongside the AnnotateNullableParameters and haven't had time to align with all changes in AnnotateNullableParameter
- Replace NULLABLE_ANNOTATION_SIMPLE_NAMES set with case-insensitive
contains("null") check to handle custom annotations (e.g. @NullAllowed)
- Replace NON_TYPE_USE_FQN negative list with TYPE_USE_NULLABLE_ANNOTATIONS
positive list, matching the approach in AnnotateNullableParameters
- Update tests to expect custom/unknown annotations as declaration-target
|
Hi @timtebeek, do you know when can I expect this and #843 to be released? |
|
In the next hour or so! :) |
… 2.30.0 to 2.34.0 [skip ci] Bumps [org.openrewrite.recipe:rewrite-static-analysis](https://github.com/openrewrite/rewrite-static-analysis) from 2.30.0 to 2.34.0. Release notes *Sourced from [org.openrewrite.recipe:rewrite-static-analysis's releases](https://github.com/openrewrite/rewrite-static-analysis/releases).* > 2.34.0 > ------ > > What's Changed > -------------- > > * bugfix: false positive in AnnotateNullableParameters when parameter … by [`@stefanodallapalma`](https://github.com/stefanodallapalma) in [openrewrite/rewrite-static-analysis#865](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/865) > > **Full Changelog**: <openrewrite/rewrite-static-analysis@v2.33.0...v2.34.0> > > 2.33.1 > ------ > > **Full Changelog**: <openrewrite/rewrite-static-analysis@v2.33.0...v2.33.1> > > 2.33.0 > ------ > > What's Changed > -------------- > > * A new test case for `SimplifyBooleanExpression` by [`@greg-at-moderne`](https://github.com/greg-at-moderne) in [openrewrite/rewrite-static-analysis#848](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/848) > * `InstanceOfPatternMatch` to avoid providing invalid variable definitions pointing to itself by [`@greg-at-moderne`](https://github.com/greg-at-moderne) in [openrewrite/rewrite-static-analysis#849](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/849) > * Enrich recipe descriptions with rationale by [`@jkschneider`](https://github.com/jkschneider) in [openrewrite/rewrite-static-analysis#850](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/850) > * Fix EmptyBlock, FinalClass, HideUtilityClassConstructor; add regression tests by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#851](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/851) > * Fix switch-related recipe bugs ([#6](https://redirect.github.com/openrewrite/rewrite-static-analysis/issues/6), [#9](https://redirect.github.com/openrewrite/rewrite-static-analysis/issues/9), [#14](https://redirect.github.com/openrewrite/rewrite-static-analysis/issues/14), [#687](https://redirect.github.com/openrewrite/rewrite-static-analysis/issues/687)) by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#852](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/852) > * Add space after // in single-line comments by [`@AVIMTA`](https://github.com/AVIMTA) in [openrewrite/rewrite-static-analysis#854](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/854) > * Fix InstanceOfPatternMatch duplicate pattern variable names with flow scoping by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#855](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/855) > * Fix RenameExceptionInEmptyCatch crash on Kotlin/Groovy files by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#856](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/856) > * Fix FinalizeLocalVariables crash on Kotlin/Groovy top-level variables by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#857](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/857) > * Fix UnnecessaryExplicitTypeArguments within lambda return statements by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#858](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/858) > * Add SillyEqualsCheck recipe (RSPEC-S2159) by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#834](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/834) > * Add RemoveUnusedLabels recipe (RSPEC-S1065) by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#835](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/835) > * Add S2209/S3252 recipe: Static members via class name by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#836](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/836) > * Add S1185 recipe: Remove methods that only call super by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#837](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/837) > * NeedBraces: add test for if-else, fix do-while by [`@greg-at-moderne`](https://github.com/greg-at-moderne) in [openrewrite/rewrite-static-analysis#859](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/859) > * Add tests confirming [#20](https://redirect.github.com/openrewrite/rewrite-static-analysis/issues/20) is fixed by [`@greg-at-moderne`](https://github.com/greg-at-moderne) in [openrewrite/rewrite-static-analysis#860](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/860) > * Handle chained addition in PreferIncrementOperator by [`@greg-at-moderne`](https://github.com/greg-at-moderne) in [openrewrite/rewrite-static-analysis#816](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/816) > * Fix UnnecessaryCatch for nested try-with-resources close() by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#863](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/863) > * Fix FinalizePrivateFields breaking code with lambda reads in field initializers by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#862](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/862) > * Regression test for `ReplaceStackWithDeque` crash on `this` argument by [`@knutwannheden`](https://github.com/knutwannheden) in [openrewrite/rewrite-static-analysis#864](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/864) > > New Contributors > ---------------- > > * [`@AVIMTA`](https://github.com/AVIMTA) made their first contribution in [openrewrite/rewrite-static-analysis#854](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/854) > > **Full Changelog**: <openrewrite/rewrite-static-analysis@v2.32.0...v2.33.0> > > 2.32.0 > ------ > > What's Changed > -------------- > > * Remove [`@Disabled`](https://github.com/Disabled) tests in `ReplaceStackWithDequeTest` by [`@greg-at-moderne`](https://github.com/greg-at-moderne) in [openrewrite/rewrite-static-analysis#840](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/840) > * A couple of test cases in `RemoveExtraSemicolonsTest` are no longer expected to fail by [`@greg-at-moderne`](https://github.com/greg-at-moderne) in [openrewrite/rewrite-static-analysis#841](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/841) > * Fix compilation after new args added to Cs.CompilationUnit by [`@greg-at-moderne`](https://github.com/greg-at-moderne) in [openrewrite/rewrite-static-analysis#842](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/842) > * Improve AnnotateNullableParameters to avoid duplicate annotations and annotation placement issues by [`@stefanodallapalma`](https://github.com/stefanodallapalma) in [openrewrite/rewrite-static-analysis#843](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/843) > * Inline JavaTemplate fields at call sites by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#844](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/844) > * Use `JavaTemplate.apply()` static method by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#846](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/846) > * Improve AnnotateNullableMethods to avoid duplicate annotations and annotation placement issues by [`@stefanodallapalma`](https://github.com/stefanodallapalma) in [openrewrite/rewrite-static-analysis#845](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/845) > * Skip `InstanceOfPatternMatch` for try-with-resources casts by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#847](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/847) ... (truncated) Commits * [`90e4a60`](openrewrite/rewrite-static-analysis@90e4a60) bugfix: false positive in AnnotateNullableParameters when parameter … ([#865](https://redirect.github.com/openrewrite/rewrite-static-analysis/issues/865)) * [`b315bbc`](openrewrite/rewrite-static-analysis@b315bbc) Extract documentation examples from tests * [`9ba38b4`](openrewrite/rewrite-static-analysis@9ba38b4) Add regression test for `ReplaceStackWithDeque` crash on `this` argument ([#864](https://redirect.github.com/openrewrite/rewrite-static-analysis/issues/864)) * [`78afc25`](openrewrite/rewrite-static-analysis@78afc25) Fix FinalizePrivateFields breaking compilation when field is read in a lambda... * [`3b2d847`](openrewrite/rewrite-static-analysis@3b2d847) OpenRewrite recipe best practices * [`2a0baac`](openrewrite/rewrite-static-analysis@2a0baac) Fix UnnecessaryCatch removing IOException for nested try-with-resources close... * [`47094c2`](openrewrite/rewrite-static-analysis@47094c2) Handle chained addition in PreferIncrementOperator ([#816](https://redirect.github.com/openrewrite/rewrite-static-analysis/issues/816)) * [`e097fab`](openrewrite/rewrite-static-analysis@e097fab) Add tests confirming [#20](https://redirect.github.com/openrewrite/rewrite-static-analysis/issues/20) is fixed ([#860](https://redirect.github.com/openrewrite/rewrite-static-analysis/issues/860)) * [`3710118`](openrewrite/rewrite-static-analysis@3710118) Test for if-else, fix do-while NeedBraces ([#859](https://redirect.github.com/openrewrite/rewrite-static-analysis/issues/859)) * [`c6ebfd4`](openrewrite/rewrite-static-analysis@c6ebfd4) Add S1185 recipe: Remove methods that only call super ([#837](https://redirect.github.com/openrewrite/rewrite-static-analysis/issues/837)) * Additional commits viewable in [compare view](openrewrite/rewrite-static-analysis@v2.30.0...v2.34.0)
Problem
Same issues as #843 (
AnnotateNullableParameters), but for method return types:1. Duplicate annotations when a different nullable annotation is already present
Also fails to detect TYPE_USE annotations already on the return type (e.g.
Outer.@Nullable Inner), causing re-annotation on subsequentRepeat.repeatUntilStablecycles:2. Compilation error with non-TYPE_USE annotations on nested/array return types
Solution
Mirrors the approach from PR #843:
Simple name matching — skip methods already carrying any annotation named
Nullable,CheckForNull, regardless of package.Non-TYPE_USE list — non-type use annotations (such as
CheckForNull) stay as method-level annotations. All others default to TYPE_USE behavior.Requested review
@timtebeek
NOTE: Test case
typescriptCode()fails locally due toRPC process shut down early with exit code 1. I've no context on what that test is meant for. Worth checking it.