From d6d7f120ff237c74c815404f95837fe8e2d30276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonathan=20Schn=C3=A9ider?= Date: Thu, 15 Aug 2024 02:53:37 +0000 Subject: [PATCH] Migrate to JSpecify from OpenRewrite JSR-305 meta-annotations Use this link to re-run the recipe: https://app.moderne.io/builder/lFW7wUiCk?organizationId=T3BlblJld3JpdGU%3D Co-authored-by: Moderne --- .../org/openrewrite/micrometer/dropwizard/package-info.java | 4 ++-- .../java/org/openrewrite/micrometer/misk/package-info.java | 4 ++-- src/main/java/org/openrewrite/micrometer/package-info.java | 4 ++-- .../micrometer/MicrometerPrometheusCompatabilityTest.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/openrewrite/micrometer/dropwizard/package-info.java b/src/main/java/org/openrewrite/micrometer/dropwizard/package-info.java index 0809c7e..1751df0 100644 --- a/src/main/java/org/openrewrite/micrometer/dropwizard/package-info.java +++ b/src/main/java/org/openrewrite/micrometer/dropwizard/package-info.java @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@NonNullApi @NonNullFields +@NullMarked @NonNullFields package org.openrewrite.micrometer.dropwizard; -import org.openrewrite.internal.lang.NonNullApi; +import org.jspecify.annotations.NullMarked; import org.openrewrite.internal.lang.NonNullFields; diff --git a/src/main/java/org/openrewrite/micrometer/misk/package-info.java b/src/main/java/org/openrewrite/micrometer/misk/package-info.java index 63263e2..374c193 100644 --- a/src/main/java/org/openrewrite/micrometer/misk/package-info.java +++ b/src/main/java/org/openrewrite/micrometer/misk/package-info.java @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@NonNullApi @NonNullFields +@NullMarked @NonNullFields package org.openrewrite.micrometer.misk; -import org.openrewrite.internal.lang.NonNullApi; +import org.jspecify.annotations.NullMarked; import org.openrewrite.internal.lang.NonNullFields; diff --git a/src/main/java/org/openrewrite/micrometer/package-info.java b/src/main/java/org/openrewrite/micrometer/package-info.java index 4581de7..87dfb0c 100644 --- a/src/main/java/org/openrewrite/micrometer/package-info.java +++ b/src/main/java/org/openrewrite/micrometer/package-info.java @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@NonNullApi @NonNullFields +@NullMarked @NonNullFields package org.openrewrite.micrometer; -import org.openrewrite.internal.lang.NonNullApi; +import org.jspecify.annotations.NullMarked; import org.openrewrite.internal.lang.NonNullFields; diff --git a/src/test/java/org/openrewrite/micrometer/MicrometerPrometheusCompatabilityTest.java b/src/test/java/org/openrewrite/micrometer/MicrometerPrometheusCompatabilityTest.java index 1d58d17..2c7a5a2 100644 --- a/src/test/java/org/openrewrite/micrometer/MicrometerPrometheusCompatabilityTest.java +++ b/src/test/java/org/openrewrite/micrometer/MicrometerPrometheusCompatabilityTest.java @@ -25,13 +25,13 @@ import io.prometheus.client.*; import io.prometheus.client.Collector.MetricFamilySamples.Sample; import lombok.RequiredArgsConstructor; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.ArgumentsProvider; import org.junit.jupiter.params.provider.ArgumentsSource; -import org.openrewrite.internal.lang.Nullable; import java.time.Duration; import java.util.*;