Merge branch 'master' into code_cleanup

# Conflicts:
#	src/test/java/examples/animal/data/AnimalDataTest.java
#	src/test/java/examples/animal/data/CommonSelectMapperTest.java
#	src/test/java/examples/animal/data/OptionalConditionsWithPredicatesAnimalDataTest.java
#	src/test/java/examples/emptywhere/EmptyWhereTest.java

Author: jeffgbutler

CHANGELOG.md

@@ -82,6 +82,8 @@ Runtime behavior changes:
 2. We have updated the "ParameterTypeConverter" used in Spring applications to maintain compatibility with Spring's
    "Converter" interface. The primary change is that the framework will no longer call a type converter if the
    input value is null. This should simplify the coding of converters and foster reuse with existing Spring converters.
+3. The "map" method on the "WhenPresent" conditions will accept a mapper function that may return a null value. The
+   conditions will now properly handle this outcome 
 
 ### Other important changes:
 

pom.xml

@@ -61,21 +61,23 @@
     <java.test.version>17</java.test.version>
     <java.test.release.version>17</java.test.release.version>
     <junit.jupiter.version>5.12.1</junit.jupiter.version>
-    <spring.batch.version>5.2.1</spring.batch.version>
+    <spring.batch.version>5.2.2</spring.batch.version>
 
     <checkstyle.config>checkstyle-override.xml</checkstyle.config>
 
     <clirr.comparisonVersion>1.5.0</clirr.comparisonVersion>
 
     <module.name>org.mybatis.dynamic.sql</module.name>
 
-    <kotlin.version>2.1.10</kotlin.version>
+    <kotlin.version>2.1.20</kotlin.version>
     <kotlin.compiler.jvmTarget>17</kotlin.compiler.jvmTarget>
     <kotlin.compiler.languageVersion>2.0</kotlin.compiler.languageVersion>
     <kotlin.compiler.apiVersion>2.0</kotlin.compiler.apiVersion>
 
     <sonar.sources>pom.xml,src/main/java,src/main/kotlin</sonar.sources>
     <sonar.tests>src/test/java,src/test/kotlin</sonar.tests>
+    <!-- setup sonar to run locally by default -->
+    <sonar.host.url>http://localhost:9000</sonar.host.url>
 
     <kotlin.code.style>official</kotlin.code.style>
     <test.containers.version>1.20.6</test.containers.version>
@@ -101,7 +103,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>6.2.4</version>
+      <version>6.2.5</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
@@ -200,7 +202,7 @@
     <dependency>
       <groupId>org.mariadb.jdbc</groupId>
       <artifactId>mariadb-java-client</artifactId>
-      <version>3.5.2</version>
+      <version>3.5.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>

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/AbstractNoValueCondition.java

@@ -60,7 +60,8 @@ public interface Filterable {
          * @param <S>
          *            condition type - not used except for compilation compliance
          *
-         * @return this condition if renderable and the supplier returns true, otherwise a condition that will not render.
+         * @return this condition if renderable and the supplier returns true, otherwise a condition that will not
+         *     render.
          */
         <S> AbstractNoValueCondition<S> filter(BooleanSupplier booleanSupplier);
     }

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);
     }
 }