From d9fefd8afb8db0030cc0725cec9410bfe377718f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kevin=20Carpenter=E2=84=A2=EF=B8=8F?= Date: Mon, 26 Aug 2024 20:25:21 +0000 Subject: [PATCH] refactor: Migrate to JSpecify Use this link to re-run the recipe: https://app.moderne.io/recipes/org.openrewrite.java.jspecify.MigrateFromOpenRewriteAnnotations?organizationId=TW9kZXJuZQ%3D%3D Co-authored-by: Moderne --- src/main/java/com/yourorg/AppendToReleaseNotes.java | 2 +- src/main/java/com/yourorg/NoCollectionMutation.java | 2 +- src/main/java/com/yourorg/package-info.java | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/yourorg/AppendToReleaseNotes.java b/src/main/java/com/yourorg/AppendToReleaseNotes.java index 7a8c38f..5d8715a 100644 --- a/src/main/java/com/yourorg/AppendToReleaseNotes.java +++ b/src/main/java/com/yourorg/AppendToReleaseNotes.java @@ -17,8 +17,8 @@ import lombok.EqualsAndHashCode; import lombok.Value; +import org.jspecify.annotations.Nullable; import org.openrewrite.*; -import org.openrewrite.internal.lang.Nullable; import org.openrewrite.text.PlainText; import org.openrewrite.text.PlainTextParser; import org.openrewrite.text.PlainTextVisitor; diff --git a/src/main/java/com/yourorg/NoCollectionMutation.java b/src/main/java/com/yourorg/NoCollectionMutation.java index 7c30b0f..bc7d727 100644 --- a/src/main/java/com/yourorg/NoCollectionMutation.java +++ b/src/main/java/com/yourorg/NoCollectionMutation.java @@ -18,11 +18,11 @@ import fj.data.Option; import lombok.EqualsAndHashCode; import lombok.Value; +import org.jspecify.annotations.Nullable; import org.openrewrite.*; import org.openrewrite.analysis.dataflow.DataFlowNode; import org.openrewrite.analysis.dataflow.DataFlowSpec; import org.openrewrite.analysis.dataflow.Dataflow; -import org.openrewrite.internal.lang.Nullable; import org.openrewrite.java.JavaTemplate; import org.openrewrite.java.JavaVisitor; import org.openrewrite.java.MethodMatcher; diff --git a/src/main/java/com/yourorg/package-info.java b/src/main/java/com/yourorg/package-info.java index 845b067..24c00b5 100644 --- a/src/main/java/com/yourorg/package-info.java +++ b/src/main/java/com/yourorg/package-info.java @@ -13,10 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@NonNullApi +@NullMarked @NonNullFields package com.yourorg; - -// We annotate the package to indicate that fields and methods in this package are non-null by default. -import org.openrewrite.internal.lang.NonNullApi; +import org.jspecify.annotations.NullMarked; import org.openrewrite.internal.lang.NonNullFields;