From e4ac24a40e9abf083dd5c707b32cc16c859000e0 Mon Sep 17 00:00:00 2001 From: jaysunxiao Date: Mon, 6 Jun 2022 15:11:35 +0800 Subject: [PATCH] =?UTF-8?q?perf[protocol]:=20=E6=94=AF=E6=8C=81TypeScript?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serializer/typescript/TsArraySerializer.java | 5 ++--- .../protocol/serializer/typescript/TsListSerializer.java | 5 ++--- .../protocol/serializer/typescript/TsMapSerializer.java | 9 ++++----- .../protocol/serializer/typescript/TsSetSerializer.java | 5 ++--- 4 files changed, 10 insertions(+), 14 deletions(-) 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 5d11546d..847b7116 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 @@ -19,7 +19,6 @@ import com.zfoo.protocol.registration.field.ArrayField; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.serializer.CodeLanguage; import com.zfoo.protocol.serializer.CutDownArraySerializer; -import com.zfoo.protocol.serializer.javascript.GenerateJsUtils; import com.zfoo.protocol.util.StringUtils; import java.lang.reflect.Field; @@ -58,7 +57,7 @@ public class TsArraySerializer implements ITsSerializer { String element = "element" + GenerateProtocolFile.index.getAndIncrement(); GenerateProtocolFile.addTab(builder, deep + 1); builder.append(StringUtils.format("{}.forEach({} => {", objectStr, element)).append(LS); - GenerateJsUtils.jsSerializer(arrayField.getArrayElementRegistration().serializer()) + GenerateTsUtils.tsSerializer(arrayField.getArrayElementRegistration().serializer()) .writeObject(builder, element, deep + 2, field, arrayField.getArrayElementRegistration()); GenerateProtocolFile.addTab(builder, deep + 1); builder.append("});").append(LS); @@ -89,7 +88,7 @@ public class TsArraySerializer implements ITsSerializer { builder.append(StringUtils.format("if ({} > 0) {", size)).append(LS); GenerateProtocolFile.addTab(builder, deep + 1); builder.append(StringUtils.format("for (let {} = 0; {} < {}; {}++) {", i, i, size, i)).append(LS); - String readObject = GenerateJsUtils.jsSerializer(arrayField.getArrayElementRegistration().serializer()) + String readObject = GenerateTsUtils.tsSerializer(arrayField.getArrayElementRegistration().serializer()) .readObject(builder, deep + 2, field, arrayField.getArrayElementRegistration()); GenerateProtocolFile.addTab(builder, deep + 2); builder.append(StringUtils.format("{}.push({});", result, readObject)).append(LS); 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 16f9c01a..3b7c9162 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 @@ -19,7 +19,6 @@ import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.registration.field.ListField; import com.zfoo.protocol.serializer.CodeLanguage; import com.zfoo.protocol.serializer.CutDownListSerializer; -import com.zfoo.protocol.serializer.javascript.GenerateJsUtils; import com.zfoo.protocol.util.StringUtils; import java.lang.reflect.Field; @@ -58,7 +57,7 @@ public class TsListSerializer implements ITsSerializer { String element = "element" + GenerateProtocolFile.index.getAndIncrement(); GenerateProtocolFile.addTab(builder, deep + 1); builder.append(StringUtils.format("{}.forEach({} => {", objectStr, element)).append(LS); - GenerateJsUtils.jsSerializer(listField.getListElementRegistration().serializer()) + GenerateTsUtils.tsSerializer(listField.getListElementRegistration().serializer()) .writeObject(builder, element, deep + 2, field, listField.getListElementRegistration()); GenerateProtocolFile.addTab(builder, deep + 1); builder.append("});").append(LS); @@ -89,7 +88,7 @@ public class TsListSerializer implements ITsSerializer { GenerateProtocolFile.addTab(builder, deep + 1); String i = "index" + GenerateProtocolFile.index.getAndIncrement(); builder.append(StringUtils.format("for (let {} = 0; {} < {}; {}++) {", i, i, size, i)).append(LS); - String readObject = GenerateJsUtils.jsSerializer(listField.getListElementRegistration().serializer()) + String readObject = GenerateTsUtils.tsSerializer(listField.getListElementRegistration().serializer()) .readObject(builder, deep + 2, field, listField.getListElementRegistration()); GenerateProtocolFile.addTab(builder, deep + 2); builder.append(StringUtils.format("{}.push({});", result, readObject)).append(LS); 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 e0f02664..6d5d6468 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 @@ -19,7 +19,6 @@ import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.registration.field.MapField; import com.zfoo.protocol.serializer.CodeLanguage; import com.zfoo.protocol.serializer.CutDownMapSerializer; -import com.zfoo.protocol.serializer.javascript.GenerateJsUtils; import com.zfoo.protocol.util.StringUtils; import java.lang.reflect.Field; @@ -60,9 +59,9 @@ public class TsMapSerializer implements ITsSerializer { GenerateProtocolFile.addTab(builder, deep + 1); builder.append(StringUtils.format("{}.forEach(({}, {}) => {", objectStr, value, key)).append(LS); - GenerateJsUtils.jsSerializer(mapField.getMapKeyRegistration().serializer()) + GenerateTsUtils.tsSerializer(mapField.getMapKeyRegistration().serializer()) .writeObject(builder, key, deep + 2, field, mapField.getMapKeyRegistration()); - GenerateJsUtils.jsSerializer(mapField.getMapValueRegistration().serializer()) + GenerateTsUtils.tsSerializer(mapField.getMapValueRegistration().serializer()) .writeObject(builder, value, deep + 2, field, mapField.getMapValueRegistration()); GenerateProtocolFile.addTab(builder, deep + 1); builder.append("});").append(LS); @@ -94,11 +93,11 @@ public class TsMapSerializer implements ITsSerializer { GenerateProtocolFile.addTab(builder, deep + 1); builder.append(StringUtils.format("for (let {} = 0; {} < {}; {}++) {", i, i, size, i)).append(LS); - String keyObject = GenerateJsUtils.jsSerializer(mapField.getMapKeyRegistration().serializer()) + String keyObject = GenerateTsUtils.tsSerializer(mapField.getMapKeyRegistration().serializer()) .readObject(builder, deep + 2, field, mapField.getMapKeyRegistration()); - String valueObject = GenerateJsUtils.jsSerializer(mapField.getMapValueRegistration().serializer()) + String valueObject = GenerateTsUtils.tsSerializer(mapField.getMapValueRegistration().serializer()) .readObject(builder, deep + 2, field, mapField.getMapValueRegistration()); GenerateProtocolFile.addTab(builder, deep + 2); 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 78334873..9960787b 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 @@ -19,7 +19,6 @@ import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.registration.field.SetField; import com.zfoo.protocol.serializer.CodeLanguage; import com.zfoo.protocol.serializer.CutDownSetSerializer; -import com.zfoo.protocol.serializer.javascript.GenerateJsUtils; import com.zfoo.protocol.util.StringUtils; import java.lang.reflect.Field; @@ -59,7 +58,7 @@ public class TsSetSerializer implements ITsSerializer { String element = "element" + GenerateProtocolFile.index.getAndIncrement(); GenerateProtocolFile.addTab(builder, deep + 1); builder.append(StringUtils.format("{}.forEach({} => {", objectStr, element)).append(LS); - GenerateJsUtils.jsSerializer(setField.getSetElementRegistration().serializer()) + GenerateTsUtils.tsSerializer(setField.getSetElementRegistration().serializer()) .writeObject(builder, element, deep + 2, field, setField.getSetElementRegistration()); GenerateProtocolFile.addTab(builder, deep + 1); builder.append("});").append(LS); @@ -90,7 +89,7 @@ public class TsSetSerializer implements ITsSerializer { GenerateProtocolFile.addTab(builder, deep + 1); String i = "index" + GenerateProtocolFile.index.getAndIncrement(); builder.append(StringUtils.format("for (let {} = 0; {} < {}; {}++) {", i, i, size, i)).append(LS); - String readObject = GenerateJsUtils.jsSerializer(setField.getSetElementRegistration().serializer()) + String readObject = GenerateTsUtils.tsSerializer(setField.getSetElementRegistration().serializer()) .readObject(builder, deep + 2, field, setField.getSetElementRegistration()); GenerateProtocolFile.addTab(builder, deep + 2); builder.append(StringUtils.format("{}.add({});", result, readObject)).append(LS);