move classparse to RocketmqUtils.getTopics

scwlkq · Mar 10, 2024 · 7ebde4b · 7ebde4b
1 parent 449b352
commit 7ebde4b
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 17 deletions.
diff --git a/...hboard-common/src/main/java/org/apache/eventmesh/dashboard/common/util/RocketmqUtils.java b/...hboard-common/src/main/java/org/apache/eventmesh/dashboard/common/util/RocketmqUtils.java
@@ -17,6 +17,8 @@
 
 package org.apache.eventmesh.dashboard.common.util;
 
+import org.apache.eventmesh.dashboard.common.model.TopicProperties;
+
 import org.apache.rocketmq.common.TopicConfig;
 import org.apache.rocketmq.common.protocol.RequestCode;
 import org.apache.rocketmq.common.protocol.body.TopicConfigSerializeWrapper;
@@ -67,21 +69,26 @@ 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;
+        List<TopicProperties> topicPropertiesList = new ArrayList<>();
+        for (TopicConfig topicConfig : topicConfigList) {
+            TopicProperties topicProperties = new TopicProperties();
+            topicProperties.setRocketmqTopicConfig(topicConfig);
+            topicPropertiesList.add(topicProperties);
+        }
+        return topicPropertiesList;
     }
 
-
     public void deleteTopic(String topicName, String nameServerAddr, long requestTimeoutMillis) {
         try {
             DeleteTopicRequestHeader deleteTopicRequestHeader = new DeleteTopicRequestHeader();

diff --git a/.../main/java/org/apache/eventmesh/dashboard/console/entity/connection/ConnectionEntity.java b/.../main/java/org/apache/eventmesh/dashboard/console/entity/connection/ConnectionEntity.java
@@ -53,7 +53,8 @@ public class ConnectionEntity extends BaseEntity {
     private String sourceType;
 
     /**
-     * The id of the source.<br> It can be connectorId or clientId according to the sourceType.
+     * The id of the source.<br>
+     * It can be connectorId or clientId according to the sourceType.
      */
     @Schema(name = "sourceId", description = "connectorId or clientId")
     private Long sourceId;

diff --git a/...che/eventmesh/dashboard/console/function/health/check/config/HealthCheckObjectConfig.java b/...che/eventmesh/dashboard/console/function/health/check/config/HealthCheckObjectConfig.java
@@ -17,7 +17,8 @@
 
 package org.apache.eventmesh.dashboard.console.function.health.check.config;
 
-import org.apache.eventmesh.dashboard.common.properties.RocketmqProperties;
+
+import org.apache.eventmesh.dashboard.service.properties.RocketmqProperties;
 
 import java.util.Properties;
 

diff --git a/...board-core/src/main/java/org/apache/eventmesh/dashboard/core/store/RocketmqTopicCore.java b/...board-core/src/main/java/org/apache/eventmesh/dashboard/core/store/RocketmqTopicCore.java
@@ -19,7 +19,7 @@
 
 
 import org.apache.eventmesh.dashboard.common.model.TopicProperties;
-import org.apache.eventmesh.dashboard.common.properties.RocketmqProperties;
+import org.apache.eventmesh.dashboard.service.properties.RocketmqProperties;
 import org.apache.eventmesh.dashboard.common.util.RocketmqUtils;
 import org.apache.eventmesh.dashboard.service.store.TopicCore;
 
@@ -46,15 +46,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

diff --git a/...common/properties/RocketmqProperties.java → ...ervice/properties/RocketmqProperties.java b/...common/properties/RocketmqProperties.java → ...ervice/properties/RocketmqProperties.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.common.properties;
+package org.apache.eventmesh.dashboard.service.properties;
 
 import lombok.Data;