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/dto/TopicProperties.java similarity index 96% rename from eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/TopicProperties.java rename to eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/dto/TopicProperties.java index 5ebfde73..0a941a8a 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/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/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/RocketmqProperties.java b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/properties/RocketmqProperties.java similarity index 95% rename from eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/RocketmqProperties.java rename to eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/properties/RocketmqProperties.java index 8d8992fb..3ca5803e 100644 --- a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/RocketmqProperties.java +++ b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/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/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 d0cac7bd..e726a2b8 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 @@ -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 getTopics(String nameServerAddr, long requestTimeou ConcurrentMap 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/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/TopicController.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/TopicController.java index 89b077fc..64a4f88f 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/TopicController.java +++ b/eventmesh-dashboard-console/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/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/health/check/config/HealthCheckObjectConfig.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/health/check/config/HealthCheckObjectConfig.java index 419e992b..19806a28 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/health/check/config/HealthCheckObjectConfig.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/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/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 6434c948..ef0785e5 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 @@ -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/eventmesh-dashboard-service/src/main/java/org/apache/eventmesh/dashboard/service/store/TopicCore.java b/eventmesh-dashboard-service/src/main/java/org/apache/eventmesh/dashboard/service/store/TopicCore.java index 07c9d9db..fd0d6a43 100644 --- a/eventmesh-dashboard-service/src/main/java/org/apache/eventmesh/dashboard/service/store/TopicCore.java +++ b/eventmesh-dashboard-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;