fix nullability

SirCotare · SirCotare · commit cd4ac55f71f8 · 2026-04-02T09:03:36.000+02:00
diff --git a/src/main/java/it/aboutbits/springboot/testing/validation/core/ValueSource.java b/src/main/java/it/aboutbits/springboot/testing/validation/core/ValueSource.java
@@ -1,10 +1,11 @@
 package it.aboutbits.springboot.testing.validation.core;
 
 import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import java.util.stream.Stream;
 
 @NullMarked
 public interface ValueSource {
-    <T> Stream<T> values(Class<T> propertyClass, Object... args);
+    <T> Stream<@Nullable T> values(Class<T> propertyClass, Object... args);
 }
diff --git a/src/main/java/it/aboutbits/springboot/testing/validation/source/BiggerThanValueSource.java b/src/main/java/it/aboutbits/springboot/testing/validation/source/BiggerThanValueSource.java
@@ -3,6 +3,7 @@
 import it.aboutbits.springboot.testing.validation.core.ValueSource;
 import it.aboutbits.springboot.toolbox.type.ScaledBigDecimal;
 import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -48,10 +49,10 @@ public static void registerType(Class<?> type, Function<Object[], Stream<?>> sou
 
     @Override
     @SuppressWarnings("unchecked")
-    public <T> Stream<T> values(Class<T> propertyClass, Object... args) {
+    public <T> Stream<@Nullable T> values(Class<T> propertyClass, Object... args) {
         var sourceFunction = TYPE_SOURCES.get(propertyClass);
         if (sourceFunction != null) {
-            return (Stream<T>) sourceFunction.apply(args);
+            return (Stream<@Nullable T>) sourceFunction.apply(args);
         }
 
         throw new IllegalArgumentException("Property class not supported!");
diff --git a/src/main/java/it/aboutbits/springboot/testing/validation/source/BlankValueSource.java b/src/main/java/it/aboutbits/springboot/testing/validation/source/BlankValueSource.java
@@ -2,6 +2,7 @@
 
 import it.aboutbits.springboot.testing.validation.core.ValueSource;
 import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -26,10 +27,10 @@ public static void registerType(Class<?> type, Function<Object[], Stream<?>> sou
 
     @Override
     @SuppressWarnings("unchecked")
-    public <T> Stream<T> values(Class<T> propertyClass, Object... args) {
+    public <T> Stream<@Nullable T> values(Class<T> propertyClass, Object... args) {
         var sourceFunction = TYPE_SOURCES.get(propertyClass);
         if (sourceFunction != null) {
-            return (Stream<T>) sourceFunction.apply(args);
+            return (Stream<@Nullable T>) sourceFunction.apply(args);
         }
 
         throw new IllegalArgumentException("Property class not supported!");
diff --git a/src/main/java/it/aboutbits/springboot/testing/validation/source/EmptyValueSource.java b/src/main/java/it/aboutbits/springboot/testing/validation/source/EmptyValueSource.java
@@ -2,6 +2,7 @@
 
 import it.aboutbits.springboot.testing.validation.core.ValueSource;
 import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,10 +39,10 @@ public static void registerType(Class<?> type, Function<Object[], Stream<?>> sou
 
     @Override
     @SuppressWarnings("unchecked")
-    public <T> Stream<T> values(Class<T> propertyClass, Object... args) {
+    public <T> Stream<@Nullable T> values(Class<T> propertyClass, Object... args) {
         var sourceFunction = TYPE_SOURCES.get(propertyClass);
         if (sourceFunction != null) {
-            return (Stream<T>) sourceFunction.apply(args);
+            return (Stream<@Nullable T>) sourceFunction.apply(args);
         }
 
         throw new IllegalArgumentException("Property class not supported!");
diff --git a/src/main/java/it/aboutbits/springboot/testing/validation/source/FutureValueSource.java b/src/main/java/it/aboutbits/springboot/testing/validation/source/FutureValueSource.java
@@ -2,6 +2,7 @@
 
 import it.aboutbits.springboot.testing.validation.core.ValueSource;
 import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import java.time.Instant;
 import java.time.LocalDate;
@@ -43,10 +44,10 @@ public static void registerType(Class<?> type, Function<Object[], Stream<?>> sou
 
     @Override
     @SuppressWarnings("unchecked")
-    public <T> Stream<T> values(Class<T> propertyClass, Object... args) {
+    public <T> Stream<@Nullable T> values(Class<T> propertyClass, Object... args) {
         var sourceFunction = TYPE_SOURCES.get(propertyClass);
         if (sourceFunction != null) {
-            return (Stream<T>) sourceFunction.apply(args);
+            return (Stream<@Nullable T>) sourceFunction.apply(args);
         }
 
         throw new IllegalArgumentException("Property class not supported!");
diff --git a/src/main/java/it/aboutbits/springboot/testing/validation/source/InertValueSource.java b/src/main/java/it/aboutbits/springboot/testing/validation/source/InertValueSource.java
@@ -2,13 +2,14 @@
 
 import it.aboutbits.springboot.testing.validation.core.ValueSource;
 import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import java.util.stream.Stream;
 
 @NullMarked
 public class InertValueSource implements ValueSource {
     @Override
-    public <T> Stream<T> values(Class<T> propertyClass, Object... args) {
+    public <T> Stream<@Nullable T> values(Class<T> propertyClass, Object... args) {
         return Stream.empty();
     }
 }
diff --git a/src/main/java/it/aboutbits/springboot/testing/validation/source/LessThanValueSource.java b/src/main/java/it/aboutbits/springboot/testing/validation/source/LessThanValueSource.java
@@ -3,6 +3,7 @@
 import it.aboutbits.springboot.testing.validation.core.ValueSource;
 import it.aboutbits.springboot.toolbox.type.ScaledBigDecimal;
 import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -49,10 +50,10 @@ public static void registerType(Class<?> type, Function<Object[], Stream<?>> sou
 
     @Override
     @SuppressWarnings("unchecked")
-    public <T> Stream<T> values(Class<T> propertyClass, Object... args) {
+    public <T> Stream<@Nullable T> values(Class<T> propertyClass, Object... args) {
         var sourceFunction = TYPE_SOURCES.get(propertyClass);
         if (sourceFunction != null) {
-            return (Stream<T>) sourceFunction.apply(args);
+            return (Stream<@Nullable T>) sourceFunction.apply(args);
         }
 
         throw new IllegalArgumentException("Property class not supported!");
diff --git a/src/main/java/it/aboutbits/springboot/testing/validation/source/LongerThanValueSource.java b/src/main/java/it/aboutbits/springboot/testing/validation/source/LongerThanValueSource.java
@@ -2,6 +2,7 @@
 
 import it.aboutbits.springboot.testing.validation.core.ValueSource;
 import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -25,10 +26,10 @@ public static void registerType(Class<?> type, Function<Object[], Stream<?>> sou
 
     @Override
     @SuppressWarnings("unchecked")
-    public <T> Stream<T> values(Class<T> propertyClass, Object... args) {
+    public <T> Stream<@Nullable T> values(Class<T> propertyClass, Object... args) {
         var sourceFunction = TYPE_SOURCES.get(propertyClass);
         if (sourceFunction != null) {
-            return (Stream<T>) sourceFunction.apply(args);
+            return (Stream<@Nullable T>) sourceFunction.apply(args);
         }
 
         throw new IllegalArgumentException("Property class not supported!");
diff --git a/src/main/java/it/aboutbits/springboot/testing/validation/source/NullValueSource.java b/src/main/java/it/aboutbits/springboot/testing/validation/source/NullValueSource.java
@@ -2,6 +2,7 @@
 
 import it.aboutbits.springboot.testing.validation.core.ValueSource;
 import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -19,10 +20,10 @@ public static void registerType(Class<?> type, Function<Object[], Stream<?>> sou
 
     @Override
     @SuppressWarnings("unchecked")
-    public <T> Stream<T> values(Class<T> propertyClass, Object... args) {
+    public <T> Stream<@Nullable T> values(Class<T> propertyClass, Object... args) {
         var sourceFunction = TYPE_SOURCES.get(propertyClass);
         if (sourceFunction != null) {
-            return (Stream<T>) sourceFunction.apply(args);
+            return (Stream<@Nullable T>) sourceFunction.apply(args);
         }
 
         return Stream.of((T) null);
diff --git a/src/main/java/it/aboutbits/springboot/testing/validation/source/PastValueSource.java b/src/main/java/it/aboutbits/springboot/testing/validation/source/PastValueSource.java
@@ -2,6 +2,7 @@
 
 import it.aboutbits.springboot.testing.validation.core.ValueSource;
 import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import java.time.Instant;
 import java.time.LocalDate;
@@ -43,10 +44,10 @@ public static void registerType(Class<?> type, Function<Object[], Stream<?>> sou
 
     @Override
     @SuppressWarnings("unchecked")
-    public <T> Stream<T> values(Class<T> propertyClass, Object... args) {
+    public <T> Stream<@Nullable T> values(Class<T> propertyClass, Object... args) {
         var sourceFunction = TYPE_SOURCES.get(propertyClass);
         if (sourceFunction != null) {
-            return (Stream<T>) sourceFunction.apply(args);
+            return (Stream<@Nullable T>) sourceFunction.apply(args);
         }
 
         throw new IllegalArgumentException("Property class not supported!");
diff --git a/src/main/java/it/aboutbits/springboot/testing/validation/source/ShorterThanValueSource.java b/src/main/java/it/aboutbits/springboot/testing/validation/source/ShorterThanValueSource.java
@@ -2,6 +2,7 @@
 
 import it.aboutbits.springboot.testing.validation.core.ValueSource;
 import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -25,10 +26,10 @@ public static void registerType(Class<?> type, Function<Object[], Stream<?>> sou
 
     @Override
     @SuppressWarnings("unchecked")
-    public <T> Stream<T> values(Class<T> propertyClass, Object... args) {
+    public <T> Stream<@Nullable T> values(Class<T> propertyClass, Object... args) {
         var sourceFunction = TYPE_SOURCES.get(propertyClass);
         if (sourceFunction != null) {
-            return (Stream<T>) sourceFunction.apply(args);
+            return (Stream<@Nullable T>) sourceFunction.apply(args);
         }
 
         throw new IllegalArgumentException("Property class not supported!");
diff --git a/src/main/java/it/aboutbits/springboot/testing/validation/source/SizeGreaterThanValueSource.java b/src/main/java/it/aboutbits/springboot/testing/validation/source/SizeGreaterThanValueSource.java
@@ -2,6 +2,7 @@
 
 import it.aboutbits.springboot.testing.validation.core.ValueSource;
 import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import java.lang.reflect.Array;
 import java.util.ArrayList;
@@ -53,16 +54,16 @@ public static void registerType(Class<?> type, LongFunction<Stream<?>> source) {
 
     @Override
     @SuppressWarnings("unchecked")
-    public <T> Stream<T> values(Class<T> propertyClass, Object... args) {
+    public <T> Stream<@Nullable T> values(Class<T> propertyClass, Object... args) {
         var value = (Long.valueOf((long) args[0]));
 
         if (propertyClass.isArray()) {
-            return (Stream<T>) arrayFunction(propertyClass, value);
+            return (Stream<@Nullable T>) arrayFunction(propertyClass, value);
         }
 
         var sourceFunction = TYPE_SOURCES.get(propertyClass);
         if (sourceFunction != null) {
-            return (Stream<T>) sourceFunction.apply(value);
+            return (Stream<@Nullable T>) sourceFunction.apply(value);
         }
 
         throw new IllegalArgumentException("Property class not supported!");
diff --git a/src/main/java/it/aboutbits/springboot/testing/validation/source/SizeLessThanValueSource.java b/src/main/java/it/aboutbits/springboot/testing/validation/source/SizeLessThanValueSource.java
@@ -2,6 +2,7 @@
 
 import it.aboutbits.springboot.testing.validation.core.ValueSource;
 import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import java.lang.reflect.Array;
 import java.util.ArrayList;
@@ -53,7 +54,7 @@ public static void registerType(Class<?> type, LongFunction<Stream<?>> source) {
 
     @Override
     @SuppressWarnings("unchecked")
-    public <T> Stream<T> values(Class<T> propertyClass, Object... args) {
+    public <T> Stream<@Nullable T> values(Class<T> propertyClass, Object... args) {
         var value = (Long.valueOf((long) args[0]));
 
         if (value == 0) {
@@ -65,12 +66,12 @@ public <T> Stream<T> values(Class<T> propertyClass, Object... args) {
         }
 
         if (propertyClass.isArray()) {
-            return (Stream<T>) arrayFunction(propertyClass, value);
+            return (Stream<@Nullable T>) arrayFunction(propertyClass, value);
         }
 
         var sourceFunction = TYPE_SOURCES.get(propertyClass);
         if (sourceFunction != null) {
-            return (Stream<T>) sourceFunction.apply(value);
+            return (Stream<@Nullable T>) sourceFunction.apply(value);
         }
 
         throw new IllegalArgumentException("Property class not supported!");
diff --git a/src/main/java/it/aboutbits/springboot/testing/validation/source/ZeroValueSource.java b/src/main/java/it/aboutbits/springboot/testing/validation/source/ZeroValueSource.java
@@ -3,6 +3,7 @@
 import it.aboutbits.springboot.testing.validation.core.ValueSource;
 import it.aboutbits.springboot.toolbox.type.ScaledBigDecimal;
 import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -46,10 +47,10 @@ public static void registerType(Class<?> type, Function<Object[], Stream<?>> sou
 
     @Override
     @SuppressWarnings("unchecked")
-    public <T> Stream<T> values(Class<T> propertyClass, Object... args) {
+    public <T> Stream<@Nullable T> values(Class<T> propertyClass, Object... args) {
         var sourceFunction = TYPE_SOURCES.get(propertyClass);
         if (sourceFunction != null) {
-            return (Stream<T>) sourceFunction.apply(args);
+            return (Stream<@Nullable T>) sourceFunction.apply(args);
         }
 
         throw new IllegalArgumentException("Property class not supported!");

Original file line number	Diff line number	Diff line change
`@@ -2,13 +2,14 @@`
`2`	`2`
`3`	`3`	`import it.aboutbits.springboot.testing.validation.core.ValueSource;`
`4`	`4`	`import org.jspecify.annotations.NullMarked;`
	`5`	`+import org.jspecify.annotations.Nullable;`
`5`	`6`
`6`	`7`	`import java.util.stream.Stream;`
`7`	`8`
`8`	`9`	`@NullMarked`
`9`	`10`	`public class InertValueSource implements ValueSource {`
`10`	`11`	`@Override`
`11`		`- public <T> Stream<T> values(Class<T> propertyClass, Object... args) {`
	`12`	`+ public <T> Stream<@Nullable T> values(Class<T> propertyClass, Object... args) {`
`12`	`13`	`return Stream.empty();`
`13`	`14`	`}`
`14`	`15`	`}`