use Jspecify

avaje · Jul 18, 2024 · 8c5a642 · 8c5a642
1 parent de32825
commit 8c5a642
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 12 deletions.
diff --git a/blackbox-test/src/main/java/example/avaje/mixin/CaptainMixin.java b/blackbox-test/src/main/java/example/avaje/mixin/CaptainMixin.java
@@ -1,7 +1,8 @@
 package example.avaje.mixin;
 
+import org.jspecify.annotations.Nullable;
+
 import example.avaje.mixin.Captain.Bankai;
-import io.avaje.lang.Nullable;
 import io.avaje.validation.MixIn;
 import io.avaje.validation.constraints.NotBlank;
 import io.avaje.validation.constraints.Positive;

diff --git a/validator-generator/src/test/java/io/avaje/validation/generator/models/valid/Customer.java b/validator-generator/src/test/java/io/avaje/validation/generator/models/valid/Customer.java
@@ -4,7 +4,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import io.avaje.lang.Nullable;
+import org.jspecify.annotations.Nullable;
+
 import io.avaje.validation.constraints.Valid;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;

diff --git a/...tor/src/test/java/io/avaje/validation/generator/models/valid/PackagePrivateTestClass.java b/...tor/src/test/java/io/avaje/validation/generator/models/valid/PackagePrivateTestClass.java
@@ -5,7 +5,8 @@
 import javax.validation.constraints.Negative;
 import javax.validation.constraints.NotEmpty;
 
-import io.avaje.lang.Nullable;
+import org.jspecify.annotations.Nullable;
+
 import io.avaje.validation.constraints.Pattern;
 import io.avaje.validation.constraints.RegexFlag;
 import jakarta.validation.Valid;

diff --git a/validator-generator/src/test/java/io/avaje/validation/generator/models/valid/TestClass.java b/validator-generator/src/test/java/io/avaje/validation/generator/models/valid/TestClass.java
@@ -5,9 +5,10 @@
 import javax.validation.constraints.Negative;
 import javax.validation.constraints.NotEmpty;
 
-import io.avaje.lang.Nullable;
-import io.avaje.validation.constraints.RegexFlag;
+import org.jspecify.annotations.Nullable;
+
 import io.avaje.validation.constraints.Pattern;
+import io.avaje.validation.constraints.RegexFlag;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;

diff --git a/validator/pom.xml b/validator/pom.xml
@@ -15,9 +15,9 @@
   <dependencies>
 
     <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>avaje-lang</artifactId>
-      <version>1.1</version>
+      <groupId>org.jspecify</groupId>
+      <artifactId>jspecify</artifactId>
+      <version>1.0.0</version>
     </dependency>
 
     <dependency>

diff --git a/validator/src/main/java/io/avaje/validation/MixIn.java b/validator/src/main/java/io/avaje/validation/MixIn.java
@@ -1,7 +1,6 @@
 package io.avaje.validation;
 
 import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.CLASS;
 import static java.lang.annotation.RetentionPolicy.SOURCE;
 
 import java.lang.annotation.Retention;

diff --git a/validator/src/main/java/io/avaje/validation/Validator.java b/validator/src/main/java/io/avaje/validation/Validator.java
@@ -9,7 +9,8 @@
 import java.util.Set;
 import java.util.function.Supplier;
 
-import io.avaje.lang.Nullable;
+import org.jspecify.annotations.Nullable;
+
 import io.avaje.validation.adapter.ValidationAdapter;
 import io.avaje.validation.adapter.ValidationContext;
 import io.avaje.validation.adapter.ValidationContext.AdapterCreateRequest;

diff --git a/validator/src/main/java/io/avaje/validation/adapter/ValidationContext.java b/validator/src/main/java/io/avaje/validation/adapter/ValidationContext.java
@@ -7,7 +7,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import io.avaje.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /** Context used to lookup validation adapters and create validation requests. */
 public interface ValidationContext {

diff --git a/validator/src/main/java/module-info.java b/validator/src/main/java/module-info.java
@@ -5,11 +5,11 @@
   exports io.avaje.validation.groups;
   exports io.avaje.validation.spi;
 
-  requires io.avaje.lang;
   requires io.avaje.applog;
   requires static io.avaje.inject;
   requires static io.avaje.inject.aop;
   requires static io.avaje.spi;
+  requires static transitive org.jspecify;
 
   uses io.avaje.validation.spi.ValidationExtension;
 }