move RocketmqProperties to properties

scwlkq · Mar 14, 2024 · e2b6c48 · e2b6c48
1 parent 31c0117
commit e2b6c48
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/...shboard/common/model/TopicProperties.java → ...dashboard/common/dto/TopicProperties.java b/...shboard/common/model/TopicProperties.java → ...dashboard/common/dto/TopicProperties.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.common.model;
+package org.apache.eventmesh.dashboard.common.dto;
 
 import org.apache.rocketmq.common.TopicFilterType;
 

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

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,7 +17,7 @@
 
 package org.apache.eventmesh.dashboard.common.util;
 
-import org.apache.eventmesh.dashboard.common.model.TopicProperties;
+import org.apache.eventmesh.dashboard.common.dto.TopicProperties;
 
 import org.apache.rocketmq.common.TopicConfig;
 import org.apache.rocketmq.common.protocol.RequestCode;
@@ -66,7 +66,7 @@ public void createTopic(String topicName, String topicFilterTypeName, int perm,
             Object result = remotingClient.invokeSync(nameServerAddr, request, requestTimeoutMillis);
             log.info("rocketmq create topic result:" + result.toString());
         } catch (Exception e) {
-            log.error("RocketmqTopicCheck init failed when examining topic stats.", e);
+            log.error("Rocketmq create topic failed when examining topic stats.", e);
         }
     }
 
@@ -79,7 +79,7 @@ public List<TopicProperties> getTopics(String nameServerAddr, long requestTimeou
             ConcurrentMap<String, TopicConfig> topicConfigTable = allTopicConfig.getTopicConfigTable();
             topicConfigList = new ArrayList<>(topicConfigTable.values());
         } catch (Exception e) {
-            log.error("RocketmqTopicCheck init failed when examining topic stats.", e);
+            log.error("Rocketmq get topics failed when examining topic stats.", e);
         }
 
         return topicConfig2TopicProperties(topicConfigList);
@@ -94,7 +94,7 @@ public void deleteTopic(String topicName, String nameServerAddr, long requestTim
 
             log.info("rocketmq delete topic result:" + result.toString());
         } catch (Exception e) {
-            log.error("RocketmqTopicCheck init failed when examining topic stats.", e);
+            log.error("Rocketmq delete topic failed when examining topic stats.", e);
         }
     }
 

diff --git a/...sole/src/main/java/org/apache/eventmesh/dashboard/console/controller/TopicController.java b/...sole/src/main/java/org/apache/eventmesh/dashboard/console/controller/TopicController.java
@@ -18,7 +18,7 @@
 package org.apache.eventmesh.dashboard.console.controller;
 
 import org.apache.eventmesh.dashboard.common.dto.Result;
-import org.apache.eventmesh.dashboard.common.model.TopicProperties;
+import org.apache.eventmesh.dashboard.common.dto.TopicProperties;
 import org.apache.eventmesh.dashboard.console.dto.CreateTopicRequest;
 import org.apache.eventmesh.dashboard.console.dto.DeleteTopicRequest;
 import org.apache.eventmesh.dashboard.service.store.TopicCore;

diff --git a/...che/eventmesh/dashboard/console/function/health/check/config/HealthCheckObjectConfig.java b/...che/eventmesh/dashboard/console/function/health/check/config/HealthCheckObjectConfig.java
@@ -18,7 +18,7 @@
 package org.apache.eventmesh.dashboard.console.function.health.check.config;
 
 
-import org.apache.eventmesh.dashboard.common.model.RocketmqProperties;
+import org.apache.eventmesh.dashboard.common.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
@@ -18,8 +18,8 @@
 package org.apache.eventmesh.dashboard.core.store;
 
 
-import org.apache.eventmesh.dashboard.common.model.RocketmqProperties;
-import org.apache.eventmesh.dashboard.common.model.TopicProperties;
+import org.apache.eventmesh.dashboard.common.properties.RocketmqProperties;
+import org.apache.eventmesh.dashboard.common.dto.TopicProperties;
 import org.apache.eventmesh.dashboard.common.util.RocketmqUtils;
 import org.apache.eventmesh.dashboard.service.store.TopicCore;
 

diff --git a/...shboard-service/src/main/java/org/apache/eventmesh/dashboard/service/store/TopicCore.java b/...shboard-service/src/main/java/org/apache/eventmesh/dashboard/service/store/TopicCore.java
@@ -17,7 +17,7 @@
 
 package org.apache.eventmesh.dashboard.service.store;
 
-import org.apache.eventmesh.dashboard.common.model.TopicProperties;
+import org.apache.eventmesh.dashboard.common.dto.TopicProperties;
 
 import java.util.List;