From 743e910cf0025835d8f3d8f3e7fba042a816dba3 Mon Sep 17 00:00:00 2001
From: meiwei <309921330@qq.com>
Date: Tue, 29 Aug 2023 11:14:34 +0800
Subject: [PATCH] perf[protocol] optimize protocol config

---
 .../registration/ProtocolAnalysis.java        | 20 ++++---------------
 .../protocol/xml/XmlModuleDefinition.java     | 16 +--------------
 2 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java b/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java
index 0a3790a6..d3b16a94 100644
--- a/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java
+++ b/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java
@@ -203,6 +203,9 @@ public class ProtocolAnalysis {
         for (var moduleDefinition : xmlProtocols.getModules()) {
             var module = modules[moduleDefinition.getId()];
             var packetClazzList = getModuleDefinitionClass(moduleDefinition);
+            if (CollectionUtils.isEmpty(packetClazzList)) {
+                continue;
+            }
             for (Class<?> clazz : packetClazzList) {
                 var protocolId = ProtocolManager.protocolId(clazz);
                 var registration = parseProtocolRegistration(clazz, module);
@@ -219,23 +222,8 @@ public class ProtocolAnalysis {
     }
 
     private static Set<Class<?>> getModuleDefinitionClass(XmlModuleDefinition moduleDefinition) {
-        var classSet = new HashSet<Class<?>>();
-        for (short id = moduleDefinition.getMinId(); id < moduleDefinition.getMaxId(); id++) {
-            var clazz = protocolClassMap.get(id);
-            if (Objects.isNull(clazz)) {
-                continue;
-            }
-            classSet.add(clazz);
-        }
-        if (CollectionUtils.isNotEmpty(classSet)) {
-            return classSet;
-        }
 
-        var moduleClassSet = moduleDefinitionClassMap.get(moduleDefinition.getId());
-        if (CollectionUtils.isEmpty(moduleClassSet)) {
-            return classSet;
-        }
-        return moduleClassSet;
+        return moduleDefinitionClassMap.get(moduleDefinition.getId());
     }
 
     public static Set<Class<?>> scanPackageList(String packageName) {
diff --git a/protocol/src/main/java/com/zfoo/protocol/xml/XmlModuleDefinition.java b/protocol/src/main/java/com/zfoo/protocol/xml/XmlModuleDefinition.java
index 354ef77e..737a7f9b 100644
--- a/protocol/src/main/java/com/zfoo/protocol/xml/XmlModuleDefinition.java
+++ b/protocol/src/main/java/com/zfoo/protocol/xml/XmlModuleDefinition.java
@@ -23,7 +23,7 @@ import java.util.List;
  * @author godotg
  * @version 3.0
  */
-@JsonPropertyOrder({"id", "name", "minId", "maxId"})
+@JsonPropertyOrder({"id", "name"})
 public class XmlModuleDefinition {
 
     @JacksonXmlProperty(isAttribute = true, localName = "id")
@@ -32,12 +32,6 @@ public class XmlModuleDefinition {
     @JacksonXmlProperty(isAttribute = true, localName = "name")
     private String name;
 
-    @JacksonXmlProperty(isAttribute = true, localName = "minId")
-    private short minId;
-
-    @JacksonXmlProperty(isAttribute = true, localName = "maxId")
-    private short maxId;
-
     @JacksonXmlProperty(localName = "protocol")
     @JacksonXmlElementWrapper(useWrapping = false)
     private List<XmlProtocolDefinition> protocols;
@@ -50,14 +44,6 @@ public class XmlModuleDefinition {
         return name;
     }
 
-    public short getMinId() {
-        return minId;
-    }
-
-    public short getMaxId() {
-        return maxId;
-    }
-
     public List<XmlProtocolDefinition> getProtocols() {
         return protocols;
     }