Another round of misc. code cleanup

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/select/UnionQuery.java

@@ -17,20 +17,9 @@
 
 import java.util.Objects;
 
-public class UnionQuery {
-    private final String connector;
-    private final SelectModel selectModel;
-
+public record UnionQuery(String connector, SelectModel selectModel) {
     public UnionQuery(String connector, SelectModel selectModel) {
         this.connector = Objects.requireNonNull(connector);
         this.selectModel = Objects.requireNonNull(selectModel);
     }
-
-    public String connector() {
-        return connector;
-    }
-
-    public SelectModel selectModel() {
-        return selectModel;
-    }
 }

src/test/java/examples/complexquery/GroupingTest.java

@@ -33,9 +33,9 @@
 
 class GroupingTest {
     private static class Foo extends SqlTable {
-        public SqlColumn<Integer> columnA = column("A");
-        public SqlColumn<Integer> columnB = column("B");
-        public SqlColumn<Integer> columnC = column("C");
+        public final SqlColumn<Integer> columnA = column("A");
+        public final SqlColumn<Integer> columnB = column("B");
+        public final SqlColumn<Integer> columnC = column("C");
 
         public Foo() {
             super("Foo");

src/test/java/examples/emptywhere/EmptyWhereTest.java

@@ -20,9 +20,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mybatis.dynamic.sql.SqlBuilder.*;
 
-import java.util.*;
+import java.util.Optional;
 import java.util.stream.Stream;
 
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -39,62 +41,63 @@
 import org.mybatis.dynamic.sql.where.WhereDSL;
 import org.mybatis.dynamic.sql.where.render.WhereClauseProvider;
 
+@NullMarked
 class EmptyWhereTest {
+    private static final String FIRST_NAME = "Fred";
+    private static final String LAST_NAME = "Flintstone";
 
-    static List<Variation> baseVariations() {
-        String firstName = "Fred";
-        String lastName = "Flintstone";
-
-        Variation v1 = new Variation(firstName, lastName,
+    static Stream<Variation> whereVariations() {
+        Variation v1 = new Variation(FIRST_NAME, LAST_NAME,
                 "where first_name = #{parameters.p1} or last_name = #{parameters.p2}");
 
-        Variation v2 = new Variation(null, lastName,
+        Variation v2 = new Variation(null, LAST_NAME,
                 "where last_name = #{parameters.p1}");
 
-        Variation v3 = new Variation(firstName, null,
+        Variation v3 = new Variation(FIRST_NAME, null,
                 "where first_name = #{parameters.p1}");
 
         Variation v4 = new Variation(null, null, "");
 
-        return List.of(v1, v2, v3, v4);
-    }
-
-    static Stream<Variation> whereVariations() {
-        return baseVariations().stream();
+        return Stream.of(v1, v2, v3, v4);
     }
 
     static Stream<Variation> joinWhereVariations() {
-        List<Variation> baseVariations = baseVariations();
+        Variation v1 = new Variation(FIRST_NAME, LAST_NAME,
+                "where person.first_name = #{parameters.p1} or person.last_name = #{parameters.p2}");
 
-        baseVariations.get(0).whereClause =
-                "where person.first_name = #{parameters.p1} or person.last_name = #{parameters.p2}";
-        baseVariations.get(1).whereClause = "where person.last_name = #{parameters.p1}";
-        baseVariations.get(2).whereClause = "where person.first_name = #{parameters.p1}";
+        Variation v2 = new Variation(null, LAST_NAME,
+                "where person.last_name = #{parameters.p1}");
 
-        return baseVariations.stream();
+        Variation v3 = new Variation(FIRST_NAME, null,
+                "where person.first_name = #{parameters.p1}");
+
+        Variation v4 = new Variation(null, null, "");
+
+        return Stream.of(v1, v2, v3, v4);
     }
 
     static Stream<Variation> updateWhereVariations() {
-        List<Variation> baseVariations = baseVariations();
+        Variation v1 = new Variation(FIRST_NAME, LAST_NAME,
+                "where first_name = #{parameters.p2} or last_name = #{parameters.p3}");
 
-        baseVariations.get(0).whereClause =
-                "where first_name = #{parameters.p2} or last_name = #{parameters.p3}";
-        baseVariations.get(1).whereClause ="where last_name = #{parameters.p2}";
-        baseVariations.get(2).whereClause = "where first_name = #{parameters.p2}";
+        Variation v2 = new Variation(null, LAST_NAME,
+                "where last_name = #{parameters.p2}");
 
-        return baseVariations.stream();
+        Variation v3 = new Variation(FIRST_NAME, null,
+                "where first_name = #{parameters.p2}");
+
+        Variation v4 = new Variation(null, null, "");
+
+        return Stream.of(v1, v2, v3, v4);
     }
 
     @Test
     void testDeleteThreeConditions() {
-        String fName = "Fred";
-        String lName = "Flintstone";
-
         DeleteDSL<DeleteModel>.DeleteWhereBuilder builder = deleteFrom(person)
                 .where(id, isEqualTo(3));
 
-        builder.and(firstName, isEqualTo(fName).filter(Objects::nonNull));
-        builder.and(PersonDynamicSqlSupport.lastName, isEqualTo(lName).filter(Objects::nonNull));
+        builder.and(firstName, isEqualTo(FIRST_NAME));
+        builder.and(PersonDynamicSqlSupport.lastName, isEqualTo(LAST_NAME));
 
         DeleteStatementProvider deleteStatement = builder.build().render(RenderingStrategies.MYBATIS3);
 
@@ -112,8 +115,8 @@ void testDeleteVariations(Variation variation) {
         DeleteDSL<DeleteModel>.DeleteWhereBuilder builder = deleteFrom(person)
                 .where();
 
-        builder.and(firstName, isEqualTo(variation.firstName).filter(Objects::nonNull));
-        builder.or(PersonDynamicSqlSupport.lastName, isEqualTo(variation.lastName).filter(Objects::nonNull));
+        builder.and(firstName, isEqualToWhenPresent(variation.firstName));
+        builder.or(PersonDynamicSqlSupport.lastName, isEqualToWhenPresent(variation.lastName));
         builder.configureStatement(c -> c.setNonRenderingWhereClauseAllowed(true));
 
         DeleteStatementProvider deleteStatement = builder.build().render(RenderingStrategies.MYBATIS3);
@@ -125,15 +128,12 @@ void testDeleteVariations(Variation variation) {
 
     @Test
     void testSelectThreeConditions() {
-        String fName = "Fred";
-        String lName = "Flintstone";
-
         QueryExpressionDSL<SelectModel>.QueryExpressionWhereBuilder builder = select(id, firstName, PersonDynamicSqlSupport.lastName)
                 .from(person)
                 .where(id, isEqualTo(3));
 
-        builder.and(firstName, isEqualTo(fName).filter(Objects::nonNull));
-        builder.and(PersonDynamicSqlSupport.lastName, isEqualTo(lName).filter(Objects::nonNull));
+        builder.and(firstName, isEqualTo(FIRST_NAME));
+        builder.and(PersonDynamicSqlSupport.lastName, isEqualTo(LAST_NAME));
 
         SelectStatementProvider selectStatement = builder.build().render(RenderingStrategies.MYBATIS3);
 
@@ -153,8 +153,8 @@ void testSelectVariations(Variation variation) {
                 .from(person)
                 .where();
 
-        builder.and(firstName, isEqualTo(variation.firstName).filter(Objects::nonNull));
-        builder.or(PersonDynamicSqlSupport.lastName, isEqualTo(variation.lastName).filter(Objects::nonNull));
+        builder.and(firstName, isEqualToWhenPresent(variation.firstName));
+        builder.or(PersonDynamicSqlSupport.lastName, isEqualToWhenPresent(variation.lastName));
         builder.configureStatement(c -> c.setNonRenderingWhereClauseAllowed(true));
 
         SelectStatementProvider selectStatement = builder.build().render(RenderingStrategies.MYBATIS3);
@@ -166,15 +166,12 @@ void testSelectVariations(Variation variation) {
 
     @Test
     void testJoinThreeConditions() {
-        String fName = "Fred";
-        String lName = "Flintstone";
-
         QueryExpressionDSL<SelectModel>.QueryExpressionWhereBuilder builder = select(id, firstName, PersonDynamicSqlSupport.lastName, orderDate)
                 .from(person).join(order).on(person.id, isEqualTo(order.personId))
                 .where(id, isEqualTo(3));
 
-        builder.and(firstName, isEqualTo(fName).filter(Objects::nonNull));
-        builder.and(PersonDynamicSqlSupport.lastName, isEqualTo(lName).filter(Objects::nonNull));
+        builder.and(firstName, isEqualTo(FIRST_NAME));
+        builder.and(PersonDynamicSqlSupport.lastName, isEqualTo(LAST_NAME));
 
         SelectStatementProvider selectStatement = builder.build().render(RenderingStrategies.MYBATIS3);
 
@@ -195,8 +192,8 @@ void testJoinVariations(Variation variation) {
                 .from(person).join(order).on(person.id, isEqualTo(order.personId))
                 .where();
 
-        builder.and(firstName, isEqualTo(variation.firstName).filter(Objects::nonNull));
-        builder.or(PersonDynamicSqlSupport.lastName, isEqualTo(variation.lastName).filter(Objects::nonNull));
+        builder.and(firstName, isEqualToWhenPresent(variation.firstName));
+        builder.or(PersonDynamicSqlSupport.lastName, isEqualToWhenPresent(variation.lastName));
         builder.configureStatement(c -> c.setNonRenderingWhereClauseAllowed(true));
 
         SelectStatementProvider selectStatement = builder.build().render(RenderingStrategies.MYBATIS3);
@@ -211,15 +208,12 @@ void testJoinVariations(Variation variation) {
 
     @Test
     void testUpdateThreeConditions() {
-        String fName = "Fred";
-        String lName = "Flintstone";
-
         UpdateDSL<UpdateModel>.UpdateWhereBuilder builder = update(person)
                 .set(id).equalTo(3)
                 .where(id, isEqualTo(3));
 
-        builder.and(firstName, isEqualTo(fName).filter(Objects::nonNull));
-        builder.and(PersonDynamicSqlSupport.lastName, isEqualTo(lName).filter(Objects::nonNull));
+        builder.and(firstName, isEqualTo(FIRST_NAME));
+        builder.and(PersonDynamicSqlSupport.lastName, isEqualTo(LAST_NAME));
 
         UpdateStatementProvider updateStatement = builder.build().render(RenderingStrategies.MYBATIS3);
 
@@ -239,8 +233,8 @@ void testUpdateVariations(Variation variation) {
                 .set(id).equalTo(3)
                 .where();
 
-        builder.and(firstName, isEqualTo(variation.firstName).filter(Objects::nonNull));
-        builder.or(PersonDynamicSqlSupport.lastName, isEqualTo(variation.lastName).filter(Objects::nonNull));
+        builder.and(firstName, isEqualToWhenPresent(variation.firstName));
+        builder.or(PersonDynamicSqlSupport.lastName, isEqualToWhenPresent(variation.lastName));
         builder.configureStatement(c -> c.setNonRenderingWhereClauseAllowed(true));
 
         UpdateStatementProvider updateStatement = builder.build().render(RenderingStrategies.MYBATIS3);
@@ -254,13 +248,10 @@ void testUpdateVariations(Variation variation) {
 
     @Test
     void testWhereThreeConditions() {
-        String fName = "Fred";
-        String lName = "Flintstone";
-
         WhereDSL.StandaloneWhereFinisher builder = where(id, isEqualTo(3));
 
-        builder.and(firstName, isEqualTo(fName).filter(Objects::nonNull));
-        builder.and(PersonDynamicSqlSupport.lastName, isEqualTo(lName).filter(Objects::nonNull));
+        builder.and(firstName, isEqualTo(FIRST_NAME));
+        builder.and(PersonDynamicSqlSupport.lastName, isEqualTo(LAST_NAME));
 
         Optional<WhereClauseProvider> whereClause = builder.build().render(RenderingStrategies.MYBATIS3);
 
@@ -278,8 +269,8 @@ void testWhereThreeConditions() {
     void testWhereVariations(Variation variation) {
         WhereDSL.StandaloneWhereFinisher builder = where();
 
-        builder.and(firstName, isEqualTo(variation.firstName).filter(Objects::nonNull));
-        builder.or(PersonDynamicSqlSupport.lastName, isEqualTo(variation.lastName).filter(Objects::nonNull));
+        builder.and(firstName, isEqualToWhenPresent(variation.firstName));
+        builder.or(PersonDynamicSqlSupport.lastName, isEqualToWhenPresent(variation.lastName));
         builder.configureStatement(c -> c.setNonRenderingWhereClauseAllowed(true));
 
         Optional<WhereClauseProvider> whereClause = builder.build().render(RenderingStrategies.MYBATIS3);
@@ -293,15 +284,5 @@ void testWhereVariations(Variation variation) {
         }
     }
 
-    private static class Variation {
-        String firstName;
-        String lastName;
-        String whereClause;
-
-        public Variation(String firstName, String lastName, String whereClause) {
-            this.firstName = firstName;
-            this.lastName = lastName;
-            this.whereClause = whereClause;
-        }
-    }
+    private record Variation (@Nullable String firstName, @Nullable String lastName, String whereClause) {}
 }

src/test/java/examples/emptywhere/OrderDynamicSqlSupport.java

@@ -22,13 +22,13 @@
 
 public class OrderDynamicSqlSupport {
 
-    public static Order order = new Order();
-    public static SqlColumn<Integer> personId = order.personId;
-    public static SqlColumn<Date> orderDate = order.orderDate;
+    public static final Order order = new Order();
+    public static final SqlColumn<Integer> personId = order.personId;
+    public static final SqlColumn<Date> orderDate = order.orderDate;
 
     public static class Order extends SqlTable {
-        public SqlColumn<Integer> personId = column("person_id");
-        public SqlColumn<Date> orderDate = column("order_date");
+        public final SqlColumn<Integer> personId = column("person_id");
+        public final SqlColumn<Date> orderDate = column("order_date");
 
         public Order() {
             super("order");

src/test/java/examples/emptywhere/PersonDynamicSqlSupport.java

@@ -20,15 +20,15 @@
 
 public class PersonDynamicSqlSupport {
 
-    public static Person person = new Person();
-    public static SqlColumn<Integer> id = person.id;
-    public static SqlColumn<String> firstName = person.firstName;
-    public static SqlColumn<String> lastName = person.lastName;
+    public static final Person person = new Person();
+    public static final SqlColumn<Integer> id = person.id;
+    public static final SqlColumn<String> firstName = person.firstName;
+    public static final SqlColumn<String> lastName = person.lastName;
 
     public static class Person extends SqlTable {
-        public SqlColumn<Integer> id = column("id");
-        public SqlColumn<String> firstName = column("first_name");
-        public SqlColumn<String> lastName = column("last_name");
+        public final SqlColumn<Integer> id = column("id");
+        public final SqlColumn<String> firstName = column("first_name");
+        public final SqlColumn<String> lastName = column("last_name");
 
         public Person() {
             super("person");

src/test/java/examples/spring/PersonTemplateTest.java

@@ -779,7 +779,7 @@ void testJoinCountWithSubCriteria() {
             };
 
 
-    static RowMapper<PersonRecord> personRowMapper =
+    static final RowMapper<PersonRecord> personRowMapper =
             (rs, i) -> {
                 PersonRecord row = new PersonRecord();
                 row.setId(rs.getInt(1));

src/test/java/examples/spring/SpringMapToRowTest.java

@@ -122,7 +122,7 @@ void testInsertBatch() {
         assertThat(records).hasSize(3);
     }
 
-    static RowMapper<CompoundKeyRow> rowMapper =
+    static final RowMapper<CompoundKeyRow> rowMapper =
             (rs, i) -> {
                 CompoundKeyRow answer = new CompoundKeyRow();
                 answer.setId1(rs.getInt("ID1"));

src/test/java/examples/springbatch/common/PersonProcessor.java

@@ -29,7 +29,7 @@ public class PersonProcessor implements ItemProcessor<PersonRecord, PersonRecord
     private ExecutionContext executionContext;
 
     @Override
-    public PersonRecord process(PersonRecord person) throws Exception {
+    public PersonRecord process(PersonRecord person) {
         incrementRowCount();
 
         PersonRecord transformed = new PersonRecord();

src/test/java/examples/springbatch/mapper/PersonDynamicSqlSupport.java

@@ -22,17 +22,17 @@
 
 public class PersonDynamicSqlSupport {
 
-    public static Person person = new Person();
-    public static SqlColumn<Integer> id = person.id;
-    public static SqlColumn<String> firstName = person.firstName;
-    public static SqlColumn<String> lastName = person.lastName;
-    public static SqlColumn<Boolean> forPagingTest = person.forPagingTest;
+    public static final Person person = new Person();
+    public static final SqlColumn<Integer> id = person.id;
+    public static final SqlColumn<String> firstName = person.firstName;
+    public static final SqlColumn<String> lastName = person.lastName;
+    public static final SqlColumn<Boolean> forPagingTest = person.forPagingTest;
 
     public static class Person extends SqlTable {
-        public SqlColumn<Integer> id = column("id", JDBCType.INTEGER);
-        public SqlColumn<String> firstName = column("first_name", JDBCType.VARCHAR);
-        public SqlColumn<String> lastName = column("last_name", JDBCType.VARCHAR);
-        public SqlColumn<Boolean> forPagingTest = column("for_paging_test", JDBCType.BOOLEAN);
+        public final SqlColumn<Integer> id = column("id", JDBCType.INTEGER);
+        public final SqlColumn<String> firstName = column("first_name", JDBCType.VARCHAR);
+        public final SqlColumn<String> lastName = column("last_name", JDBCType.VARCHAR);
+        public final SqlColumn<Boolean> forPagingTest = column("for_paging_test", JDBCType.BOOLEAN);
 
         public Person() {
             super("person");