diff --git a/src/main/resources/META-INF/rewrite/jspecify.yml b/src/main/resources/META-INF/rewrite/jspecify.yml index 656df487e2..8a8d807ec3 100644 --- a/src/main/resources/META-INF/rewrite/jspecify.yml +++ b/src/main/resources/META-INF/rewrite/jspecify.yml @@ -71,6 +71,10 @@ recipeList: oldFullyQualifiedTypeName: javax.annotation.Nullable newFullyQualifiedTypeName: org.jspecify.annotations.Nullable ignoreDefinition: true + - org.openrewrite.java.ChangeType: + oldFullyQualifiedTypeName: javax.annotation.CheckForNull + newFullyQualifiedTypeName: org.jspecify.annotations.Nullable + ignoreDefinition: true - org.openrewrite.java.ChangeType: oldFullyQualifiedTypeName: javax.annotation.Nonnull newFullyQualifiedTypeName: org.jspecify.annotations.NonNull diff --git a/src/test/java/org/openrewrite/java/migrate/jspecify/JSpecifyBestPracticesTest.java b/src/test/java/org/openrewrite/java/migrate/jspecify/JSpecifyBestPracticesTest.java index ca0d36e7b9..a55883ca88 100644 --- a/src/test/java/org/openrewrite/java/migrate/jspecify/JSpecifyBestPracticesTest.java +++ b/src/test/java/org/openrewrite/java/migrate/jspecify/JSpecifyBestPracticesTest.java @@ -46,6 +46,7 @@ void migrateFromJavaxAnnotationApiToJspecify() { """ import javax.annotation.Nonnull; import javax.annotation.Nullable; + import javax.annotation.CheckForNull; public class Test { @Nonnull @@ -54,6 +55,8 @@ public class Test { public String field2; @Nullable public Foo.Bar foobar; + @CheckForNull + public String checked; } interface Foo { @@ -73,6 +76,8 @@ public class Test { @Nullable public String field2; public Foo.@Nullable Bar foobar; + @Nullable + public String checked; } interface Foo {