From 00829cf198fd994f26f63e9d68e7913631d3a8c1 Mon Sep 17 00:00:00 2001
From: redkale <redkale@qq.com>
Date: Fri, 31 Mar 2023 11:09:15 +0800
Subject: [PATCH] =?UTF-8?q?convert=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/redkale/convert/Convert.java     | 22 +++++++++++--------
 .../org/redkale/convert/bson/BsonConvert.java | 18 +++++++++++----
 .../org/redkale/convert/json/JsonConvert.java | 19 ++++++++--------
 3 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/src/main/java/org/redkale/convert/Convert.java b/src/main/java/org/redkale/convert/Convert.java
index 166ffa750..9dd5d9eef 100644
--- a/src/main/java/org/redkale/convert/Convert.java
+++ b/src/main/java/org/redkale/convert/Convert.java
@@ -36,22 +36,26 @@ public abstract class Convert<R extends Reader, W extends Writer> {
         return writer;
     }
 
-    protected <S extends W> S fieldFunc(S writer, BiFunction<Attribute, Object, Object> objFieldFunc, Function<Object, ConvertField[]> objExtFunc) {
-        writer.objFieldFunc = objFieldFunc;
-        writer.objExtFunc = objExtFunc;
-        return writer;
-    }
-
-    protected <S extends W> S fieldFunc(S writer, BiFunction<Object, Object, Object> mapFieldFunc, BiFunction<Attribute, Object, Object> objFieldFunc, Function<Object, ConvertField[]> objExtFunc) {
+    protected <S extends W> S fieldFunc(S writer, BiFunction<Attribute, Object, Object> objFieldFunc, BiFunction<Object, Object, Object> mapFieldFunc, Function<Object, ConvertField[]> objExtFunc) {
         writer.mapFieldFunc = mapFieldFunc;
         writer.objFieldFunc = objFieldFunc;
         writer.objExtFunc = objExtFunc;
         return writer;
     }
 
-    public abstract Convert<R, W> newConvert(final BiFunction<Attribute, Object, Object> objFieldFunc);
+    public Convert<R, W> newConvert(BiFunction<Attribute, Object, Object> objFieldFunc) {
+        return newConvert(objFieldFunc, null, null);
+    }
 
-    public abstract Convert<R, W> newConvert(final BiFunction<Attribute, Object, Object> objFieldFunc, Function<Object, ConvertField[]> objExtFunc);
+    public Convert<R, W> newConvert(BiFunction<Attribute, Object, Object> objFieldFunc, BiFunction<Object, Object, Object> mapFieldFunc) {
+        return newConvert(objFieldFunc, mapFieldFunc, null);
+    }
+
+    public Convert<R, W> newConvert(BiFunction<Attribute, Object, Object> objFieldFunc, Function<Object, ConvertField[]> objExtFunc) {
+        return newConvert(objFieldFunc, null, objExtFunc);
+    }
+
+    public abstract Convert<R, W> newConvert(BiFunction<Attribute, Object, Object> objFieldFunc, BiFunction<Object, Object, Object> mapFieldFunc, Function<Object, ConvertField[]> objExtFunc);
 
     public abstract boolean isBinary();
 
diff --git a/src/main/java/org/redkale/convert/bson/BsonConvert.java b/src/main/java/org/redkale/convert/bson/BsonConvert.java
index a00a3b273..27301d376 100644
--- a/src/main/java/org/redkale/convert/bson/BsonConvert.java
+++ b/src/main/java/org/redkale/convert/bson/BsonConvert.java
@@ -62,16 +62,26 @@ public class BsonConvert extends BinaryConvert<BsonReader, BsonWriter> {
     }
 
     @Override
-    public BsonConvert newConvert(final BiFunction<Attribute, Object, Object> fieldFunc) {
-        return newConvert(fieldFunc, null);
+    public BsonConvert newConvert(final BiFunction<Attribute, Object, Object> objFieldFunc) {
+        return newConvert(objFieldFunc, null, null);
     }
 
     @Override
-    public BsonConvert newConvert(final BiFunction<Attribute, Object, Object> fieldFunc, Function<Object, ConvertField[]> objExtFunc) {
+    public BsonConvert newConvert(final BiFunction<Attribute, Object, Object> objFieldFunc, BiFunction<Object, Object, Object> mapFieldFunc) {
+        return newConvert(objFieldFunc, mapFieldFunc, null);
+    }
+
+    @Override
+    public BsonConvert newConvert(final BiFunction<Attribute, Object, Object> objFieldFunc, Function<Object, ConvertField[]> objExtFunc) {
+        return newConvert(objFieldFunc, null, objExtFunc);
+    }
+
+    @Override
+    public BsonConvert newConvert(final BiFunction<Attribute, Object, Object> fieldFunc, BiFunction<Object, Object, Object> mapFieldFunc, Function<Object, ConvertField[]> objExtFunc) {
         return new BsonConvert(getFactory(), tiny) {
             @Override
             protected <S extends BsonWriter> S configWrite(S writer) {
-                return fieldFunc(writer, fieldFunc, objExtFunc);
+                return fieldFunc(writer, fieldFunc, mapFieldFunc, objExtFunc);
             }
         };
     }
diff --git a/src/main/java/org/redkale/convert/json/JsonConvert.java b/src/main/java/org/redkale/convert/json/JsonConvert.java
index 658912faa..638371005 100644
--- a/src/main/java/org/redkale/convert/json/JsonConvert.java
+++ b/src/main/java/org/redkale/convert/json/JsonConvert.java
@@ -61,24 +61,25 @@ public class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
 
     @Override
     public JsonConvert newConvert(final BiFunction<Attribute, Object, Object> objFieldFunc) {
-        return newConvert(objFieldFunc, null);
+        return newConvert(objFieldFunc, null, null);
     }
 
     @Override
     public JsonConvert newConvert(final BiFunction<Attribute, Object, Object> objFieldFunc, Function<Object, ConvertField[]> objExtFunc) {
-        return new JsonConvert(getFactory(), tiny) {
-            @Override
-            protected <S extends JsonWriter> S configWrite(S writer) {
-                return fieldFunc(writer, objFieldFunc, objExtFunc);
-            }
-        };
+        return newConvert(objFieldFunc, null, objExtFunc);
     }
 
-    public JsonConvert newConvert(BiFunction<Object, Object, Object> mapFieldFunc, final BiFunction<Attribute, Object, Object> objFieldFunc, Function<Object, ConvertField[]> objExtFunc) {
+    @Override
+    public JsonConvert newConvert(final BiFunction<Attribute, Object, Object> objFieldFunc, BiFunction<Object, Object, Object> mapFieldFunc) {
+        return newConvert(objFieldFunc, mapFieldFunc, null);
+    }
+
+    @Override
+    public JsonConvert newConvert(final BiFunction<Attribute, Object, Object> objFieldFunc, BiFunction<Object, Object, Object> mapFieldFunc, Function<Object, ConvertField[]> objExtFunc) {
         return new JsonConvert(getFactory(), tiny) {
             @Override
             protected <S extends JsonWriter> S configWrite(S writer) {
-                return fieldFunc(writer, mapFieldFunc, objFieldFunc, objExtFunc);
+                return fieldFunc(writer, objFieldFunc, mapFieldFunc, objExtFunc);
             }
         };
     }