From 6e7470a737e699d66759a06f03d2fd9ccecbd86f Mon Sep 17 00:00:00 2001 From: sun Date: Thu, 31 Aug 2023 16:45:07 +0800 Subject: [PATCH] perf[tab]: unified add tab method entry --- .../generate/GenerateProtocolFile.java | 6 +++++ .../gdscript/GdArraySerializer.java | 20 ++++++++--------- .../gdscript/GdBooleanSerializer.java | 4 ++-- .../serializer/gdscript/GdByteSerializer.java | 4 ++-- .../serializer/gdscript/GdCharSerializer.java | 4 ++-- .../gdscript/GdDoubleSerializer.java | 4 ++-- .../gdscript/GdFloatSerializer.java | 4 ++-- .../serializer/gdscript/GdIntSerializer.java | 4 ++-- .../serializer/gdscript/GdListSerializer.java | 20 ++++++++--------- .../serializer/gdscript/GdLongSerializer.java | 4 ++-- .../serializer/gdscript/GdMapSerializer.java | 22 +++++++++---------- .../gdscript/GdObjectProtocolSerializer.java | 4 ++-- .../serializer/gdscript/GdSetSerializer.java | 20 ++++++++--------- .../gdscript/GdShortSerializer.java | 4 ++-- .../gdscript/GdStringSerializer.java | 4 ++-- .../serializer/gdscript/GenerateGdUtils.java | 4 ---- .../serializer/python/GeneratePyUtils.java | 4 ---- .../serializer/python/PyArraySerializer.java | 20 ++++++++--------- .../python/PyBooleanSerializer.java | 4 ++-- .../serializer/python/PyByteSerializer.java | 4 ++-- .../serializer/python/PyCharSerializer.java | 4 ++-- .../serializer/python/PyDoubleSerializer.java | 4 ++-- .../serializer/python/PyFloatSerializer.java | 4 ++-- .../serializer/python/PyIntSerializer.java | 4 ++-- .../serializer/python/PyListSerializer.java | 20 ++++++++--------- .../serializer/python/PyLongSerializer.java | 4 ++-- .../serializer/python/PyMapSerializer.java | 22 +++++++++---------- .../python/PyObjectProtocolSerializer.java | 4 ++-- .../serializer/python/PySetSerializer.java | 20 ++++++++--------- .../serializer/python/PyShortSerializer.java | 4 ++-- .../serializer/python/PyStringSerializer.java | 4 ++-- 31 files changed, 128 insertions(+), 130 deletions(-) diff --git a/protocol/src/main/java/com/zfoo/protocol/generate/GenerateProtocolFile.java b/protocol/src/main/java/com/zfoo/protocol/generate/GenerateProtocolFile.java index 7d8a83ba..c34b3d2e 100644 --- a/protocol/src/main/java/com/zfoo/protocol/generate/GenerateProtocolFile.java +++ b/protocol/src/main/java/com/zfoo/protocol/generate/GenerateProtocolFile.java @@ -38,6 +38,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import static com.zfoo.protocol.util.StringUtils.TAB; +import static com.zfoo.protocol.util.StringUtils.TAB_ASCII; /** * @author godotg @@ -57,6 +58,11 @@ public abstract class GenerateProtocolFile { return builder; } + public static StringBuilder addTabAscii(StringBuilder builder, int deep) { + builder.append(TAB_ASCII.repeat(Math.max(0, deep))); + return builder; + } + public static void clear() { generateProtocolFilter = null; index = null; diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdArraySerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdArraySerializer.java index 09b83e6f..744099e1 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdArraySerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdArraySerializer.java @@ -49,7 +49,7 @@ public class GdArraySerializer implements IGdSerializer { @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); if (CutDownArraySerializer.getInstance().writeObject(builder, objectStr, field, fieldRegistration, CodeLanguage.GdScript)) { return; } @@ -57,16 +57,16 @@ public class GdArraySerializer implements IGdSerializer { ArrayField arrayField = (ArrayField) fieldRegistration; builder.append(StringUtils.format("if ({} == null):", objectStr)).append(LS); - GenerateGdUtils.addTab(builder, deep + 1); + GenerateProtocolFile.addTabAscii(builder, deep + 1); builder.append("buffer.writeInt(0)").append(LS); - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); builder.append("else:").append(LS); - GenerateGdUtils.addTab(builder, deep + 1); + GenerateProtocolFile.addTabAscii(builder, deep + 1); builder.append(StringUtils.format("buffer.writeInt({}.size())", objectStr)).append(LS); String element = "element" + GenerateProtocolFile.index.getAndIncrement(); - GenerateGdUtils.addTab(builder, deep + 1); + GenerateProtocolFile.addTabAscii(builder, deep + 1); builder.append(StringUtils.format("for {} in {}:", element, objectStr)).append(LS); GenerateGdUtils.gdSerializer(arrayField.getArrayElementRegistration().serializer()) .writeObject(builder, element, deep + 2, field, arrayField.getArrayElementRegistration()); @@ -74,7 +74,7 @@ public class GdArraySerializer implements IGdSerializer { @Override public String readObject(StringBuilder builder, int deep, Field field, IFieldRegistration fieldRegistration) { - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); var cutDown = CutDownArraySerializer.getInstance().readObject(builder, field, fieldRegistration, CodeLanguage.GdScript); if (cutDown != null) { return cutDown; @@ -88,16 +88,16 @@ public class GdArraySerializer implements IGdSerializer { String i = "index" + GenerateProtocolFile.index.getAndIncrement(); String size = "size" + GenerateProtocolFile.index.getAndIncrement(); - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); builder.append(StringUtils.format("var {} = buffer.readInt()", size)).append(LS); - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); builder.append(StringUtils.format("if ({} > 0):", size)).append(LS); - GenerateGdUtils.addTab(builder, deep + 1); + GenerateProtocolFile.addTabAscii(builder, deep + 1); builder.append(StringUtils.format("for {} in range({}):", i, size)).append(LS); String readObject = GenerateGdUtils.gdSerializer(arrayField.getArrayElementRegistration().serializer()) .readObject(builder, deep + 2, field, arrayField.getArrayElementRegistration()); - GenerateGdUtils.addTab(builder, deep + 2); + GenerateProtocolFile.addTabAscii(builder, deep + 2); builder.append(StringUtils.format("{}.append({})", result, readObject)).append(LS); return result; } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdBooleanSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdBooleanSerializer.java index da80bb44..f148070d 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdBooleanSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdBooleanSerializer.java @@ -35,7 +35,7 @@ public class GdBooleanSerializer implements IGdSerializer { @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); builder.append(StringUtils.format("buffer.writeBool({})", objectStr)).append(LS); } @@ -43,7 +43,7 @@ public class GdBooleanSerializer implements IGdSerializer { public String readObject(StringBuilder builder, int deep, Field field, IFieldRegistration fieldRegistration) { String result = "result" + GenerateProtocolFile.index.getAndIncrement(); - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); builder.append(StringUtils.format("var {} = buffer.readBool() ", result)).append(LS); return result; } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdByteSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdByteSerializer.java index d78a7425..0737ad60 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdByteSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdByteSerializer.java @@ -35,7 +35,7 @@ public class GdByteSerializer implements IGdSerializer { @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); builder.append(StringUtils.format("buffer.writeByte({})", objectStr)).append(LS); } @@ -43,7 +43,7 @@ public class GdByteSerializer implements IGdSerializer { public String readObject(StringBuilder builder, int deep, Field field, IFieldRegistration fieldRegistration) { String result = "result" + GenerateProtocolFile.index.getAndIncrement(); - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); builder.append(StringUtils.format("var {} = buffer.readByte()", result)).append(LS); return result; } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdCharSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdCharSerializer.java index 8be8c798..7f49ff3a 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdCharSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdCharSerializer.java @@ -34,14 +34,14 @@ public class GdCharSerializer implements IGdSerializer { @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); builder.append(StringUtils.format("buffer.writeChar({})", objectStr)).append(LS); } @Override public String readObject(StringBuilder builder, int deep, Field field, IFieldRegistration fieldRegistration) { String result = "result" + GenerateProtocolFile.index.getAndIncrement(); - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); builder.append(StringUtils.format("var {} = buffer.readChar()", result)).append(LS); return result; } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdDoubleSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdDoubleSerializer.java index 97470a0b..cc23e763 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdDoubleSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdDoubleSerializer.java @@ -35,7 +35,7 @@ public class GdDoubleSerializer implements IGdSerializer { @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); builder.append(StringUtils.format("buffer.writeDouble({})", objectStr)).append(LS); } @@ -43,7 +43,7 @@ public class GdDoubleSerializer implements IGdSerializer { public String readObject(StringBuilder builder, int deep, Field field, IFieldRegistration fieldRegistration) { String result = "result" + GenerateProtocolFile.index.getAndIncrement(); - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); builder.append(StringUtils.format("var {} = buffer.readDouble()", result)).append(LS); return result; } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdFloatSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdFloatSerializer.java index 4f2c44f9..c68e0268 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdFloatSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdFloatSerializer.java @@ -35,7 +35,7 @@ public class GdFloatSerializer implements IGdSerializer { @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); builder.append(StringUtils.format("buffer.writeFloat({})", objectStr)).append(LS); } @@ -43,7 +43,7 @@ public class GdFloatSerializer implements IGdSerializer { public String readObject(StringBuilder builder, int deep, Field field, IFieldRegistration fieldRegistration) { String result = "result" + GenerateProtocolFile.index.getAndIncrement(); - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); builder.append(StringUtils.format("var {} = buffer.readFloat()", result)).append(LS); return result; } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdIntSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdIntSerializer.java index 8dfd0002..03503def 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdIntSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdIntSerializer.java @@ -34,7 +34,7 @@ public class GdIntSerializer implements IGdSerializer { @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); builder.append(StringUtils.format("buffer.writeInt({})", objectStr)).append(LS); } @@ -42,7 +42,7 @@ public class GdIntSerializer implements IGdSerializer { public String readObject(StringBuilder builder, int deep, Field field, IFieldRegistration fieldRegistration) { String result = "result" + GenerateProtocolFile.index.getAndIncrement(); - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); builder.append(StringUtils.format("var {} = buffer.readInt()", result)).append(LS); return result; } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdListSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdListSerializer.java index aa302848..674a59a3 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdListSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdListSerializer.java @@ -40,7 +40,7 @@ public class GdListSerializer implements IGdSerializer { @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); if (CutDownListSerializer.getInstance().writeObject(builder, objectStr, field, fieldRegistration, CodeLanguage.GdScript)) { return; } @@ -48,16 +48,16 @@ public class GdListSerializer implements IGdSerializer { ListField listField = (ListField) fieldRegistration; builder.append(StringUtils.format("if ({} == null):", objectStr)).append(LS); - GenerateGdUtils.addTab(builder, deep + 1); + GenerateProtocolFile.addTabAscii(builder, deep + 1); builder.append("buffer.writeInt(0)").append(LS); - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); builder.append("else:").append(LS); - GenerateGdUtils.addTab(builder, deep + 1); + GenerateProtocolFile.addTabAscii(builder, deep + 1); builder.append(StringUtils.format("buffer.writeInt({}.size())", objectStr)).append(LS); String element = "element" + GenerateProtocolFile.index.getAndIncrement(); - GenerateGdUtils.addTab(builder, deep + 1); + GenerateProtocolFile.addTabAscii(builder, deep + 1); builder.append(StringUtils.format("for {} in {}:", element, objectStr)).append(LS); GenerateGdUtils.gdSerializer(listField.getListElementRegistration().serializer()) .writeObject(builder, element, deep + 2, field, listField.getListElementRegistration()); @@ -65,7 +65,7 @@ public class GdListSerializer implements IGdSerializer { @Override public String readObject(StringBuilder builder, int deep, Field field, IFieldRegistration fieldRegistration) { - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); var cutDown = CutDownListSerializer.getInstance().readObject(builder, field, fieldRegistration, CodeLanguage.GdScript); if (cutDown != null) { return cutDown; @@ -79,16 +79,16 @@ public class GdListSerializer implements IGdSerializer { String i = "index" + GenerateProtocolFile.index.getAndIncrement(); String size = "size" + GenerateProtocolFile.index.getAndIncrement(); - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); builder.append(StringUtils.format("var {} = buffer.readInt()", size)).append(LS); - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); builder.append(StringUtils.format("if ({} > 0):", size)).append(LS); - GenerateGdUtils.addTab(builder, deep + 1); + GenerateProtocolFile.addTabAscii(builder, deep + 1); builder.append(StringUtils.format("for {} in range({}):", i, size)).append(LS); String readObject = GenerateGdUtils.gdSerializer(listField.getListElementRegistration().serializer()) .readObject(builder, deep + 2, field, listField.getListElementRegistration()); - GenerateGdUtils.addTab(builder, deep + 2); + GenerateProtocolFile.addTabAscii(builder, deep + 2); builder.append(StringUtils.format("{}.append({})", result, readObject)).append(LS); return result; } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdLongSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdLongSerializer.java index 1a919228..35566b03 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdLongSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdLongSerializer.java @@ -34,7 +34,7 @@ public class GdLongSerializer implements IGdSerializer { @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); builder.append(StringUtils.format("buffer.writeLong({})", objectStr)).append(LS); } @@ -42,7 +42,7 @@ public class GdLongSerializer implements IGdSerializer { public String readObject(StringBuilder builder, int deep, Field field, IFieldRegistration fieldRegistration) { String result = "result" + GenerateProtocolFile.index.getAndIncrement(); - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); builder.append(StringUtils.format("var {} = buffer.readLong()", result)).append(LS); return result; } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdMapSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdMapSerializer.java index d7eac95a..aa26b3b3 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdMapSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdMapSerializer.java @@ -37,28 +37,28 @@ public class GdMapSerializer implements IGdSerializer { @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); if (CutDownMapSerializer.getInstance().writeObject(builder, objectStr, field, fieldRegistration, CodeLanguage.GdScript)) { return; } MapField mapField = (MapField) fieldRegistration; builder.append(StringUtils.format("if ({} == null):", objectStr)).append(LS); - GenerateGdUtils.addTab(builder, deep + 1); + GenerateProtocolFile.addTabAscii(builder, deep + 1); builder.append("buffer.writeInt(0)").append(LS); - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); builder.append("else:").append(LS); - GenerateGdUtils.addTab(builder, deep + 1); + GenerateProtocolFile.addTabAscii(builder, deep + 1); builder.append(StringUtils.format("buffer.writeInt({}.size())", objectStr)).append(LS); String key = "key" + GenerateProtocolFile.index.getAndIncrement(); String value = "value" + GenerateProtocolFile.index.getAndIncrement(); - GenerateGdUtils.addTab(builder, deep + 1); + GenerateProtocolFile.addTabAscii(builder, deep + 1); builder.append(StringUtils.format("for {} in {}:", key, objectStr)).append(LS); - GenerateGdUtils.addTab(builder, deep + 2); + GenerateProtocolFile.addTabAscii(builder, deep + 2); builder.append(StringUtils.format("var {} = {}[{}]", value, objectStr, key)).append(LS); GenerateGdUtils.gdSerializer(mapField.getMapKeyRegistration().serializer()) .writeObject(builder, key, deep + 2, field, mapField.getMapKeyRegistration()); @@ -68,7 +68,7 @@ public class GdMapSerializer implements IGdSerializer { @Override public String readObject(StringBuilder builder, int deep, Field field, IFieldRegistration fieldRegistration) { - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); var cutDown = CutDownMapSerializer.getInstance().readObject(builder, field, fieldRegistration, CodeLanguage.GdScript); if (cutDown != null) { return cutDown; @@ -79,15 +79,15 @@ public class GdMapSerializer implements IGdSerializer { builder.append(StringUtils.format("var {} = {}", result)).append(LS); - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); String size = "size" + GenerateProtocolFile.index.getAndIncrement(); builder.append(StringUtils.format("var {} = buffer.readInt()", size)).append(LS); - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); builder.append(StringUtils.format("if ({} > 0):", size)).append(LS); String i = "index" + GenerateProtocolFile.index.getAndIncrement(); - GenerateGdUtils.addTab(builder, deep + 1); + GenerateProtocolFile.addTabAscii(builder, deep + 1); builder.append(StringUtils.format("for {} in range({}):", i, size)).append(LS); String keyObject = GenerateGdUtils.gdSerializer(mapField.getMapKeyRegistration().serializer()) @@ -96,7 +96,7 @@ public class GdMapSerializer implements IGdSerializer { String valueObject = GenerateGdUtils.gdSerializer(mapField.getMapValueRegistration().serializer()) .readObject(builder, deep + 2, field, mapField.getMapValueRegistration()); - GenerateGdUtils.addTab(builder, deep + 2); + GenerateProtocolFile.addTabAscii(builder, deep + 2); builder.append(StringUtils.format("{}[{}] = {}", result, keyObject, valueObject)).append(LS); return result; diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdObjectProtocolSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdObjectProtocolSerializer.java index 759d2a8f..79de506e 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdObjectProtocolSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdObjectProtocolSerializer.java @@ -38,7 +38,7 @@ public class GdObjectProtocolSerializer implements IGdSerializer { @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { ObjectProtocolField objectProtocolField = (ObjectProtocolField) fieldRegistration; - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); builder.append(StringUtils.format("buffer.writePacket({}, {})", objectStr, objectProtocolField.getProtocolId())).append(LS); } @@ -46,7 +46,7 @@ public class GdObjectProtocolSerializer implements IGdSerializer { public String readObject(StringBuilder builder, int deep, Field field, IFieldRegistration fieldRegistration) { ObjectProtocolField objectProtocolField = (ObjectProtocolField) fieldRegistration; var result = "result" + GenerateProtocolFile.index.getAndIncrement(); - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); builder.append(StringUtils.format("var {} = buffer.readPacket({})", result, objectProtocolField.getProtocolId())).append(LS); return result; } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdSetSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdSetSerializer.java index a9c5cc59..8eff3d5c 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdSetSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdSetSerializer.java @@ -40,7 +40,7 @@ public class GdSetSerializer implements IGdSerializer { @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); if (CutDownSetSerializer.getInstance().writeObject(builder, objectStr, field, fieldRegistration, CodeLanguage.GdScript)) { return; } @@ -48,16 +48,16 @@ public class GdSetSerializer implements IGdSerializer { SetField setField = (SetField) fieldRegistration; builder.append(StringUtils.format("if ({} == null):", objectStr)).append(LS); - GenerateGdUtils.addTab(builder, deep + 1); + GenerateProtocolFile.addTabAscii(builder, deep + 1); builder.append("buffer.writeInt(0)").append(LS); - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); builder.append("else:").append(LS); - GenerateGdUtils.addTab(builder, deep + 1); + GenerateProtocolFile.addTabAscii(builder, deep + 1); builder.append(StringUtils.format("buffer.writeInt({}.size())", objectStr)).append(LS); String element = "element" + GenerateProtocolFile.index.getAndIncrement(); - GenerateGdUtils.addTab(builder, deep + 1); + GenerateProtocolFile.addTabAscii(builder, deep + 1); builder.append(StringUtils.format("for {} in {}:", element, objectStr)).append(LS); GenerateGdUtils.gdSerializer(setField.getSetElementRegistration().serializer()) .writeObject(builder, element, deep + 2, field, setField.getSetElementRegistration()); @@ -65,7 +65,7 @@ public class GdSetSerializer implements IGdSerializer { @Override public String readObject(StringBuilder builder, int deep, Field field, IFieldRegistration fieldRegistration) { - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); var cutDown = CutDownSetSerializer.getInstance().readObject(builder, field, fieldRegistration, CodeLanguage.GdScript); if (cutDown != null) { return cutDown; @@ -79,16 +79,16 @@ public class GdSetSerializer implements IGdSerializer { String i = "index" + GenerateProtocolFile.index.getAndIncrement(); String size = "size" + GenerateProtocolFile.index.getAndIncrement(); - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); builder.append(StringUtils.format("var {} = buffer.readInt()", size)).append(LS); - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); builder.append(StringUtils.format("if ({} > 0):", size)).append(LS); - GenerateGdUtils.addTab(builder, deep + 1); + GenerateProtocolFile.addTabAscii(builder, deep + 1); builder.append(StringUtils.format("for {} in range({}):", i, size)).append(LS); String readObject = GenerateGdUtils.gdSerializer(setField.getSetElementRegistration().serializer()) .readObject(builder, deep + 2, field, setField.getSetElementRegistration()); - GenerateGdUtils.addTab(builder, deep + 2); + GenerateProtocolFile.addTabAscii(builder, deep + 2); builder.append(StringUtils.format("{}.append({})", result, readObject)).append(LS); return result; } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdShortSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdShortSerializer.java index 1c8c9c95..b50df5a5 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdShortSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdShortSerializer.java @@ -35,7 +35,7 @@ public class GdShortSerializer implements IGdSerializer { @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); builder.append(StringUtils.format("buffer.writeShort({})", objectStr)).append(LS); } @@ -43,7 +43,7 @@ public class GdShortSerializer implements IGdSerializer { public String readObject(StringBuilder builder, int deep, Field field, IFieldRegistration fieldRegistration) { String result = "result" + GenerateProtocolFile.index.getAndIncrement(); - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); builder.append(StringUtils.format("var {} = buffer.readShort()", result)).append(LS); return result; } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdStringSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdStringSerializer.java index 91e99cca..d7f83508 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdStringSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdStringSerializer.java @@ -34,14 +34,14 @@ public class GdStringSerializer implements IGdSerializer { @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append(StringUtils.format("buffer.writeString({})", objectStr)).append(LS); } @Override public String readObject(StringBuilder builder, int deep, Field field, IFieldRegistration fieldRegistration) { String result = "result" + GenerateProtocolFile.index.getAndIncrement(); - GenerateGdUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append(StringUtils.format("var {} = buffer.readString()", result)).append(LS); return result; } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GenerateGdUtils.java b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GenerateGdUtils.java index 678c0d90..f9fe6a3d 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GenerateGdUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GenerateGdUtils.java @@ -227,8 +227,4 @@ public abstract class GenerateGdUtils { return gdBuilder.toString(); } - public static StringBuilder addTab(StringBuilder builder, int deep) { - builder.append(TAB_ASCII.repeat(Math.max(0, deep))); - return builder; - } } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/python/GeneratePyUtils.java b/protocol/src/main/java/com/zfoo/protocol/serializer/python/GeneratePyUtils.java index 96fc5316..28586f5f 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/python/GeneratePyUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/python/GeneratePyUtils.java @@ -181,8 +181,4 @@ public abstract class GeneratePyUtils { return pyBuilder.toString(); } - public static StringBuilder addTab(StringBuilder builder, int deep) { - builder.append(TAB.repeat(Math.max(0, deep))); - return builder; - } } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyArraySerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyArraySerializer.java index 8f46ddb5..486a5e09 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyArraySerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyArraySerializer.java @@ -37,7 +37,7 @@ public class PyArraySerializer implements IPySerializer { @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); if (CutDownArraySerializer.getInstance().writeObject(builder, objectStr, field, fieldRegistration, CodeLanguage.Python)) { return; } @@ -45,16 +45,16 @@ public class PyArraySerializer implements IPySerializer { ArrayField arrayField = (ArrayField) fieldRegistration; builder.append(StringUtils.format("if {} is None:", objectStr)).append(LS); - GeneratePyUtils.addTab(builder, deep + 1); + GenerateProtocolFile.addTab(builder, deep + 1); builder.append("buffer.writeInt(0)").append(LS); - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append("else:").append(LS); - GeneratePyUtils.addTab(builder, deep + 1); + GenerateProtocolFile.addTab(builder, deep + 1); builder.append(StringUtils.format("buffer.writeInt(len({}))", objectStr)).append(LS); String element = "element" + GenerateProtocolFile.index.getAndIncrement(); - GeneratePyUtils.addTab(builder, deep + 1); + GenerateProtocolFile.addTab(builder, deep + 1); builder.append(StringUtils.format("for {} in {}:", element, objectStr)).append(LS); GeneratePyUtils.pySerializer(arrayField.getArrayElementRegistration().serializer()) .writeObject(builder, element, deep + 2, field, arrayField.getArrayElementRegistration()); @@ -62,7 +62,7 @@ public class PyArraySerializer implements IPySerializer { @Override public String readObject(StringBuilder builder, int deep, Field field, IFieldRegistration fieldRegistration) { - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); var cutDown = CutDownArraySerializer.getInstance().readObject(builder, field, fieldRegistration, CodeLanguage.Python); if (cutDown != null) { return cutDown; @@ -76,16 +76,16 @@ public class PyArraySerializer implements IPySerializer { String i = "index" + GenerateProtocolFile.index.getAndIncrement(); String size = "size" + GenerateProtocolFile.index.getAndIncrement(); - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append(StringUtils.format("{} = buffer.readInt()", size)).append(LS); - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append(StringUtils.format("if {} > 0:", size)).append(LS); - GeneratePyUtils.addTab(builder, deep + 1); + GenerateProtocolFile.addTab(builder, deep + 1); builder.append(StringUtils.format("for {} in range({}):", i, size)).append(LS); String readObject = GeneratePyUtils.pySerializer(arrayField.getArrayElementRegistration().serializer()) .readObject(builder, deep + 2, field, arrayField.getArrayElementRegistration()); - GeneratePyUtils.addTab(builder, deep + 2); + GenerateProtocolFile.addTab(builder, deep + 2); builder.append(StringUtils.format("{}.append({})", result, readObject)).append(LS); return result; } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyBooleanSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyBooleanSerializer.java index 7aac0b3a..065005af 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyBooleanSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyBooleanSerializer.java @@ -34,7 +34,7 @@ public class PyBooleanSerializer implements IPySerializer { @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append(StringUtils.format("buffer.writeBool({})", objectStr)).append(LS); } @@ -42,7 +42,7 @@ public class PyBooleanSerializer implements IPySerializer { public String readObject(StringBuilder builder, int deep, Field field, IFieldRegistration fieldRegistration) { String result = "result" + GenerateProtocolFile.index.getAndIncrement(); - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append(StringUtils.format("{} = buffer.readBool() ", result)).append(LS); return result; } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyByteSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyByteSerializer.java index 62a5e043..5f710024 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyByteSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyByteSerializer.java @@ -34,7 +34,7 @@ public class PyByteSerializer implements IPySerializer { @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append(StringUtils.format("buffer.writeByte({})", objectStr)).append(LS); } @@ -42,7 +42,7 @@ public class PyByteSerializer implements IPySerializer { public String readObject(StringBuilder builder, int deep, Field field, IFieldRegistration fieldRegistration) { String result = "result" + GenerateProtocolFile.index.getAndIncrement(); - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append(StringUtils.format("{} = buffer.readByte()", result)).append(LS); return result; } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyCharSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyCharSerializer.java index ae6272e0..b88d9e3a 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyCharSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyCharSerializer.java @@ -34,14 +34,14 @@ public class PyCharSerializer implements IPySerializer { @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append(StringUtils.format("buffer.writeChar({})", objectStr)).append(LS); } @Override public String readObject(StringBuilder builder, int deep, Field field, IFieldRegistration fieldRegistration) { String result = "result" + GenerateProtocolFile.index.getAndIncrement(); - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append(StringUtils.format("{} = buffer.readChar()", result)).append(LS); return result; } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyDoubleSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyDoubleSerializer.java index ece68a52..32d5a0e0 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyDoubleSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyDoubleSerializer.java @@ -34,7 +34,7 @@ public class PyDoubleSerializer implements IPySerializer { @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append(StringUtils.format("buffer.writeDouble({})", objectStr)).append(LS); } @@ -42,7 +42,7 @@ public class PyDoubleSerializer implements IPySerializer { public String readObject(StringBuilder builder, int deep, Field field, IFieldRegistration fieldRegistration) { String result = "result" + GenerateProtocolFile.index.getAndIncrement(); - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append(StringUtils.format("{} = buffer.readDouble()", result)).append(LS); return result; } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyFloatSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyFloatSerializer.java index 1e29b461..ecfd4af5 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyFloatSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyFloatSerializer.java @@ -34,7 +34,7 @@ public class PyFloatSerializer implements IPySerializer { @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append(StringUtils.format("buffer.writeFloat({})", objectStr)).append(LS); } @@ -42,7 +42,7 @@ public class PyFloatSerializer implements IPySerializer { public String readObject(StringBuilder builder, int deep, Field field, IFieldRegistration fieldRegistration) { String result = "result" + GenerateProtocolFile.index.getAndIncrement(); - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append(StringUtils.format("{} = buffer.readFloat()", result)).append(LS); return result; } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyIntSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyIntSerializer.java index 2d444c32..17f35b12 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyIntSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyIntSerializer.java @@ -34,7 +34,7 @@ public class PyIntSerializer implements IPySerializer { @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append(StringUtils.format("buffer.writeInt({})", objectStr)).append(LS); } @@ -42,7 +42,7 @@ public class PyIntSerializer implements IPySerializer { public String readObject(StringBuilder builder, int deep, Field field, IFieldRegistration fieldRegistration) { String result = "result" + GenerateProtocolFile.index.getAndIncrement(); - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append(StringUtils.format("{} = buffer.readInt()", result)).append(LS); return result; } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyListSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyListSerializer.java index 199977ed..05c03a76 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyListSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyListSerializer.java @@ -37,7 +37,7 @@ public class PyListSerializer implements IPySerializer { @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); if (CutDownListSerializer.getInstance().writeObject(builder, objectStr, field, fieldRegistration, CodeLanguage.Python)) { return; } @@ -45,16 +45,16 @@ public class PyListSerializer implements IPySerializer { ListField listField = (ListField) fieldRegistration; builder.append(StringUtils.format("if {} is None:", objectStr)).append(LS); - GeneratePyUtils.addTab(builder, deep + 1); + GenerateProtocolFile.addTab(builder, deep + 1); builder.append("buffer.writeInt(0)").append(LS); - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append("else:").append(LS); - GeneratePyUtils.addTab(builder, deep + 1); + GenerateProtocolFile.addTab(builder, deep + 1); builder.append(StringUtils.format("buffer.writeInt(len({}))", objectStr)).append(LS); String element = "element" + GenerateProtocolFile.index.getAndIncrement(); - GeneratePyUtils.addTab(builder, deep + 1); + GenerateProtocolFile.addTab(builder, deep + 1); builder.append(StringUtils.format("for {} in {}:", element, objectStr)).append(LS); GeneratePyUtils.pySerializer(listField.getListElementRegistration().serializer()) .writeObject(builder, element, deep + 2, field, listField.getListElementRegistration()); @@ -62,7 +62,7 @@ public class PyListSerializer implements IPySerializer { @Override public String readObject(StringBuilder builder, int deep, Field field, IFieldRegistration fieldRegistration) { - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); var cutDown = CutDownListSerializer.getInstance().readObject(builder, field, fieldRegistration, CodeLanguage.Python); if (cutDown != null) { return cutDown; @@ -76,16 +76,16 @@ public class PyListSerializer implements IPySerializer { String i = "index" + GenerateProtocolFile.index.getAndIncrement(); String size = "size" + GenerateProtocolFile.index.getAndIncrement(); - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append(StringUtils.format("{} = buffer.readInt()", size)).append(LS); - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append(StringUtils.format("if {} > 0:", size)).append(LS); - GeneratePyUtils.addTab(builder, deep + 1); + GenerateProtocolFile.addTab(builder, deep + 1); builder.append(StringUtils.format("for {} in range({}):", i, size)).append(LS); String readObject = GeneratePyUtils.pySerializer(listField.getListElementRegistration().serializer()) .readObject(builder, deep + 2, field, listField.getListElementRegistration()); - GeneratePyUtils.addTab(builder, deep + 2); + GenerateProtocolFile.addTab(builder, deep + 2); builder.append(StringUtils.format("{}.append({})", result, readObject)).append(LS); return result; } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyLongSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyLongSerializer.java index 4815cd06..0ec6e0ff 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyLongSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyLongSerializer.java @@ -34,7 +34,7 @@ public class PyLongSerializer implements IPySerializer { @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append(StringUtils.format("buffer.writeLong({})", objectStr)).append(LS); } @@ -42,7 +42,7 @@ public class PyLongSerializer implements IPySerializer { public String readObject(StringBuilder builder, int deep, Field field, IFieldRegistration fieldRegistration) { String result = "result" + GenerateProtocolFile.index.getAndIncrement(); - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append(StringUtils.format("{} = buffer.readLong()", result)).append(LS); return result; } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyMapSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyMapSerializer.java index 4520973b..271314a3 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyMapSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyMapSerializer.java @@ -37,28 +37,28 @@ public class PyMapSerializer implements IPySerializer { @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); if (CutDownMapSerializer.getInstance().writeObject(builder, objectStr, field, fieldRegistration, CodeLanguage.Python)) { return; } MapField mapField = (MapField) fieldRegistration; builder.append(StringUtils.format("if {} is None:", objectStr)).append(LS); - GeneratePyUtils.addTab(builder, deep + 1); + GenerateProtocolFile.addTab(builder, deep + 1); builder.append("buffer.writeInt(0)").append(LS); - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append("else:").append(LS); - GeneratePyUtils.addTab(builder, deep + 1); + GenerateProtocolFile.addTab(builder, deep + 1); builder.append(StringUtils.format("buffer.writeInt(len({}))", objectStr)).append(LS); String key = "key" + GenerateProtocolFile.index.getAndIncrement(); String value = "value" + GenerateProtocolFile.index.getAndIncrement(); - GeneratePyUtils.addTab(builder, deep + 1); + GenerateProtocolFile.addTab(builder, deep + 1); builder.append(StringUtils.format("for {} in {}:", key, objectStr)).append(LS); - GeneratePyUtils.addTab(builder, deep + 2); + GenerateProtocolFile.addTab(builder, deep + 2); builder.append(StringUtils.format("{} = {}[{}]", value, objectStr, key)).append(LS); GeneratePyUtils.pySerializer(mapField.getMapKeyRegistration().serializer()) .writeObject(builder, key, deep + 2, field, mapField.getMapKeyRegistration()); @@ -68,7 +68,7 @@ public class PyMapSerializer implements IPySerializer { @Override public String readObject(StringBuilder builder, int deep, Field field, IFieldRegistration fieldRegistration) { - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); var cutDown = CutDownMapSerializer.getInstance().readObject(builder, field, fieldRegistration, CodeLanguage.Python); if (cutDown != null) { return cutDown; @@ -79,15 +79,15 @@ public class PyMapSerializer implements IPySerializer { builder.append(StringUtils.format("{} = {}", result)).append(LS); - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); String size = "size" + GenerateProtocolFile.index.getAndIncrement(); builder.append(StringUtils.format("{} = buffer.readInt()", size)).append(LS); - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append(StringUtils.format("if {} > 0:", size)).append(LS); String i = "index" + GenerateProtocolFile.index.getAndIncrement(); - GeneratePyUtils.addTab(builder, deep + 1); + GenerateProtocolFile.addTab(builder, deep + 1); builder.append(StringUtils.format("for {} in range({}):", i, size)).append(LS); String keyObject = GeneratePyUtils.pySerializer(mapField.getMapKeyRegistration().serializer()) @@ -96,7 +96,7 @@ public class PyMapSerializer implements IPySerializer { String valueObject = GeneratePyUtils.pySerializer(mapField.getMapValueRegistration().serializer()) .readObject(builder, deep + 2, field, mapField.getMapValueRegistration()); - GeneratePyUtils.addTab(builder, deep + 2); + GenerateProtocolFile.addTab(builder, deep + 2); builder.append(StringUtils.format("{}[{}] = {}", result, keyObject, valueObject)).append(LS); return result; diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyObjectProtocolSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyObjectProtocolSerializer.java index d3812a8d..f4a1c7d3 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyObjectProtocolSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyObjectProtocolSerializer.java @@ -36,7 +36,7 @@ public class PyObjectProtocolSerializer implements IPySerializer { @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { ObjectProtocolField objectProtocolField = (ObjectProtocolField) fieldRegistration; - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append(StringUtils.format("buffer.writePacket({}, {})", objectStr, objectProtocolField.getProtocolId())).append(LS); } @@ -44,7 +44,7 @@ public class PyObjectProtocolSerializer implements IPySerializer { public String readObject(StringBuilder builder, int deep, Field field, IFieldRegistration fieldRegistration) { ObjectProtocolField objectProtocolField = (ObjectProtocolField) fieldRegistration; var result = "result" + GenerateProtocolFile.index.getAndIncrement(); - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append(StringUtils.format("{} = buffer.readPacket({})", result, objectProtocolField.getProtocolId())).append(LS); return result; } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/python/PySetSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/python/PySetSerializer.java index 60752c6f..1b9e64d4 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/python/PySetSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/python/PySetSerializer.java @@ -37,7 +37,7 @@ public class PySetSerializer implements IPySerializer { @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); if (CutDownSetSerializer.getInstance().writeObject(builder, objectStr, field, fieldRegistration, CodeLanguage.Python)) { return; } @@ -45,16 +45,16 @@ public class PySetSerializer implements IPySerializer { SetField setField = (SetField) fieldRegistration; builder.append(StringUtils.format("if {} is None:", objectStr)).append(LS); - GeneratePyUtils.addTab(builder, deep + 1); + GenerateProtocolFile.addTab(builder, deep + 1); builder.append("buffer.writeInt(0)").append(LS); - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append("else:").append(LS); - GeneratePyUtils.addTab(builder, deep + 1); + GenerateProtocolFile.addTab(builder, deep + 1); builder.append(StringUtils.format("buffer.writeInt(len({}))", objectStr)).append(LS); String element = "element" + GenerateProtocolFile.index.getAndIncrement(); - GeneratePyUtils.addTab(builder, deep + 1); + GenerateProtocolFile.addTab(builder, deep + 1); builder.append(StringUtils.format("for {} in {}:", element, objectStr)).append(LS); GeneratePyUtils.pySerializer(setField.getSetElementRegistration().serializer()) .writeObject(builder, element, deep + 2, field, setField.getSetElementRegistration()); @@ -62,7 +62,7 @@ public class PySetSerializer implements IPySerializer { @Override public String readObject(StringBuilder builder, int deep, Field field, IFieldRegistration fieldRegistration) { - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); var cutDown = CutDownSetSerializer.getInstance().readObject(builder, field, fieldRegistration, CodeLanguage.Python); if (cutDown != null) { return cutDown; @@ -76,16 +76,16 @@ public class PySetSerializer implements IPySerializer { String i = "index" + GenerateProtocolFile.index.getAndIncrement(); String size = "size" + GenerateProtocolFile.index.getAndIncrement(); - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append(StringUtils.format("{} = buffer.readInt()", size)).append(LS); - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append(StringUtils.format("if {} > 0:", size)).append(LS); - GeneratePyUtils.addTab(builder, deep + 1); + GenerateProtocolFile.addTab(builder, deep + 1); builder.append(StringUtils.format("for {} in range({}):", i, size)).append(LS); String readObject = GeneratePyUtils.pySerializer(setField.getSetElementRegistration().serializer()) .readObject(builder, deep + 2, field, setField.getSetElementRegistration()); - GeneratePyUtils.addTab(builder, deep + 2); + GenerateProtocolFile.addTab(builder, deep + 2); builder.append(StringUtils.format("{}.append({})", result, readObject)).append(LS); return result; } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyShortSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyShortSerializer.java index 030d1cb7..19b39119 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyShortSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyShortSerializer.java @@ -34,7 +34,7 @@ public class PyShortSerializer implements IPySerializer { @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append(StringUtils.format("buffer.writeShort({})", objectStr)).append(LS); } @@ -42,7 +42,7 @@ public class PyShortSerializer implements IPySerializer { public String readObject(StringBuilder builder, int deep, Field field, IFieldRegistration fieldRegistration) { String result = "result" + GenerateProtocolFile.index.getAndIncrement(); - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append(StringUtils.format("{} = buffer.readShort()", result)).append(LS); return result; } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyStringSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyStringSerializer.java index 490ed1ce..a2e6c765 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyStringSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/python/PyStringSerializer.java @@ -34,14 +34,14 @@ public class PyStringSerializer implements IPySerializer { @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append(StringUtils.format("buffer.writeString({})", objectStr)).append(LS); } @Override public String readObject(StringBuilder builder, int deep, Field field, IFieldRegistration fieldRegistration) { String result = "result" + GenerateProtocolFile.index.getAndIncrement(); - GeneratePyUtils.addTab(builder, deep); + GenerateProtocolFile.addTab(builder, deep); builder.append(StringUtils.format("{} = buffer.readString()", result)).append(LS); return result; }