diff --git a/src/main/java/org/redkale/convert/ConvertFactory.java b/src/main/java/org/redkale/convert/ConvertFactory.java index 9711c88b9..57db3450c 100644 --- a/src/main/java/org/redkale/convert/ConvertFactory.java +++ b/src/main/java/org/redkale/convert/ConvertFactory.java @@ -163,12 +163,12 @@ public abstract class ConvertFactory { @Override public void convertTo(W out, Object value) { - out.writeSmallString(value == null ? null : value.toString()); + out.writeStandardString(value == null ? null : value.toString()); } @Override public Object convertFrom(R in) { - String t = in.readSmallString(); + String t = in.readStandardString(); return t == null ? null : sqldateInvoker.invoke(null, t); } }); @@ -179,12 +179,12 @@ public abstract class ConvertFactory { @Override public void convertTo(W out, Object value) { - out.writeSmallString(value == null ? null : value.toString()); + out.writeStandardString(value == null ? null : value.toString()); } @Override public Object convertFrom(R in) { - String t = in.readSmallString(); + String t = in.readStandardString(); return t == null ? null : sqltimeInvoker.invoke(null, t); } }); @@ -195,12 +195,12 @@ public abstract class ConvertFactory { @Override public void convertTo(W out, Object value) { - out.writeSmallString(value == null ? null : value.toString()); + out.writeStandardString(value == null ? null : value.toString()); } @Override public Object convertFrom(R in) { - String t = in.readSmallString(); + String t = in.readStandardString(); return t == null ? null : timestampInvoker.invoke(null, t); } }); diff --git a/src/main/java/org/redkale/convert/ConvertSmallString.java b/src/main/java/org/redkale/convert/ConvertSmallString.java index 7198918bd..47039fee3 100644 --- a/src/main/java/org/redkale/convert/ConvertSmallString.java +++ b/src/main/java/org/redkale/convert/ConvertSmallString.java @@ -5,19 +5,22 @@ */ package org.redkale.convert; +import java.lang.annotation.*; import static java.lang.annotation.ElementType.*; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import java.lang.annotation.*; - /** * 序列化时标记String字段的值是否为无转义字符且长度不超过255的字符串，通常用于类名、字段名、枚举值字符串等 + * replace by {@link org.redkale.convert.ConvertStandardString} * *

详情见: https://redkale.org * + * @see org.redkale.convert.ConvertStandardString + * @deprecated 2.8.0 * @author zhangjx * @since 2.3.0 */ +@Deprecated(since = "2.8.0") @Target({METHOD, FIELD}) @Retention(RUNTIME) public @interface ConvertSmallString {} diff --git a/src/main/java/org/redkale/convert/ConvertStandardString.java b/src/main/java/org/redkale/convert/ConvertStandardString.java new file mode 100644 index 000000000..a25e0b393 --- /dev/null +++ b/src/main/java/org/redkale/convert/ConvertStandardString.java @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2016-2116 Redkale + * All rights reserved. + */ +package org.redkale.convert; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import java.lang.annotation.Retention; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Target; + +/** + * 序列化时标记String字段的值是否为无转义字符且长度不超过255的字符串，通常用于类名、字段名、枚举值字符串等 + * + *

详情见: https://redkale.org + * + * @author zhangjx + * @since 2.8.0 + */ +@Target({METHOD, FIELD}) +@Retention(RUNTIME) +public @interface ConvertStandardString {} diff --git a/src/main/java/org/redkale/convert/Reader.java b/src/main/java/org/redkale/convert/Reader.java index dad318d17..d368bbe8d 100644 --- a/src/main/java/org/redkale/convert/Reader.java +++ b/src/main/java/org/redkale/convert/Reader.java @@ -189,7 +189,7 @@ public abstract class Reader { * * @return String值 */ - public abstract String readSmallString(); + public abstract String readStandardString(); /** * 读取反解析对象的类名 diff --git a/src/main/java/org/redkale/convert/Writer.java b/src/main/java/org/redkale/convert/Writer.java index abc26706e..ff199802e 100644 --- a/src/main/java/org/redkale/convert/Writer.java +++ b/src/main/java/org/redkale/convert/Writer.java @@ -335,7 +335,7 @@ public abstract class Writer { * * @param value 非空且不含需要转义的字符的String值 */ - public abstract void writeSmallString(String value); + public abstract void writeStandardString(String value); /** * 写入一个String值 diff --git a/src/main/java/org/redkale/convert/bson/BsonByteBufferReader.java b/src/main/java/org/redkale/convert/bson/BsonByteBufferReader.java index cb504277c..f27304775 100644 --- a/src/main/java/org/redkale/convert/bson/BsonByteBufferReader.java +++ b/src/main/java/org/redkale/convert/bson/BsonByteBufferReader.java @@ -151,7 +151,7 @@ public class BsonByteBufferReader extends BsonReader { } @Override - public final String readSmallString() { + public final String readStandardString() { int len = 0xff & readByte(); if (len == 0) { return ""; diff --git a/src/main/java/org/redkale/convert/bson/BsonReader.java b/src/main/java/org/redkale/convert/bson/BsonReader.java index 9a7d96fb6..92d97980d 100644 --- a/src/main/java/org/redkale/convert/bson/BsonReader.java +++ b/src/main/java/org/redkale/convert/bson/BsonReader.java @@ -255,7 +255,7 @@ public class BsonReader extends Reader { @Override public final DeMember readFieldName(final DeMemberInfo memberInfo) { - final String exceptedField = readSmallString(); + final String exceptedField = readStandardString(); this.fieldTypeEnum = readByte(); return memberInfo.getMemberByField(exceptedField); } @@ -345,11 +345,11 @@ public class BsonReader extends Reader { @Override public final String readClassName() { - return readSmallString(); + return readStandardString(); } @Override - public String readSmallString() { + public String readStandardString() { int len = 0xff & readByte(); if (len == 0) { return ""; diff --git a/src/main/java/org/redkale/convert/bson/BsonWriter.java b/src/main/java/org/redkale/convert/bson/BsonWriter.java index e8827f5fe..8db5c2502 100644 --- a/src/main/java/org/redkale/convert/bson/BsonWriter.java +++ b/src/main/java/org/redkale/convert/bson/BsonWriter.java @@ -234,13 +234,13 @@ public class BsonWriter extends Writer implements ByteTuple { @Override public final void writeClassName(String clazz) { - writeSmallString(clazz == null ? "" : clazz); + writeStandardString(clazz == null ? "" : clazz); } @Override public final void writeObjectB(Object obj) { super.writeObjectB(obj); - writeSmallString(""); + writeStandardString(""); writeShort(BsonReader.SIGN_OBJECTB); } @@ -253,7 +253,7 @@ public class BsonWriter extends Writer implements ByteTuple { @Override public final void writeFieldName(EnMember member, String fieldName, Type fieldType, int fieldPos) { writeByte(BsonReader.SIGN_HASNEXT); - writeSmallString(fieldName); + writeStandardString(fieldName); writeByte(BsonFactory.typeEnum(fieldType)); } @@ -263,7 +263,7 @@ public class BsonWriter extends Writer implements ByteTuple { * @param value String值 */ @Override - public final void writeSmallString(String value) { + public final void writeStandardString(String value) { if (value.isEmpty()) { writeTo((byte) 0); return; diff --git a/src/main/java/org/redkale/convert/ext/BigDecimalSimpledCoder.java b/src/main/java/org/redkale/convert/ext/BigDecimalSimpledCoder.java index 07c86feed..8b1dad424 100644 --- a/src/main/java/org/redkale/convert/ext/BigDecimalSimpledCoder.java +++ b/src/main/java/org/redkale/convert/ext/BigDecimalSimpledCoder.java @@ -29,12 +29,12 @@ public final class BigDecimalSimpledCoder ex out.writeNull(); return; } - out.writeSmallString(value.toString()); + out.writeStandardString(value.toString()); } @Override public BigDecimal convertFrom(R in) { - String value = in.readSmallString(); + String value = in.readStandardString(); if (value == null) { return null; } @@ -57,7 +57,7 @@ public final class BigDecimalSimpledCoder ex if (value == null) { out.writeNull(); } else { - out.writeSmallString(value.toString()); + out.writeStandardString(value.toString()); } } diff --git a/src/main/java/org/redkale/convert/ext/BigIntegerSimpledCoder.java b/src/main/java/org/redkale/convert/ext/BigIntegerSimpledCoder.java index c148410d9..826ef5b4c 100644 --- a/src/main/java/org/redkale/convert/ext/BigIntegerSimpledCoder.java +++ b/src/main/java/org/redkale/convert/ext/BigIntegerSimpledCoder.java @@ -55,7 +55,7 @@ public final class BigIntegerSimpledCoder ex if (value == null) { out.writeNull(); } else { - out.writeSmallString(value.toString()); + out.writeStandardString(value.toString()); } } @@ -86,7 +86,7 @@ public final class BigIntegerSimpledCoder ex out.writeNull(); } else { String s = value.toString(16); - out.writeSmallString(s.charAt(0) == '-' ? ("-0x" + s.substring(1)) : ("0x" + s)); + out.writeStandardString(s.charAt(0) == '-' ? ("-0x" + s.substring(1)) : ("0x" + s)); } } diff --git a/src/main/java/org/redkale/convert/ext/DurationSimpledCoder.java b/src/main/java/org/redkale/convert/ext/DurationSimpledCoder.java index 1f17bb465..8699bacbc 100644 --- a/src/main/java/org/redkale/convert/ext/DurationSimpledCoder.java +++ b/src/main/java/org/redkale/convert/ext/DurationSimpledCoder.java @@ -32,7 +32,7 @@ public class DurationSimpledCoder extends Si @Override public Duration convertFrom(R in) { - String value = in.readSmallString(); + String value = in.readStandardString(); if (value == null) { return null; } diff --git a/src/main/java/org/redkale/convert/ext/EnumSimpledCoder.java b/src/main/java/org/redkale/convert/ext/EnumSimpledCoder.java index fcc8b2da3..fb342a6e7 100644 --- a/src/main/java/org/redkale/convert/ext/EnumSimpledCoder.java +++ b/src/main/java/org/redkale/convert/ext/EnumSimpledCoder.java @@ -73,14 +73,14 @@ public final class EnumSimpledCoder extends Sim if (value == null) { out.writeNull(); } else { - out.writeSmallString(value.toString()); + out.writeStandardString(value.toString()); } } @Override public Instant convertFrom(R in) { - final String str = in.readSmallString(); + final String str = in.readStandardString(); if (str == null) { return null; } diff --git a/src/main/java/org/redkale/convert/ext/IntSimpledCoder.java b/src/main/java/org/redkale/convert/ext/IntSimpledCoder.java index 32609e0d6..9ccc3e8e8 100644 --- a/src/main/java/org/redkale/convert/ext/IntSimpledCoder.java +++ b/src/main/java/org/redkale/convert/ext/IntSimpledCoder.java @@ -45,12 +45,12 @@ public final class IntSimpledCoder extends S @Override public void convertTo(final W out, final Integer value) { if (value == null) { - out.writeSmallString("0x0"); + out.writeStandardString("0x0"); } else { if (value < 0) { throw new ConvertException("Negative values (" + value + ") are not supported"); } - out.writeSmallString("0x" + Integer.toHexString(value)); + out.writeStandardString("0x" + Integer.toHexString(value)); } } diff --git a/src/main/java/org/redkale/convert/ext/LocalDateSimpledCoder.java b/src/main/java/org/redkale/convert/ext/LocalDateSimpledCoder.java index 16de4b899..f895f6215 100644 --- a/src/main/java/org/redkale/convert/ext/LocalDateSimpledCoder.java +++ b/src/main/java/org/redkale/convert/ext/LocalDateSimpledCoder.java @@ -59,13 +59,13 @@ public final class LocalDateSimpledCoder ext if (value == null) { out.writeNull(); } else { - out.writeSmallString(value.toString()); + out.writeStandardString(value.toString()); } } @Override public LocalDate convertFrom(R in) { - final String str = in.readSmallString(); + final String str = in.readStandardString(); if (str == null) { return null; } diff --git a/src/main/java/org/redkale/convert/ext/LocalDateTimeSimpledCoder.java b/src/main/java/org/redkale/convert/ext/LocalDateTimeSimpledCoder.java index 490d6df2b..c9d3b062a 100644 --- a/src/main/java/org/redkale/convert/ext/LocalDateTimeSimpledCoder.java +++ b/src/main/java/org/redkale/convert/ext/LocalDateTimeSimpledCoder.java @@ -92,13 +92,13 @@ public final class LocalDateTimeSimpledCoder if (value == null) { out.writeNull(); } else { - out.writeSmallString(value.toString()); + out.writeStandardString(value.toString()); } } @Override public LocalDateTime convertFrom(R in) { - final String str = in.readSmallString(); + final String str = in.readStandardString(); if (str == null) { return null; } diff --git a/src/main/java/org/redkale/convert/ext/LocalTimeSimpledCoder.java b/src/main/java/org/redkale/convert/ext/LocalTimeSimpledCoder.java index deb137b9f..ccb50ffc4 100644 --- a/src/main/java/org/redkale/convert/ext/LocalTimeSimpledCoder.java +++ b/src/main/java/org/redkale/convert/ext/LocalTimeSimpledCoder.java @@ -57,13 +57,13 @@ public final class LocalTimeSimpledCoder ext if (value == null) { out.writeNull(); } else { - out.writeSmallString(value.toString()); + out.writeStandardString(value.toString()); } } @Override public LocalTime convertFrom(R in) { - final String str = in.readSmallString(); + final String str = in.readStandardString(); if (str == null) { return null; } diff --git a/src/main/java/org/redkale/convert/ext/LongSimpledCoder.java b/src/main/java/org/redkale/convert/ext/LongSimpledCoder.java index f2274c987..62a554683 100644 --- a/src/main/java/org/redkale/convert/ext/LongSimpledCoder.java +++ b/src/main/java/org/redkale/convert/ext/LongSimpledCoder.java @@ -45,12 +45,12 @@ public final class LongSimpledCoder extends @Override public void convertTo(final W out, final Long value) { if (value == null) { - out.writeSmallString("0x0"); + out.writeStandardString("0x0"); } else { if (value < 0) { throw new ConvertException("Negative values (" + value + ") are not supported"); } - out.writeSmallString("0x" + Long.toHexString(value)); + out.writeStandardString("0x" + Long.toHexString(value)); } } diff --git a/src/main/java/org/redkale/convert/ext/StringSimpledCoder.java b/src/main/java/org/redkale/convert/ext/StringSimpledCoder.java index 18248af5d..445550ec7 100644 --- a/src/main/java/org/redkale/convert/ext/StringSimpledCoder.java +++ b/src/main/java/org/redkale/convert/ext/StringSimpledCoder.java @@ -39,12 +39,12 @@ public final class StringSimpledCoder extend @Override public void convertTo(W out, String value) { - out.writeSmallString(value); + out.writeStandardString(value); } @Override public String convertFrom(R in) { - return in.readSmallString(); + return in.readStandardString(); } } } diff --git a/src/main/java/org/redkale/convert/ext/TypeSimpledCoder.java b/src/main/java/org/redkale/convert/ext/TypeSimpledCoder.java index 2fe6d2592..d0f729a54 100644 --- a/src/main/java/org/redkale/convert/ext/TypeSimpledCoder.java +++ b/src/main/java/org/redkale/convert/ext/TypeSimpledCoder.java @@ -25,13 +25,13 @@ public class TypeSimpledCoder extends Simple if (value == null) { out.writeNull(); } else { - out.writeSmallString(value.getName()); + out.writeStandardString(value.getName()); } } @Override public Class convertFrom(R in) { - String str = in.readSmallString(); + String str = in.readStandardString(); if (str == null) { return null; } diff --git a/src/main/java/org/redkale/convert/ext/Uint128SimpledCoder.java b/src/main/java/org/redkale/convert/ext/Uint128SimpledCoder.java index 8523a1f9b..00ae93226 100644 --- a/src/main/java/org/redkale/convert/ext/Uint128SimpledCoder.java +++ b/src/main/java/org/redkale/convert/ext/Uint128SimpledCoder.java @@ -60,13 +60,13 @@ public final class Uint128SimpledCoder exten if (value == null) { out.writeNull(); } else { - out.writeSmallString(value.toString()); + out.writeStandardString(value.toString()); } } @Override public Uint128 convertFrom(R in) { - final String str = in.readSmallString(); + final String str = in.readStandardString(); if (str == null) { return null; } diff --git a/src/main/java/org/redkale/convert/json/JsonByteBufferReader.java b/src/main/java/org/redkale/convert/json/JsonByteBufferReader.java index 295c38fdb..b09efef25 100644 --- a/src/main/java/org/redkale/convert/json/JsonByteBufferReader.java +++ b/src/main/java/org/redkale/convert/json/JsonByteBufferReader.java @@ -486,7 +486,7 @@ public class JsonByteBufferReader extends JsonReader { * @return String值 */ @Override - public final String readSmallString() { + public final String readStandardString() { return readString(true); } diff --git a/src/main/java/org/redkale/convert/json/JsonDynEncoder.java b/src/main/java/org/redkale/convert/json/JsonDynEncoder.java index 1856ab474..9911e64bb 100644 --- a/src/main/java/org/redkale/convert/json/JsonDynEncoder.java +++ b/src/main/java/org/redkale/convert/json/JsonDynEncoder.java @@ -144,12 +144,12 @@ public abstract class JsonDynEncoder extends ObjectEncoder { if (fieldType == int.class) { intFieldCount++; } - if (fieldType == String.class && membersSize == 1 && readConvertSmallString(factory, element) != null) { + if (fieldType == String.class && membersSize == 1 && isConvertStandardString(factory, element)) { onlyOneLatin1FieldObjectFlag = true; } else if (fieldType != short.class && fieldType != int.class && fieldType != long.class - && !(fieldType == String.class && readConvertSmallString(factory, element) != null)) { + && !(fieldType == String.class && isConvertStandardString(factory, element))) { onlyShotIntLongLatin1MoreFieldObjectFlag = false; } } @@ -612,7 +612,7 @@ public abstract class JsonDynEncoder extends ObjectEncoder { mv.visitVarInsn(loadid, maxLocals); mv.visitMethodInsn(INVOKEVIRTUAL, writerName, "writeDouble", "(D)V", false); } else if (fieldType == String.class) { - if (readConvertSmallString(factory, element) == null) { + if (!isConvertStandardString(factory, element)) { mv.visitVarInsn(ALOAD, 1); mv.visitVarInsn(loadid, maxLocals); mv.visitMethodInsn( @@ -875,23 +875,37 @@ public abstract class JsonDynEncoder extends ObjectEncoder { } } - protected static ConvertSmallString readConvertSmallString(JsonFactory factory, AccessibleObject element) { + protected static boolean isConvertStandardString(JsonFactory factory, AccessibleObject element) { if (element instanceof Field) { - return ((Field) element).getAnnotation(ConvertSmallString.class); + return ((Field) element).getAnnotation(ConvertStandardString.class) != null + || ((Field) element).getAnnotation(ConvertSmallString.class) != null; } Method method = (Method) element; - ConvertSmallString small = method.getAnnotation(ConvertSmallString.class); - if (small == null) { + ConvertStandardString standard = method.getAnnotation(ConvertStandardString.class); + if (standard == null) { try { Field f = method.getDeclaringClass().getDeclaredField(factory.readGetSetFieldName(method)); if (f != null) { - small = f.getAnnotation(ConvertSmallString.class); + standard = f.getAnnotation(ConvertStandardString.class); } } catch (Exception e) { // do nothing } } - return small; + if (standard == null) { + if (method.getAnnotation(ConvertSmallString.class) != null) { + return true; + } + try { + Field f = method.getDeclaringClass().getDeclaredField(factory.readGetSetFieldName(method)); + if (f != null && f.getAnnotation(ConvertSmallString.class) != null) { + return true; + } + } catch (Exception e) { + // do nothing + } + } + return standard != null; } protected static Class readGetSetFieldType(AccessibleObject element) { diff --git a/src/main/java/org/redkale/convert/json/JsonReader.java b/src/main/java/org/redkale/convert/json/JsonReader.java index 9501a9bdb..cb9e951f6 100644 --- a/src/main/java/org/redkale/convert/json/JsonReader.java +++ b/src/main/java/org/redkale/convert/json/JsonReader.java @@ -107,7 +107,7 @@ public class JsonReader extends Reader { nextGoodChar(true); // 读掉 { [ for (String key1 : keys) { while (this.hasNext()) { - String field = this.readSmallString(); + String field = this.readStandardString(); readBlank(); if (key1.equals(field)) { break; @@ -129,7 +129,7 @@ public class JsonReader extends Reader { break; case '{': while (hasNext()) { - this.readSmallString(); // 读掉field + this.readStandardString(); // 读掉field this.readBlank(); this.skipValue(); } @@ -663,7 +663,7 @@ public class JsonReader extends Reader { } public final String readFieldName() { - return this.readSmallString(); + return this.readStandardString(); } @Override @@ -708,7 +708,7 @@ public class JsonReader extends Reader { @Override public final boolean readBoolean() { - return "true".equalsIgnoreCase(this.readSmallString()); + return "true".equalsIgnoreCase(this.readStandardString()); } @Override @@ -759,7 +759,7 @@ public class JsonReader extends Reader { @Override public final float readFloat() { - String chars = readSmallString(); + String chars = readStandardString(); if (chars != null) { chars = chars.trim(); } @@ -778,7 +778,7 @@ public class JsonReader extends Reader { @Override public final double readDouble() { - String chars = readSmallString(); + String chars = readStandardString(); if (chars != null) { chars = chars.trim(); } @@ -796,7 +796,7 @@ public class JsonReader extends Reader { } @Override - public String readSmallString() { + public String readStandardString() { final int eof = this.limit; if (this.position == eof) { return null; diff --git a/src/main/java/org/redkale/convert/json/JsonWriter.java b/src/main/java/org/redkale/convert/json/JsonWriter.java index 5fc291d37..6d62c958c 100644 --- a/src/main/java/org/redkale/convert/json/JsonWriter.java +++ b/src/main/java/org/redkale/convert/json/JsonWriter.java @@ -159,7 +159,7 @@ public abstract class JsonWriter extends Writer { } @Override - public final void writeSmallString(String value) { + public final void writeStandardString(String value) { writeLatin1To(true, value); } diff --git a/src/main/java/org/redkale/convert/pb/ProtobufEnumSimpledCoder.java b/src/main/java/org/redkale/convert/pb/ProtobufEnumSimpledCoder.java index 318316193..4e9ecdbd9 100644 --- a/src/main/java/org/redkale/convert/pb/ProtobufEnumSimpledCoder.java +++ b/src/main/java/org/redkale/convert/pb/ProtobufEnumSimpledCoder.java @@ -46,7 +46,7 @@ public class ProtobufEnumSimpledCoder) type, value); } else { int value = in.readRawVarint32(); diff --git a/src/main/java/org/redkale/convert/pb/ProtobufReader.java b/src/main/java/org/redkale/convert/pb/ProtobufReader.java index 50ad4d875..d3a87b96b 100644 --- a/src/main/java/org/redkale/convert/pb/ProtobufReader.java +++ b/src/main/java/org/redkale/convert/pb/ProtobufReader.java @@ -439,7 +439,7 @@ public class ProtobufReader extends Reader { } @Override - public final String readSmallString() { + public final String readStandardString() { return readString(); } diff --git a/src/main/java/org/redkale/convert/pb/ProtobufWriter.java b/src/main/java/org/redkale/convert/pb/ProtobufWriter.java index 69a1d39b5..5c0ffb084 100644 --- a/src/main/java/org/redkale/convert/pb/ProtobufWriter.java +++ b/src/main/java/org/redkale/convert/pb/ProtobufWriter.java @@ -385,7 +385,7 @@ public class ProtobufWriter extends Writer implements ByteTuple { } @Override - public final void writeSmallString(String value) { + public final void writeStandardString(String value) { writeString(value); } diff --git a/src/test/java/org/redkale/test/convert/json/Json5Test.java b/src/test/java/org/redkale/test/convert/json/Json5Test.java index 7a30e7612..33ba6d576 100644 --- a/src/test/java/org/redkale/test/convert/json/Json5Test.java +++ b/src/test/java/org/redkale/test/convert/json/Json5Test.java @@ -9,7 +9,7 @@ import java.lang.reflect.Type; import java.util.*; import org.junit.jupiter.api.*; import org.redkale.convert.Convert; -import org.redkale.convert.ConvertSmallString; +import org.redkale.convert.ConvertStandardString; import org.redkale.convert.Decodeable; import org.redkale.convert.json.*; import org.redkale.util.TypeToken; @@ -93,7 +93,7 @@ public class Json5Test { public String name; - @ConvertSmallString + @ConvertStandardString public String desc; @Override diff --git a/src/test/java/org/redkale/test/convert/json/Message.java b/src/test/java/org/redkale/test/convert/json/Message.java index 007416940..621fc16cb 100644 --- a/src/test/java/org/redkale/test/convert/json/Message.java +++ b/src/test/java/org/redkale/test/convert/json/Message.java @@ -20,7 +20,7 @@ public final class Message { private List longs; - @ConvertSmallString + @ConvertStandardString private String message; public Message() {}