From d5e1f495df129d4f284e88a87d979caa66c793a8 Mon Sep 17 00:00:00 2001 From: godotg Date: Mon, 15 Jan 2024 18:53:49 +0800 Subject: [PATCH] fix[generate]: join root path and generate path --- .../com/zfoo/protocol/serializer/cpp/GenerateCppUtils.java | 7 +------ .../zfoo/protocol/serializer/csharp/GenerateCsUtils.java | 7 +------ .../zfoo/protocol/serializer/gdscript/GenerateGdUtils.java | 7 +------ .../com/zfoo/protocol/serializer/go/GenerateGoUtils.java | 7 +------ .../protocol/serializer/javascript/GenerateJsUtils.java | 7 +------ .../com/zfoo/protocol/serializer/lua/GenerateLuaUtils.java | 7 +------ .../zfoo/protocol/serializer/protobuf/GeneratePbUtils.java | 7 +------ .../zfoo/protocol/serializer/python/GeneratePyUtils.java | 7 +------ .../protocol/serializer/typescript/GenerateTsUtils.java | 7 +------ 9 files changed, 9 insertions(+), 54 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 c2891a4e..fd7a447c 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 @@ -62,12 +62,7 @@ public abstract class GenerateCppUtils { } public static void init(GenerateOperation generateOperation) { - // if not specify output path, then use current default path - if (StringUtils.isNotEmpty(generateOperation.getProtocolPath())) { - protocolOutputPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath); - } else { - protocolOutputPath = generateOperation.getProtocolPath(); - } + protocolOutputPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath); FileUtils.deleteFile(new File(protocolOutputPath)); cppSerializerMap = new HashMap<>(); 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 fecb5019..adc349ac 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 @@ -58,12 +58,7 @@ public abstract class GenerateCsUtils { } public static void init(GenerateOperation generateOperation) { - // if not specify output path, then use current default path - if (StringUtils.isNotEmpty(generateOperation.getProtocolPath())) { - protocolOutputPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath); - } else { - protocolOutputPath = generateOperation.getProtocolPath(); - } + protocolOutputPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath); FileUtils.deleteFile(new File(protocolOutputPath)); csSerializerMap = new HashMap<>(); 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 83fad8a2..51df366f 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 @@ -61,12 +61,7 @@ public abstract class GenerateGdUtils { } public static void init(GenerateOperation generateOperation) { - // if not specify output path, then use current default path - if (StringUtils.isNotEmpty(generateOperation.getProtocolPath())) { - protocolOutputPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath); - } else { - protocolOutputPath = generateOperation.getProtocolPath(); - } + protocolOutputPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath); FileUtils.deleteFile(new File(protocolOutputPath)); gdSerializerMap = new HashMap<>(); 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 69f01781..fcaf4e3b 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 @@ -56,12 +56,7 @@ public abstract class GenerateGoUtils { } public static void init(GenerateOperation generateOperation) { - // if not specify output path, then use current default path - if (StringUtils.isNotEmpty(generateOperation.getProtocolPath())) { - protocolOutputPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath); - } else { - protocolOutputPath = generateOperation.getProtocolPath(); - } + protocolOutputPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath); FileUtils.deleteFile(new File(protocolOutputPath)); goSerializerMap = new HashMap<>(); 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 5a5975e8..2e064a24 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 @@ -55,12 +55,7 @@ public abstract class GenerateJsUtils { } public static void init(GenerateOperation generateOperation) { - // if not specify output path, then use current default path - if (StringUtils.isNotEmpty(generateOperation.getProtocolPath())) { - protocolOutputPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath); - } else { - protocolOutputPath = generateOperation.getProtocolPath(); - } + protocolOutputPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath); FileUtils.deleteFile(new File(protocolOutputPath)); jsSerializerMap = new HashMap<>(); 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 15ea904a..4f0b52e6 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 @@ -57,12 +57,7 @@ public abstract class GenerateLuaUtils { } public static void init(GenerateOperation generateOperation) { - // if not specify output path, then use current default path - if (StringUtils.isNotEmpty(generateOperation.getProtocolPath())) { - protocolOutputPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath); - } else { - protocolOutputPath = generateOperation.getProtocolPath(); - } + protocolOutputPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath); FileUtils.deleteFile(new File(protocolOutputPath)); luaSerializerMap = new HashMap<>(); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/protobuf/GeneratePbUtils.java b/protocol/src/main/java/com/zfoo/protocol/serializer/protobuf/GeneratePbUtils.java index c7486f3a..a56b9bab 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/protobuf/GeneratePbUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/protobuf/GeneratePbUtils.java @@ -48,12 +48,7 @@ public abstract class GeneratePbUtils { public static final int COMPATIBLE_FIELD_TAG = 1000; public static void create(PbGenerateOperation pbGenerateOperation) { - // if not specify output path, then use current default path - if (StringUtils.isEmpty(pbGenerateOperation.getOutputPath())) { - protocolOutputPath = FileUtils.joinPath(pbGenerateOperation.getOutputPath(), protocolOutputRootPath); - } else { - protocolOutputPath = pbGenerateOperation.getOutputPath(); - } + protocolOutputPath = FileUtils.joinPath(pbGenerateOperation.getOutputPath(), protocolOutputRootPath); // java package path if (StringUtils.isNotEmpty(pbGenerateOperation.getJavaPackage())) { protocolOutputPath = protocolOutputPath + File.separator + pbGenerateOperation.getJavaPackage().replaceAll(StringUtils.PERIOD_REGEX, "/"); 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 7808b1e3..79315adb 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 @@ -57,12 +57,7 @@ public abstract class GeneratePyUtils { } public static void init(GenerateOperation generateOperation) { - // if not specify output path, then use current default path - if (StringUtils.isNotEmpty(generateOperation.getProtocolPath())) { - protocolOutputPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath); - } else { - protocolOutputPath = generateOperation.getProtocolPath(); - } + protocolOutputPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath); FileUtils.deleteFile(new File(protocolOutputPath)); pySerializerMap = new HashMap<>(); 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 e8d30b5f..4eb35ab9 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 @@ -58,12 +58,7 @@ public abstract class GenerateTsUtils { } public static void init(GenerateOperation generateOperation) { - // if not specify output path, then use current default path - if (StringUtils.isNotEmpty(generateOperation.getProtocolPath())) { - protocolOutputPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath); - } else { - protocolOutputPath = generateOperation.getProtocolPath(); - } + protocolOutputPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath); FileUtils.deleteFile(new File(protocolOutputPath)); tsSerializerMap = new HashMap<>();