Further JSpecify refinements

jeffgbutler · jeffgbutler · commit 6daca91884ac · 2025-01-02T16:44:54.000-05:00
diff --git a/src/main/java/org/mybatis/dynamic/sql/AbstractListValueCondition.java b/src/main/java/org/mybatis/dynamic/sql/AbstractListValueCondition.java
@@ -23,14 +23,16 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.jspecify.annotations.Nullable;
+
 public abstract class AbstractListValueCondition<T> implements VisitableCondition<T> {
-    protected final Collection<T> values;
+    protected final Collection<@Nullable T> values;
 
-    protected AbstractListValueCondition(Collection<T> values) {
+    protected AbstractListValueCondition(Collection<@Nullable T> values) {
         this.values = Objects.requireNonNull(values);
     }
 
-    public final Stream<T> values() {
+    public final Stream<@Nullable T> values() {
         return values.stream();
     }
 
@@ -44,18 +46,18 @@ public <R> R accept(ConditionVisitor<T, R> visitor) {
         return visitor.visit(this);
     }
 
-    private <R> Collection<R> applyMapper(Function<? super T, ? extends R> mapper) {
+    private <R> Collection<R> applyMapper(Function<? super @Nullable T, ? extends @Nullable R> mapper) {
         Objects.requireNonNull(mapper);
         return values.stream().map(mapper).collect(Collectors.toList());
     }
 
-    private Collection<T> applyFilter(Predicate<? super T> predicate) {
+    private Collection<T> applyFilter(Predicate<? super @Nullable T> predicate) {
         Objects.requireNonNull(predicate);
         return values.stream().filter(predicate).toList();
     }
 
-    protected <S extends AbstractListValueCondition<T>> S filterSupport(Predicate<? super T> predicate,
-            Function<Collection<T>, S> constructor, S self, Supplier<S> emptySupplier) {
+    protected <S extends AbstractListValueCondition<T>> S filterSupport(Predicate<? super @Nullable T> predicate,
+            Function<Collection<@Nullable T>, S> constructor, S self, Supplier<S> emptySupplier) {
         if (isEmpty()) {
             return self;
         } else {
@@ -64,8 +66,9 @@ protected <S extends AbstractListValueCondition<T>> S filterSupport(Predicate<?
         }
     }
 
-    protected <R, S extends AbstractListValueCondition<R>> S mapSupport(Function<? super T, ? extends R> mapper,
-            Function<Collection<R>, S> constructor, Supplier<S> emptySupplier) {
+    protected <R, S extends AbstractListValueCondition<R>> S mapSupport(
+            Function<? super @Nullable T, ? extends @Nullable R> mapper,
+            Function<Collection<@Nullable R>, S> constructor, Supplier<S> emptySupplier) {
         if (isEmpty()) {
             return emptySupplier.get();
         } else {
@@ -81,7 +84,7 @@ protected <R, S extends AbstractListValueCondition<R>> S mapSupport(Function<? s
      *
      * @return a new condition with filtered values if renderable, otherwise an empty condition
      */
-    public abstract AbstractListValueCondition<T> filter(Predicate<? super T> predicate);
+    public abstract AbstractListValueCondition<T> filter(Predicate<? super @Nullable T> predicate);
 
     public abstract String operator();
 }
diff --git a/src/main/java/org/mybatis/dynamic/sql/SqlBuilder.java b/src/main/java/org/mybatis/dynamic/sql/SqlBuilder.java
@@ -764,11 +764,11 @@ static <T> IsLessThanOrEqualTo<T> isLessThanOrEqualToWhenPresent(Supplier<@Nulla
     }
 
     @SafeVarargs
-    static <T> IsIn<T> isIn(T... values) {
+    static <T> IsIn<T> isIn(@Nullable T... values) {
         return IsIn.of(values);
     }
 
-    static <T> IsIn<T> isIn(Collection<T> values) {
+    static <T> IsIn<T> isIn(Collection<@Nullable T> values) {
         return IsIn.of(values);
     }
 
@@ -786,11 +786,11 @@ static <T> IsInWhenPresent<T> isInWhenPresent(@Nullable Collection<@Nullable T>
     }
 
     @SafeVarargs
-    static <T> IsNotIn<T> isNotIn(T... values) {
+    static <T> IsNotIn<T> isNotIn(@Nullable T... values) {
         return IsNotIn.of(values);
     }
 
-    static <T> IsNotIn<T> isNotIn(Collection<T> values) {
+    static <T> IsNotIn<T> isNotIn(Collection<@Nullable T> values) {
         return IsNotIn.of(values);
     }
 
@@ -914,11 +914,11 @@ static IsNotLikeCaseInsensitive isNotLikeCaseInsensitiveWhenPresent(Supplier<@Nu
         return isNotLikeCaseInsensitiveWhenPresent(valueSupplier.get());
     }
 
-    static IsInCaseInsensitive isInCaseInsensitive(String... values) {
+    static IsInCaseInsensitive isInCaseInsensitive(@Nullable String... values) {
         return IsInCaseInsensitive.of(values);
     }
 
-    static IsInCaseInsensitive isInCaseInsensitive(Collection<String> values) {
+    static IsInCaseInsensitive isInCaseInsensitive(Collection<@Nullable String> values) {
         return IsInCaseInsensitive.of(values);
     }
 
@@ -931,11 +931,11 @@ static IsInCaseInsensitiveWhenPresent isInCaseInsensitiveWhenPresent(
         return values == null ? IsInCaseInsensitiveWhenPresent.empty() : IsInCaseInsensitiveWhenPresent.of(values);
     }
 
-    static IsNotInCaseInsensitive isNotInCaseInsensitive(String... values) {
+    static IsNotInCaseInsensitive isNotInCaseInsensitive(@Nullable String... values) {
         return IsNotInCaseInsensitive.of(values);
     }
 
-    static IsNotInCaseInsensitive isNotInCaseInsensitive(Collection<String> values) {
+    static IsNotInCaseInsensitive isNotInCaseInsensitive(Collection<@Nullable String> values) {
         return IsNotInCaseInsensitive.of(values);
     }
 
diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/GeneralInsertDSL.java b/src/main/java/org/mybatis/dynamic/sql/insert/GeneralInsertDSL.java
@@ -92,20 +92,20 @@ public GeneralInsertDSL toValue(Supplier<T> valueSupplier) {
             return GeneralInsertDSL.this;
         }
 
-        public GeneralInsertDSL toValueOrNull(T value) {
+        public GeneralInsertDSL toValueOrNull(@Nullable T value) {
             return toValueOrNull(() -> value);
         }
 
-        public GeneralInsertDSL toValueOrNull(Supplier<T> valueSupplier) {
+        public GeneralInsertDSL toValueOrNull(Supplier<@Nullable T> valueSupplier) {
             columnMappings.add(ValueOrNullMapping.of(column, valueSupplier));
             return GeneralInsertDSL.this;
         }
 
-        public GeneralInsertDSL toValueWhenPresent(T value) {
+        public GeneralInsertDSL toValueWhenPresent(@Nullable T value) {
             return toValueWhenPresent(() -> value);
         }
 
-        public GeneralInsertDSL toValueWhenPresent(Supplier<T> valueSupplier) {
+        public GeneralInsertDSL toValueWhenPresent(Supplier<@Nullable T> valueSupplier) {
             columnMappings.add(ValueWhenPresentMapping.of(column, valueSupplier));
             return GeneralInsertDSL.this;
         }
diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/InsertColumnListModel.java b/src/main/java/org/mybatis/dynamic/sql/insert/InsertColumnListModel.java
@@ -20,13 +20,14 @@
 import java.util.Objects;
 import java.util.stream.Stream;
 
+import org.jspecify.annotations.Nullable;
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.util.Validator;
 
 public class InsertColumnListModel {
     private final List<SqlColumn<?>> columns = new ArrayList<>();
 
-    private InsertColumnListModel(List<SqlColumn<?>> columns) {
+    private InsertColumnListModel(@Nullable List<SqlColumn<?>> columns) {
         Objects.requireNonNull(columns);
         Validator.assertNotEmpty(columns, "ERROR.4"); //$NON-NLS-1$
         this.columns.addAll(columns);
@@ -37,7 +38,7 @@ public Stream<SqlColumn<?>> columns() {
         return columns.stream();
     }
 
-    public static InsertColumnListModel of(List<SqlColumn<?>> columns) {
+    public static InsertColumnListModel of(@Nullable List<SqlColumn<?>> columns) {
         return new InsertColumnListModel(columns);
     }
 }
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/join/JoinModel.java b/src/main/java/org/mybatis/dynamic/sql/select/join/JoinModel.java
@@ -20,13 +20,14 @@
 import java.util.Objects;
 import java.util.stream.Stream;
 
+import org.jspecify.annotations.Nullable;
 import org.mybatis.dynamic.sql.TableExpression;
 import org.mybatis.dynamic.sql.util.Validator;
 
 public class JoinModel {
     private final List<JoinSpecification> joinSpecifications = new ArrayList<>();
 
-    private JoinModel(List<JoinSpecification> joinSpecifications) {
+    private JoinModel(@Nullable List<JoinSpecification> joinSpecifications) {
         Objects.requireNonNull(joinSpecifications);
         Validator.assertNotEmpty(joinSpecifications, "ERROR.15"); //$NON-NLS-1$
         this.joinSpecifications.addAll(joinSpecifications);
@@ -36,7 +37,7 @@ public Stream<JoinSpecification> joinSpecifications() {
         return joinSpecifications.stream();
     }
 
-    public static JoinModel of(List<JoinSpecification> joinSpecifications) {
+    public static JoinModel of(@Nullable List<JoinSpecification> joinSpecifications) {
         return new JoinModel(joinSpecifications);
     }
 
diff --git a/src/main/java/org/mybatis/dynamic/sql/update/UpdateDSL.java b/src/main/java/org/mybatis/dynamic/sql/update/UpdateDSL.java
@@ -174,20 +174,20 @@ public UpdateDSL<R> equalTo(BasicColumn rightColumn) {
             return UpdateDSL.this;
         }
 
-        public UpdateDSL<R> equalToOrNull(T value) {
+        public UpdateDSL<R> equalToOrNull(@Nullable T value) {
             return equalToOrNull(() -> value);
         }
 
-        public UpdateDSL<R> equalToOrNull(Supplier<T> valueSupplier) {
+        public UpdateDSL<R> equalToOrNull(Supplier<@Nullable T> valueSupplier) {
             columnMappings.add(ValueOrNullMapping.of(column, valueSupplier));
             return UpdateDSL.this;
         }
 
-        public UpdateDSL<R> equalToWhenPresent(T value) {
+        public UpdateDSL<R> equalToWhenPresent(@Nullable T value) {
             return equalToWhenPresent(() -> value);
         }
 
-        public UpdateDSL<R> equalToWhenPresent(Supplier<T> valueSupplier) {
+        public UpdateDSL<R> equalToWhenPresent(Supplier<@Nullable T> valueSupplier) {
             columnMappings.add(ValueWhenPresentMapping.of(column, valueSupplier));
             return UpdateDSL.this;
         }
diff --git a/src/main/java/org/mybatis/dynamic/sql/where/condition/AndGatherer.java b/src/main/java/org/mybatis/dynamic/sql/where/condition/AndGatherer.java
@@ -42,7 +42,7 @@ public R and(@Nullable T value2) {
         return build();
     }
 
-    public R and(Supplier<T> valueSupplier2) {
+    public R and(Supplier<@Nullable T> valueSupplier2) {
         return and(valueSupplier2.get());
     }
 
diff --git a/src/main/java/org/mybatis/dynamic/sql/where/condition/IsInCaseInsensitive.java b/src/main/java/org/mybatis/dynamic/sql/where/condition/IsInCaseInsensitive.java
@@ -35,7 +35,7 @@ public static IsInCaseInsensitive empty() {
         return EMPTY;
     }
 
-    protected IsInCaseInsensitive(Collection<String> values) {
+    protected IsInCaseInsensitive(Collection<@Nullable String> values) {
         super(values);
     }
 
@@ -66,11 +66,11 @@ public IsInCaseInsensitive map(UnaryOperator<@Nullable String> mapper) {
         return mapSupport(mapper, IsInCaseInsensitive::new, IsInCaseInsensitive::empty);
     }
 
-    public static IsInCaseInsensitive of(String... values) {
+    public static IsInCaseInsensitive of(@Nullable String... values) {
         return of(Arrays.asList(values));
     }
 
-    public static IsInCaseInsensitive of(Collection<String> values) {
+    public static IsInCaseInsensitive of(Collection<@Nullable String> values) {
         return new IsInCaseInsensitive(values).map(StringUtilities::safelyUpperCase);
     }
 }
diff --git a/src/main/java/org/mybatis/dynamic/sql/where/condition/IsNotInCaseInsensitive.java b/src/main/java/org/mybatis/dynamic/sql/where/condition/IsNotInCaseInsensitive.java
@@ -35,7 +35,7 @@ public static IsNotInCaseInsensitive empty() {
         return EMPTY;
     }
 
-    protected IsNotInCaseInsensitive(Collection<String> values) {
+    protected IsNotInCaseInsensitive(Collection<@Nullable String> values) {
         super(values);
     }
 
@@ -66,11 +66,11 @@ public IsNotInCaseInsensitive map(UnaryOperator<@Nullable String> mapper) {
         return mapSupport(mapper, IsNotInCaseInsensitive::new, IsNotInCaseInsensitive::empty);
     }
 
-    public static IsNotInCaseInsensitive of(String... values) {
+    public static IsNotInCaseInsensitive of(@Nullable String... values) {
         return of(Arrays.asList(values));
     }
 
-    public static IsNotInCaseInsensitive of(Collection<String> values) {
+    public static IsNotInCaseInsensitive of(Collection<@Nullable String> values) {
         return new IsNotInCaseInsensitive(values).map(StringUtilities::safelyUpperCase);
     }
 }
diff --git a/src/main/java/org/mybatis/dynamic/sql/where/render/DefaultConditionVisitor.java b/src/main/java/org/mybatis/dynamic/sql/where/render/DefaultConditionVisitor.java
@@ -114,7 +114,7 @@ public FragmentAndParameters visit(AbstractColumnComparisonCondition<T> conditio
         return column.convertParameterType(value);
     }
 
-    private FragmentAndParameters toFragmentAndParameters(T value) {
+    private FragmentAndParameters toFragmentAndParameters(@Nullable T value) {
         RenderedParameterInfo parameterInfo = renderingContext.calculateParameterInfo(column);
         return FragmentAndParameters.withFragment(parameterInfo.renderedPlaceHolder())
                 .withParameter(parameterInfo.parameterMapKey(), convertValue(value))
diff --git a/src/test/java/examples/animal/data/Length.java b/src/test/java/examples/animal/data/Length.java
@@ -18,12 +18,14 @@
 import java.sql.JDBCType;
 import java.util.Optional;
 
+import org.jspecify.annotations.NullMarked;
 import org.mybatis.dynamic.sql.BasicColumn;
 import org.mybatis.dynamic.sql.BindableColumn;
 import org.mybatis.dynamic.sql.render.RenderingContext;
 import org.mybatis.dynamic.sql.select.function.AbstractTypeConvertingFunction;
 import org.mybatis.dynamic.sql.util.FragmentAndParameters;
 
+@NullMarked
 public class Length extends AbstractTypeConvertingFunction<Object, Integer, Length> {
     private Length(BasicColumn column) {
         super(column);
diff --git a/src/test/java/examples/custom_render/JsonRenderingStrategy.java b/src/test/java/examples/custom_render/JsonRenderingStrategy.java
@@ -15,9 +15,11 @@
  */
 package examples.custom_render;
 
+import org.jspecify.annotations.NullMarked;
 import org.mybatis.dynamic.sql.BindableColumn;
 import org.mybatis.dynamic.sql.render.MyBatis3RenderingStrategy;
 
+@NullMarked
 public class JsonRenderingStrategy extends MyBatis3RenderingStrategy {
 
     @Override
diff --git a/src/test/java/examples/joins/ItemMasterDynamicSQLSupport.java b/src/test/java/examples/joins/ItemMasterDynamicSQLSupport.java
@@ -17,9 +17,11 @@
 
 import java.sql.JDBCType;
 
+import org.jspecify.annotations.NullMarked;
 import org.mybatis.dynamic.sql.AliasableSqlTable;
 import org.mybatis.dynamic.sql.SqlColumn;
 
+@NullMarked
 public final class ItemMasterDynamicSQLSupport {
     public static final ItemMaster itemMaster = new ItemMaster();
     public static final SqlColumn<Integer> itemId = itemMaster.itemId;
diff --git a/src/test/java/examples/joins/UserDynamicSQLSupport.java b/src/test/java/examples/joins/UserDynamicSQLSupport.java
@@ -17,9 +17,11 @@
 
 import java.sql.JDBCType;
 
+import org.jspecify.annotations.NullMarked;
 import org.mybatis.dynamic.sql.AliasableSqlTable;
 import org.mybatis.dynamic.sql.SqlColumn;
 
+@NullMarked
 public class UserDynamicSQLSupport {
     public static final User user = new User();
     public final SqlColumn<Integer> userId = user.userId;
diff --git a/src/test/java/examples/paging/LimitAndOffsetAdapter.java b/src/test/java/examples/paging/LimitAndOffsetAdapter.java
@@ -20,6 +20,7 @@
 import java.util.Objects;
 import java.util.function.Function;
 
+import org.jspecify.annotations.NullMarked;
 import org.mybatis.dynamic.sql.render.RenderingStrategies;
 import org.mybatis.dynamic.sql.select.SelectModel;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
@@ -40,6 +41,7 @@
  *
  * @author Jeff Butler
  */
+@NullMarked
 public class LimitAndOffsetAdapter<R> {
     private final SelectModel selectModel;
     private final Function<SelectStatementProvider, R> mapperMethod;
diff --git a/src/test/java/examples/sharding/TableCodesDynamicSqlSupport.java b/src/test/java/examples/sharding/TableCodesDynamicSqlSupport.java
@@ -17,9 +17,11 @@
 
 import java.sql.JDBCType;
 
+import org.jspecify.annotations.NullMarked;
 import org.mybatis.dynamic.sql.AliasableSqlTable;
 import org.mybatis.dynamic.sql.SqlColumn;
 
+@NullMarked
 public final class TableCodesDynamicSqlSupport {
     public static final TableCodes tableCodes = new TableCodes();
     public static final SqlColumn<Integer> id = tableCodes.id;
diff --git a/src/test/java/examples/spring/LastNameParameterConverter.java b/src/test/java/examples/spring/LastNameParameterConverter.java
@@ -15,12 +15,14 @@
  */
 package examples.spring;
 
+import org.jspecify.annotations.Nullable;
 import org.mybatis.dynamic.sql.ParameterTypeConverter;
 import org.springframework.core.convert.converter.Converter;
 
-public class LastNameParameterConverter implements ParameterTypeConverter<LastName, String>, Converter<LastName, String> {
+public class LastNameParameterConverter implements ParameterTypeConverter<LastName, String>,
+        Converter<LastName, String> {
     @Override
-    public String convert(LastName source) {
+    public @Nullable String convert(@Nullable LastName source) {
         return source == null ? null : source.getName();
     }
 }
diff --git a/src/test/java/examples/spring/YesNoParameterConverter.java b/src/test/java/examples/spring/YesNoParameterConverter.java
@@ -15,12 +15,13 @@
  */
 package examples.spring;
 
+import org.jspecify.annotations.Nullable;
 import org.mybatis.dynamic.sql.ParameterTypeConverter;
 
 public class YesNoParameterConverter implements ParameterTypeConverter<Boolean, String> {
 
     @Override
-    public String convert(Boolean source) {
+    public @Nullable String convert(@Nullable Boolean source) {
         return source == null ? null : source ? "Yes" : "No";
     }
 }
diff --git a/src/test/java/examples/type_conversion/ToBase64.java b/src/test/java/examples/type_conversion/ToBase64.java
diff --git a/src/test/java/org/mybatis/dynamic/sql/InvalidSQLTest.java b/src/test/java/org/mybatis/dynamic/sql/InvalidSQLTest.java
diff --git a/src/test/java/org/mybatis/dynamic/sql/insert/InsertStatementTest.java b/src/test/java/org/mybatis/dynamic/sql/insert/InsertStatementTest.java
diff --git a/src/test/java/org/mybatis/dynamic/sql/where/condition/FilterAndMapTest.java b/src/test/java/org/mybatis/dynamic/sql/where/condition/FilterAndMapTest.java

Original file line number	Diff line number	Diff line change
`@@ -764,11 +764,11 @@ static <T> IsLessThanOrEqualTo<T> isLessThanOrEqualToWhenPresent(Supplier<@Nulla`
`764`	`764`	`}`
`765`	`765`
`766`	`766`	`@SafeVarargs`
`767`		`- static <T> IsIn<T> isIn(T... values) {`
	`767`	`+ static <T> IsIn<T> isIn(@Nullable T... values) {`
`768`	`768`	`return IsIn.of(values);`
`769`	`769`	`}`
`770`	`770`
`771`		`- static <T> IsIn<T> isIn(Collection<T> values) {`
	`771`	`+ static <T> IsIn<T> isIn(Collection<@Nullable T> values) {`
`772`	`772`	`return IsIn.of(values);`
`773`	`773`	`}`
`774`	`774`
`@@ -786,11 +786,11 @@ static <T> IsInWhenPresent<T> isInWhenPresent(@Nullable Collection<@Nullable T>`
`786`	`786`	`}`
`787`	`787`
`788`	`788`	`@SafeVarargs`
`789`		`- static <T> IsNotIn<T> isNotIn(T... values) {`
	`789`	`+ static <T> IsNotIn<T> isNotIn(@Nullable T... values) {`
`790`	`790`	`return IsNotIn.of(values);`
`791`	`791`	`}`
`792`	`792`
`793`		`- static <T> IsNotIn<T> isNotIn(Collection<T> values) {`
	`793`	`+ static <T> IsNotIn<T> isNotIn(Collection<@Nullable T> values) {`
`794`	`794`	`return IsNotIn.of(values);`
`795`	`795`	`}`
`796`	`796`
`@@ -914,11 +914,11 @@ static IsNotLikeCaseInsensitive isNotLikeCaseInsensitiveWhenPresent(Supplier<@Nu`
`914`	`914`	`return isNotLikeCaseInsensitiveWhenPresent(valueSupplier.get());`
`915`	`915`	`}`
`916`	`916`
`917`		`- static IsInCaseInsensitive isInCaseInsensitive(String... values) {`
	`917`	`+ static IsInCaseInsensitive isInCaseInsensitive(@Nullable String... values) {`
`918`	`918`	`return IsInCaseInsensitive.of(values);`
`919`	`919`	`}`
`920`	`920`
`921`		`- static IsInCaseInsensitive isInCaseInsensitive(Collection<String> values) {`
	`921`	`+ static IsInCaseInsensitive isInCaseInsensitive(Collection<@Nullable String> values) {`
`922`	`922`	`return IsInCaseInsensitive.of(values);`
`923`	`923`	`}`
`924`	`924`
`@@ -931,11 +931,11 @@ static IsInCaseInsensitiveWhenPresent isInCaseInsensitiveWhenPresent(`
`931`	`931`	`return values == null ? IsInCaseInsensitiveWhenPresent.empty() : IsInCaseInsensitiveWhenPresent.of(values);`
`932`	`932`	`}`
`933`	`933`
`934`		`- static IsNotInCaseInsensitive isNotInCaseInsensitive(String... values) {`
	`934`	`+ static IsNotInCaseInsensitive isNotInCaseInsensitive(@Nullable String... values) {`
`935`	`935`	`return IsNotInCaseInsensitive.of(values);`
`936`	`936`	`}`
`937`	`937`
`938`		`- static IsNotInCaseInsensitive isNotInCaseInsensitive(Collection<String> values) {`
	`938`	`+ static IsNotInCaseInsensitive isNotInCaseInsensitive(Collection<@Nullable String> values) {`
`939`	`939`	`return IsNotInCaseInsensitive.of(values);`
`940`	`940`	`}`
`941`	`941`
Original file line number	Diff line number	Diff line change
`@@ -92,20 +92,20 @@ public GeneralInsertDSL toValue(Supplier<T> valueSupplier) {`
`92`	`92`	`return GeneralInsertDSL.this;`
`93`	`93`	`}`
`94`	`94`
`95`		`- public GeneralInsertDSL toValueOrNull(T value) {`
	`95`	`+ public GeneralInsertDSL toValueOrNull(@Nullable T value) {`
`96`	`96`	`return toValueOrNull(() -> value);`
`97`	`97`	`}`
`98`	`98`
`99`		`- public GeneralInsertDSL toValueOrNull(Supplier<T> valueSupplier) {`
	`99`	`+ public GeneralInsertDSL toValueOrNull(Supplier<@Nullable T> valueSupplier) {`
`100`	`100`	`columnMappings.add(ValueOrNullMapping.of(column, valueSupplier));`
`101`	`101`	`return GeneralInsertDSL.this;`
`102`	`102`	`}`
`103`	`103`
`104`		`- public GeneralInsertDSL toValueWhenPresent(T value) {`
	`104`	`+ public GeneralInsertDSL toValueWhenPresent(@Nullable T value) {`
`105`	`105`	`return toValueWhenPresent(() -> value);`
`106`	`106`	`}`
`107`	`107`
`108`		`- public GeneralInsertDSL toValueWhenPresent(Supplier<T> valueSupplier) {`
	`108`	`+ public GeneralInsertDSL toValueWhenPresent(Supplier<@Nullable T> valueSupplier) {`
`109`	`109`	`columnMappings.add(ValueWhenPresentMapping.of(column, valueSupplier));`
`110`	`110`	`return GeneralInsertDSL.this;`
`111`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -174,20 +174,20 @@ public UpdateDSL<R> equalTo(BasicColumn rightColumn) {`
`174`	`174`	`return UpdateDSL.this;`
`175`	`175`	`}`
`176`	`176`
`177`		`- public UpdateDSL<R> equalToOrNull(T value) {`
	`177`	`+ public UpdateDSL<R> equalToOrNull(@Nullable T value) {`
`178`	`178`	`return equalToOrNull(() -> value);`
`179`	`179`	`}`
`180`	`180`
`181`		`- public UpdateDSL<R> equalToOrNull(Supplier<T> valueSupplier) {`
	`181`	`+ public UpdateDSL<R> equalToOrNull(Supplier<@Nullable T> valueSupplier) {`
`182`	`182`	`columnMappings.add(ValueOrNullMapping.of(column, valueSupplier));`
`183`	`183`	`return UpdateDSL.this;`
`184`	`184`	`}`
`185`	`185`
`186`		`- public UpdateDSL<R> equalToWhenPresent(T value) {`
	`186`	`+ public UpdateDSL<R> equalToWhenPresent(@Nullable T value) {`
`187`	`187`	`return equalToWhenPresent(() -> value);`
`188`	`188`	`}`
`189`	`189`
`190`		`- public UpdateDSL<R> equalToWhenPresent(Supplier<T> valueSupplier) {`
	`190`	`+ public UpdateDSL<R> equalToWhenPresent(Supplier<@Nullable T> valueSupplier) {`
`191`	`191`	`columnMappings.add(ValueWhenPresentMapping.of(column, valueSupplier));`
`192`	`192`	`return UpdateDSL.this;`
`193`	`193`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public R and(@Nullable T value2) {`
`42`	`42`	`return build();`
`43`	`43`	`}`
`44`	`44`
`45`		`- public R and(Supplier<T> valueSupplier2) {`
	`45`	`+ public R and(Supplier<@Nullable T> valueSupplier2) {`
`46`	`46`	`return and(valueSupplier2.get());`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public static IsInCaseInsensitive empty() {`
`35`	`35`	`return EMPTY;`
`36`	`36`	`}`
`37`	`37`
`38`		`- protected IsInCaseInsensitive(Collection<String> values) {`
	`38`	`+ protected IsInCaseInsensitive(Collection<@Nullable String> values) {`
`39`	`39`	`super(values);`
`40`	`40`	`}`
`41`	`41`
`@@ -66,11 +66,11 @@ public IsInCaseInsensitive map(UnaryOperator<@Nullable String> mapper) {`
`66`	`66`	`return mapSupport(mapper, IsInCaseInsensitive::new, IsInCaseInsensitive::empty);`
`67`	`67`	`}`
`68`	`68`
`69`		`- public static IsInCaseInsensitive of(String... values) {`
	`69`	`+ public static IsInCaseInsensitive of(@Nullable String... values) {`
`70`	`70`	`return of(Arrays.asList(values));`
`71`	`71`	`}`
`72`	`72`
`73`		`- public static IsInCaseInsensitive of(Collection<String> values) {`
	`73`	`+ public static IsInCaseInsensitive of(Collection<@Nullable String> values) {`
`74`	`74`	`return new IsInCaseInsensitive(values).map(StringUtilities::safelyUpperCase);`
`75`	`75`	`}`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public static IsNotInCaseInsensitive empty() {`
`35`	`35`	`return EMPTY;`
`36`	`36`	`}`
`37`	`37`
`38`		`- protected IsNotInCaseInsensitive(Collection<String> values) {`
	`38`	`+ protected IsNotInCaseInsensitive(Collection<@Nullable String> values) {`
`39`	`39`	`super(values);`
`40`	`40`	`}`
`41`	`41`
`@@ -66,11 +66,11 @@ public IsNotInCaseInsensitive map(UnaryOperator<@Nullable String> mapper) {`
`66`	`66`	`return mapSupport(mapper, IsNotInCaseInsensitive::new, IsNotInCaseInsensitive::empty);`
`67`	`67`	`}`
`68`	`68`
`69`		`- public static IsNotInCaseInsensitive of(String... values) {`
	`69`	`+ public static IsNotInCaseInsensitive of(@Nullable String... values) {`
`70`	`70`	`return of(Arrays.asList(values));`
`71`	`71`	`}`
`72`	`72`
`73`		`- public static IsNotInCaseInsensitive of(Collection<String> values) {`
	`73`	`+ public static IsNotInCaseInsensitive of(Collection<@Nullable String> values) {`
`74`	`74`	`return new IsNotInCaseInsensitive(values).map(StringUtilities::safelyUpperCase);`
`75`	`75`	`}`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public FragmentAndParameters visit(AbstractColumnComparisonCondition<T> conditio`
`114`	`114`	`return column.convertParameterType(value);`
`115`	`115`	`}`
`116`	`116`
`117`		`- private FragmentAndParameters toFragmentAndParameters(T value) {`
	`117`	`+ private FragmentAndParameters toFragmentAndParameters(@Nullable T value) {`
`118`	`118`	`RenderedParameterInfo parameterInfo = renderingContext.calculateParameterInfo(column);`
`119`	`119`	`return FragmentAndParameters.withFragment(parameterInfo.renderedPlaceHolder())`
`120`	`120`	`.withParameter(parameterInfo.parameterMapKey(), convertValue(value))`