MyBatis result classes need Nullable fields

Author: jeffgbutler

src/test/java/examples/array/NamesRecord.java

@@ -15,19 +15,21 @@
  */
 package examples.array;
 
+import org.jspecify.annotations.Nullable;
+
 public class NamesRecord {
-    private Integer id;
-    private String[] names;
+    private @Nullable Integer id;
+    private @Nullable String[] names;
 
-    public Integer getId() {
+    public @Nullable Integer getId() {
         return id;
     }
 
     public void setId(Integer id) {
         this.id = id;
     }
 
-    public String[] getNames() {
+    public @Nullable String[] getNames() {
         return names;
     }
 

src/test/java/examples/generated/always/mybatis/GeneratedKey.java

@@ -15,11 +15,13 @@
  */
 package examples.generated.always.mybatis;
 
+import org.jspecify.annotations.Nullable;
+
 public class GeneratedKey {
 
-    private Integer key;
+    private @Nullable Integer key;
 
-    public Integer getKey() {
+    public @Nullable Integer getKey() {
         return key;
     }
 

src/test/java/examples/joins/OrderMaster.java

@@ -18,28 +18,30 @@
 import java.util.Date;
 import java.util.List;
 
+import org.jspecify.annotations.Nullable;
+
 public class OrderMaster {
-    private Integer id;
-    private Date orderDate;
-    private List<OrderDetail> details;
+    private @Nullable Integer id;
+    private @Nullable Date orderDate;
+    private @Nullable List<OrderDetail> details;
 
-    public Integer getId() {
+    public @Nullable Integer getId() {
         return id;
     }
 
     public void setId(Integer id) {
         this.id = id;
     }
 
-    public Date getOrderDate() {
+    public @Nullable Date getOrderDate() {
         return orderDate;
     }
 
     public void setOrderDate(Date orderDate) {
         this.orderDate = orderDate;
     }
 
-    public List<OrderDetail> getDetails() {
+    public @Nullable List<OrderDetail> getDetails() {
         return details;
     }
 

src/test/java/examples/simple/AddressRecord.java

@@ -15,46 +15,48 @@
  */
 package examples.simple;
 
+import org.jspecify.annotations.Nullable;
+
 public class AddressRecord {
-    private Integer id;
-    private String streetAddress;
-    private String city;
-    private String state;
-    private AddressType addressType;
+    private @Nullable Integer id;
+    private @Nullable String streetAddress;
+    private @Nullable String city;
+    private @Nullable String state;
+    private @Nullable AddressType addressType;
 
-    public Integer getId() {
+    public @Nullable Integer getId() {
         return id;
     }
 
     public void setId(Integer id) {
         this.id = id;
     }
 
-    public String getStreetAddress() {
+    public @Nullable String getStreetAddress() {
         return streetAddress;
     }
 
     public void setStreetAddress(String streetAddress) {
         this.streetAddress = streetAddress;
     }
 
-    public String getCity() {
+    public @Nullable String getCity() {
         return city;
     }
 
     public void setCity(String city) {
         this.city = city;
     }
 
-    public String getState() {
+    public @Nullable String getState() {
         return state;
     }
 
     public void setState(String state) {
         this.state = state;
     }
 
-    public AddressType getAddressType() {
+    public @Nullable AddressType getAddressType() {
         return addressType;
     }
 

src/test/java/examples/simple/PersonWithAddress.java

@@ -15,66 +15,68 @@
  */
 package examples.simple;
 
+import org.jspecify.annotations.Nullable;
+
 import java.util.Date;
 
 public class PersonWithAddress {
-    private Integer id;
-    private String firstName;
-    private LastName lastName;
-    private Date birthDate;
-    private Boolean employed;
-    private String occupation;
-    private AddressRecord address;
-
-    public Integer getId() {
+    private @Nullable Integer id;
+    private @Nullable String firstName;
+    private @Nullable LastName lastName;
+    private @Nullable Date birthDate;
+    private @Nullable Boolean employed;
+    private @Nullable String occupation;
+    private @Nullable AddressRecord address;
+
+    public @Nullable Integer getId() {
         return id;
     }
 
     public void setId(Integer id) {
         this.id = id;
     }
 
-    public String getFirstName() {
+    public @Nullable String getFirstName() {
         return firstName;
     }
 
     public void setFirstName(String firstName) {
         this.firstName = firstName;
     }
 
-    public LastName getLastName() {
+    public @Nullable LastName getLastName() {
         return lastName;
     }
 
     public void setLastName(LastName lastName) {
         this.lastName = lastName;
     }
 
-    public Date getBirthDate() {
+    public @Nullable Date getBirthDate() {
         return birthDate;
     }
 
     public void setBirthDate(Date birthDate) {
         this.birthDate = birthDate;
     }
 
-    public String getOccupation() {
+    public @Nullable String getOccupation() {
         return occupation;
     }
 
     public void setOccupation(String occupation) {
         this.occupation = occupation;
     }
 
-    public Boolean getEmployed() {
+    public @Nullable Boolean getEmployed() {
         return employed;
     }
 
     public void setEmployed(Boolean employed) {
         this.employed = employed;
     }
 
-    public AddressRecord getAddress() {
+    public @Nullable AddressRecord getAddress() {
         return address;
     }
 

src/test/java/issues/gh324/NameRecord.java

@@ -15,21 +15,23 @@
  */
 package issues.gh324;
 
+import org.jspecify.annotations.Nullable;
+
 import java.io.Serializable;
 
 public class NameRecord implements Serializable {
-    private Integer id;
-    private String name;
+    private @Nullable Integer id;
+    private @Nullable String name;
 
-    public Integer getId() {
+    public @Nullable Integer getId() {
         return id;
     }
 
     public void setId(Integer id) {
         this.id = id;
     }
 
-    public String getName() {
+    public @Nullable String getName() {
         return name;
     }
 

src/test/java/org/mybatis/dynamic/sql/mybatis3/InsertStatementTest.java

@@ -20,6 +20,7 @@
 
 import java.sql.JDBCType;
 
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Test;
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
@@ -77,36 +78,36 @@ void testSelectiveInsertStatementBuilder() {
     }
 
     static class TestRecord {
-        private Integer id;
-        private String firstName;
-        private String lastName;
-        private String occupation;
+        private @Nullable Integer id;
+        private @Nullable String firstName;
+        private @Nullable String lastName;
+        private @Nullable String occupation;
 
-        Integer getId() {
+        @Nullable Integer getId() {
             return id;
         }
 
         void setId(Integer id) {
             this.id = id;
         }
 
-        String getFirstName() {
+        @Nullable String getFirstName() {
             return firstName;
         }
 
         void setFirstName(String firstName) {
             this.firstName = firstName;
         }
 
-        String getLastName() {
+        @Nullable String getLastName() {
             return lastName;
         }
 
         void setLastName(String lastName) {
             this.lastName = lastName;
         }
 
-        String getOccupation() {
+        @Nullable String getOccupation() {
             return occupation;
         }