tiennm99/zfoo
1
0 Fork 0
mirror of https://github.com/tiennm99/zfoo.git synced 2026-10-14 20:17:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix[generate]: the root path of the generated protocol is incorrect

Browse Source
This commit is contained in:
godotg committed 2024-01-15 16:07:04 +08:00
1 parent 62fb1b4a42
commit 0b08d4eac0
8 files changed
+17 -17
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

protocol/src/main/java/com/zfoo/protocol/serializer/cpp/GenerateCppUtils.java
+1 -1
View File
@@ -63,7 +63,7 @@ public abstract class GenerateCppUtils {
public static void init(GenerateOperation generateOperation) { public static void init(GenerateOperation generateOperation) {
// if not specify output path, then use current default path // 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); protocolOutputPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath);
} else { } else {
protocolOutputPath = generateOperation.getProtocolPath(); protocolOutputPath = generateOperation.getProtocolPath();
protocol/src/main/java/com/zfoo/protocol/serializer/csharp/GenerateCsUtils.java
+1 -1
View File
@@ -59,7 +59,7 @@ public abstract class GenerateCsUtils {
public static void init(GenerateOperation generateOperation) { public static void init(GenerateOperation generateOperation) {
// if not specify output path, then use current default path // 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); protocolOutputPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath);
} else { } else {
protocolOutputPath = generateOperation.getProtocolPath(); protocolOutputPath = generateOperation.getProtocolPath();
protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GenerateGdUtils.java
+1 -1
View File
@@ -62,7 +62,7 @@ public abstract class GenerateGdUtils {
public static void init(GenerateOperation generateOperation) { public static void init(GenerateOperation generateOperation) {
// if not specify output path, then use current default path // 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); protocolOutputPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath);
} else { } else {
protocolOutputPath = generateOperation.getProtocolPath(); protocolOutputPath = generateOperation.getProtocolPath();
protocol/src/main/java/com/zfoo/protocol/serializer/go/GenerateGoUtils.java
+1 -1
View File
@@ -57,7 +57,7 @@ public abstract class GenerateGoUtils {
public static void init(GenerateOperation generateOperation) { public static void init(GenerateOperation generateOperation) {
// if not specify output path, then use current default path // 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); protocolOutputPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath);
} else { } else {
protocolOutputPath = generateOperation.getProtocolPath(); protocolOutputPath = generateOperation.getProtocolPath();
protocol/src/main/java/com/zfoo/protocol/serializer/javascript/GenerateJsUtils.java
+1 -1
View File
@@ -56,7 +56,7 @@ public abstract class GenerateJsUtils {
public static void init(GenerateOperation generateOperation) { public static void init(GenerateOperation generateOperation) {
// if not specify output path, then use current default path // 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); protocolOutputPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath);
} else { } else {
protocolOutputPath = generateOperation.getProtocolPath(); protocolOutputPath = generateOperation.getProtocolPath();
protocol/src/main/java/com/zfoo/protocol/serializer/lua/GenerateLuaUtils.java
+10 -10
View File
@@ -58,7 +58,7 @@ public abstract class GenerateLuaUtils {
public static void init(GenerateOperation generateOperation) { public static void init(GenerateOperation generateOperation) {
// if not specify output path, then use current default path // 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); protocolOutputPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath);
} else { } else {
protocolOutputPath = generateOperation.getProtocolPath(); protocolOutputPath = generateOperation.getProtocolPath();
@@ -105,7 +105,7 @@ public abstract class GenerateLuaUtils {
protocolBuilder.append(TAB).append(StringUtils.format("protocols[{}] = Protocols.{}", protocolId, protocolName)).append(LS); 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()); 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); FileUtils.writeStringToFile(file, protocolManagerTemplate, true);
logger.info("Generated Lua protocol manager file:[{}] is in path:[{}]", file.getName(), file.getAbsolutePath()); 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(StringUtils.format("Protocols.{} = {}", protocolClazzName, protocolClazzName)).append(LS);
} }
builderProtocol.append("return Protocols"); builderProtocol.append("return Protocols");
var protocolsFile = new File(StringUtils.format("{}/{}", protocolOutputRootPath, "Protocols.lua")); var protocolsFile = new File(StringUtils.format("{}/{}", protocolOutputPath, "Protocols.lua"));
var protocolBaseFile = new File(StringUtils.format("{}/{}", protocolOutputRootPath, "ProtocolBase.lua")); var protocolBaseFile = new File(StringUtils.format("{}/{}", protocolOutputPath, "ProtocolBase.lua"));
var protocolWriterFile = new File(StringUtils.format("{}/{}", protocolOutputRootPath, "ProtocolWriter.lua")); var protocolWriterFile = new File(StringUtils.format("{}/{}", protocolOutputPath, "ProtocolWriter.lua"));
var protocolReaderFile = new File(StringUtils.format("{}/{}", protocolOutputRootPath, "ProtocolReader.lua")); var protocolReaderFile = new File(StringUtils.format("{}/{}", protocolOutputPath, "ProtocolReader.lua"));
FileUtils.writeStringToFile(protocolsFile, builderProtocol.toString(), true); FileUtils.writeStringToFile(protocolsFile, builderProtocol.toString(), true);
FileUtils.writeStringToFile(protocolBaseFile, builderProtocolBase.toString(), true); FileUtils.writeStringToFile(protocolBaseFile, builderProtocolBase.toString(), true);
FileUtils.writeStringToFile(protocolWriterFile, builderProtocolWriter.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); 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()); 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); FileUtils.writeStringToFile(file, protocolManagerTemplate, true);
logger.info("Generated Lua protocol manager file:[{}] is in path:[{}]", file.getName(), file.getAbsolutePath()); 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"); var list = List.of("lua/Long.lua");
for (var fileName : list) { for (var fileName : list) {
var fileInputStream = ClassUtils.getFileFromClassPath(fileName); 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); FileUtils.writeInputStreamToFile(createFile, fileInputStream);
} }
var byteBufferFileName = "lua/ByteBuffer.lua"; var byteBufferFileName = "lua/ByteBuffer.lua";
var byteBufferTemplate = ClassUtils.getFileFromClassPathToString(byteBufferFileName); 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); FileUtils.writeStringToFile(byteBufferFile, StringUtils.format(byteBufferTemplate, protocolOutputRootPath), false);
} }
@@ -234,7 +234,7 @@ public abstract class GenerateLuaUtils {
, protocolClazzName, writePacket.trim(), protocolClazzName, protocolClazzName, readPacket.trim(), protocolClazzName); , protocolClazzName, writePacket.trim(), protocolClazzName, protocolClazzName, readPacket.trim(), protocolClazzName);
var outputPath = StringUtils.format("{}/{}/{}.lua" var outputPath = StringUtils.format("{}/{}/{}.lua"
, protocolOutputRootPath, GenerateProtocolPath.getProtocolPath(protocolId), protocolClazzName); , protocolOutputPath, GenerateProtocolPath.getProtocolPath(protocolId), protocolClazzName);
var file = new File(outputPath); var file = new File(outputPath);
FileUtils.writeStringToFile(file, protocolTemplate, true); FileUtils.writeStringToFile(file, protocolTemplate, true);
logger.info("Generated Lua protocol file:[{}] is in path:[{}]", file.getName(), file.getAbsolutePath()); logger.info("Generated Lua protocol file:[{}] is in path:[{}]", file.getName(), file.getAbsolutePath());
protocol/src/main/java/com/zfoo/protocol/serializer/python/GeneratePyUtils.java
+1 -1
View File
@@ -58,7 +58,7 @@ public abstract class GeneratePyUtils {
public static void init(GenerateOperation generateOperation) { public static void init(GenerateOperation generateOperation) {
// if not specify output path, then use current default path // 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); protocolOutputPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath);
} else { } else {
protocolOutputPath = generateOperation.getProtocolPath(); protocolOutputPath = generateOperation.getProtocolPath();
protocol/src/main/java/com/zfoo/protocol/serializer/typescript/GenerateTsUtils.java
+1 -1
View File
@@ -59,7 +59,7 @@ public abstract class GenerateTsUtils {
public static void init(GenerateOperation generateOperation) { public static void init(GenerateOperation generateOperation) {
// if not specify output path, then use current default path // 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); protocolOutputPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath);
} else { } else {
protocolOutputPath = generateOperation.getProtocolPath(); protocolOutputPath = generateOperation.getProtocolPath();