Fully denote the nullability of filter and map methods.

Also fix al the tests that were, essentially, misuses of the library.

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/AbstractListValueCondition.java

@@ -23,6 +23,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.jspecify.annotations.NonNull;
 import org.mybatis.dynamic.sql.render.RenderedParameterInfo;
 import org.mybatis.dynamic.sql.render.RenderingContext;
 import org.mybatis.dynamic.sql.util.FragmentAndParameters;
@@ -113,7 +114,7 @@ public interface Filterable<T> {
          * @return this condition if renderable and the value matches the predicate, otherwise a condition
          *     that will not render.
          */
-        AbstractListValueCondition<T> filter(Predicate<? super T> predicate);
+        AbstractListValueCondition<T> filter(Predicate<? super @NonNull T> predicate);
     }
 
     /**
@@ -138,6 +139,6 @@ public interface Mappable<T> {
          * @return a new condition with the result of applying the mapper to the value of this condition,
          *     if renderable, otherwise a condition that will not render.
          */
-        <R> AbstractListValueCondition<R> map(Function<? super T, ? extends R> mapper);
+        <R> AbstractListValueCondition<R> map(Function<? super @NonNull T, ? extends R> mapper);
     }
 }

src/main/java/org/mybatis/dynamic/sql/AbstractSingleValueCondition.java

@@ -21,6 +21,7 @@
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 
+import org.jspecify.annotations.NonNull;
 import org.mybatis.dynamic.sql.render.RenderedParameterInfo;
 import org.mybatis.dynamic.sql.render.RenderingContext;
 import org.mybatis.dynamic.sql.util.FragmentAndParameters;
@@ -88,7 +89,7 @@ public interface Filterable<T> {
          * @return this condition if renderable and the value matches the predicate, otherwise a condition
          *     that will not render.
          */
-        AbstractSingleValueCondition<T> filter(Predicate<? super T> predicate);
+        AbstractSingleValueCondition<T> filter(Predicate<? super @NonNull T> predicate);
     }
 
     /**
@@ -113,6 +114,6 @@ public interface Mappable<T> {
          * @return a new condition with the result of applying the mapper to the value of this condition,
          *     if renderable, otherwise a condition that will not render.
          */
-        <R> AbstractSingleValueCondition<R> map(Function<? super T, ? extends R> mapper);
+        <R> AbstractSingleValueCondition<R> map(Function<? super @NonNull T, ? extends R> mapper);
     }
 }

src/main/java/org/mybatis/dynamic/sql/AbstractTwoValueCondition.java

@@ -23,6 +23,7 @@
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 
+import org.jspecify.annotations.NonNull;
 import org.mybatis.dynamic.sql.render.RenderedParameterInfo;
 import org.mybatis.dynamic.sql.render.RenderingContext;
 import org.mybatis.dynamic.sql.util.FragmentAndParameters;
@@ -110,7 +111,7 @@ public interface Filterable<T> {
          * @return this condition if renderable and the values match the predicate, otherwise a condition
          *     that will not render.
          */
-        AbstractTwoValueCondition<T> filter(BiPredicate<? super T, ? super T> predicate);
+        AbstractTwoValueCondition<T> filter(BiPredicate<? super @NonNull T, ? super @NonNull T> predicate);
 
         /**
          * If renderable and both values match the predicate, returns this condition. Else returns a condition
@@ -121,7 +122,7 @@ public interface Filterable<T> {
          * @return this condition if renderable and the values match the predicate, otherwise a condition
          *     that will not render.
          */
-        AbstractTwoValueCondition<T> filter(Predicate<? super T> predicate);
+        AbstractTwoValueCondition<T> filter(Predicate<? super @NonNull T> predicate);
     }
 
     /**
@@ -147,8 +148,8 @@ public interface Mappable<T> {
          * @return a new condition with the result of applying the mappers to the values of this condition,
          *     if renderable, otherwise a condition that will not render.
          */
-        <R> AbstractTwoValueCondition<R> map(Function<? super T, ? extends R> mapper1,
-                                             Function<? super T, ? extends R> mapper2);
+        <R> AbstractTwoValueCondition<R> map(Function<? super @NonNull T, ? extends R> mapper1,
+                                             Function<? super @NonNull T, ? extends R> mapper2);
 
         /**
          * If renderable, apply the mapping to both values and return a new condition with the new values. Else return a
@@ -159,6 +160,6 @@ <R> AbstractTwoValueCondition<R> map(Function<? super T, ? extends R> mapper1,
          * @return a new condition with the result of applying the mappers to the values of this condition,
          *     if renderable, otherwise a condition that will not render.
          */
-        <R> AbstractTwoValueCondition<R> map(Function<? super T, ? extends R> mapper);
+        <R> AbstractTwoValueCondition<R> map(Function<? super @NonNull T, ? extends R> mapper);
     }
 }

src/main/java/org/mybatis/dynamic/sql/where/condition/IsBetween.java

@@ -20,9 +20,10 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 
+import org.jspecify.annotations.NonNull;
 import org.mybatis.dynamic.sql.AbstractTwoValueCondition;
 
-public class IsBetween<T> extends AbstractTwoValueCondition<T>
+public class IsBetween<T> extends AbstractTwoValueCondition<@NonNull T>
         implements AbstractTwoValueCondition.Filterable<T>, AbstractTwoValueCondition.Mappable<T> {
     private static final IsBetween<?> EMPTY = new IsBetween<Object>(-1, -1) {
         @Override
@@ -62,22 +63,23 @@ public String operator2() {
     }
 
     @Override
-    public IsBetween<T> filter(BiPredicate<? super T, ? super T> predicate) {
+    public IsBetween<T> filter(BiPredicate<? super @NonNull T, ? super @NonNull T> predicate) {
         return filterSupport(predicate, IsBetween::empty, this);
     }
 
     @Override
-    public IsBetween<T> filter(Predicate<? super T> predicate) {
+    public IsBetween<T> filter(Predicate<? super @NonNull T> predicate) {
         return filterSupport(predicate, IsBetween::empty, this);
     }
 
     @Override
-    public <R> IsBetween<R> map(Function<? super T, ? extends R> mapper1, Function<? super T, ? extends R> mapper2) {
+    public <R> IsBetween<R> map(Function<? super @NonNull T, ? extends @NonNull R> mapper1,
+                                Function<? super @NonNull T, ? extends @NonNull R> mapper2) {
         return mapSupport(mapper1, mapper2, IsBetween::new, IsBetween::empty);
     }
 
     @Override
-    public <R> IsBetween<R> map(Function<? super T, ? extends R> mapper) {
+    public <R> IsBetween<R> map(Function<? super @NonNull T, ? extends @NonNull R> mapper) {
         return map(mapper, mapper);
     }
 

src/main/java/org/mybatis/dynamic/sql/where/condition/IsBetweenWhenPresent.java

@@ -20,6 +20,7 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 
+import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 import org.mybatis.dynamic.sql.AbstractTwoValueCondition;
 
@@ -63,23 +64,23 @@ public String operator2() {
     }
 
     @Override
-    public IsBetweenWhenPresent<T> filter(BiPredicate<? super T, ? super T> predicate) {
+    public IsBetweenWhenPresent<T> filter(BiPredicate<? super @NonNull T, ? super @NonNull T> predicate) {
         return filterSupport(predicate, IsBetweenWhenPresent::empty, this);
     }
 
     @Override
-    public IsBetweenWhenPresent<T> filter(Predicate<? super T> predicate) {
+    public IsBetweenWhenPresent<T> filter(Predicate<? super @NonNull T> predicate) {
         return filterSupport(predicate, IsBetweenWhenPresent::empty, this);
     }
 
     @Override
-    public <R> IsBetweenWhenPresent<R> map(Function<? super T, ? extends @Nullable R> mapper1,
-                                           Function<? super T, ? extends @Nullable R> mapper2) {
+    public <R> IsBetweenWhenPresent<R> map(Function<? super @NonNull T, ? extends @Nullable R> mapper1,
+                                           Function<? super @NonNull T, ? extends @Nullable R> mapper2) {
         return mapSupport(mapper1, mapper2, IsBetweenWhenPresent::of, IsBetweenWhenPresent::empty);
     }
 
     @Override
-    public <R> IsBetweenWhenPresent<R> map(Function<? super T, ? extends @Nullable R> mapper) {
+    public <R> IsBetweenWhenPresent<R> map(Function<? super @NonNull T, ? extends @Nullable R> mapper) {
         return map(mapper, mapper);
     }
 

src/main/java/org/mybatis/dynamic/sql/where/condition/IsEqualTo.java

@@ -19,6 +19,7 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 
+import org.jspecify.annotations.NonNull;
 import org.mybatis.dynamic.sql.AbstractSingleValueCondition;
 
 public class IsEqualTo<T> extends AbstractSingleValueCondition<T>
@@ -56,12 +57,12 @@ public static <T> IsEqualTo<T> of(T value) {
     }
 
     @Override
-    public IsEqualTo<T> filter(Predicate<? super T> predicate) {
+    public IsEqualTo<T> filter(Predicate<? super @NonNull T> predicate) {
         return filterSupport(predicate, IsEqualTo::empty, this);
     }
 
     @Override
-    public <R> IsEqualTo<R> map(Function<? super T, ? extends R> mapper) {
+    public <R> IsEqualTo<R> map(Function<? super @NonNull T, ? extends @NonNull R> mapper) {
         return mapSupport(mapper, IsEqualTo::new, IsEqualTo::empty);
     }
 }

src/main/java/org/mybatis/dynamic/sql/where/condition/IsEqualToWhenPresent.java

@@ -19,6 +19,7 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 
+import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 import org.mybatis.dynamic.sql.AbstractSingleValueCondition;
 
@@ -61,12 +62,12 @@ public static <T> IsEqualToWhenPresent<T> of(@Nullable T value) {
     }
 
     @Override
-    public IsEqualToWhenPresent<T> filter(Predicate<? super T> predicate) {
+    public IsEqualToWhenPresent<T> filter(Predicate<? super @NonNull T> predicate) {
         return filterSupport(predicate, IsEqualToWhenPresent::empty, this);
     }
 
     @Override
-    public <R> IsEqualToWhenPresent<R> map(Function<? super T, ? extends @Nullable R> mapper) {
+    public <R> IsEqualToWhenPresent<R> map(Function<? super @NonNull T, ? extends @Nullable R> mapper) {
         return mapSupport(mapper, IsEqualToWhenPresent::of, IsEqualToWhenPresent::empty);
     }
 }

src/main/java/org/mybatis/dynamic/sql/where/condition/IsGreaterThan.java

@@ -19,6 +19,7 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 
+import org.jspecify.annotations.NonNull;
 import org.mybatis.dynamic.sql.AbstractSingleValueCondition;
 
 public class IsGreaterThan<T> extends AbstractSingleValueCondition<T>
@@ -55,12 +56,12 @@ public static <T> IsGreaterThan<T> of(T value) {
     }
 
     @Override
-    public IsGreaterThan<T> filter(Predicate<? super T> predicate) {
+    public IsGreaterThan<T> filter(Predicate<? super @NonNull T> predicate) {
         return filterSupport(predicate, IsGreaterThan::empty, this);
     }
 
     @Override
-    public <R> IsGreaterThan<R> map(Function<? super T, ? extends R> mapper) {
+    public <R> IsGreaterThan<R> map(Function<? super @NonNull T, ? extends @NonNull R> mapper) {
         return mapSupport(mapper, IsGreaterThan::new, IsGreaterThan::empty);
     }
 }

src/main/java/org/mybatis/dynamic/sql/where/condition/IsGreaterThanOrEqualTo.java

@@ -19,6 +19,7 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 
+import org.jspecify.annotations.NonNull;
 import org.mybatis.dynamic.sql.AbstractSingleValueCondition;
 
 public class IsGreaterThanOrEqualTo<T> extends AbstractSingleValueCondition<T>
@@ -55,12 +56,12 @@ public static <T> IsGreaterThanOrEqualTo<T> of(T value) {
     }
 
     @Override
-    public IsGreaterThanOrEqualTo<T> filter(Predicate<? super T> predicate) {
+    public IsGreaterThanOrEqualTo<T> filter(Predicate<? super @NonNull T> predicate) {
         return filterSupport(predicate, IsGreaterThanOrEqualTo::empty, this);
     }
 
     @Override
-    public <R> IsGreaterThanOrEqualTo<R> map(Function<? super T, ? extends R> mapper) {
+    public <R> IsGreaterThanOrEqualTo<R> map(Function<? super @NonNull T, ? extends @NonNull R> mapper) {
         return mapSupport(mapper, IsGreaterThanOrEqualTo::new, IsGreaterThanOrEqualTo::empty);
     }
 }

src/main/java/org/mybatis/dynamic/sql/where/condition/IsGreaterThanOrEqualToWhenPresent.java

@@ -19,6 +19,7 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 
+import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 import org.mybatis.dynamic.sql.AbstractSingleValueCondition;
 
@@ -60,12 +61,12 @@ public static <T> IsGreaterThanOrEqualToWhenPresent<T> of(@Nullable T value) {
     }
 
     @Override
-    public IsGreaterThanOrEqualToWhenPresent<T> filter(Predicate<? super T> predicate) {
+    public IsGreaterThanOrEqualToWhenPresent<T> filter(Predicate<? super @NonNull T> predicate) {
         return filterSupport(predicate, IsGreaterThanOrEqualToWhenPresent::empty, this);
     }
 
     @Override
-    public <R> IsGreaterThanOrEqualToWhenPresent<R> map(Function<? super T, ? extends @Nullable R> mapper) {
+    public <R> IsGreaterThanOrEqualToWhenPresent<R> map(Function<? super @NonNull T, ? extends @Nullable R> mapper) {
         return mapSupport(mapper, IsGreaterThanOrEqualToWhenPresent::of, IsGreaterThanOrEqualToWhenPresent::empty);
     }
 }