From 31c01175296e66ad3aa84cf8c8309025a4c1aa29 Mon Sep 17 00:00:00 2001
From: scwlkq <scwlkq@gmaIL.com>
Date: Thu, 14 Mar 2024 15:38:05 +0800
Subject: [PATCH] move classparser to rocketmqUtil

---
 .../dashboard/common/model/TopicProperties.java      |  1 -
 .../dashboard/common/util/RocketmqUtils.java         |  8 +++++---
 .../dashboard/core/store/RocketmqTopicCore.java      | 12 +-----------
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/TopicProperties.java b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/TopicProperties.java
index 3cb0f755..5ebfde73 100644
--- a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/TopicProperties.java
+++ b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/TopicProperties.java
@@ -27,7 +27,6 @@
 
 @Data
 public class TopicProperties {
-    private RocketmqProperties rocketmqProperties;
 
     private static final String SEPARATOR = " ";
 
diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/util/RocketmqUtils.java b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/util/RocketmqUtils.java
index 3e268ef4..d0cac7bd 100644
--- a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/util/RocketmqUtils.java
+++ b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/util/RocketmqUtils.java
@@ -70,18 +70,19 @@ public void createTopic(String topicName, String topicFilterTypeName, int perm,
         }
     }
 
-    public List<TopicConfig> getTopics(String nameServerAddr, long requestTimeoutMillis) {
+    public List<TopicProperties> getTopics(String nameServerAddr, long requestTimeoutMillis) {
         List<TopicConfig> topicConfigList = new ArrayList<>();
         try {
             RemotingCommand request = RemotingCommand.createRequestCommand(RequestCode.GET_ALL_TOPIC_CONFIG, (CommandCustomHeader) null);
-            RemotingCommand response = remotingClient.invokeSync(nameServerAddr, request, 3000L);
+            RemotingCommand response = remotingClient.invokeSync(nameServerAddr, request, requestTimeoutMillis);
             TopicConfigSerializeWrapper allTopicConfig = TopicConfigSerializeWrapper.decode(response.getBody(), TopicConfigSerializeWrapper.class);
             ConcurrentMap<String, TopicConfig> topicConfigTable = allTopicConfig.getTopicConfigTable();
             topicConfigList = new ArrayList<>(topicConfigTable.values());
         } catch (Exception e) {
             log.error("RocketmqTopicCheck init failed when examining topic stats.", e);
         }
-        return topicConfigList;
+
+        return topicConfig2TopicProperties(topicConfigList);
     }
 
     public void deleteTopic(String topicName, String nameServerAddr, long requestTimeoutMillis) {
@@ -106,4 +107,5 @@ private List<TopicProperties> topicConfig2TopicProperties(List<TopicConfig> topi
         }
         return topicPropertiesList;
     }
+
 }
diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/store/RocketmqTopicCore.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/store/RocketmqTopicCore.java
index bb7d5148..6434c948 100644
--- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/store/RocketmqTopicCore.java
+++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/store/RocketmqTopicCore.java
@@ -23,11 +23,9 @@
 import org.apache.eventmesh.dashboard.common.util.RocketmqUtils;
 import org.apache.eventmesh.dashboard.service.store.TopicCore;
 
-import org.apache.rocketmq.common.TopicConfig;
 import org.apache.rocketmq.common.TopicFilterType;
 import org.apache.rocketmq.common.constant.PermName;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import org.springframework.stereotype.Service;
@@ -46,15 +44,7 @@ public RocketmqTopicCore(RocketmqProperties rocketmqProperties) {
 
     @Override
     public List<TopicProperties> getTopics() {
-        List<TopicConfig> topicConfigList =
-            RocketmqUtils.getTopics(rocketmqProperties.getNamesrvAddr(), rocketmqProperties.getRequestTimeoutMillis());
-        List<TopicProperties> topicPropertiesList = new ArrayList<>();
-        for (TopicConfig topicConfig : topicConfigList) {
-            TopicProperties topicProperties = new TopicProperties();
-            topicProperties.setRocketmqTopicConfig(topicConfig);
-            topicPropertiesList.add(topicProperties);
-        }
-        return topicPropertiesList;
+        return RocketmqUtils.getTopics(rocketmqProperties.getNamesrvAddr(), rocketmqProperties.getRequestTimeoutMillis());
     }
 
     @Override