diff --git a/src/main/java/org/redkale/convert/EnMember.java b/src/main/java/org/redkale/convert/EnMember.java index e15f69c48..2108d1530 100644 --- a/src/main/java/org/redkale/convert/EnMember.java +++ b/src/main/java/org/redkale/convert/EnMember.java @@ -35,9 +35,9 @@ public final class EnMember { // final boolean isnumber; final boolean bool; - final char[] jsonFieldNameChars; + final char[] jsonFieldNameColonChars; - final byte[] jsonFieldNameBytes; + final byte[] jsonFieldNameColonBytes; // 对应类成员的Field也可能为null @Nullable @@ -68,8 +68,8 @@ public final class EnMember { Class t = attribute.type(); this.string = CharSequence.class.isAssignableFrom(t); this.bool = t == Boolean.class || t == boolean.class; - this.jsonFieldNameChars = ('"' + attribute.field() + "\":").toCharArray(); - this.jsonFieldNameBytes = ('"' + attribute.field() + "\":").getBytes(); + this.jsonFieldNameColonChars = ('"' + attribute.field() + "\":").toCharArray(); + this.jsonFieldNameColonBytes = ('"' + attribute.field() + "\":").getBytes(); this.comment = ""; this.field = null; this.method = null; @@ -86,8 +86,8 @@ public final class EnMember { Class t = attribute.type(); this.string = CharSequence.class.isAssignableFrom(t); this.bool = t == Boolean.class || t == boolean.class; - this.jsonFieldNameChars = ('"' + attribute.field() + "\":").toCharArray(); - this.jsonFieldNameBytes = ('"' + attribute.field() + "\":").getBytes(); + this.jsonFieldNameColonChars = ('"' + attribute.field() + "\":").toCharArray(); + this.jsonFieldNameColonBytes = ('"' + attribute.field() + "\":").getBytes(); if (field != null) { Comment ct = field.getAnnotation(Comment.class); this.comment = ct == null ? "" : ct.value(); @@ -156,12 +156,12 @@ public final class EnMember { return comment; } - public char[] getJsonFieldNameChars() { - return jsonFieldNameChars; + public char[] getJsonFieldNameColonChars() { + return jsonFieldNameColonChars; } - public byte[] getJsonFieldNameBytes() { - return jsonFieldNameBytes; + public byte[] getJsonFieldNameColonBytes() { + return jsonFieldNameColonBytes; } public Encodeable getEncoder() { diff --git a/src/main/java/org/redkale/convert/json/JsonBytesWriter.java b/src/main/java/org/redkale/convert/json/JsonBytesWriter.java index e9f6e2d80..f899a32a9 100644 --- a/src/main/java/org/redkale/convert/json/JsonBytesWriter.java +++ b/src/main/java/org/redkale/convert/json/JsonBytesWriter.java @@ -119,7 +119,7 @@ public class JsonBytesWriter extends JsonWriter implements ByteTuple { writeTo(BYTE_COMMA); } if (member != null) { - byte[] bs = member.getJsonFieldNameBytes(); + byte[] bs = member.getJsonFieldNameColonBytes(); expand(bs.length); System.arraycopy(bs, 0, content, count, bs.length); count += bs.length; diff --git a/src/main/java/org/redkale/convert/json/JsonCharsWriter.java b/src/main/java/org/redkale/convert/json/JsonCharsWriter.java index bed97329e..3b55d39d8 100644 --- a/src/main/java/org/redkale/convert/json/JsonCharsWriter.java +++ b/src/main/java/org/redkale/convert/json/JsonCharsWriter.java @@ -121,7 +121,7 @@ public class JsonCharsWriter extends JsonWriter { writeTo(','); } if (member != null) { - writeTo(member.getJsonFieldNameChars()); + writeTo(member.getJsonFieldNameColonChars()); } else { writeLatin1To(true, fieldName); writeTo(':'); diff --git a/src/main/java/org/redkale/convert/json/JsonWriter.java b/src/main/java/org/redkale/convert/json/JsonWriter.java index c3f560781..7d8a17487 100644 --- a/src/main/java/org/redkale/convert/json/JsonWriter.java +++ b/src/main/java/org/redkale/convert/json/JsonWriter.java @@ -254,7 +254,7 @@ public abstract class JsonWriter extends Writer { writeTo(BYTE_COMMA); } if (member != null) { - writeTo(member.getJsonFieldNameBytes()); + writeTo(member.getJsonFieldNameColonBytes()); } else { writeLatin1To(true, fieldName); writeTo(BYTE_COLON);