Merge pull request #931 from jeffgbutler/code_cleanup

Use Records when Possible

Author: jeffgbutler

Diff for: 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;
-    }
 }

Diff for: src/main/java/org/mybatis/dynamic/sql/util/spring/BatchInsertUtility.java

@@ -39,15 +39,5 @@ public static <T> SqlParameterSource[] createBatch(List<T> rows) {
         return SqlParameterSourceUtils.createBatch(tt);
     }
 
-    public static class RowHolder<T> {
-        private final T row;
-
-        public RowHolder(T row) {
-            this.row = row;
-        }
-
-        public T getRow() {
-            return row;
-        }
-    }
+    public record RowHolder<T> (T row) {}
 }

Diff for: src/test/java/examples/animal/data/AnimalData.java

@@ -15,41 +15,4 @@
  */
 package examples.animal.data;
 
-public class AnimalData {
-    private int id;
-    private String animalName;
-    private double brainWeight;
-    private double bodyWeight;
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public String getAnimalName() {
-        return animalName;
-    }
-
-    public void setAnimalName(String animalName) {
-        this.animalName = animalName;
-    }
-
-    public double getBrainWeight() {
-        return brainWeight;
-    }
-
-    public void setBrainWeight(double brainWeight) {
-        this.brainWeight = brainWeight;
-    }
-
-    public double getBodyWeight() {
-        return bodyWeight;
-    }
-
-    public void setBodyWeight(double bodyWeight) {
-        this.bodyWeight = bodyWeight;
-    }
-}
+public record AnimalData(int id, String animalName, double brainWeight, double bodyWeight) {}

Diff for: src/test/java/examples/animal/data/AnimalDataMapper.java

@@ -17,10 +17,8 @@
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Arg;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Result;
-import org.apache.ibatis.annotations.ResultMap;
-import org.apache.ibatis.annotations.Results;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.SelectProvider;
 import org.apache.ibatis.session.RowBounds;
@@ -34,36 +32,46 @@
 public interface AnimalDataMapper extends CommonDeleteMapper, CommonInsertMapper<AnimalData>, CommonUpdateMapper {
 
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
-    @Results(id="AnimalDataResult", value={
-        @Result(column="id", property="id", id=true),
-        @Result(column="animal_name", property="animalName"),
-        @Result(column="brain_weight", property="brainWeight"),
-        @Result(column="body_weight", property="bodyWeight")
-    })
+    @Arg(column = "id", javaType = int.class, id = true)
+    @Arg(column = "animal_name", javaType = String.class)
+    @Arg(column = "brain_weight", javaType = double.class)
+    @Arg(column = "body_weight", javaType = double.class)
     List<AnimalData> selectMany(SelectStatementProvider selectStatement);
 
     @SelectProvider(type = SqlProviderAdapter.class, method = "select")
-    @ResultMap("AnimalDataResult")
+    @Arg(column = "id", javaType = int.class, id = true)
+    @Arg(column = "animal_name", javaType = String.class)
+    @Arg(column = "brain_weight", javaType = double.class)
+    @Arg(column = "body_weight", javaType = double.class)
     List<AnimalData> selectManyWithRowBounds(SelectStatementProvider selectStatement, RowBounds rowBounds);
 
     @SelectProvider(type = SqlProviderAdapter.class, method = "select")
-    @ResultMap("AnimalDataResult")
+    @Arg(column = "id", javaType = int.class, id = true)
+    @Arg(column = "animal_name", javaType = String.class)
+    @Arg(column = "brain_weight", javaType = double.class)
+    @Arg(column = "body_weight", javaType = double.class)
     AnimalData selectOne(SelectStatementProvider selectStatement);
 
     @Select({
         "select id, animal_name, brain_weight, body_weight",
         "from AnimalData",
         "${whereClause}"
     })
-    @ResultMap("AnimalDataResult")
+    @Arg(column = "id", javaType = int.class, id = true)
+    @Arg(column = "animal_name", javaType = String.class)
+    @Arg(column = "brain_weight", javaType = double.class)
+    @Arg(column = "body_weight", javaType = double.class)
     List<AnimalData> selectWithWhereClause(WhereClauseProvider whereClause);
 
     @Select({
         "select a.id, a.animal_name, a.brain_weight, a.body_weight",
         "from AnimalData a",
         "${whereClause}"
     })
-    @ResultMap("AnimalDataResult")
+    @Arg(column = "id", javaType = int.class, id = true)
+    @Arg(column = "animal_name", javaType = String.class)
+    @Arg(column = "brain_weight", javaType = double.class)
+    @Arg(column = "body_weight", javaType = double.class)
     List<AnimalData> selectWithWhereClauseAndAlias(WhereClauseProvider whereClause);
 
     @Select({
@@ -73,7 +81,10 @@ public interface AnimalDataMapper extends CommonDeleteMapper, CommonInsertMapper
         "order by id",
         "OFFSET #{offset,jdbcType=INTEGER} LIMIT #{limit,jdbcType=INTEGER}"
     })
-    @ResultMap("AnimalDataResult")
+    @Arg(column = "id", javaType = int.class, id = true)
+    @Arg(column = "animal_name", javaType = String.class)
+    @Arg(column = "brain_weight", javaType = double.class)
+    @Arg(column = "body_weight", javaType = double.class)
     List<AnimalData> selectWithWhereClauseLimitAndOffset(@Param("whereClauseProvider") WhereClauseProvider whereClause,
             @Param("limit") int limit, @Param("offset") int offset);
 
@@ -84,7 +95,10 @@ List<AnimalData> selectWithWhereClauseLimitAndOffset(@Param("whereClauseProvider
         "order by id",
         "OFFSET #{offset,jdbcType=INTEGER} LIMIT #{limit,jdbcType=INTEGER}"
     })
-    @ResultMap("AnimalDataResult")
+    @Arg(column = "id", javaType = int.class, id = true)
+    @Arg(column = "animal_name", javaType = String.class)
+    @Arg(column = "brain_weight", javaType = double.class)
+    @Arg(column = "body_weight", javaType = double.class)
     List<AnimalData> selectWithWhereClauseAliasLimitAndOffset(@Param("whereClauseProvider") WhereClauseProvider whereClause,
                                                               @Param("limit") int limit, @Param("offset") int offset);
 }