From f6aa27cb1d2125e11c1b47c977fd19a9a1b3ac60 Mon Sep 17 00:00:00 2001
From: godotg <jaysunxiao@gmail.com>
Date: Thu, 30 Nov 2023 18:59:31 +0800
Subject: [PATCH] perf[protocol]: all protocol files are generated in a single
 protocol file

---
 .../protocol/serializer/lua/GenerateLuaUtils.java  |  4 ++--
 .../resources/lua-one/ProtocolReaderTemplate.lua   | 14 ++++++++++----
 .../resources/lua-one/ProtocolWriterTemplate.lua   | 14 ++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/lua/GenerateLuaUtils.java b/protocol/src/main/java/com/zfoo/protocol/serializer/lua/GenerateLuaUtils.java
index 0b629bc0..90134786 100644
--- a/protocol/src/main/java/com/zfoo/protocol/serializer/lua/GenerateLuaUtils.java
+++ b/protocol/src/main/java/com/zfoo/protocol/serializer/lua/GenerateLuaUtils.java
@@ -139,8 +139,8 @@ public abstract class GenerateLuaUtils {
 
             var protocol = StringUtils.format(protocolTemplate, classNote, protocolClazzName, StringUtils.EMPTY_JSON, protocolClazzName, valueOfMethod.trim());
             var protocolBase = StringUtils.format(protocolBaseTemplate, protocolClazzName, protocolId, protocolClazzName, protocolClazzName, protocolClazzName, toStringJsonTemplate, toStringParams);
-            var protocolWriter = StringUtils.format(protocolWriterTemplate, protocolClazzName, writePacket.trim(), protocolClazzName);
-            var protocolReader = StringUtils.format(protocolReaderTemplate, protocolClazzName, readPacket.trim());
+            var protocolWriter = StringUtils.format(protocolWriterTemplate, protocolClazzName, writePacket.trim());
+            var protocolReader = StringUtils.format(protocolReaderTemplate, protocolClazzName, protocolClazzName, readPacket.trim());
 
             builderProtocol.append(protocol).append(LS);
             builderProtocolBase.append(protocolBase).append(LS).append(LS);
diff --git a/protocol/src/main/resources/lua-one/ProtocolReaderTemplate.lua b/protocol/src/main/resources/lua-one/ProtocolReaderTemplate.lua
index d4347420..1c82e934 100644
--- a/protocol/src/main/resources/lua-one/ProtocolReaderTemplate.lua
+++ b/protocol/src/main/resources/lua-one/ProtocolReaderTemplate.lua
@@ -1,7 +1,13 @@
-function Protocols.{}:write(buffer, packet)
-    if packet == nil then
-        buffer:writeInt(0)
-        return
+function Protocols.{}:read(buffer)
+    local length = buffer:readInt()
+    if length == 0 then
+        return nil
     end
+    local beforeReadIndex = buffer:getReadOffset()
+    local packet = Protocols.{}:new()
     {}
+    if length > 0 then
+        buffer:setReadOffset(beforeReadIndex + length)
+    end
+    return packet
 end
\ No newline at end of file
diff --git a/protocol/src/main/resources/lua-one/ProtocolWriterTemplate.lua b/protocol/src/main/resources/lua-one/ProtocolWriterTemplate.lua
index 1c82e934..d4347420 100644
--- a/protocol/src/main/resources/lua-one/ProtocolWriterTemplate.lua
+++ b/protocol/src/main/resources/lua-one/ProtocolWriterTemplate.lua
@@ -1,13 +1,7 @@
-function Protocols.{}:read(buffer)
-    local length = buffer:readInt()
-    if length == 0 then
-        return nil
+function Protocols.{}:write(buffer, packet)
+    if packet == nil then
+        buffer:writeInt(0)
+        return
     end
-    local beforeReadIndex = buffer:getReadOffset()
-    local packet = Protocols.{}:new()
     {}
-    if length > 0 then
-        buffer:setReadOffset(beforeReadIndex + length)
-    end
-    return packet
 end
\ No newline at end of file