diff --git a/src/org/redkale/convert/Convert.java b/src/org/redkale/convert/Convert.java index 505fd7f83..a81d43010 100644 --- a/src/org/redkale/convert/Convert.java +++ b/src/org/redkale/convert/Convert.java @@ -36,7 +36,7 @@ public abstract class Convert { return writer; } - protected S fieldFunc(S writer, BiFunction objFieldFunc, Function objExtFunc) { + protected S fieldFunc(S writer, BiFunction objFieldFunc, Function objExtFunc) { writer.objFieldFunc = objFieldFunc; writer.objExtFunc = objExtFunc; return writer; @@ -44,7 +44,7 @@ public abstract class Convert { public abstract Convert newConvert(final BiFunction objFieldFunc); - public abstract Convert newConvert(final BiFunction objFieldFunc, Function objExtFunc); + public abstract Convert newConvert(final BiFunction objFieldFunc, Function objExtFunc); public abstract boolean isBinary(); diff --git a/src/org/redkale/convert/EnFieldValue.java b/src/org/redkale/convert/ConvertField.java similarity index 74% rename from src/org/redkale/convert/EnFieldValue.java rename to src/org/redkale/convert/ConvertField.java index ad7ac420d..16dc869e6 100644 --- a/src/org/redkale/convert/EnFieldValue.java +++ b/src/org/redkale/convert/ConvertField.java @@ -17,7 +17,7 @@ import org.redkale.convert.json.JsonConvert; * * @author zhangjx */ -public class EnFieldValue implements Serializable { +public class ConvertField implements Serializable { protected String name; @@ -27,38 +27,38 @@ public class EnFieldValue implements Serializable { protected Object value; - public EnFieldValue() { + public ConvertField() { } - public EnFieldValue(String name, Object value) { + public ConvertField(String name, Object value) { this.name = name; this.value = value; } - public EnFieldValue(String name, int position, Object value) { + public ConvertField(String name, int position, Object value) { this.name = name; this.position = position; this.value = value; } - public EnFieldValue(String name, Type type, Object value) { + public ConvertField(String name, Type type, Object value) { this.name = name; this.type = type; this.value = value; } - public EnFieldValue(String name, Type type, int position, Object value) { + public ConvertField(String name, Type type, int position, Object value) { this.name = name; this.type = type; this.position = position; this.value = value; } - public static EnFieldValue[] ofArray(Object... items) { + public static ConvertField[] ofArray(Object... items) { int len = items.length / 2; - EnFieldValue[] rs = new EnFieldValue[len]; + ConvertField[] rs = new ConvertField[len]; for (int i = 0; i < len; i++) { - rs[i] = new EnFieldValue(items[i * 2].toString(), items[i * 2 + 1]); + rs[i] = new ConvertField(items[i * 2].toString(), items[i * 2 + 1]); } return rs; } diff --git a/src/org/redkale/convert/ObjectEncoder.java b/src/org/redkale/convert/ObjectEncoder.java index 9f420f5e4..e22f275be 100644 --- a/src/org/redkale/convert/ObjectEncoder.java +++ b/src/org/redkale/convert/ObjectEncoder.java @@ -170,10 +170,10 @@ public class ObjectEncoder implements Encodeable { out.writeObjectField(member, value); } if (out.objExtFunc != null) { - EnFieldValue[] extFields = out.objExtFunc.apply(value); + ConvertField[] extFields = out.objExtFunc.apply(value); if (extFields != null) { Encodeable anyEncoder = factory.getAnyEncoder(); - for (EnFieldValue en : extFields) { + for (ConvertField 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 6c25298ef..78c99c8c3 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 objFieldFunc; //对某个对象进行动态扩展字段值处理 - protected Function objExtFunc; + protected Function objExtFunc; /** * 设置specify diff --git a/src/org/redkale/convert/bson/BsonConvert.java b/src/org/redkale/convert/bson/BsonConvert.java index 60aa74f4f..7d51de6c7 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 { } @Override - public BsonConvert newConvert(final BiFunction fieldFunc, Function objExtFunc) { + public BsonConvert newConvert(final BiFunction fieldFunc, Function objExtFunc) { return new BsonConvert(getFactory(), tiny) { @Override protected S configWrite(S writer) { diff --git a/src/org/redkale/convert/json/JsonConvert.java b/src/org/redkale/convert/json/JsonConvert.java index 2f17fa5de..0c922ee1e 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 { } @Override - public JsonConvert newConvert(final BiFunction fieldFunc, Function objExtFunc) { + public JsonConvert newConvert(final BiFunction fieldFunc, Function objExtFunc) { return new JsonConvert(getFactory(), tiny) { @Override protected S configWrite(S writer) {