Animal data nullability updates

Author: jeffgbutler

src/test/java/examples/animal/data/AnimalDataTest.java

@@ -33,7 +33,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 
 import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;

src/test/java/examples/animal/data/MyInCondition.java

@@ -22,11 +22,11 @@
 import org.jspecify.annotations.Nullable;
 import org.mybatis.dynamic.sql.SqlBuilder;
 import org.mybatis.dynamic.sql.where.condition.IsIn;
+import org.mybatis.dynamic.sql.where.condition.IsInWhenPresent;
 
 public class MyInCondition {
-    public static IsIn<String> isIn(@Nullable String...values) {
-        return SqlBuilder.isIn(values)
-                .filter(Objects::nonNull)
+    public static IsInWhenPresent<String> isIn(@Nullable String...values) {
+        return SqlBuilder.isInWhenPresent(values)
                 .map(String::trim)
                 .filter(not(String::isEmpty));
     }

src/test/java/examples/animal/data/OptionalConditionsAnimalDataTest.java

@@ -34,6 +34,7 @@
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.session.SqlSessionFactoryBuilder;
 import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mybatis.dynamic.sql.render.RenderingStrategies;
@@ -43,7 +44,7 @@ class OptionalConditionsAnimalDataTest {
 
     private static final String JDBC_URL = "jdbc:hsqldb:mem:aname";
     private static final String JDBC_DRIVER = "org.hsqldb.jdbcDriver";
-    private static final Integer NULL_INTEGER = null;
+    private static final @Nullable Integer NULL_INTEGER = null;
 
     private SqlSessionFactory sqlSessionFactory;
 

src/test/java/examples/animal/data/OptionalConditionsWithPredicatesAnimalDataTest.java

@@ -30,7 +30,6 @@
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.util.List;
-import java.util.Objects;
 
 import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;
 import org.apache.ibatis.jdbc.ScriptRunner;
@@ -94,26 +93,6 @@ void testAllIgnored() {
         }
     }
 
-    @Test
-    void testSelectByNull() {
-        // this method demonstrates that ignoring the null value warning will still work
-        try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
-            AnimalDataMapper mapper = sqlSession.getMapper(AnimalDataMapper.class);
-            SelectStatementProvider selectStatement = select(id, animalName, bodyWeight, brainWeight)
-                    .from(animalData)
-                    .where(id, isGreaterThan(NULL_INTEGER))  // should be an IDE warning about passing null to a nonnull method
-                    .orderBy(id)
-                    .build()
-                    .render(RenderingStrategies.MYBATIS3);
-            List<AnimalData> animals = mapper.selectMany(selectStatement);
-            assertAll(
-                    () -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select id, animal_name, body_weight, brain_weight from AnimalData where id > #{parameters.p1,jdbcType=INTEGER} order by id"),
-                    () -> assertThat(selectStatement.getParameters()).containsEntry("p1", null),
-                    () -> assertThat(animals).isEmpty()
-            );
-        }
-    }
-
     @Test
     void testIgnoredBetweenRendered() {
         try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
@@ -122,7 +101,7 @@ void testIgnoredBetweenRendered() {
                     .from(animalData)
                     .where(id, isEqualTo(3))
                     .and(id, isNotEqualToWhenPresent(NULL_INTEGER))
-                    .or(id, isEqualTo(4).filter(Objects::nonNull))
+                    .or(id, isEqualTo(4))
                     .orderBy(id)
                     .build()
                     .render(RenderingStrategies.MYBATIS3);
@@ -143,8 +122,8 @@ void testIgnoredInWhere() {
             SelectStatementProvider selectStatement = select(id, animalName, bodyWeight, brainWeight)
                     .from(animalData)
                     .where(id, isLessThanWhenPresent(NULL_INTEGER))
-                    .and(id, isEqualTo(3).filter(Objects::nonNull))
-                    .or(id, isEqualTo(4).filter(Objects::nonNull))
+                    .and(id, isEqualTo(3))
+                    .or(id, isEqualTo(4))
                     .orderBy(id)
                     .build()
                     .render(RenderingStrategies.MYBATIS3);
@@ -187,8 +166,8 @@ void testIgnoredInitialWhere() {
             AnimalDataMapper mapper = sqlSession.getMapper(AnimalDataMapper.class);
             SelectStatementProvider selectStatement = select(id, animalName, bodyWeight, brainWeight)
                     .from(animalData)
-                    .where(id, isLessThanWhenPresent(NULL_INTEGER), and(id, isEqualTo(3).filter(Objects::nonNull)))
-                    .or(id, isEqualTo(4).filter(Objects::nonNull))
+                    .where(id, isLessThanWhenPresent(NULL_INTEGER), and(id, isEqualTo(3)))
+                    .or(id, isEqualTo(4))
                     .orderBy(id)
                     .build()
                     .render(RenderingStrategies.MYBATIS3);
@@ -802,7 +781,7 @@ void testIsLikeWhenWithValue() {
             AnimalDataMapper mapper = sqlSession.getMapper(AnimalDataMapper.class);
             SelectStatementProvider selectStatement = select(id, animalName, bodyWeight, brainWeight)
                     .from(animalData)
-                    .where(animalName, isLike("%mole").filter(Objects::nonNull))
+                    .where(animalName, isLike("%mole"))
                     .and(id, isLessThanOrEqualTo(10))
                     .orderBy(id)
                     .build()
@@ -882,7 +861,7 @@ void testIsNotLikeWhenWithValue() {
             AnimalDataMapper mapper = sqlSession.getMapper(AnimalDataMapper.class);
             SelectStatementProvider selectStatement = select(id, animalName, bodyWeight, brainWeight)
                     .from(animalData)
-                    .where(animalName, isNotLike("%mole").filter(Objects::nonNull))
+                    .where(animalName, isNotLike("%mole"))
                     .and(id, isLessThanOrEqualTo(10))
                     .orderBy(id)
                     .build()

src/test/java/examples/animal/data/VariousListConditionsTest.java

@@ -86,19 +86,18 @@ void testInWithNull() {
 
             SelectStatementProvider selectStatement = select(id, animalName)
                     .from(animalData)
-                    .where(id, isIn(2, 3, null))
+                    .where(id, isInWhenPresent(2, 3, null))
                     .orderBy(id)
                     .build()
                     .render(RenderingStrategies.MYBATIS3);
 
             assertThat(selectStatement.getSelectStatement()).isEqualTo(
                     "select id, animal_name from AnimalData where id " +
-                            "in (#{parameters.p1,jdbcType=INTEGER},#{parameters.p2,jdbcType=INTEGER},#{parameters.p3,jdbcType=INTEGER}) " +
+                            "in (#{parameters.p1,jdbcType=INTEGER},#{parameters.p2,jdbcType=INTEGER}) " +
                             "order by id"
             );
             assertThat(selectStatement.getParameters()).containsEntry("p1", 2);
             assertThat(selectStatement.getParameters()).containsEntry("p2", 3);
-            assertThat(selectStatement.getParameters()).containsEntry("p3", null);
 
             List<Map<String, Object>> rows = mapper.selectManyMappedRows(selectStatement);
             assertThat(rows).hasSize(2);
@@ -171,13 +170,6 @@ void testInWhenPresentWithEmptyList() {
         }
     }
 
-    @Test
-    void testInWithNullList() {
-        assertThatExceptionOfType(NullPointerException.class).isThrownBy(() ->
-                isIn((Collection<Integer>) null)
-        );
-    }
-
     @Test
     void testInWhenPresentWithNullList() {
         try (SqlSession sqlSession = sqlSessionFactory.openSession()) {