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 cd718eb9..785665b8 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,8 +253,8 @@ public class CodeGenerateJavaScript implements ICodeGenerate { for (var fieldNote : fieldNotes) { fieldDefinitionBuilder.append(fieldNote).append(LS); } - var triple = jsSerializer(fieldRegistration.serializer()).field(field, fieldRegistration); - fieldDefinitionBuilder.append(StringUtils.format("this.{} = {}; // {}", fieldName, triple.getRight(), triple.getLeft())) + var pair = jsSerializer(fieldRegistration.serializer()).field(field, fieldRegistration); + fieldDefinitionBuilder.append(StringUtils.format("this.{} = {}; // {}", fieldName, pair.getValue(), pair.getKey())) .append(LS); } 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 453cc892..62cac939 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 @@ -13,7 +13,7 @@ package com.zfoo.protocol.serializer.javascript; -import com.zfoo.protocol.model.Triple; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import java.lang.reflect.Field; @@ -26,7 +26,7 @@ public interface IJsSerializer { /** * 获取属性的类型,名称,默认值 */ - Triple field(Field field, IFieldRegistration fieldRegistration); + Pair field(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 323093e7..91b110dc 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 @@ -14,6 +14,7 @@ package com.zfoo.protocol.serializer.javascript; import com.zfoo.protocol.generate.GenerateProtocolFile; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.model.Triple; import com.zfoo.protocol.registration.field.ArrayField; import com.zfoo.protocol.registration.field.IFieldRegistration; @@ -31,9 +32,9 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsArraySerializer implements IJsSerializer { @Override - public Triple field(Field field, IFieldRegistration fieldRegistration) { + public Pair field(Field field, IFieldRegistration fieldRegistration) { var type = StringUtils.format("Array<{}>", CodeGenerateTypeScript.toTsClassName(field.getType().getComponentType().getSimpleName())); - return new Triple<>(type, field.getName(), "[]"); + return new Pair<>(type, "[]"); } @Override 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 3f4c4299..0bd43f53 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 @@ -14,7 +14,7 @@ package com.zfoo.protocol.serializer.javascript; import com.zfoo.protocol.generate.GenerateProtocolFile; -import com.zfoo.protocol.model.Triple; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.util.StringUtils; @@ -27,8 +27,8 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsBoolSerializer implements IJsSerializer { @Override - public Triple field(Field field, IFieldRegistration fieldRegistration) { - return new Triple<>("boolean", field.getName(), "false"); + public Pair field(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("boolean", "false"); } @Override 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 bde7f65f..7e924f4e 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 @@ -14,7 +14,7 @@ package com.zfoo.protocol.serializer.javascript; import com.zfoo.protocol.generate.GenerateProtocolFile; -import com.zfoo.protocol.model.Triple; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.util.StringUtils; @@ -27,8 +27,8 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsByteSerializer implements IJsSerializer { @Override - public Triple field(Field field, IFieldRegistration fieldRegistration) { - return new Triple<>("number", field.getName(), "0"); + public Pair field(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("number", "0"); } @Override 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 170d7114..ae41dd24 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 @@ -14,7 +14,7 @@ package com.zfoo.protocol.serializer.javascript; import com.zfoo.protocol.generate.GenerateProtocolFile; -import com.zfoo.protocol.model.Triple; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.util.StringUtils; @@ -27,8 +27,8 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsDoubleSerializer implements IJsSerializer { @Override - public Triple field(Field field, IFieldRegistration fieldRegistration) { - return new Triple<>("number", field.getName(), "0"); + public Pair field(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("number", "0"); } @Override 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 22df9fce..f252531d 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 @@ -14,7 +14,7 @@ package com.zfoo.protocol.serializer.javascript; import com.zfoo.protocol.generate.GenerateProtocolFile; -import com.zfoo.protocol.model.Triple; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.util.StringUtils; @@ -27,8 +27,8 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsFloatSerializer implements IJsSerializer { @Override - public Triple field(Field field, IFieldRegistration fieldRegistration) { - return new Triple<>("number", field.getName(), "0"); + public Pair field(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("number", "0"); } @Override 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 0226b179..2f9e413c 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 @@ -14,7 +14,7 @@ package com.zfoo.protocol.serializer.javascript; import com.zfoo.protocol.generate.GenerateProtocolFile; -import com.zfoo.protocol.model.Triple; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.util.StringUtils; @@ -27,8 +27,8 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsIntSerializer implements IJsSerializer { @Override - public Triple field(Field field, IFieldRegistration fieldRegistration) { - return new Triple<>("number", field.getName(), "0"); + public Pair field(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("number", "0"); } @Override 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 d8d8f0eb..17818ab0 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 @@ -14,7 +14,7 @@ package com.zfoo.protocol.serializer.javascript; import com.zfoo.protocol.generate.GenerateProtocolFile; -import com.zfoo.protocol.model.Triple; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.registration.field.ListField; import com.zfoo.protocol.serializer.CodeLanguage; @@ -31,8 +31,8 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsListSerializer implements IJsSerializer { @Override - public Triple field(Field field, IFieldRegistration fieldRegistration) { - return new Triple<>(CodeGenerateTypeScript.toTsClassName(field.getGenericType().toString()), field.getName(), "[]"); + public Pair field(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>(CodeGenerateTypeScript.toTsClassName(field.getGenericType().toString()), "[]"); } @Override 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 32e64d78..63f69e95 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 @@ -14,7 +14,7 @@ package com.zfoo.protocol.serializer.javascript; import com.zfoo.protocol.generate.GenerateProtocolFile; -import com.zfoo.protocol.model.Triple; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.util.StringUtils; @@ -27,8 +27,8 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsLongSerializer implements IJsSerializer { @Override - public Triple field(Field field, IFieldRegistration fieldRegistration) { - return new Triple<>("number", field.getName(), "0"); + public Pair field(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("number", "0"); } @Override 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 2ed479d1..c9f4b585 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 @@ -14,7 +14,7 @@ package com.zfoo.protocol.serializer.javascript; import com.zfoo.protocol.generate.GenerateProtocolFile; -import com.zfoo.protocol.model.Triple; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.registration.field.MapField; import com.zfoo.protocol.serializer.CodeLanguage; @@ -31,8 +31,8 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsMapSerializer implements IJsSerializer { @Override - public Triple field(Field field, IFieldRegistration fieldRegistration) { - return new Triple<>(CodeGenerateTypeScript.toTsClassName(field.getGenericType().toString()), field.getName(), "new Map()"); + public Pair field(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>(CodeGenerateTypeScript.toTsClassName(field.getGenericType().toString()), "new Map()"); } @Override 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 a3028562..40c3d20c 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 @@ -14,6 +14,7 @@ package com.zfoo.protocol.serializer.javascript; import com.zfoo.protocol.generate.GenerateProtocolFile; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.model.Triple; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.registration.field.ObjectProtocolField; @@ -29,11 +30,11 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsObjectProtocolSerializer implements IJsSerializer { @Override - public Triple field(Field field, IFieldRegistration fieldRegistration) { + public Pair field(Field field, IFieldRegistration fieldRegistration) { ObjectProtocolField objectProtocolField = (ObjectProtocolField) fieldRegistration; var protocolSimpleName = EnhanceObjectProtocolSerializer.getProtocolClassSimpleName(objectProtocolField.getProtocolId()); var type = StringUtils.format("{} | null", protocolSimpleName); - return new Triple<>(type, field.getName(), "null"); + return new Pair<>(type, "null"); } @Override 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 e7430e87..e1e177e0 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 @@ -14,7 +14,7 @@ package com.zfoo.protocol.serializer.javascript; import com.zfoo.protocol.generate.GenerateProtocolFile; -import com.zfoo.protocol.model.Triple; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.registration.field.SetField; import com.zfoo.protocol.serializer.CodeLanguage; @@ -31,8 +31,8 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsSetSerializer implements IJsSerializer { @Override - public Triple field(Field field, IFieldRegistration fieldRegistration) { - return new Triple<>(CodeGenerateTypeScript.toTsClassName(field.getGenericType().toString()), field.getName(), "new Set()"); + public Pair field(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>(CodeGenerateTypeScript.toTsClassName(field.getGenericType().toString()), "new Set()"); } @Override 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 3b05ba64..0d5cb202 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 @@ -14,7 +14,7 @@ package com.zfoo.protocol.serializer.javascript; import com.zfoo.protocol.generate.GenerateProtocolFile; -import com.zfoo.protocol.model.Triple; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.util.StringUtils; @@ -27,8 +27,8 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsShortSerializer implements IJsSerializer { @Override - public Triple field(Field field, IFieldRegistration fieldRegistration) { - return new Triple<>("number", field.getName(), "0"); + public Pair field(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("number", "0"); } @Override 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 afc1fc95..300aa4a9 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 @@ -14,7 +14,7 @@ package com.zfoo.protocol.serializer.javascript; import com.zfoo.protocol.generate.GenerateProtocolFile; -import com.zfoo.protocol.model.Triple; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.util.StringUtils; @@ -27,8 +27,8 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsStringSerializer implements IJsSerializer { @Override - public Triple field(Field field, IFieldRegistration fieldRegistration) { - return new Triple<>("string", field.getName(), "\"\""); + public Pair field(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("string", "\"\""); } @Override