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 b06fd248..e3e4dbf4 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 @@ -232,7 +232,7 @@ public abstract class GeneratePbUtils { var builder = new StringBuilder(); // package definition - builder.append(StringUtils.format("package {};", pbGenerateOperation.getJavaPackage())).append(LS).append(LS); + builder.append(StringUtils.format("package {}.{};", pbGenerateOperation.getJavaPackage(), proto.getName())).append(LS).append(LS); // import other class var imports = buildMessageImports(pbGenerateOperation, protos, proto, pbMessage); @@ -259,10 +259,6 @@ public abstract class GeneratePbUtils { imports.add(Protocol.class.getName()); var pbFields = pbMessage.getFields(); - if (CollectionUtils.isEmpty(pbFields)) { - return StringUtils.EMPTY; - } - for (var pbField : pbFields) { if (CollectionUtils.isNotEmpty(pbField.getComments())) { imports.add(Note.class.getName()); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/protobuf/parser/Proto.java b/protocol/src/main/java/com/zfoo/protocol/serializer/protobuf/parser/Proto.java index 9c90c7e6..11d424c5 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/protobuf/parser/Proto.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/protobuf/parser/Proto.java @@ -26,6 +26,10 @@ import java.util.List; */ public class Proto { + /** + * 协议的起始Id + */ + private short startProtocolId; /** * Proto描述文件的名称 */ @@ -54,10 +58,15 @@ public class Proto { * proto文件的单行注释列表 */ private List comments = new ArrayList<>(); - /** - * 协议的起始Id - */ - private short startProtocolId; + + + public short getStartProtocolId() { + return startProtocolId; + } + + public void setStartProtocolId(short startProtocolId) { + this.startProtocolId = startProtocolId; + } public String getName() { return name; @@ -115,11 +124,4 @@ public class Proto { this.comments = comments; } - public short getStartProtocolId() { - return startProtocolId; - } - - public void setStartProtocolId(short startProtocolId) { - this.startProtocolId = startProtocolId; - } } \ No newline at end of file