Adopt JSpecify

Co-authored-by: Moderne <[email protected]>
openrewrite · Aug 28, 2024 · 04d83db · 04d83db
1 parent 0025f53
commit 04d83db
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 12 deletions.
diff --git a/src/main/java/org/openrewrite/docker/DockerImageVersion.java b/src/main/java/org/openrewrite/docker/DockerImageVersion.java
@@ -16,7 +16,7 @@
 package org.openrewrite.docker;
 
 import lombok.Value;
-import org.openrewrite.internal.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @Value
 public class DockerImageVersion {

diff --git a/src/main/java/org/openrewrite/docker/package-info.java b/src/main/java/org/openrewrite/docker/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 org.openrewrite.docker;
-
-// 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;
diff --git a/src/main/java/org/openrewrite/docker/search/package-info.java b/src/main/java/org/openrewrite/docker/search/package-info.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@NonNullApi
+@NullMarked
 @NonNullFields
 package org.openrewrite.docker.search;
 
-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/docker/table/package-info.java b/src/main/java/org/openrewrite/docker/table/package-info.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@NonNullApi
+@NullMarked
 @NonNullFields
 package org.openrewrite.docker.table;
 
-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/docker/trait/Dockerfile.java b/src/main/java/org/openrewrite/docker/trait/Dockerfile.java
@@ -16,9 +16,9 @@
 package org.openrewrite.docker.trait;
 
 import lombok.Value;
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.Cursor;
 import org.openrewrite.docker.DockerImageVersion;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.text.PlainText;
 import org.openrewrite.trait.SimpleTraitMatcher;
 import org.openrewrite.trait.Trait;

diff --git a/src/main/java/org/openrewrite/docker/trait/package-info.java b/src/main/java/org/openrewrite/docker/trait/package-info.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@NonNullApi
+@NullMarked
 @NonNullFields
 package org.openrewrite.docker.trait;
 
-import org.openrewrite.internal.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.internal.lang.NonNullFields;