diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/CodeGenerateJavaScript.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/CodeGenerateJavaScript.java index 785665b8..82be7e90 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/CodeGenerateJavaScript.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/CodeGenerateJavaScript.java @@ -253,10 +253,10 @@ public class CodeGenerateJavaScript implements ICodeGenerate { for (var fieldNote : fieldNotes) { fieldDefinitionBuilder.append(fieldNote).append(LS); } - var pair = jsSerializer(fieldRegistration.serializer()).field(field, fieldRegistration); - fieldDefinitionBuilder.append(StringUtils.format("this.{} = {}; // {}", fieldName, pair.getValue(), pair.getKey())) - .append(LS); - + var fieldTypeDefaultValue = jsSerializer(fieldRegistration.serializer()).fieldTypeDefaultValue(field, fieldRegistration); + var fieldType = fieldTypeDefaultValue.getKey(); + var fieldDefaultValue = fieldTypeDefaultValue.getValue(); + fieldDefinitionBuilder.append(StringUtils.format("this.{} = {}; // {}", fieldName, fieldDefaultValue, fieldType)).append(LS); } return fieldDefinitionBuilder.toString(); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/IJsSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/IJsSerializer.java index 62cac939..6f6590b1 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/IJsSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/IJsSerializer.java @@ -24,9 +24,9 @@ import java.lang.reflect.Field; public interface IJsSerializer { /** - * 获取属性的类型,名称,默认值 + * 获取属性的类型,默认值 */ - 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/javascript/JsArraySerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsArraySerializer.java index 91b110dc..7d0487b9 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsArraySerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsArraySerializer.java @@ -32,7 +32,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsArraySerializer implements IJsSerializer { @Override - public Pair field(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/javascript/JsBoolSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsBoolSerializer.java index 0bd43f53..4ee0712c 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsBoolSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsBoolSerializer.java @@ -27,7 +27,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsBoolSerializer implements IJsSerializer { @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/javascript/JsByteSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsByteSerializer.java index 7e924f4e..0e73718a 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsByteSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsByteSerializer.java @@ -27,7 +27,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsByteSerializer implements IJsSerializer { @Override - public Pair field(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/javascript/JsDoubleSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsDoubleSerializer.java index ae41dd24..48de010e 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsDoubleSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsDoubleSerializer.java @@ -27,7 +27,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsDoubleSerializer implements IJsSerializer { @Override - public Pair field(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/javascript/JsFloatSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsFloatSerializer.java index f252531d..21eadc46 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsFloatSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsFloatSerializer.java @@ -27,7 +27,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsFloatSerializer implements IJsSerializer { @Override - public Pair field(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/javascript/JsIntSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsIntSerializer.java index 2f9e413c..b811728e 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsIntSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsIntSerializer.java @@ -27,7 +27,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsIntSerializer implements IJsSerializer { @Override - public Pair field(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/javascript/JsListSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsListSerializer.java index 17818ab0..0eb77891 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsListSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsListSerializer.java @@ -31,7 +31,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsListSerializer implements IJsSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>(CodeGenerateTypeScript.toTsClassName(field.getGenericType().toString()), "[]"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsLongSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsLongSerializer.java index 63f69e95..44ce1d54 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsLongSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsLongSerializer.java @@ -27,7 +27,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsLongSerializer implements IJsSerializer { @Override - public Pair field(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/javascript/JsMapSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsMapSerializer.java index c9f4b585..21f0e72b 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsMapSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsMapSerializer.java @@ -31,7 +31,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsMapSerializer implements IJsSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>(CodeGenerateTypeScript.toTsClassName(field.getGenericType().toString()), "new Map()"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsObjectProtocolSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsObjectProtocolSerializer.java index 40c3d20c..216c4bf7 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsObjectProtocolSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsObjectProtocolSerializer.java @@ -30,7 +30,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsObjectProtocolSerializer implements IJsSerializer { @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()); var type = StringUtils.format("{} | null", protocolSimpleName); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsSetSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsSetSerializer.java index e1e177e0..b64eee62 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsSetSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsSetSerializer.java @@ -31,7 +31,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsSetSerializer implements IJsSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>(CodeGenerateTypeScript.toTsClassName(field.getGenericType().toString()), "new Set()"); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsShortSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsShortSerializer.java index 0d5cb202..82e1134c 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsShortSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsShortSerializer.java @@ -27,7 +27,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsShortSerializer implements IJsSerializer { @Override - public Pair field(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/javascript/JsStringSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsStringSerializer.java index 300aa4a9..0aee387f 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsStringSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsStringSerializer.java @@ -27,7 +27,7 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsStringSerializer implements IJsSerializer { @Override - public Pair field(Field field, IFieldRegistration fieldRegistration) { + public Pair fieldTypeDefaultValue(Field field, IFieldRegistration fieldRegistration) { return new Pair<>("string", "\"\""); }