NameRecord can be a record

Author: jeffgbutler

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

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

src/test/java/issues/gh324/NameService.java

@@ -60,19 +60,15 @@ public NameService() {
     public void insertRecord() {
         try (SqlSession session = sqlSessionFactory.openSession(true)) {
             NameTableMapper mapper = session.getMapper(NameTableMapper.class);
-            NameRecord row = new NameRecord();
-            row.setId(1);
-            row.setName("Fred");
+            NameRecord row = new NameRecord(1, "Fred");
             mapper.insert(row);
         }
     }
 
     public void updateRecordWithAutoCommit() {
         try (SqlSession session = sqlSessionFactory.openSession(true)) {
             NameTableMapper mapper = session.getMapper(NameTableMapper.class);
-            NameRecord row = new NameRecord();
-            row.setId(1);
-            row.setName("Barney");
+            NameRecord row = new NameRecord(1, "Barney");
             mapper.updateByPrimaryKey(row);
         }
     }
@@ -81,19 +77,15 @@ public void updateRecordWithoutAutoCommitAndNoExplicitCommit() {
         // this should rollback
         try (SqlSession session = sqlSessionFactory.openSession()) {
             NameTableMapper mapper = session.getMapper(NameTableMapper.class);
-            NameRecord row = new NameRecord();
-            row.setId(1);
-            row.setName("Barney");
+            NameRecord row = new NameRecord(1, "Barney");
             mapper.updateByPrimaryKey(row);
         }
     }
 
     public void updateRecordWithoutAutoCommitAndExplicitCommit() {
         try (SqlSession session = sqlSessionFactory.openSession()) {
             NameTableMapper mapper = session.getMapper(NameTableMapper.class);
-            NameRecord row = new NameRecord();
-            row.setId(1);
-            row.setName("Barney");
+            NameRecord row = new NameRecord(1, "Barney");
             mapper.updateByPrimaryKey(row);
             session.commit();
         }

src/test/java/issues/gh324/NameTableMapper.java

@@ -21,26 +21,31 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.annotations.Arg;
+import org.apache.ibatis.annotations.CacheNamespace;
+import org.apache.ibatis.annotations.SelectProvider;
 import org.mybatis.dynamic.sql.BasicColumn;
 import org.mybatis.dynamic.sql.delete.DeleteDSLCompleter;
 import org.mybatis.dynamic.sql.select.SelectDSLCompleter;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 import org.mybatis.dynamic.sql.update.UpdateDSLCompleter;
 import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
-import org.mybatis.dynamic.sql.util.mybatis3.*;
+import org.mybatis.dynamic.sql.util.mybatis3.CommonCountMapper;
+import org.mybatis.dynamic.sql.util.mybatis3.CommonDeleteMapper;
+import org.mybatis.dynamic.sql.util.mybatis3.CommonInsertMapper;
+import org.mybatis.dynamic.sql.util.mybatis3.CommonUpdateMapper;
+import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3Utils;
 
 @CacheNamespace(implementation = ObservableCache.class)
 public interface NameTableMapper extends CommonCountMapper, CommonDeleteMapper, CommonInsertMapper<NameRecord>, CommonUpdateMapper {
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
-    @Results(id="NameTableResult", value={
-            @Result(column="id", property="id", id=true),
-            @Result(column="name", property="name")
-    })
+    @Arg(column = "id", javaType = Integer.class, id = true)
+    @Arg(column = "name", javaType = String.class)
     List<NameRecord> selectMany(SelectStatementProvider selectStatement);
 
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
-    @ResultMap("NameTableResult")
+    @Arg(column = "id", javaType = Integer.class, id = true)
+    @Arg(column = "name", javaType = String.class)
     Optional<NameRecord> selectOne(SelectStatementProvider selectStatement);
 
     BasicColumn[] selectList = BasicColumn.columnList(id, name);
@@ -68,8 +73,8 @@ default int update(UpdateDSLCompleter completer) {
 
     default int updateByPrimaryKey(NameRecord row) {
         return update(c ->
-                c.set(name).equalTo(row::getName)
-                        .where(id, isEqualTo(row::getId))
+                c.set(name).equalTo(row::name)
+                        .where(id, isEqualTo(row::id))
         );
     }
 

src/test/java/issues/gh324/TestUtils.java

@@ -19,12 +19,12 @@
 
 public class TestUtils {
     public static void recordIsFred(NameRecord row) {
-        assertThat(row.getId()).isEqualTo(1);
-        assertThat(row.getName()).isEqualTo("Fred");
+        assertThat(row.id()).isEqualTo(1);
+        assertThat(row.name()).isEqualTo("Fred");
     }
 
     public static void recordIsBarney(NameRecord row) {
-        assertThat(row.getId()).isEqualTo(1);
-        assertThat(row.getName()).isEqualTo("Barney");
+        assertThat(row.id()).isEqualTo(1);
+        assertThat(row.name()).isEqualTo("Barney");
     }
 }

src/test/java/issues/gh324/spring/SpringNameService.java

@@ -37,25 +37,19 @@ public class SpringNameService {
 
     @Transactional(propagation = Propagation.REQUIRES_NEW)
     public void insertRecord() {
-        NameRecord row = new NameRecord();
-        row.setId(1);
-        row.setName("Fred");
+        NameRecord row = new NameRecord(1, "Fred");
         mapper.insert(row);
     }
 
     @Transactional(propagation = Propagation.REQUIRES_NEW)
     public void updateRecordAndCommit() {
-        NameRecord row = new NameRecord();
-        row.setId(1);
-        row.setName("Barney");
+        NameRecord row = new NameRecord(1, "Barney");
         mapper.updateByPrimaryKey(row);
     }
 
     public void updateRecordAndRollback() {
         TransactionStatus txStatus = transactionManager.getTransaction(new DefaultTransactionDefinition());
-        NameRecord row = new NameRecord();
-        row.setId(1);
-        row.setName("Barney");
+        NameRecord row = new NameRecord(1, "Barney");
         mapper.updateByPrimaryKey(row);
         transactionManager.rollback(txStatus);
     }