fix[pb]: missing package definition

This commit is contained in:
godotg committed 2024-01-11 19:52:55 +08:00
1 parent 265f625934
commit 89e63d7153
2 files changed
+14 -16

No files matched your search

@@ -232,7 +232,7 @@ public abstract class GeneratePbUtils {
var builder = new StringBuilder(); var builder = new StringBuilder();
// package definition // 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 // import other class
var imports = buildMessageImports(pbGenerateOperation, protos, proto, pbMessage); var imports = buildMessageImports(pbGenerateOperation, protos, proto, pbMessage);
@@ -259,10 +259,6 @@ public abstract class GeneratePbUtils {
imports.add(Protocol.class.getName()); imports.add(Protocol.class.getName());
var pbFields = pbMessage.getFields(); var pbFields = pbMessage.getFields();
if (CollectionUtils.isEmpty(pbFields)) {
return StringUtils.EMPTY;
}
for (var pbField : pbFields) { for (var pbField : pbFields) {
if (CollectionUtils.isNotEmpty(pbField.getComments())) { if (CollectionUtils.isNotEmpty(pbField.getComments())) {
imports.add(Note.class.getName()); imports.add(Note.class.getName());
@@ -26,6 +26,10 @@ import java.util.List;
*/ */
public class Proto { public class Proto {
/**
* 协议的起始Id
*/
private short startProtocolId;
/** /**
* Proto描述文件的名称 * Proto描述文件的名称
*/ */
@@ -54,10 +58,15 @@ public class Proto {
* proto文件的单行注释列表 * proto文件的单行注释列表
*/ */
private List<String> comments = new ArrayList<>(); private List<String> comments = new ArrayList<>();
/**
* 协议的起始Id
*/ public short getStartProtocolId() {
private short startProtocolId; return startProtocolId;
}
public void setStartProtocolId(short startProtocolId) {
this.startProtocolId = startProtocolId;
}
public String getName() { public String getName() {
return name; return name;
@@ -115,11 +124,4 @@ public class Proto {
this.comments = comments; this.comments = comments;
} }
public short getStartProtocolId() {
return startProtocolId;
}
public void setStartProtocolId(short startProtocolId) {
this.startProtocolId = startProtocolId;
}
} }