From 9179b8557aca95b48d4bdfd29310f8084468076f Mon Sep 17 00:00:00 2001 From: godotg Date: Mon, 15 Jul 2024 14:42:47 +0800 Subject: [PATCH] ref[protocol]: refactor field method --- .../com/zfoo/protocol/serializer/cpp/CodeGenerateCpp.java | 7 +++---- .../zfoo/protocol/serializer/cpp/CppArraySerializer.java | 4 ++-- .../zfoo/protocol/serializer/cpp/CppBoolSerializer.java | 4 ++-- .../zfoo/protocol/serializer/cpp/CppByteSerializer.java | 4 ++-- .../zfoo/protocol/serializer/cpp/CppDoubleSerializer.java | 4 ++-- .../zfoo/protocol/serializer/cpp/CppFloatSerializer.java | 4 ++-- .../com/zfoo/protocol/serializer/cpp/CppIntSerializer.java | 4 ++-- .../zfoo/protocol/serializer/cpp/CppListSerializer.java | 4 ++-- .../zfoo/protocol/serializer/cpp/CppLongSerializer.java | 4 ++-- .../com/zfoo/protocol/serializer/cpp/CppMapSerializer.java | 4 ++-- .../serializer/cpp/CppObjectProtocolSerializer.java | 4 ++-- .../com/zfoo/protocol/serializer/cpp/CppSetSerializer.java | 4 ++-- .../zfoo/protocol/serializer/cpp/CppShortSerializer.java | 4 ++-- .../zfoo/protocol/serializer/cpp/CppStringSerializer.java | 4 ++-- .../com/zfoo/protocol/serializer/cpp/ICppSerializer.java | 4 ++-- .../serializer/typescript/CodeGenerateTypeScript.java | 2 +- .../zfoo/protocol/serializer/typescript/ITsSerializer.java | 4 ++-- .../protocol/serializer/typescript/TsArraySerializer.java | 2 +- .../protocol/serializer/typescript/TsBoolSerializer.java | 2 +- .../protocol/serializer/typescript/TsByteSerializer.java | 2 +- .../protocol/serializer/typescript/TsDoubleSerializer.java | 2 +- .../protocol/serializer/typescript/TsFloatSerializer.java | 2 +- .../protocol/serializer/typescript/TsIntSerializer.java | 2 +- .../protocol/serializer/typescript/TsListSerializer.java | 2 +- .../protocol/serializer/typescript/TsLongSerializer.java | 2 +- .../protocol/serializer/typescript/TsMapSerializer.java | 2 +- .../serializer/typescript/TsObjectProtocolSerializer.java | 2 +- .../protocol/serializer/typescript/TsSetSerializer.java | 2 +- .../protocol/serializer/typescript/TsShortSerializer.java | 2 +- .../protocol/serializer/typescript/TsStringSerializer.java | 2 +- 30 files changed, 47 insertions(+), 48 deletions(-) diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CodeGenerateCpp.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CodeGenerateCpp.java index 96b7810a..44d7ff48 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CodeGenerateCpp.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CodeGenerateCpp.java @@ -276,11 +276,10 @@ public class CodeGenerateCpp implements ICodeGenerate { var field = sequencedFields.get(i); IFieldRegistration fieldRegistration = fieldRegistrations[GenerateProtocolFile.indexOf(fields, field)]; var fieldName = field.getName(); - var propertyTypeAndName = cppSerializer(fieldRegistration.serializer()).field(field, fieldRegistration); - var propertyType = propertyTypeAndName.getKey(); - var propertyName = propertyTypeAndName.getValue(); + var fieldTypeValue = cppSerializer(fieldRegistration.serializer()).fieldTypeValue(field, fieldRegistration); + var fieldType = fieldTypeValue.getKey(); - var propertyFullName = StringUtils.format("{} {};", propertyType, propertyName); + var propertyFullName = StringUtils.format("{} {};", fieldType, fieldName); // 生成注释 var fieldNotes = GenerateProtocolNote.fieldNotes(protocolId, fieldName, CodeLanguage.Cpp); for (var fieldNote : fieldNotes) { diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppArraySerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppArraySerializer.java index b53390f6..09e56f31 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppArraySerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppArraySerializer.java @@ -32,9 +32,9 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class CppArraySerializer implements ICppSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { var type = CodeGenerateCpp.toCppClassName(field.getType().getComponentType().getSimpleName()); - return new Pair<>(StringUtils.format("vector<{}>", type), field.getName()); + return new Pair<>(StringUtils.format("vector<{}>", type), "null"); } @Override diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppBoolSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppBoolSerializer.java index eae6af89..7102903f 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppBoolSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppBoolSerializer.java @@ -28,8 +28,8 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class CppBoolSerializer implements ICppSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { - return new Pair<>("bool", field.getName()); + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("bool", "false"); } @Override diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppByteSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppByteSerializer.java index ba68ec0d..3defed02 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppByteSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppByteSerializer.java @@ -28,8 +28,8 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class CppByteSerializer implements ICppSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { - return new Pair<>("int8_t", field.getName()); + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("int8_t", "0"); } @Override diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppDoubleSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppDoubleSerializer.java index e79bdc3a..014c68df 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppDoubleSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppDoubleSerializer.java @@ -28,8 +28,8 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class CppDoubleSerializer implements ICppSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { - return new Pair<>("double", field.getName()); + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("double", "0"); } @Override diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppFloatSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppFloatSerializer.java index 142f231d..4c1bc2d3 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppFloatSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppFloatSerializer.java @@ -28,8 +28,8 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class CppFloatSerializer implements ICppSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { - return new Pair<>("float", field.getName()); + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("float", "0"); } @Override diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppIntSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppIntSerializer.java index d1e19369..ed547d7c 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppIntSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppIntSerializer.java @@ -28,8 +28,8 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class CppIntSerializer implements ICppSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { - return new Pair<>("int32_t", field.getName()); + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("int32_t", "0"); } @Override diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppListSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppListSerializer.java index 5c96ef3d..ae88b2c3 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppListSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppListSerializer.java @@ -32,9 +32,9 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class CppListSerializer implements ICppSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { var type = CodeGenerateCpp.toCppClassName(field.getGenericType().toString()); - return new Pair<>(type, field.getName()); + return new Pair<>(type, "null"); } @Override diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppLongSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppLongSerializer.java index 874e5d09..68ed9bf3 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppLongSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppLongSerializer.java @@ -28,8 +28,8 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class CppLongSerializer implements ICppSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { - return new Pair<>("int64_t", field.getName()); + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("int64_t", "0"); } @Override diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppMapSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppMapSerializer.java index 3dac4a55..a637667a 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppMapSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppMapSerializer.java @@ -32,9 +32,9 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class CppMapSerializer implements ICppSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { var type = CodeGenerateCpp.toCppClassName(field.getGenericType().toString()); - return new Pair<>(type, field.getName()); + return new Pair<>(type, "null"); } @Override diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppObjectProtocolSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppObjectProtocolSerializer.java index 2a1187db..8f66a60d 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppObjectProtocolSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppObjectProtocolSerializer.java @@ -32,11 +32,11 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class CppObjectProtocolSerializer implements ICppSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { ObjectProtocolField objectProtocolField = (ObjectProtocolField) fieldRegistration; var protocolSimpleName = EnhanceObjectProtocolSerializer.getProtocolClassSimpleName(objectProtocolField.getProtocolId()); var type = StringUtils.format("{}", protocolSimpleName); - return new Pair<>(type, field.getName()); + return new Pair<>(type, "null"); } @Override diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppSetSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppSetSerializer.java index a41d62c7..9e292332 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppSetSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppSetSerializer.java @@ -32,9 +32,9 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class CppSetSerializer implements ICppSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { var type = CodeGenerateCpp.toCppClassName(field.getGenericType().toString()); - return new Pair<>(type, field.getName()); + return new Pair<>(type, "null"); } @Override diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppShortSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppShortSerializer.java index 1be2763a..889da0e4 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppShortSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppShortSerializer.java @@ -28,8 +28,8 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class CppShortSerializer implements ICppSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { - return new Pair<>("int16_t", field.getName()); + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("int16_t", "0"); } @Override diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppStringSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppStringSerializer.java index 4b436a60..29db200e 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppStringSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/CppStringSerializer.java @@ -28,8 +28,8 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class CppStringSerializer implements ICppSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { - return new Pair<>("string", field.getName()); + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("string", "null"); } @Override diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/ICppSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/ICppSerializer.java index 8d901d65..485539a0 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/ICppSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/ICppSerializer.java @@ -24,9 +24,9 @@ import java.lang.reflect.Field; public interface ICppSerializer { /** - * 获取属性的类型和名称 + * 获取属性的类型和默认值 */ - Pair field(Field field, IFieldRegistration fieldRegistration); + Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration); void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/CodeGenerateTypeScript.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/CodeGenerateTypeScript.java index 7c2749ca..f2dff891 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/CodeGenerateTypeScript.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/CodeGenerateTypeScript.java @@ -293,7 +293,7 @@ public class CodeGenerateTypeScript implements ICodeGenerate { for (var fieldNote : fieldNotes) { tsBuilder.append(fieldNote).append(LS); } - var pair = tsSerializer(fieldRegistration.serializer()).field(field, fieldRegistration); + var pair = tsSerializer(fieldRegistration.serializer()).fieldTypeValue(field, fieldRegistration); tsBuilder.append(StringUtils.format("{}: {} = {};", fieldName, pair.getKey(), pair.getValue())).append(LS); } return tsBuilder.toString(); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/ITsSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/ITsSerializer.java index ca0297e5..5365147a 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/ITsSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/ITsSerializer.java @@ -24,9 +24,9 @@ import java.lang.reflect.Field; public interface ITsSerializer { /** - * 获取属性的类型，名称，默认值 + * 获取属性的类型，默认值 */ - Pair field(Field field, IFieldRegistration fieldRegistration); + Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration); void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsArraySerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsArraySerializer.java index d7b1b2c5..684737b1 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsArraySerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsArraySerializer.java @@ -31,7 +31,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class TsArraySerializer implements ITsSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { var type = StringUtils.format("Array<{}>", CodeGenerateTypeScript.toTsClassName(field.getType().getComponentType().getSimpleName())); return new Pair<>(type, "[]"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsBoolSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsBoolSerializer.java index a24c4c90..c2019212 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsBoolSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsBoolSerializer.java @@ -28,7 +28,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class TsBoolSerializer implements ITsSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("boolean", "false"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsByteSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsByteSerializer.java index 7ec38000..d2d39f90 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsByteSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsByteSerializer.java @@ -28,7 +28,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class TsByteSerializer implements ITsSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("number", "0"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsDoubleSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsDoubleSerializer.java index f9e85a0a..306464a9 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsDoubleSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsDoubleSerializer.java @@ -28,7 +28,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class TsDoubleSerializer implements ITsSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("number", "0"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsFloatSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsFloatSerializer.java index d5806974..eb6e94ee 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsFloatSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsFloatSerializer.java @@ -28,7 +28,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class TsFloatSerializer implements ITsSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("number", "0"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsIntSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsIntSerializer.java index 1303eee9..f64f16a3 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsIntSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsIntSerializer.java @@ -29,7 +29,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class TsIntSerializer implements ITsSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("number", "0"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsListSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsListSerializer.java index 66970054..bd8d0f84 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsListSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsListSerializer.java @@ -31,7 +31,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class TsListSerializer implements ITsSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { var type = StringUtils.format("{}", CodeGenerateTypeScript.toTsClassName(field.getGenericType().toString())); return new Pair<>(type, "[]"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsLongSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsLongSerializer.java index c94bb2ea..7a0395c7 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsLongSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsLongSerializer.java @@ -28,7 +28,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class TsLongSerializer implements ITsSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("number", "0"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsMapSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsMapSerializer.java index 4fe9a418..2adad6a0 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsMapSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsMapSerializer.java @@ -31,7 +31,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class TsMapSerializer implements ITsSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { var type = StringUtils.format("{}", CodeGenerateTypeScript.toTsClassName(field.getGenericType().toString())); return new Pair<>(type, "new Map()"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsObjectProtocolSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsObjectProtocolSerializer.java index f0a6ae1a..d397077b 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsObjectProtocolSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsObjectProtocolSerializer.java @@ -30,7 +30,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class TsObjectProtocolSerializer implements ITsSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { ObjectProtocolField objectProtocolField = (ObjectProtocolField) fieldRegistration; var protocolSimpleName = EnhanceObjectProtocolSerializer.getProtocolClassSimpleName(objectProtocolField.getProtocolId()); var type = StringUtils.format("{} | null", protocolSimpleName); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsSetSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsSetSerializer.java index 560e6534..d1a82f20 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsSetSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsSetSerializer.java @@ -31,7 +31,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class TsSetSerializer implements ITsSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { var type = StringUtils.format("{}", CodeGenerateTypeScript.toTsClassName(field.getGenericType().toString())); return new Pair<>(type, "new Set()"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsShortSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsShortSerializer.java index c72f79c9..dc34d7f9 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsShortSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsShortSerializer.java @@ -28,7 +28,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class TsShortSerializer implements ITsSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("number", "0"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsStringSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsStringSerializer.java index ccd400f3..f130cf97 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsStringSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsStringSerializer.java @@ -28,7 +28,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class TsStringSerializer implements ITsSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("string", "''"); }