From ddacd87ec1944eb1d660afb0bdde8437160836e9 Mon Sep 17 00:00:00 2001 From: godotg Date: Mon, 15 Jul 2024 15:01:32 +0800 Subject: [PATCH] ref[protocol]: refactor field method --- .../com/zfoo/protocol/serializer/gdscript/IGdSerializer.java | 1 - .../com/zfoo/protocol/serializer/golang/IGoSerializer.java | 2 +- .../zfoo/protocol/serializer/kotlin/CodeGenerateKotlin.java | 2 +- .../com/zfoo/protocol/serializer/kotlin/IKtSerializer.java | 2 +- .../zfoo/protocol/serializer/kotlin/KtArraySerializer.java | 4 ++-- .../zfoo/protocol/serializer/kotlin/KtBoolSerializer.java | 2 +- .../zfoo/protocol/serializer/kotlin/KtByteSerializer.java | 2 +- .../zfoo/protocol/serializer/kotlin/KtDoubleSerializer.java | 2 +- .../zfoo/protocol/serializer/kotlin/KtFloatSerializer.java | 2 +- .../com/zfoo/protocol/serializer/kotlin/KtIntSerializer.java | 2 +- .../zfoo/protocol/serializer/kotlin/KtListSerializer.java | 2 +- .../zfoo/protocol/serializer/kotlin/KtLongSerializer.java | 2 +- .../com/zfoo/protocol/serializer/kotlin/KtMapSerializer.java | 2 +- .../serializer/kotlin/KtObjectProtocolSerializer.java | 2 +- .../com/zfoo/protocol/serializer/kotlin/KtSetSerializer.java | 2 +- .../zfoo/protocol/serializer/kotlin/KtShortSerializer.java | 2 +- .../zfoo/protocol/serializer/kotlin/KtStringSerializer.java | 2 +- .../com/zfoo/protocol/serializer/php/CodeGeneratePhp.java | 2 +- .../com/zfoo/protocol/serializer/php/IPhpSerializer.java | 5 ++--- .../com/zfoo/protocol/serializer/php/PhpArraySerializer.java | 2 +- .../com/zfoo/protocol/serializer/php/PhpBoolSerializer.java | 2 +- .../com/zfoo/protocol/serializer/php/PhpByteSerializer.java | 2 +- .../zfoo/protocol/serializer/php/PhpDoubleSerializer.java | 2 +- .../com/zfoo/protocol/serializer/php/PhpFloatSerializer.java | 2 +- .../com/zfoo/protocol/serializer/php/PhpIntSerializer.java | 2 +- .../com/zfoo/protocol/serializer/php/PhpListSerializer.java | 2 +- .../com/zfoo/protocol/serializer/php/PhpLongSerializer.java | 2 +- .../com/zfoo/protocol/serializer/php/PhpMapSerializer.java | 2 +- .../protocol/serializer/php/PhpObjectProtocolSerializer.java | 2 +- .../com/zfoo/protocol/serializer/php/PhpSetSerializer.java | 2 +- .../com/zfoo/protocol/serializer/php/PhpShortSerializer.java | 2 +- .../zfoo/protocol/serializer/php/PhpStringSerializer.java | 2 +- .../zfoo/protocol/serializer/scala/CodeGenerateScala.java | 2 +- .../com/zfoo/protocol/serializer/scala/IScalaSerializer.java | 2 +- .../zfoo/protocol/serializer/scala/ScalaArraySerializer.java | 4 ++-- .../zfoo/protocol/serializer/scala/ScalaBoolSerializer.java | 2 +- .../zfoo/protocol/serializer/scala/ScalaByteSerializer.java | 2 +- .../protocol/serializer/scala/ScalaDoubleSerializer.java | 2 +- .../zfoo/protocol/serializer/scala/ScalaFloatSerializer.java | 2 +- .../zfoo/protocol/serializer/scala/ScalaIntSerializer.java | 2 +- .../zfoo/protocol/serializer/scala/ScalaListSerializer.java | 2 +- .../zfoo/protocol/serializer/scala/ScalaLongSerializer.java | 2 +- .../zfoo/protocol/serializer/scala/ScalaMapSerializer.java | 2 +- .../serializer/scala/ScalaObjectProtocolSerializer.java | 2 +- .../zfoo/protocol/serializer/scala/ScalaSetSerializer.java | 2 +- .../zfoo/protocol/serializer/scala/ScalaShortSerializer.java | 2 +- .../protocol/serializer/scala/ScalaStringSerializer.java | 2 +- .../serializer/typescript/CodeGenerateTypeScript.java | 2 +- .../zfoo/protocol/serializer/typescript/ITsSerializer.java | 2 +- .../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 +- .../zfoo/protocol/serializer/typescript/TsIntSerializer.java | 2 +- .../protocol/serializer/typescript/TsListSerializer.java | 2 +- .../protocol/serializer/typescript/TsLongSerializer.java | 2 +- .../zfoo/protocol/serializer/typescript/TsMapSerializer.java | 2 +- .../serializer/typescript/TsObjectProtocolSerializer.java | 2 +- .../zfoo/protocol/serializer/typescript/TsSetSerializer.java | 2 +- .../protocol/serializer/typescript/TsShortSerializer.java | 2 +- .../protocol/serializer/typescript/TsStringSerializer.java | 2 +- 62 files changed, 64 insertions(+), 66 deletions(-) diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/IGdSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/IGdSerializer.java index 12cb72fd..40a5c008 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/IGdSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/IGdSerializer.java @@ -13,7 +13,6 @@ package com.zfoo.protocol.serializer.gdscript; -import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import java.lang.reflect.Field; diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/golang/IGoSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/golang/IGoSerializer.java index 0a336198..5b568ad8 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/golang/IGoSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/golang/IGoSerializer.java @@ -23,7 +23,7 @@ import java.lang.reflect.Field; public interface IGoSerializer { /** - * 获取属性的类型和名称 + * 获取属性的类型 */ String fieldType(Field field, IFieldRegistration fieldRegistration); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/CodeGenerateKotlin.java b/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/CodeGenerateKotlin.java index 72e7cac9..5d345741 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/CodeGenerateKotlin.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/CodeGenerateKotlin.java @@ -279,7 +279,7 @@ public class CodeGenerateKotlin implements ICodeGenerate { for (var fieldNote : fieldNotes) { ktBuilder.append(fieldNote).append(LS); } - var pair = ktSerializer(fieldRegistration.serializer()).field(field, fieldRegistration); + var pair = ktSerializer(fieldRegistration.serializer()).fieldTypeValue(field, fieldRegistration); ktBuilder.append(StringUtils.format("var {}: {} = {}", fieldName, pair.getKey(), pair.getValue())).append(LS); } return ktBuilder.toString(); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/IKtSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/IKtSerializer.java index 8f8cc5b3..de16e70a 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/IKtSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/IKtSerializer.java @@ -25,7 +25,7 @@ public interface IKtSerializer { /** * 获取属性的类型，默认值 */ - 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/kotlin/KtArraySerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtArraySerializer.java index 26ebc521..1be760d4 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtArraySerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtArraySerializer.java @@ -31,7 +31,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class KtArraySerializer implements IKtSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { var type = StringUtils.format("Array<{}>", CodeGenerateKotlin.toKotlinClassName(field.getType().getComponentType().getSimpleName())); return new Pair<>(type, "emptyArray()"); } @@ -84,7 +84,7 @@ public class KtArraySerializer implements IKtSerializer { builder.append(StringUtils.format("val {} = buffer.readInt()", size)).append(LS); GenerateProtocolFile.addTab(builder, deep); - var pair = CodeGenerateKotlin.ktSerializer(arrayField.getArrayElementRegistration().serializer()).field(field, arrayField.getArrayElementRegistration()); + var pair = CodeGenerateKotlin.ktSerializer(arrayField.getArrayElementRegistration().serializer()).fieldTypeValue(field, arrayField.getArrayElementRegistration()); var defaultValue = pair.getValue(); if (defaultValue.equals("null")) { defaultValue = StringUtils.format("{}()", typeName); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtBoolSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtBoolSerializer.java index bcff25f6..e00725da 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtBoolSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtBoolSerializer.java @@ -28,7 +28,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class KtBoolSerializer implements IKtSerializer { @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/kotlin/KtByteSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtByteSerializer.java index 5d615e05..aa767988 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtByteSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtByteSerializer.java @@ -28,7 +28,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class KtByteSerializer implements IKtSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("Byte", "0"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtDoubleSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtDoubleSerializer.java index d54497fd..ab4658fd 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtDoubleSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtDoubleSerializer.java @@ -28,7 +28,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class KtDoubleSerializer implements IKtSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("Double", "0.0"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtFloatSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtFloatSerializer.java index 7215915b..9dc5af8f 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtFloatSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtFloatSerializer.java @@ -28,7 +28,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class KtFloatSerializer implements IKtSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("Float", "0f"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtIntSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtIntSerializer.java index d04f4438..b5b5b5ae 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtIntSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtIntSerializer.java @@ -28,7 +28,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class KtIntSerializer implements IKtSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("Int", "0"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtListSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtListSerializer.java index 5ae9b026..4c44f5c7 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtListSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtListSerializer.java @@ -31,7 +31,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class KtListSerializer implements IKtSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { var type = StringUtils.format("{}", CodeGenerateKotlin.toKotlinClassName(field.getGenericType().toString())); return new Pair<>(type, "emptyList()"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtLongSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtLongSerializer.java index 0a21c696..a1bb4d33 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtLongSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtLongSerializer.java @@ -28,7 +28,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class KtLongSerializer implements IKtSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("Long", "0"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtMapSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtMapSerializer.java index e47c7923..3f8d8ff5 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtMapSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtMapSerializer.java @@ -31,7 +31,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class KtMapSerializer implements IKtSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { var type = StringUtils.format("{}", CodeGenerateKotlin.toKotlinClassName(field.getGenericType().toString())); return new Pair<>(type, "emptyMap()"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtObjectProtocolSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtObjectProtocolSerializer.java index 9a5f9a3a..e506b1a1 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtObjectProtocolSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtObjectProtocolSerializer.java @@ -31,7 +31,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class KtObjectProtocolSerializer implements IKtSerializer { @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); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtSetSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtSetSerializer.java index 5df4653c..3defffae 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtSetSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtSetSerializer.java @@ -31,7 +31,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class KtSetSerializer implements IKtSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { var type = StringUtils.format("{}", CodeGenerateKotlin.toKotlinClassName(field.getGenericType().toString())); return new Pair<>(type, "emptySet()"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtShortSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtShortSerializer.java index 0b7f1667..2b10d002 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtShortSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtShortSerializer.java @@ -28,7 +28,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class KtShortSerializer implements IKtSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("Short", "0"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtStringSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtStringSerializer.java index aba530b1..ea27b17a 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtStringSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/kotlin/KtStringSerializer.java @@ -28,7 +28,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class KtStringSerializer implements IKtSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("String", "\"\""); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/php/CodeGeneratePhp.java b/protocol/src/main/java/com/zfoo/protocol/serializer/php/CodeGeneratePhp.java index 0716c808..abfd4ef4 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/php/CodeGeneratePhp.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/php/CodeGeneratePhp.java @@ -243,7 +243,7 @@ public class CodeGeneratePhp implements ICodeGenerate { for (var fieldNote : fieldNotes) { phpBuilder.append(fieldNote).append(LS); } - var pair = phpSerializer(fieldRegistration.serializer()).field(field, fieldRegistration); + var pair = phpSerializer(fieldRegistration.serializer()).fieldTypeDefaultValue(field, fieldRegistration); phpBuilder.append(StringUtils.format("var {} ${} = {};", pair.getKey(), fieldName, pair.getValue())).append(LS); } return phpBuilder.toString(); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/php/IPhpSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/php/IPhpSerializer.java index b9d8f822..0dd73f68 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/php/IPhpSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/php/IPhpSerializer.java @@ -14,7 +14,6 @@ package com.zfoo.protocol.serializer.php; import com.zfoo.protocol.model.Pair; -import com.zfoo.protocol.model.Triple; import com.zfoo.protocol.registration.field.IFieldRegistration; import java.lang.reflect.Field; @@ -25,9 +24,9 @@ import java.lang.reflect.Field; public interface IPhpSerializer { /** - * 获取属性的类型，名称，默认值 + * 获取属性的类型，默认值 */ - Pair field(Field field, IFieldRegistration fieldRegistration); + Pair fieldTypeDefaultValue(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/php/PhpArraySerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpArraySerializer.java index 38d2127b..bc54657d 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpArraySerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpArraySerializer.java @@ -33,7 +33,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class PhpArraySerializer implements IPhpSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("array", "array()"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpBoolSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpBoolSerializer.java index ba26257e..bd75a8a0 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpBoolSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpBoolSerializer.java @@ -28,7 +28,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class PhpBoolSerializer implements IPhpSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("bool", "false"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpByteSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpByteSerializer.java index cb998b90..1863a298 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpByteSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpByteSerializer.java @@ -29,7 +29,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class PhpByteSerializer implements IPhpSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("int", "0"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpDoubleSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpDoubleSerializer.java index b6cbb295..beff48a6 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpDoubleSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpDoubleSerializer.java @@ -29,7 +29,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class PhpDoubleSerializer implements IPhpSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("float", "0"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpFloatSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpFloatSerializer.java index a6cf2a12..60dc3fc0 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpFloatSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpFloatSerializer.java @@ -29,7 +29,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class PhpFloatSerializer implements IPhpSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("float", "0"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpIntSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpIntSerializer.java index 32b16c80..9bba99ee 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpIntSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpIntSerializer.java @@ -29,7 +29,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class PhpIntSerializer implements IPhpSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("int", "0"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpListSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpListSerializer.java index 25e943b8..cffb6012 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpListSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpListSerializer.java @@ -34,7 +34,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class PhpListSerializer implements IPhpSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("array", "array()"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpLongSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpLongSerializer.java index 13ef0296..c97ee8fe 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpLongSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpLongSerializer.java @@ -29,7 +29,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class PhpLongSerializer implements IPhpSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("int", "0"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpMapSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpMapSerializer.java index 7db79ecd..e4e832df 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpMapSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpMapSerializer.java @@ -32,7 +32,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class PhpMapSerializer implements IPhpSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("array", "array()"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpObjectProtocolSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpObjectProtocolSerializer.java index af25e08d..506794fe 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpObjectProtocolSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpObjectProtocolSerializer.java @@ -31,7 +31,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class PhpObjectProtocolSerializer implements IPhpSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("mixed", "null"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpSetSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpSetSerializer.java index 3a5f25cd..04aaef5b 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpSetSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpSetSerializer.java @@ -33,7 +33,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class PhpSetSerializer implements IPhpSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("array", "array()"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpShortSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpShortSerializer.java index 676102d1..8965b3e9 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpShortSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpShortSerializer.java @@ -29,7 +29,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class PhpShortSerializer implements IPhpSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("int", "0"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpStringSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpStringSerializer.java index 666337df..f9d4019b 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpStringSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/php/PhpStringSerializer.java @@ -29,7 +29,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class PhpStringSerializer implements IPhpSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("string", "\"\""); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/scala/CodeGenerateScala.java b/protocol/src/main/java/com/zfoo/protocol/serializer/scala/CodeGenerateScala.java index f2033c7c..73d82c1d 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/scala/CodeGenerateScala.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/scala/CodeGenerateScala.java @@ -279,7 +279,7 @@ public class CodeGenerateScala implements ICodeGenerate { for (var fieldNote : fieldNotes) { scalaBuilder.append(fieldNote).append(LS); } - var pair = scalaSerializer(fieldRegistration.serializer()).field(field, fieldRegistration); + var pair = scalaSerializer(fieldRegistration.serializer()).fieldTypeDefaultValue(field, fieldRegistration); scalaBuilder.append(StringUtils.format("var {}: {} = {}", fieldName, pair.getKey(), pair.getValue())).append(LS); } return scalaBuilder.toString(); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/scala/IScalaSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/scala/IScalaSerializer.java index 54ddbc1a..acc7d159 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/scala/IScalaSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/scala/IScalaSerializer.java @@ -25,7 +25,7 @@ public interface IScalaSerializer { /** * 获取属性的类型，默认值 */ - Pair field(Field field, IFieldRegistration fieldRegistration); + Pair fieldTypeDefaultValue(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/scala/ScalaArraySerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaArraySerializer.java index 2785d48b..f670b8af 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaArraySerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaArraySerializer.java @@ -31,7 +31,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class ScalaArraySerializer implements IScalaSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { var type = StringUtils.format("Array[{}]", CodeGenerateScala.toScalaClassName(field.getType().getComponentType().getSimpleName())); return new Pair<>(type, "_"); } @@ -84,7 +84,7 @@ public class ScalaArraySerializer implements IScalaSerializer { builder.append(StringUtils.format("val {} = buffer.readInt", size)).append(LS); GenerateProtocolFile.addTab(builder, deep); - var pair = CodeGenerateScala.scalaSerializer(arrayField.getArrayElementRegistration().serializer()).field(field, arrayField.getArrayElementRegistration()); + var pair = CodeGenerateScala.scalaSerializer(arrayField.getArrayElementRegistration().serializer()).fieldTypeDefaultValue(field, arrayField.getArrayElementRegistration()); var defaultValue = pair.getValue(); if (defaultValue.equals("null")) { defaultValue = StringUtils.format("{}()", typeName); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaBoolSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaBoolSerializer.java index ed74a02c..4e092e7d 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaBoolSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaBoolSerializer.java @@ -28,7 +28,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class ScalaBoolSerializer implements IScalaSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("Boolean", "false"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaByteSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaByteSerializer.java index 08fe531f..7e8849b5 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaByteSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaByteSerializer.java @@ -28,7 +28,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class ScalaByteSerializer implements IScalaSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("Byte", "0"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaDoubleSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaDoubleSerializer.java index f6f701a2..446df5dd 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaDoubleSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaDoubleSerializer.java @@ -28,7 +28,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class ScalaDoubleSerializer implements IScalaSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("Double", "0D"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaFloatSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaFloatSerializer.java index 6598e390..fffefda1 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaFloatSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaFloatSerializer.java @@ -28,7 +28,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class ScalaFloatSerializer implements IScalaSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("Float", "0f"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaIntSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaIntSerializer.java index 9942b4f6..bcad37ac 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaIntSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaIntSerializer.java @@ -28,7 +28,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class ScalaIntSerializer implements IScalaSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("Int", "0"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaListSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaListSerializer.java index e72ff2a0..a849d528 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaListSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaListSerializer.java @@ -31,7 +31,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class ScalaListSerializer implements IScalaSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { var type = StringUtils.format("{}", CodeGenerateScala.toScalaClassName(field.getGenericType().toString())); return new Pair<>(type, "_"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaLongSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaLongSerializer.java index 0b1edce5..73f698bb 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaLongSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaLongSerializer.java @@ -28,7 +28,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class ScalaLongSerializer implements IScalaSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("Long", "0L"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaMapSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaMapSerializer.java index 3352d647..ab98fed2 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaMapSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaMapSerializer.java @@ -31,7 +31,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class ScalaMapSerializer implements IScalaSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { var type = StringUtils.format("{}", CodeGenerateScala.toScalaClassName(field.getGenericType().toString())); return new Pair<>(type, "_"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaObjectProtocolSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaObjectProtocolSerializer.java index a154c655..c535c4dd 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaObjectProtocolSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaObjectProtocolSerializer.java @@ -31,7 +31,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class ScalaObjectProtocolSerializer implements IScalaSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { ObjectProtocolField objectProtocolField = (ObjectProtocolField) fieldRegistration; var protocolSimpleName = EnhanceObjectProtocolSerializer.getProtocolClassSimpleName(objectProtocolField.getProtocolId()); return new Pair<>(protocolSimpleName, "_"); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaSetSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaSetSerializer.java index 59220e59..303eb527 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaSetSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaSetSerializer.java @@ -31,7 +31,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class ScalaSetSerializer implements IScalaSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { var type = StringUtils.format("{}", CodeGenerateScala.toScalaClassName(field.getGenericType().toString())); return new Pair<>(type, "_"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaShortSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaShortSerializer.java index 1dcb25a4..476f7fbf 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaShortSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaShortSerializer.java @@ -28,7 +28,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class ScalaShortSerializer implements IScalaSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("Short", "0"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaStringSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaStringSerializer.java index b93848a6..43c1e0f5 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaStringSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/scala/ScalaStringSerializer.java @@ -28,7 +28,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class ScalaStringSerializer implements IScalaSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("String", "_"); } 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 f2dff891..3e4e7077 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()).fieldTypeValue(field, fieldRegistration); + var pair = tsSerializer(fieldRegistration.serializer()).fieldTypeDefaultValue(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 5365147a..4bf9e0f1 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 @@ -26,7 +26,7 @@ public interface ITsSerializer { /** * 获取属性的类型，默认值 */ - Pair fieldTypeValue(Field field, IFieldRegistration fieldRegistration); + Pair fieldTypeDefaultValue(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 684737b1..2dbda717 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 fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(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 c2019212..f0b3d88d 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 fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(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 d2d39f90..4128ada2 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 fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(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 306464a9..87205a4e 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 fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(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 eb6e94ee..7779ffbb 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 fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(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 f64f16a3..965612d3 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 fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(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 bd8d0f84..d339777a 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 fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(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 7a0395c7..1d9168aa 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 fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(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 2adad6a0..7fd9ed7a 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 fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(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 d397077b..4010e63e 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 fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(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 d1a82f20..a5005b1b 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 fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(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 dc34d7f9..64bffef6 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 fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(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 f130cf97..69553289 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 fieldTypeValue(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("string", "''"); }