diff --git a/src/org/redkale/convert/EnMember.java b/src/org/redkale/convert/EnMember.java index e09d7886b..19c3ae24e 100644 --- a/src/org/redkale/convert/EnMember.java +++ b/src/org/redkale/convert/EnMember.java @@ -65,6 +65,10 @@ public final class EnMember { return attribute.field().equals(name); } + public Attribute getAttribute() { + return attribute; + } + public int getIndex() { return this.index; } diff --git a/src/org/redkale/convert/Writer.java b/src/org/redkale/convert/Writer.java index 4ddd13fd9..dad5fb005 100644 --- a/src/org/redkale/convert/Writer.java +++ b/src/org/redkale/convert/Writer.java @@ -6,7 +6,6 @@ package org.redkale.convert; import java.lang.reflect.*; -import org.redkale.util.Attribute; /** * 序列化的数据输出流 @@ -112,7 +111,7 @@ public abstract class Writer { if (!((Boolean) value)) return; } } - this.writeFieldName(member.attribute); + this.writeFieldName(member); member.encoder.convertTo(this, value); this.comma = true; } @@ -165,9 +164,9 @@ public abstract class Writer { /** * 输出一个字段名 * - * @param attribute 字段的Attribute对象 + * @param member 字段的EnMember对象 */ - public abstract void writeFieldName(Attribute attribute); + public abstract void writeFieldName(EnMember member); /** * 写入一个boolean值 diff --git a/src/org/redkale/convert/bson/BsonWriter.java b/src/org/redkale/convert/bson/BsonWriter.java index e82b01f53..3102951cc 100644 --- a/src/org/redkale/convert/bson/BsonWriter.java +++ b/src/org/redkale/convert/bson/BsonWriter.java @@ -180,7 +180,8 @@ public class BsonWriter extends Writer { } @Override - public final void writeFieldName(Attribute attribute) { + public final void writeFieldName(EnMember member) { + Attribute attribute = member.getAttribute(); writeByte(BsonReader.SIGN_HASNEXT); writeSmallString(attribute.field()); byte typeval = 127; //字段的类型值 diff --git a/src/org/redkale/convert/json/JsonWriter.java b/src/org/redkale/convert/json/JsonWriter.java index 160833c02..83c864fe6 100644 --- a/src/org/redkale/convert/json/JsonWriter.java +++ b/src/org/redkale/convert/json/JsonWriter.java @@ -6,7 +6,7 @@ package org.redkale.convert.json; import java.nio.ByteBuffer; -import org.redkale.convert.Writer; +import org.redkale.convert.*; import org.redkale.util.*; /** @@ -157,9 +157,9 @@ public class JsonWriter extends Writer { } @Override - public final void writeFieldName(Attribute attribute) { + public final void writeFieldName(EnMember member) { if (this.comma) writeTo(','); - writeTo(true, attribute.field()); + writeTo(true, member.getAttribute().field()); writeTo(':'); }