tiennm99/zfoo
1
0
Fork 0
mirror of https://github.com/tiennm99/zfoo.git synced 2026-08-22 18:26:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat[protobuf]: check duplicate protocolId and protocolName

Browse Source
This commit is contained in:
godotg
2023-12-04 19:09:23 +08:00
parent 9c5a3e9127
commit fb5dba800d
2 changed files with 42 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
protocol/src/main/java/com/zfoo/protocol/serializer/protobuf/GeneratePbUtils.java
+32 -4
View File
@@ -16,6 +16,7 @@ package com.zfoo.protocol.serializer.protobuf;
import com.zfoo.protocol.anno.Note;
import com.zfoo.protocol.anno.Protocol;
import com.zfoo.protocol.collection.CollectionUtils;
import com.zfoo.protocol.model.Pair;
import com.zfoo.protocol.serializer.protobuf.parser.Proto;
import com.zfoo.protocol.serializer.protobuf.parser.ProtoParser;
import com.zfoo.protocol.util.FileUtils;
@@ -59,10 +60,40 @@ public abstract class GeneratePbUtils {
if (StringUtils.isBlank(protoString)) {
continue;
}
// parse protobuf proto
ProtoParser parser = new ProtoParser(protoString);
Proto proto = parser.parse();
proto.setName(FileUtils.fileSimpleName(protoFile.getName()));
protos.add(proto);
// auto generate protocolId
var startProtocolId = proto.getStartProtocolId();
for (var pbMessage : proto.getPbMessages()) {
pbMessage.setProtocolId(startProtocolId++);
}
}
// check duplicate protocolId and protocolName
var protocolIdMap = new HashMap<Short, Pair<Proto, PbMessage>>();
var protocolNameMap = new HashMap<String, Pair<Proto, PbMessage>>();
for (var proto : protos) {
for (var pbMessage : proto.getPbMessages()) {
var protocolId = pbMessage.getProtocolId();
var protocolName = pbMessage.getName();
if (protocolIdMap.containsKey(protocolId)) {
var pair = protocolIdMap.get(protocolId);
throw new RuntimeException(StringUtils.format("duplicate protocolId:[{}] in [{}]:[{}] and [{}]:[{}], consider proto start_protocol_id is too close"
, protocolId, pair.getKey().getName(), pair.getValue().getName(), proto.getName(), protocolName));
}
if (protocolNameMap.containsKey(protocolName)) {
var pair = protocolIdMap.get(protocolId);
throw new RuntimeException(StringUtils.format("duplicate protocol name in [{}]:[{}] and [{}]:[{}]"
, pair.getKey().getName(), pair.getValue().getName(), proto.getName(), protocolName));
}
protocolIdMap.put(protocolId, new Pair<>(proto, pbMessage));
protocolNameMap.put(protocolName, new Pair<>(proto, pbMessage));
}
}
return protos;
}
@@ -235,11 +266,8 @@ public abstract class GeneratePbUtils {
builder.append(documentComment);
// message
var startProtocolId = proto.getStartProtocolId();
builder.append(StringUtils.format("@Protocol(id = {})", startProtocolId)).append(LS);
builder.append(StringUtils.format("@Protocol(id = {})", pbMessage.getProtocolId())).append(LS);
builder.append(StringUtils.format("public class {} {", pbMessage.getName())).append(LS);
startProtocolId++;
proto.setStartProtocolId(startProtocolId);
var pbFields = pbMessage.getFields()
.stream()
protocol/src/main/java/com/zfoo/protocol/serializer/protobuf/PbMessage.java
+10 -17
View File
@@ -24,14 +24,14 @@ public class PbMessage {
* 消息的名称
*/
private String name;
/**
* 协议Id
*/
private short protocolId;
/**
* 消息包含的Fields列表
*/
private List<PbField> fields = new ArrayList<>();
/**
* 消息内嵌的Message列表
*/
private List<PbMessage> pbMessages = new ArrayList<>();
/**
* 消息的备注信息
*/
@@ -41,31 +41,24 @@ public class PbMessage {
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public short getProtocolId() {
return protocolId;
}
public void setProtocolId(short protocolId) {
this.protocolId = protocolId;
}
public List<PbField> getFields() {
return fields;
}
public void setFields(List<PbField> fields) {
this.fields = fields;
}
public List<PbMessage> getProtoMessages() {
return pbMessages;
}
public void setProtoMessages(List<PbMessage> pbMessages) {
this.pbMessages = pbMessages;
}
public List<String> getComments() {
return comments;
}
public void setComments(List<String> comments) {
this.comments = comments;
}