From d88e4120a1f91404bc9a91b966fe7fbf29b35876 Mon Sep 17 00:00:00 2001
From: Redkale <8730487+redkale@users.noreply.github.com>
Date: Sun, 13 Oct 2019 17:29:12 +0800
Subject: [PATCH]

---
 src/org/redkale/convert/Convert.java                     | 4 ++--
 src/org/redkale/convert/ObjectEncoder.java               | 4 ++--
 src/org/redkale/convert/Writer.java                      | 2 +-
 src/org/redkale/convert/bson/BsonConvert.java            | 2 +-
 src/org/redkale/convert/json/JsonConvert.java            | 2 +-
 test/org/redkale/test/convert/BiFunctionConvertMain.java | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/org/redkale/convert/Convert.java b/src/org/redkale/convert/Convert.java
index 8e45843af..505fd7f83 100644
--- a/src/org/redkale/convert/Convert.java
+++ b/src/org/redkale/convert/Convert.java
@@ -36,7 +36,7 @@ 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, EnFieldObject[]> objExtFunc) {
+    protected <S extends W> S fieldFunc(S writer, BiFunction<Attribute, Object, Object> objFieldFunc, Function<Object, EnFieldValue[]> objExtFunc) {
         writer.objFieldFunc = objFieldFunc;
         writer.objExtFunc = objExtFunc;
         return writer;
@@ -44,7 +44,7 @@ public abstract class Convert<R extends Reader, W extends Writer> {
 
     public abstract Convert<R, W> newConvert(final BiFunction<Attribute, Object, Object> objFieldFunc);
 
-    public abstract Convert<R, W> newConvert(final BiFunction<Attribute, Object, Object> objFieldFunc, Function<Object, EnFieldObject[]> objExtFunc);
+    public abstract Convert<R, W> newConvert(final BiFunction<Attribute, Object, Object> objFieldFunc, Function<Object, EnFieldValue[]> objExtFunc);
 
     public abstract boolean isBinary();
 
diff --git a/src/org/redkale/convert/ObjectEncoder.java b/src/org/redkale/convert/ObjectEncoder.java
index 8a03c8753..9f420f5e4 100644
--- a/src/org/redkale/convert/ObjectEncoder.java
+++ b/src/org/redkale/convert/ObjectEncoder.java
@@ -170,10 +170,10 @@ public class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T> {
                 out.writeObjectField(member, value);
             }
             if (out.objExtFunc != null) {
-                EnFieldObject[] extFields = out.objExtFunc.apply(value);
+                EnFieldValue[] extFields = out.objExtFunc.apply(value);
                 if (extFields != null) {
                     Encodeable<W, ?> anyEncoder = factory.getAnyEncoder();
-                    for (EnFieldObject en : extFields) {
+                    for (EnFieldValue en : extFields) {
                         if (en == null) continue;
                         maxPosition++;
                         out.writeObjectField(en.getName(), en.getType(), Math.max(en.getPosition(), maxPosition), anyEncoder, en.getValue());
diff --git a/src/org/redkale/convert/Writer.java b/src/org/redkale/convert/Writer.java
index 73d1c39d7..6c25298ef 100644
--- a/src/org/redkale/convert/Writer.java
+++ b/src/org/redkale/convert/Writer.java
@@ -29,7 +29,7 @@ public abstract class Writer {
     protected BiFunction<Attribute, Object, Object> objFieldFunc;
 
     //对某个对象进行动态扩展字段值处理
-    protected Function<Object, EnFieldObject[]> objExtFunc;
+    protected Function<Object, EnFieldValue[]> objExtFunc;
 
     /**
      * 设置specify
diff --git a/src/org/redkale/convert/bson/BsonConvert.java b/src/org/redkale/convert/bson/BsonConvert.java
index adee83785..60aa74f4f 100644
--- a/src/org/redkale/convert/bson/BsonConvert.java
+++ b/src/org/redkale/convert/bson/BsonConvert.java
@@ -65,7 +65,7 @@ public class BsonConvert extends BinaryConvert<BsonReader, BsonWriter> {
     }
 
     @Override
-    public BsonConvert newConvert(final BiFunction<Attribute, Object, Object> fieldFunc, Function<Object, EnFieldObject[]> objExtFunc) {
+    public BsonConvert newConvert(final BiFunction<Attribute, Object, Object> fieldFunc, Function<Object, EnFieldValue[]> objExtFunc) {
         return new BsonConvert(getFactory(), tiny) {
             @Override
             protected <S extends BsonWriter> S configWrite(S writer) {
diff --git a/src/org/redkale/convert/json/JsonConvert.java b/src/org/redkale/convert/json/JsonConvert.java
index 61852b6fc..2f17fa5de 100644
--- a/src/org/redkale/convert/json/JsonConvert.java
+++ b/src/org/redkale/convert/json/JsonConvert.java
@@ -52,7 +52,7 @@ public class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
     }
 
     @Override
-    public JsonConvert newConvert(final BiFunction<Attribute, Object, Object> fieldFunc, Function<Object, EnFieldObject[]> objExtFunc) {
+    public JsonConvert newConvert(final BiFunction<Attribute, Object, Object> fieldFunc, Function<Object, EnFieldValue[]> objExtFunc) {
         return new JsonConvert(getFactory(), tiny) {
             @Override
             protected <S extends JsonWriter> S configWrite(S writer) {
diff --git a/test/org/redkale/test/convert/BiFunctionConvertMain.java b/test/org/redkale/test/convert/BiFunctionConvertMain.java
index 10be928e3..84502f0f6 100644
--- a/test/org/redkale/test/convert/BiFunctionConvertMain.java
+++ b/test/org/redkale/test/convert/BiFunctionConvertMain.java
@@ -5,7 +5,7 @@
  */
 package org.redkale.test.convert;
 
-import org.redkale.convert.EnFieldObject;
+import org.redkale.convert.EnFieldValue;
 import org.redkale.convert.json.JsonConvert;
 import org.redkale.util.Attribute;
 
@@ -58,7 +58,7 @@ public class BiFunctionConvertMain {
             return t.get(u);
         }, (Object u) -> {
             if (table != u) return null;
-            return new EnFieldObject[]{new EnFieldObject("extcol1", 30), new EnFieldObject("extcol2", "扩展字段值")};
+            return new EnFieldValue[]{new EnFieldValue("extcol1", 30), new EnFieldValue("extcol2", "扩展字段值")};
         });
         System.out.println(convert2.convertTo(table));
         //{"players":[{"cards":[11,12,13,14,15],"userid":1,"username":"玩家1"},{"cards":[21,22,23,24,25],"userid":2,"username":"玩家2"},{"cards":[31,32,33,34,35],"userid":3,"username":"玩家3"}],"tableid":100}