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

perf[net]: 不用强制在xml文件中写协议号

Browse Source
This commit is contained in:
jaysunxiao
2022-06-24 10:52:13 +08:00
parent cfc15a80be
commit fc027fc269
6 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java
+8 -5
View File
@@ -123,16 +123,18 @@ public class ProtocolAnalysis {
modules[module.getId()] = module;
for (var protocolDefinition : moduleDefinition.getProtocols()) {
var id = protocolDefinition.getId();
var location = protocolDefinition.getLocation();
var clazz = Class.forName(location);
var id = getProtocolIdByClass(clazz);
AssertionUtils.isTrue(id >= moduleDefinition.getMinId(), "模块[{}]中的协议[{}]的协议号必须大于或者等于[{}]", moduleDefinition.getName(), clazz.getSimpleName(), moduleDefinition.getMinId());
AssertionUtils.isTrue(id < moduleDefinition.getMaxId(), "模块[{}]中的协议[{}]的协议号必须小于[{}]", moduleDefinition.getName(), clazz.getSimpleName(), moduleDefinition.getMaxId());
AssertionUtils.isNull(protocols[id], "duplicate definition [id:{}] Exception!", id);
// 协议号是否和id是否相等
AssertionUtils.isTrue(getProtocolIdByClass(clazz) == id, "[class:{}]协议序列号[{}]和协议文件里的协议序列号不相等", clazz.getCanonicalName(), PROTOCOL_ID);
// 协议号是否和id是否相等，如果xml文件中没有填protocolId则不检测
if (protocolDefinition.getId() >= 0) {
AssertionUtils.isTrue(protocolDefinition.getId() == id, "[class:{}]协议序列号[{}]和协议文件里的协议序列号不相等", clazz.getCanonicalName(), PROTOCOL_ID);
}
checkProtocol(clazz);
}
}
@@ -140,8 +142,9 @@ public class ProtocolAnalysis {
for (var moduleDefinition : xmlProtocols.getModules()) {
var module = modules[moduleDefinition.getId()];
for (var protocolDefinition : moduleDefinition.getProtocols()) {
var id = protocolDefinition.getId();
var clazz = protocolClassMap.get(id);
var location = protocolDefinition.getLocation();
var clazz = Class.forName(location);
var id = getProtocolIdByClass(clazz);
var registration = parseProtocolRegistration(clazz, module);
if (protocolDefinition.isEnhance()) {
enhanceList.add(registration);
protocol/src/main/java/com/zfoo/protocol/xml/XmlProtocolDefinition.java
+1 -1
View File
@@ -20,7 +20,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
public class XmlProtocolDefinition {
@JacksonXmlProperty(isAttribute = true, localName = "id")
private short id;
private final short id = -1;
@JacksonXmlProperty(isAttribute = true, localName = "location")
private String location;