Initial Updates for JSpecify

Author: jeffgbutler

pom.xml

@@ -86,6 +86,11 @@
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>org.jspecify</groupId>
+      <artifactId>jspecify</artifactId>
+      <version>1.0.0</version>
+    </dependency>
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-stdlib-jdk8</artifactId>

src/main/java/org/mybatis/dynamic/sql/AbstractSingleValueCondition.java

@@ -19,14 +19,16 @@
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 
+import org.jspecify.annotations.Nullable;
+
 public abstract class AbstractSingleValueCondition<T> implements VisitableCondition<T> {
-    protected final T value;
+    protected final @Nullable T value;
 
-    protected AbstractSingleValueCondition(T value) {
+    protected AbstractSingleValueCondition(@Nullable T value) {
         this.value = value;
     }
 
-    public T value() {
+    public @Nullable T value() {
         return value;
     }
 

src/main/java/org/mybatis/dynamic/sql/AbstractTwoValueCondition.java

@@ -21,20 +21,22 @@
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 
+import org.jspecify.annotations.Nullable;
+
 public abstract class AbstractTwoValueCondition<T> implements VisitableCondition<T> {
-    protected final T value1;
-    protected final T value2;
+    protected final @Nullable T value1;
+    protected final @Nullable T value2;
 
-    protected AbstractTwoValueCondition(T value1, T value2) {
+    protected AbstractTwoValueCondition(@Nullable T value1, @Nullable T value2) {
         this.value1 = value1;
         this.value2 = value2;
     }
 
-    public T value1() {
+    public @Nullable T value1() {
         return value1;
     }
 
-    public T value2() {
+    public @Nullable T value2() {
         return value2;
     }
 

src/main/java/org/mybatis/dynamic/sql/AliasableSqlTable.java

@@ -19,9 +19,11 @@
 import java.util.Optional;
 import java.util.function.Supplier;
 
+import org.jspecify.annotations.Nullable;
+
 public abstract class AliasableSqlTable<T extends AliasableSqlTable<T>> extends SqlTable {
 
-    private String tableAlias;
+    private @Nullable String tableAlias;
     private final Supplier<T> constructor;
 
     protected AliasableSqlTable(String tableName, Supplier<T> constructor) {

src/main/java/org/mybatis/dynamic/sql/AndOrCriteriaGroup.java

@@ -21,6 +21,8 @@
 import java.util.Objects;
 import java.util.Optional;
 
+import org.jspecify.annotations.Nullable;
+
 /**
  * This class represents a criteria group with either an AND or an OR connector.
  * This class is intentionally NOT derived from SqlCriterion because we only want it to be
@@ -32,7 +34,7 @@
  */
 public class AndOrCriteriaGroup {
     private final String connector;
-    private final SqlCriterion initialCriterion;
+    private final @Nullable SqlCriterion initialCriterion;
     private final List<AndOrCriteriaGroup> subCriteria;
 
     private AndOrCriteriaGroup(Builder builder) {
@@ -54,16 +56,16 @@ public List<AndOrCriteriaGroup> subCriteria() {
     }
 
     public static class Builder {
-        private String connector;
-        private SqlCriterion initialCriterion;
+        private @Nullable String connector;
+        private @Nullable SqlCriterion initialCriterion;
         private final List<AndOrCriteriaGroup> subCriteria = new ArrayList<>();
 
         public Builder withConnector(String connector) {
             this.connector = connector;
             return this;
         }
 
-        public Builder withInitialCriterion(SqlCriterion initialCriterion) {
+        public Builder withInitialCriterion(@Nullable SqlCriterion initialCriterion) {
             this.initialCriterion = initialCriterion;
             return this;
         }

src/main/java/org/mybatis/dynamic/sql/BindableColumn.java

@@ -17,6 +17,8 @@
 
 import java.util.Optional;
 
+import org.jspecify.annotations.Nullable;
+
 /**
  * Describes a column with a known data type. The type is only used by the compiler to assure type safety
  * when building clauses with conditions.
@@ -34,7 +36,7 @@ public interface BindableColumn<T> extends BasicColumn {
     @Override
     BindableColumn<T> as(String alias);
 
-    default Object convertParameterType(T value) {
+    default @Nullable Object convertParameterType(@Nullable T value) {
         return value;
     }
 

src/main/java/org/mybatis/dynamic/sql/ColumnAndConditionCriterion.java

@@ -17,6 +17,8 @@
 
 import java.util.Objects;
 
+import org.jspecify.annotations.Nullable;
+
 public class ColumnAndConditionCriterion<T> extends SqlCriterion {
     private final BindableColumn<T> column;
     private final VisitableCondition<T> condition;
@@ -45,8 +47,8 @@ public static <T> Builder<T> withColumn(BindableColumn<T> column) {
     }
 
     public static class Builder<T> extends AbstractBuilder<Builder<T>> {
-        private BindableColumn<T> column;
-        private VisitableCondition<T> condition;
+        private @Nullable BindableColumn<T> column;
+        private @Nullable VisitableCondition<T> condition;
 
         public Builder<T> withColumn(BindableColumn<T> column) {
             this.column = column;

src/main/java/org/mybatis/dynamic/sql/Constant.java

@@ -18,19 +18,20 @@
 import java.util.Objects;
 import java.util.Optional;
 
+import org.jspecify.annotations.Nullable;
 import org.mybatis.dynamic.sql.render.RenderingContext;
 import org.mybatis.dynamic.sql.util.FragmentAndParameters;
 
 public class Constant<T> implements BindableColumn<T> {
 
-    private final String alias;
+    private final @Nullable String alias;
     private final String value;
 
     private Constant(String value) {
         this(value, null);
     }
 
-    private Constant(String value, String alias) {
+    private Constant(String value, @Nullable String alias) {
         this.value = Objects.requireNonNull(value);
         this.alias = alias;
     }

src/main/java/org/mybatis/dynamic/sql/CriteriaGroup.java

@@ -17,6 +17,8 @@
 
 import java.util.Optional;
 
+import org.jspecify.annotations.Nullable;
+
 /**
  * This class represents a criteria group without an AND or an OR connector. This is useful
  * in situations where the initial SqlCriterion in a list should be further grouped
@@ -27,7 +29,7 @@
  * @since 1.4.0
  */
 public class CriteriaGroup extends SqlCriterion {
-    private final SqlCriterion initialCriterion;
+    private final @Nullable SqlCriterion initialCriterion;
 
     protected CriteriaGroup(AbstractGroupBuilder<?> builder) {
         super(builder);
@@ -44,9 +46,9 @@ public <R> R accept(SqlCriterionVisitor<R> visitor) {
     }
 
     public abstract static class AbstractGroupBuilder<T extends AbstractGroupBuilder<T>> extends AbstractBuilder<T> {
-        private SqlCriterion initialCriterion;
+        private @Nullable SqlCriterion initialCriterion;
 
-        public T withInitialCriterion(SqlCriterion initialCriterion) {
+        public T withInitialCriterion(@Nullable SqlCriterion initialCriterion) {
             this.initialCriterion = initialCriterion;
             return getThis();
         }

src/main/java/org/mybatis/dynamic/sql/DerivedColumn.java

@@ -19,6 +19,7 @@
 import java.util.Objects;
 import java.util.Optional;
 
+import org.jspecify.annotations.Nullable;
 import org.mybatis.dynamic.sql.render.RenderingContext;
 import org.mybatis.dynamic.sql.util.FragmentAndParameters;
 
@@ -34,10 +35,10 @@
  */
 public class DerivedColumn<T> implements BindableColumn<T> {
     private final String name;
-    private final String tableQualifier;
-    private final String columnAlias;
-    private final JDBCType jdbcType;
-    private final String typeHandler;
+    private final @Nullable String tableQualifier;
+    private final @Nullable String columnAlias;
+    private final @Nullable JDBCType jdbcType;
+    private final @Nullable String typeHandler;
 
     protected DerivedColumn(Builder<T> builder) {
         this.name = Objects.requireNonNull(builder.name);
@@ -93,18 +94,18 @@ public static <T> DerivedColumn<T> of(String name, String tableQualifier) {
     }
 
     public static class Builder<T> {
-        private String name;
-        private String tableQualifier;
-        private String columnAlias;
-        private JDBCType jdbcType;
-        private String typeHandler;
+        private @Nullable String name;
+        private @Nullable String tableQualifier;
+        private @Nullable String columnAlias;
+        private @Nullable JDBCType jdbcType;
+        private @Nullable String typeHandler;
 
         public Builder<T> withName(String name) {
             this.name = name;
             return this;
         }
 
-        public Builder<T> withTableQualifier(String tableQualifier) {
+        public Builder<T> withTableQualifier(@Nullable String tableQualifier) {
             this.tableQualifier = tableQualifier;
             return this;
         }
@@ -114,12 +115,12 @@ public Builder<T> withColumnAlias(String columnAlias) {
             return this;
         }
 
-        public Builder<T> withJdbcType(JDBCType jdbcType) {
+        public Builder<T> withJdbcType(@Nullable JDBCType jdbcType) {
             this.jdbcType = jdbcType;
             return this;
         }
 
-        public Builder<T> withTypeHandler(String typeHandler) {
+        public Builder<T> withTypeHandler(@Nullable String typeHandler) {
             this.typeHandler = typeHandler;
             return this;
         }