diff --git a/protocol/src/main/java/com/zfoo/protocol/generate/GenerateProtocolPath.java b/protocol/src/main/java/com/zfoo/protocol/generate/GenerateProtocolPath.java index 694e6d71..7e004410 100644 --- a/protocol/src/main/java/com/zfoo/protocol/generate/GenerateProtocolPath.java +++ b/protocol/src/main/java/com/zfoo/protocol/generate/GenerateProtocolPath.java @@ -16,9 +16,6 @@ import com.zfoo.protocol.collection.CollectionUtils; import com.zfoo.protocol.collection.tree.GeneralTree; import com.zfoo.protocol.collection.tree.TreeNode; import com.zfoo.protocol.registration.ProtocolRegistration; -import com.zfoo.protocol.serializer.CodeLanguage; -import com.zfoo.protocol.serializer.enhance.EnhanceObjectProtocolSerializer; -import com.zfoo.protocol.util.AssertionUtils; import com.zfoo.protocol.util.StringUtils; import java.util.*; @@ -63,7 +60,7 @@ public abstract class GenerateProtocolPath { return StringUtils.joinWith(StringUtils.SLASH, Arrays.stream(protocolPathSlash(protocolId).split(StringUtils.SLASH)).map(it -> StringUtils.capitalize(it)).toArray()); } - public static String getRelativePath(short protocolId, short relativeProtocolId) { + public static String relativePath(short protocolId, short relativeProtocolId) { // 不是折叠协议的话,protocolPathMap一定是空,这里返回“”,上层会解析为同一个文件下 if (CollectionUtils.isEmpty(protocolPathMap)) { return StringUtils.EMPTY; diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/CodeGenerateTypeScript.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/CodeGenerateTypeScript.java index ebbbc9b1..eb9e00f7 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/CodeGenerateTypeScript.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/CodeGenerateTypeScript.java @@ -238,7 +238,7 @@ public class CodeGenerateTypeScript implements ICodeGenerate { // import other sub protocols for (var subProtocolId : subProtocols) { var protocolName = EnhanceObjectProtocolSerializer.getProtocolClassSimpleName(subProtocolId); - var path = GenerateProtocolPath.getRelativePath(protocolId, subProtocolId); + var path = GenerateProtocolPath.relativePath(protocolId, subProtocolId); importBuilder.append(StringUtils.format("import {} from '{}/{}';", protocolName, path, protocolName)).append(LS); } return importBuilder.toString();