From 1d07176f321d41efcdab56da6f52d427d6fe769f Mon Sep 17 00:00:00 2001
From: Suomm <1474983351@qq.com>
Date: Tue, 22 Aug 2023 16:07:22 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=9B=9E=E8=B0=83=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E9=87=8D=E5=91=BD=E5=90=8D=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/zh/base/active-record.md                 |  2 +-
 .../core/activerecord/MapperModel.java        | 20 +++++++++----------
 .../mybatisflex/core/activerecord/Model.java  |  8 ++++----
 .../test/mapper/ActiveRecordTest.java         |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/docs/zh/base/active-record.md b/docs/zh/base/active-record.md
index d0e7247f..09fbf5b3 100644
--- a/docs/zh/base/active-record.md
+++ b/docs/zh/base/active-record.md
@@ -205,7 +205,7 @@ User.create()
 ## 回调方法 <Badge type="tip" text="v1.5.9" />
 
 有些情况下，我们在操作完数据库后，还需要继续使用实体类的内容，例如：获取插入数据后返回的主键。此时这些返回值为 `boolean` 的方法就不满足我们的需求了，
-应该使用 `xxxCallback` 方法，在操作数据库执行成功之后返回 `Optional.of(this)`，执行失败返回 `Optional.empty()`。这样就可以进行链式的调用了。
+应该使用 `xxxOpt` 方法，在操作数据库执行成功之后返回 `Optional.of(this)`，执行失败返回 `Optional.empty()`。这样就可以进行链式的调用了。
 
 ```java
 // 插入成功之后返回主键信息
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/MapperModel.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/MapperModel.java
index a400a483..6539f4aa 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/MapperModel.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/MapperModel.java
@@ -78,8 +78,8 @@ public interface MapperModel<T> {
      *
      * @return {@link Optional} 链式调用
      */
-    default Optional<T> saveCallback() {
-        return saveCallback(true);
+    default Optional<T> saveOpt() {
+        return saveOpt(true);
     }
 
     /**
@@ -100,7 +100,7 @@ public interface MapperModel<T> {
      * @param ignoreNulls 是否忽略 {@code null} 值
      * @return {@link Optional} 链式调用
      */
-    default Optional<T> saveCallback(boolean ignoreNulls) {
+    default Optional<T> saveOpt(boolean ignoreNulls) {
         return save(ignoreNulls) ? Optional.of((T) this) : Optional.empty();
     }
 
@@ -122,8 +122,8 @@ public interface MapperModel<T> {
      *
      * @return {@link Optional} 链式调用
      */
-    default Optional<T> saveOrUpdateCallback() {
-        return saveOrUpdateCallback(true);
+    default Optional<T> saveOrUpdateOpt() {
+        return saveOrUpdateOpt(true);
     }
 
     /**
@@ -146,7 +146,7 @@ public interface MapperModel<T> {
      * @param ignoreNulls 是否忽略 {@code null} 值
      * @return {@link Optional} 链式调用
      */
-    default Optional<T> saveOrUpdateCallback(boolean ignoreNulls) {
+    default Optional<T> saveOrUpdateOpt(boolean ignoreNulls) {
         return saveOrUpdate(ignoreNulls) ? Optional.of((T) this) : Optional.empty();
     }
 
@@ -165,7 +165,7 @@ public interface MapperModel<T> {
      *
      * @return {@link Optional} 链式调用
      */
-    default Optional<T> removeByIdCallback() {
+    default Optional<T> removeByIdOpt() {
         return removeById() ? Optional.of((T) this) : Optional.empty();
     }
 
@@ -185,8 +185,8 @@ public interface MapperModel<T> {
      *
      * @return {@link Optional} 链式调用
      */
-    default Optional<T> updateByIdCallback() {
-        return updateByIdCallback(true);
+    default Optional<T> updateByIdOpt() {
+        return updateByIdOpt(true);
     }
 
     /**
@@ -207,7 +207,7 @@ public interface MapperModel<T> {
      * @param ignoreNulls 是否忽略 {@code null} 值
      * @return {@link Optional} 链式调用
      */
-    default Optional<T> updateByIdCallback(boolean ignoreNulls) {
+    default Optional<T> updateByIdOpt(boolean ignoreNulls) {
         return updateById(ignoreNulls) ? Optional.of((T) this) : Optional.empty();
     }
 
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/Model.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/Model.java
index 63452366..9602f14d 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/Model.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/Model.java
@@ -54,7 +54,7 @@ public abstract class Model<T extends Model<T>>
      *
      * @return {@link Optional} 链式调用
      */
-    public Optional<T> removeCallback() {
+    public Optional<T> removeOpt() {
         return remove() ? Optional.of((T) this) : Optional.empty();
     }
 
@@ -74,8 +74,8 @@ public abstract class Model<T extends Model<T>>
      *
      * @return {@link Optional} 链式调用
      */
-    public Optional<T> updateCallback() {
-        return updateCallback(true);
+    public Optional<T> updateOpt() {
+        return updateOpt(true);
     }
 
     /**
@@ -96,7 +96,7 @@ public abstract class Model<T extends Model<T>>
      * @param ignoreNulls 是否忽略 {@code null} 值
      * @return {@link Optional} 链式调用
      */
-    public Optional<T> updateCallback(boolean ignoreNulls) {
+    public Optional<T> updateOpt(boolean ignoreNulls) {
         return update(ignoreNulls) ? Optional.of((T) this) : Optional.empty();
     }
 
diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-test/src/test/java/com/mybatisflex/test/mapper/ActiveRecordTest.java b/mybatis-flex-test/mybatis-flex-spring-boot-test/src/test/java/com/mybatisflex/test/mapper/ActiveRecordTest.java
index c6e40c36..26ced894 100644
--- a/mybatis-flex-test/mybatis-flex-spring-boot-test/src/test/java/com/mybatisflex/test/mapper/ActiveRecordTest.java
+++ b/mybatis-flex-test/mybatis-flex-spring-boot-test/src/test/java/com/mybatisflex/test/mapper/ActiveRecordTest.java
@@ -62,7 +62,7 @@ class ActiveRecordTest {
         Integer goodId = Good.create()
             .setPrice(28.0)
             .setName("摆渡人")
-            .saveCallback()
+            .saveOpt()
             .orElseThrow(RuntimeException::new)
             .getGoodId();