From 5195826d3477ae60a0e659cd2f236a422fee7641 Mon Sep 17 00:00:00 2001
From: Saairam Venkatesh <greenghost1100@gmail.com>
Date: Fri, 3 Nov 2023 19:30:54 -0500
Subject: [PATCH] Fixed flakiness caused by Class.getDeclaredFields

---
 .../mybatis/mapper/mapperhelper/FieldHelper.java |  1 +
 .../mapper/mapperhelper/ComplexEntityTest.java   | 16 ++++++++--------
 .../mapper/mapperhelper/SqlHelperTest.java       |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/tk/mybatis/mapper/mapperhelper/FieldHelper.java b/core/src/main/java/tk/mybatis/mapper/mapperhelper/FieldHelper.java
index a9fe51e33..c09051423 100644
--- a/core/src/main/java/tk/mybatis/mapper/mapperhelper/FieldHelper.java
+++ b/core/src/main/java/tk/mybatis/mapper/mapperhelper/FieldHelper.java
@@ -181,6 +181,7 @@ private List<EntityField> _getFields(Class<?> entityClass, List<EntityField> fie
                 return fieldList;
             }
             Field[] fields = entityClass.getDeclaredFields();
+            Arrays.sort(fields, Comparator.comparing(Field::getName));
             int index = 0;
             for (int i = 0; i < fields.length; i++) {
                 Field field = fields[i];
diff --git a/core/src/test/java/tk/mybatis/mapper/mapperhelper/ComplexEntityTest.java b/core/src/test/java/tk/mybatis/mapper/mapperhelper/ComplexEntityTest.java
index 1ecd948f0..edfba3400 100644
--- a/core/src/test/java/tk/mybatis/mapper/mapperhelper/ComplexEntityTest.java
+++ b/core/src/test/java/tk/mybatis/mapper/mapperhelper/ComplexEntityTest.java
@@ -152,19 +152,19 @@ public void test() {
         sqlBuilder.append(SqlHelper.fromTable(entityClass, entityTable.getName()));
         sqlBuilder.append(SqlHelper.whereAllIfColumns(entityClass, config.isNotEmpty()));
         final String sql = sqlBuilder.toString();
-        Assert.assertEquals("SELECT id,user_name,address,state  FROM user " +
+        Assert.assertEquals("SELECT address,id,state,user_name  FROM user " +
                 "<where>" +
-                "<if test=\"id != null\"> AND id = #{id}</if>" +
-                "<if test=\"userName != null\"> AND user_name = #{userName}</if>" +
                 "<if test=\"address != null\"> AND address = #{address, typeHandler=tk.mybatis.mapper.mapperhelper.ComplexEntityTest$AddressHandler}</if>" +
-                "<if test=\"state != null\"> AND state = #{state}</if></where>", sql);
+                "<if test=\"id != null\"> AND id = #{id}</if>" +
+                "<if test=\"state != null\"> AND state = #{state}</if>" +
+                "<if test=\"userName != null\"> AND user_name = #{userName}</if></where>", sql);
 
         final ResultMap resultMap = entityTable.getResultMap(configuration);
         final List<ResultMapping> resultMappings = resultMap.getResultMappings();
-        final ResultMapping idMapping = resultMappings.get(0);
-        final ResultMapping userNameMapping = resultMappings.get(1);
-        final ResultMapping addressMapping = resultMappings.get(2);
-        final ResultMapping stateMapping = resultMappings.get(3);
+        final ResultMapping addressMapping = resultMappings.get(0);
+        final ResultMapping idMapping = resultMappings.get(1);
+        final ResultMapping stateMapping = resultMappings.get(2);
+        final ResultMapping userNameMapping = resultMappings.get(3);
 
         Assert.assertEquals("id", idMapping.getColumn());
         Assert.assertEquals("id", idMapping.getProperty());
diff --git a/core/src/test/java/tk/mybatis/mapper/mapperhelper/SqlHelperTest.java b/core/src/test/java/tk/mybatis/mapper/mapperhelper/SqlHelperTest.java
index 78308e53a..1589e20de 100644
--- a/core/src/test/java/tk/mybatis/mapper/mapperhelper/SqlHelperTest.java
+++ b/core/src/test/java/tk/mybatis/mapper/mapperhelper/SqlHelperTest.java
@@ -35,7 +35,7 @@ public void testLogicDeleteSql() {
         Assert.assertEquals(" AND is_valid = 1", notLogicDeletedColumn);
 
         String updateSetColumns = SqlHelper.updateSetColumns(User.class, null, false, false);
-        Assert.assertEquals("<set>username = #{username},is_valid = 1,</set>", updateSetColumns);
+        Assert.assertEquals("<set>is_valid = 1,username = #{username},</set>", updateSetColumns);
     }
 
 }