From 0b08d4eac09e0ed708ff9a4e9ca8924e99e35360 Mon Sep 17 00:00:00 2001 From: godotg Date: Mon, 15 Jan 2024 16:07:04 +0800 Subject: [PATCH] fix[generate]: the root path of the generated protocol is incorrect --- .../serializer/cpp/GenerateCppUtils.java | 2 +- .../serializer/csharp/GenerateCsUtils.java | 2 +- .../serializer/gdscript/GenerateGdUtils.java | 2 +- .../serializer/go/GenerateGoUtils.java | 2 +- .../javascript/GenerateJsUtils.java | 2 +- .../serializer/lua/GenerateLuaUtils.java | 20 +++++++++---------- .../serializer/python/GeneratePyUtils.java | 2 +- .../typescript/GenerateTsUtils.java | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/GenerateCppUtils.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/GenerateCppUtils.java index 538d042a..c2891a4e 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/GenerateCppUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/GenerateCppUtils.java @@ -63,7 +63,7 @@ public abstract class GenerateCppUtils { public static void init(GenerateOperation generateOperation) { // if not specify output path, then use current default path - if (StringUtils.isEmpty(generateOperation.getProtocolPath())) { + if (StringUtils.isNotEmpty(generateOperation.getProtocolPath())) { protocolOutputPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath); } else { protocolOutputPath = generateOperation.getProtocolPath(); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/csharp/GenerateCsUtils.java b/protocol/src/main/java/com/zfoo/protocol/serializer/csharp/GenerateCsUtils.java index 0584de42..fecb5019 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/csharp/GenerateCsUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/csharp/GenerateCsUtils.java @@ -59,7 +59,7 @@ public abstract class GenerateCsUtils { public static void init(GenerateOperation generateOperation) { // if not specify output path, then use current default path - if (StringUtils.isEmpty(generateOperation.getProtocolPath())) { + if (StringUtils.isNotEmpty(generateOperation.getProtocolPath())) { protocolOutputPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath); } else { protocolOutputPath = generateOperation.getProtocolPath(); 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 dc71a30c..83fad8a2 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 @@ -62,7 +62,7 @@ public abstract class GenerateGdUtils { public static void init(GenerateOperation generateOperation) { // if not specify output path, then use current default path - if (StringUtils.isEmpty(generateOperation.getProtocolPath())) { + if (StringUtils.isNotEmpty(generateOperation.getProtocolPath())) { protocolOutputPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath); } else { protocolOutputPath = generateOperation.getProtocolPath(); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/go/GenerateGoUtils.java b/protocol/src/main/java/com/zfoo/protocol/serializer/go/GenerateGoUtils.java index 138e087a..69f01781 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/go/GenerateGoUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/go/GenerateGoUtils.java @@ -57,7 +57,7 @@ public abstract class GenerateGoUtils { public static void init(GenerateOperation generateOperation) { // if not specify output path, then use current default path - if (StringUtils.isEmpty(generateOperation.getProtocolPath())) { + if (StringUtils.isNotEmpty(generateOperation.getProtocolPath())) { protocolOutputPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath); } else { protocolOutputPath = generateOperation.getProtocolPath(); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/GenerateJsUtils.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/GenerateJsUtils.java index 03d5a989..5a5975e8 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/GenerateJsUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/GenerateJsUtils.java @@ -56,7 +56,7 @@ public abstract class GenerateJsUtils { public static void init(GenerateOperation generateOperation) { // if not specify output path, then use current default path - if (StringUtils.isEmpty(generateOperation.getProtocolPath())) { + if (StringUtils.isNotEmpty(generateOperation.getProtocolPath())) { protocolOutputPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath); } else { protocolOutputPath = generateOperation.getProtocolPath(); 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 ff35016d..15ea904a 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 @@ -58,7 +58,7 @@ public abstract class GenerateLuaUtils { public static void init(GenerateOperation generateOperation) { // if not specify output path, then use current default path - if (StringUtils.isEmpty(generateOperation.getProtocolPath())) { + if (StringUtils.isNotEmpty(generateOperation.getProtocolPath())) { protocolOutputPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath); } else { protocolOutputPath = generateOperation.getProtocolPath(); @@ -105,7 +105,7 @@ public abstract class GenerateLuaUtils { protocolBuilder.append(TAB).append(StringUtils.format("protocols[{}] = Protocols.{}", protocolId, protocolName)).append(LS); } protocolManagerTemplate = StringUtils.format(protocolManagerTemplate, StringUtils.EMPTY_JSON, StringUtils.EMPTY_JSON, builderImports.toString().trim(), protocolBuilder.toString().trim()); - var file = new File(StringUtils.format("{}/{}", protocolOutputRootPath, "ProtocolManager.lua")); + var file = new File(StringUtils.format("{}/{}", protocolOutputPath, "ProtocolManager.lua")); FileUtils.writeStringToFile(file, protocolManagerTemplate, true); logger.info("Generated Lua protocol manager file:[{}] is in path:[{}]", file.getName(), file.getAbsolutePath()); } @@ -158,10 +158,10 @@ public abstract class GenerateLuaUtils { builderProtocol.append(StringUtils.format("Protocols.{} = {}", protocolClazzName, protocolClazzName)).append(LS); } builderProtocol.append("return Protocols"); - var protocolsFile = new File(StringUtils.format("{}/{}", protocolOutputRootPath, "Protocols.lua")); - var protocolBaseFile = new File(StringUtils.format("{}/{}", protocolOutputRootPath, "ProtocolBase.lua")); - var protocolWriterFile = new File(StringUtils.format("{}/{}", protocolOutputRootPath, "ProtocolWriter.lua")); - var protocolReaderFile = new File(StringUtils.format("{}/{}", protocolOutputRootPath, "ProtocolReader.lua")); + var protocolsFile = new File(StringUtils.format("{}/{}", protocolOutputPath, "Protocols.lua")); + var protocolBaseFile = new File(StringUtils.format("{}/{}", protocolOutputPath, "ProtocolBase.lua")); + var protocolWriterFile = new File(StringUtils.format("{}/{}", protocolOutputPath, "ProtocolWriter.lua")); + var protocolReaderFile = new File(StringUtils.format("{}/{}", protocolOutputPath, "ProtocolReader.lua")); FileUtils.writeStringToFile(protocolsFile, builderProtocol.toString(), true); FileUtils.writeStringToFile(protocolBaseFile, builderProtocolBase.toString(), true); FileUtils.writeStringToFile(protocolWriterFile, builderProtocolWriter.toString(), true); @@ -193,7 +193,7 @@ public abstract class GenerateLuaUtils { protocolBuilder.append(TAB).append(StringUtils.format("protocols[{}] = {}", protocolId, protocolName)).append(LS); } protocolManagerTemplate = StringUtils.format(protocolManagerTemplate, StringUtils.EMPTY_JSON, StringUtils.EMPTY_JSON, fieldBuilder.toString().trim(), protocolBuilder.toString().trim()); - var file = new File(StringUtils.format("{}/{}", protocolOutputRootPath, "ProtocolManager.lua")); + var file = new File(StringUtils.format("{}/{}", protocolOutputPath, "ProtocolManager.lua")); FileUtils.writeStringToFile(file, protocolManagerTemplate, true); logger.info("Generated Lua protocol manager file:[{}] is in path:[{}]", file.getName(), file.getAbsolutePath()); } @@ -202,13 +202,13 @@ public abstract class GenerateLuaUtils { var list = List.of("lua/Long.lua"); for (var fileName : list) { var fileInputStream = ClassUtils.getFileFromClassPath(fileName); - var createFile = new File(StringUtils.format("{}/{}", protocolOutputRootPath, StringUtils.substringAfterFirst(fileName, "lua/"))); + var createFile = new File(StringUtils.format("{}/{}", protocolOutputPath, StringUtils.substringAfterFirst(fileName, "lua/"))); FileUtils.writeInputStreamToFile(createFile, fileInputStream); } var byteBufferFileName = "lua/ByteBuffer.lua"; var byteBufferTemplate = ClassUtils.getFileFromClassPathToString(byteBufferFileName); - var byteBufferFile = new File(StringUtils.format("{}/{}", protocolOutputRootPath, StringUtils.substringAfterFirst(byteBufferFileName, "lua/"))); + var byteBufferFile = new File(StringUtils.format("{}/{}", protocolOutputPath, StringUtils.substringAfterFirst(byteBufferFileName, "lua/"))); FileUtils.writeStringToFile(byteBufferFile, StringUtils.format(byteBufferTemplate, protocolOutputRootPath), false); } @@ -234,7 +234,7 @@ public abstract class GenerateLuaUtils { , protocolClazzName, writePacket.trim(), protocolClazzName, protocolClazzName, readPacket.trim(), protocolClazzName); var outputPath = StringUtils.format("{}/{}/{}.lua" - , protocolOutputRootPath, GenerateProtocolPath.getProtocolPath(protocolId), protocolClazzName); + , protocolOutputPath, GenerateProtocolPath.getProtocolPath(protocolId), protocolClazzName); var file = new File(outputPath); FileUtils.writeStringToFile(file, protocolTemplate, true); logger.info("Generated Lua protocol file:[{}] is in path:[{}]", file.getName(), file.getAbsolutePath()); 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 32895c98..7808b1e3 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 @@ -58,7 +58,7 @@ public abstract class GeneratePyUtils { public static void init(GenerateOperation generateOperation) { // if not specify output path, then use current default path - if (StringUtils.isEmpty(generateOperation.getProtocolPath())) { + if (StringUtils.isNotEmpty(generateOperation.getProtocolPath())) { protocolOutputPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath); } else { protocolOutputPath = generateOperation.getProtocolPath(); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/GenerateTsUtils.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/GenerateTsUtils.java index 8bc20fe0..e8d30b5f 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/GenerateTsUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/GenerateTsUtils.java @@ -59,7 +59,7 @@ public abstract class GenerateTsUtils { public static void init(GenerateOperation generateOperation) { // if not specify output path, then use current default path - if (StringUtils.isEmpty(generateOperation.getProtocolPath())) { + if (StringUtils.isNotEmpty(generateOperation.getProtocolPath())) { protocolOutputPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath); } else { protocolOutputPath = generateOperation.getProtocolPath();