Refinements for null handling

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/insert/render/FieldAndValueAndParameters.java

@@ -65,6 +65,8 @@ public Builder withValuePhrase(String valuePhrase) {
         }
 
         public Builder withParameter(String key, @Nullable Object value) {
+            // the value can be null because a parameter type converter may return null
+
             //noinspection DataFlowIssue
             parameters.put(key, value);
             return this;

src/main/java/org/mybatis/dynamic/sql/util/FragmentAndParameters.java

@@ -72,6 +72,8 @@ public Builder withFragment(String fragment) {
         }
 
         public Builder withParameter(String key, @Nullable Object value) {
+            // the value can be null because a parameter type converter may return null
+
             //noinspection DataFlowIssue
             parameters.put(key, value);
             return this;

src/main/java/org/mybatis/dynamic/sql/util/ValueOrNullMapping.java

@@ -28,7 +28,7 @@ public class ValueOrNullMapping<T> extends AbstractColumnMapping {
     // keep a reference to the column so we don't lose the type
     private final SqlColumn<T> localColumn;
 
-    private ValueOrNullMapping(SqlColumn<T> column, Supplier<T> valueSupplier) {
+    private ValueOrNullMapping(SqlColumn<T> column, Supplier<@Nullable T> valueSupplier) {
         super(column);
         this.valueSupplier = Objects.requireNonNull(valueSupplier);
         localColumn = Objects.requireNonNull(column);
@@ -43,7 +43,7 @@ public <R> R accept(ColumnMappingVisitor<R> visitor) {
         return visitor.visit(this);
     }
 
-    public static <T> ValueOrNullMapping<T> of(SqlColumn<T> column, Supplier<T> valueSupplier) {
+    public static <T> ValueOrNullMapping<T> of(SqlColumn<T> column, Supplier<@Nullable T> valueSupplier) {
         return new ValueOrNullMapping<>(column, valueSupplier);
     }
 }

src/main/java/org/mybatis/dynamic/sql/util/ValueWhenPresentMapping.java

@@ -28,7 +28,7 @@ public class ValueWhenPresentMapping<T> extends AbstractColumnMapping {
     // keep a reference to the column so we don't lose the type
     private final SqlColumn<T> localColumn;
 
-    private ValueWhenPresentMapping(SqlColumn<T> column, Supplier<T> valueSupplier) {
+    private ValueWhenPresentMapping(SqlColumn<T> column, Supplier<@Nullable T> valueSupplier) {
         super(column);
         this.valueSupplier = Objects.requireNonNull(valueSupplier);
         localColumn = Objects.requireNonNull(column);
@@ -47,7 +47,7 @@ public <R> R accept(ColumnMappingVisitor<R> visitor) {
         return visitor.visit(this);
     }
 
-    public static <T> ValueWhenPresentMapping<T> of(SqlColumn<T> column, Supplier<T> valueSupplier) {
+    public static <T> ValueWhenPresentMapping<T> of(SqlColumn<T> column, Supplier<@Nullable T> valueSupplier) {
         return new ValueWhenPresentMapping<>(column, valueSupplier);
     }
 }

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

@@ -23,6 +23,7 @@
 
 import org.mybatis.dynamic.sql.AbstractListValueCondition;
 import org.mybatis.dynamic.sql.render.RenderingContext;
+import org.mybatis.dynamic.sql.util.StringUtilities;
 import org.mybatis.dynamic.sql.util.Validator;
 
 public class IsInCaseInsensitive extends AbstractListValueCondition<String>
@@ -69,6 +70,8 @@ public static IsInCaseInsensitive of(String... values) {
     }
 
     public static IsInCaseInsensitive of(Collection<String> values) {
-        return new IsInCaseInsensitive(values).map(String::toUpperCase);
+        // Keep the null safe upper case utility for backwards compatibility
+        //noinspection DataFlowIssue
+        return new IsInCaseInsensitive(values).map(StringUtilities::safelyUpperCase);
     }
 }

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

@@ -23,6 +23,7 @@
 
 import org.jspecify.annotations.Nullable;
 import org.mybatis.dynamic.sql.AbstractListValueCondition;
+import org.mybatis.dynamic.sql.util.StringUtilities;
 import org.mybatis.dynamic.sql.util.Utilities;
 
 public class IsInCaseInsensitiveWhenPresent extends AbstractListValueCondition<String>
@@ -65,6 +66,8 @@ public static IsInCaseInsensitiveWhenPresent of(@Nullable String... values) {
     }
 
     public static IsInCaseInsensitiveWhenPresent of(Collection<@Nullable String> values) {
-        return new IsInCaseInsensitiveWhenPresent(values).map(String::toUpperCase);
+        // Keep the null safe upper case utility for backwards compatibility
+        //noinspection DataFlowIssue
+        return new IsInCaseInsensitiveWhenPresent(values).map(StringUtilities::safelyUpperCase);
     }
 }

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

@@ -20,6 +20,7 @@
 import java.util.function.UnaryOperator;
 
 import org.mybatis.dynamic.sql.AbstractSingleValueCondition;
+import org.mybatis.dynamic.sql.util.StringUtilities;
 
 public class IsLikeCaseInsensitive extends AbstractSingleValueCondition<String>
         implements CaseInsensitiveVisitableCondition {
@@ -66,6 +67,8 @@ public IsLikeCaseInsensitive map(UnaryOperator<String> mapper) {
     }
 
     public static IsLikeCaseInsensitive of(String value) {
-        return new IsLikeCaseInsensitive(value).map(String::toUpperCase);
+        // Keep the null safe upper case utility for backwards compatibility
+        //noinspection DataFlowIssue
+        return new IsLikeCaseInsensitive(value).map(StringUtilities::safelyUpperCase);
     }
 }

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

@@ -23,6 +23,7 @@
 
 import org.mybatis.dynamic.sql.AbstractListValueCondition;
 import org.mybatis.dynamic.sql.render.RenderingContext;
+import org.mybatis.dynamic.sql.util.StringUtilities;
 import org.mybatis.dynamic.sql.util.Validator;
 
 public class IsNotInCaseInsensitive extends AbstractListValueCondition<String>
@@ -69,6 +70,8 @@ public static IsNotInCaseInsensitive of(String... values) {
     }
 
     public static IsNotInCaseInsensitive of(Collection<String> values) {
-        return new IsNotInCaseInsensitive(values).map(String::toUpperCase);
+        // Keep the null safe upper case utility for backwards compatibility
+        //noinspection DataFlowIssue
+        return new IsNotInCaseInsensitive(values).map(StringUtilities::safelyUpperCase);
     }
 }

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

@@ -23,6 +23,7 @@
 
 import org.jspecify.annotations.Nullable;
 import org.mybatis.dynamic.sql.AbstractListValueCondition;
+import org.mybatis.dynamic.sql.util.StringUtilities;
 import org.mybatis.dynamic.sql.util.Utilities;
 
 public class IsNotInCaseInsensitiveWhenPresent extends AbstractListValueCondition<String>
@@ -65,6 +66,8 @@ public static IsNotInCaseInsensitiveWhenPresent of(@Nullable String... values) {
     }
 
     public static IsNotInCaseInsensitiveWhenPresent of(Collection<@Nullable String> values) {
-        return new IsNotInCaseInsensitiveWhenPresent(values).map(String::toUpperCase);
+        // Keep the null safe upper case utility for backwards compatibility
+        //noinspection DataFlowIssue
+        return new IsNotInCaseInsensitiveWhenPresent(values).map(StringUtilities::safelyUpperCase);
     }
 }

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

@@ -20,6 +20,7 @@
 import java.util.function.UnaryOperator;
 
 import org.mybatis.dynamic.sql.AbstractSingleValueCondition;
+import org.mybatis.dynamic.sql.util.StringUtilities;
 
 public class IsNotLikeCaseInsensitive extends AbstractSingleValueCondition<String>
         implements CaseInsensitiveVisitableCondition {
@@ -68,6 +69,8 @@ public IsNotLikeCaseInsensitive map(UnaryOperator<String> mapper) {
     }
 
     public static IsNotLikeCaseInsensitive of(String value) {
-        return new IsNotLikeCaseInsensitive(value).map(String::toUpperCase);
+        // Keep the null safe upper case utility for backwards compatibility
+        //noinspection DataFlowIssue
+        return new IsNotLikeCaseInsensitive(value).map(StringUtilities::safelyUpperCase);
     }
 }