move Request classes to console module

Pil0tXia · Mar 1, 2024 · 22182eb · 22182eb
1 parent 21eca5f
commit 22182eb
Show file tree

Hide file tree

Showing 20 changed files with 37 additions and 52 deletions.
diff --git a/...sh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/Status.java b/...sh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/Status.java
@@ -74,7 +74,7 @@ public enum Category {
 
         SUCCESS("Successfully received and processed"),
 
-        SDK_CONFIG_ERR("The Meta SDK config in EventMeshAdmin application.yml error"),
+        SDK_CONFIG_ERR("Meta SDK config error"),
 
         META_COM_ERR("Network communication to Meta error"),
         ;

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
@@ -17,10 +17,10 @@
 
 package org.apache.eventmesh.dashboard.console.controller;
 
-import org.apache.eventmesh.dashboard.common.dto.CreateTopicRequest;
-import org.apache.eventmesh.dashboard.common.dto.DeleteTopicRequest;
 import org.apache.eventmesh.dashboard.common.dto.Result;
 import org.apache.eventmesh.dashboard.common.model.TopicProperties;
+import org.apache.eventmesh.dashboard.console.dto.CreateTopicRequest;
+import org.apache.eventmesh.dashboard.console.dto.DeleteTopicRequest;
 import org.apache.eventmesh.dashboard.service.store.TopicService;
 
 import java.util.List;

diff --git a/...hboard/common/dto/CreateTopicRequest.java → ...board/console/dto/CreateTopicRequest.java b/...hboard/common/dto/CreateTopicRequest.java → ...board/console/dto/CreateTopicRequest.java
@@ -15,13 +15,17 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.common.dto;
+package org.apache.eventmesh.dashboard.console.dto;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import lombok.Data;
 
+/**
+ * TODO this class is copied from storage plugin, needs update
+ */
+
 @Data
 public class CreateTopicRequest {
 

diff --git a/...hboard/common/dto/DeleteTopicRequest.java → ...board/console/dto/DeleteTopicRequest.java b/...hboard/common/dto/DeleteTopicRequest.java → ...board/console/dto/DeleteTopicRequest.java
@@ -15,13 +15,17 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.common.dto;
+package org.apache.eventmesh.dashboard.console.dto;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import lombok.Data;
 
+/**
+ * TODO this class is copied from storage plugin, needs update
+ */
+
 @Data
 public class DeleteTopicRequest {
 

diff --git a/...sole/src/main/java/org/apache/eventmesh/dashboard/console/service/group/GroupService.java b/...sole/src/main/java/org/apache/eventmesh/dashboard/console/service/group/GroupService.java
@@ -20,7 +20,6 @@
 import org.apache.eventmesh.dashboard.console.entity.group.GroupEntity;
 import org.apache.eventmesh.dashboard.console.entity.groupmember.GroupMemberEntity;
 
-
 import java.util.List;
 
 /**

diff --git a/...nsole/src/test/java/org/apache/eventmesh/dashboard/console/health/HealthExecutorTest.java b/...nsole/src/test/java/org/apache/eventmesh/dashboard/console/health/HealthExecutorTest.java
@@ -22,7 +22,6 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.ArgumentMatchers.any;
 
-import java.util.concurrent.CompletableFuture;
 import org.apache.eventmesh.dashboard.console.EventMeshDashboardApplication;
 import org.apache.eventmesh.dashboard.console.entity.health.HealthCheckResultEntity;
 import org.apache.eventmesh.dashboard.console.enums.health.HealthCheckStatus;
@@ -31,6 +30,9 @@
 import org.apache.eventmesh.dashboard.console.health.check.AbstractHealthCheckService;
 import org.apache.eventmesh.dashboard.console.health.check.config.HealthCheckObjectConfig;
 import org.apache.eventmesh.dashboard.console.service.health.impl.HealthDataServiceDatabaseImpl;
+
+import java.util.concurrent.CompletableFuture;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;

diff --git a/...onsole/src/test/java/org/apache/eventmesh/dashboard/console/health/HealthServiceTest.java b/...onsole/src/test/java/org/apache/eventmesh/dashboard/console/health/HealthServiceTest.java
@@ -21,6 +21,7 @@
 import org.apache.eventmesh.dashboard.console.health.check.AbstractHealthCheckService;
 import org.apache.eventmesh.dashboard.console.health.check.config.HealthCheckObjectConfig;
 import org.apache.eventmesh.dashboard.console.service.health.HealthDataService;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;

diff --git a/.../java/org/apache/eventmesh/dashboard/console/health/check/impl/StorageRedisCheckTest.java b/.../java/org/apache/eventmesh/dashboard/console/health/check/impl/StorageRedisCheckTest.java
@@ -17,8 +17,9 @@
 
 package org.apache.eventmesh.dashboard.console.health.check.impl;
 
-import org.apache.eventmesh.dashboard.console.health.check.config.HealthCheckObjectConfig;
 import org.apache.eventmesh.dashboard.console.health.callback.HealthCheckCallback;
+import org.apache.eventmesh.dashboard.console.health.check.config.HealthCheckObjectConfig;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

diff --git a/...org/apache/eventmesh/dashboard/console/integration/health/HealthServiceIntegrateTest.java b/...org/apache/eventmesh/dashboard/console/integration/health/HealthServiceIntegrateTest.java
@@ -17,13 +17,15 @@
 
 package org.apache.eventmesh.dashboard.console.integration.health;
 
-import java.util.List;
 import org.apache.eventmesh.dashboard.console.entity.health.HealthCheckResultEntity;
 import org.apache.eventmesh.dashboard.console.enums.health.HealthCheckType;
 import org.apache.eventmesh.dashboard.console.health.CheckResultCache;
 import org.apache.eventmesh.dashboard.console.health.HealthService;
 import org.apache.eventmesh.dashboard.console.health.check.config.HealthCheckObjectConfig;
 import org.apache.eventmesh.dashboard.console.service.health.HealthDataService;
+
+import java.util.List;
+
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

diff --git a/...t/java/org/apache/eventmesh/dashboard/console/mapper/connection/ConnectionMapperTest.java b/...t/java/org/apache/eventmesh/dashboard/console/mapper/connection/ConnectionMapperTest.java
@@ -24,7 +24,6 @@
 import org.apache.eventmesh.dashboard.console.EventMeshDashboardApplication;
 import org.apache.eventmesh.dashboard.console.entity.connection.ConnectionEntity;
 
-
 import java.util.Arrays;
 import java.util.List;
 

diff --git a/...ava/org/apache/eventmesh/dashboard/console/mapper/health/HealthCheckResultMapperTest.java b/...ava/org/apache/eventmesh/dashboard/console/mapper/health/HealthCheckResultMapperTest.java
@@ -19,14 +19,16 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
+import org.apache.eventmesh.dashboard.console.EventMeshDashboardApplication;
+import org.apache.eventmesh.dashboard.console.entity.health.HealthCheckResultEntity;
+
 import java.sql.Timestamp;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
-import org.apache.eventmesh.dashboard.console.EventMeshDashboardApplication;
-import org.apache.eventmesh.dashboard.console.entity.health.HealthCheckResultEntity;
+
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/...sole/src/test/java/org/apache/eventmesh/dashboard/console/mapper/meta/MetaMapperTest.java b/...sole/src/test/java/org/apache/eventmesh/dashboard/console/mapper/meta/MetaMapperTest.java
@@ -19,6 +19,7 @@
 
 import org.apache.eventmesh.dashboard.console.EventMeshDashboardApplication;
 import org.apache.eventmesh.dashboard.console.entity.meta.MetaEntity;
+
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/...sole/src/test/java/org/apache/eventmesh/dashboard/console/unit/group/TestGroupMapper.java b/...sole/src/test/java/org/apache/eventmesh/dashboard/console/unit/group/TestGroupMapper.java
@@ -1,7 +1,6 @@
 package org.apache.eventmesh.dashboard.console.unit.group;
 
 import org.apache.eventmesh.dashboard.console.EventMeshDashboardApplication;
-
 import org.apache.eventmesh.dashboard.console.entity.group.GroupEntity;
 import org.apache.eventmesh.dashboard.console.mapper.group.OprGroupMapper;
 

diff --git a/...shboard-core/src/main/java/org/apache/eventmesh/dashboard/core/config/BeanTypeConfig.java b/...shboard-core/src/main/java/org/apache/eventmesh/dashboard/core/config/BeanTypeConfig.java
@@ -18,11 +18,11 @@
 package org.apache.eventmesh.dashboard.core.config;
 
 import org.apache.eventmesh.dashboard.common.constant.ConfigConst;
-import org.apache.eventmesh.dashboard.core.service.meta.EtcdConnectionService;
-import org.apache.eventmesh.dashboard.core.service.meta.EtcdSubscriptionService;
-import org.apache.eventmesh.dashboard.core.service.meta.NacosConnectionService;
-import org.apache.eventmesh.dashboard.core.service.meta.NacosSubscriptionService;
-import org.apache.eventmesh.dashboard.core.service.store.RocketmqTopicService;
+import org.apache.eventmesh.dashboard.core.meta.EtcdConnectionService;
+import org.apache.eventmesh.dashboard.core.meta.EtcdSubscriptionService;
+import org.apache.eventmesh.dashboard.core.meta.NacosConnectionService;
+import org.apache.eventmesh.dashboard.core.meta.NacosSubscriptionService;
+import org.apache.eventmesh.dashboard.core.store.RocketmqTopicService;
 import org.apache.eventmesh.dashboard.service.meta.ConnectionService;
 import org.apache.eventmesh.dashboard.service.meta.SubscriptionService;
 import org.apache.eventmesh.dashboard.service.store.TopicService;

diff --git a/...e/service/meta/EtcdConnectionService.java → ...oard/core/meta/EtcdConnectionService.java b/...e/service/meta/EtcdConnectionService.java → ...oard/core/meta/EtcdConnectionService.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.core.service.meta;
+package org.apache.eventmesh.dashboard.core.meta;
 
 import org.apache.eventmesh.dashboard.service.meta.ConnectionService;
 

diff --git a/...service/meta/EtcdSubscriptionService.java → ...rd/core/meta/EtcdSubscriptionService.java b/...service/meta/EtcdSubscriptionService.java → ...rd/core/meta/EtcdSubscriptionService.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.core.service.meta;
+package org.apache.eventmesh.dashboard.core.meta;
 
 import org.apache.eventmesh.dashboard.common.dto.Result;
 import org.apache.eventmesh.dashboard.common.model.SubscriptionInfo;

diff --git a/.../service/meta/NacosConnectionService.java → ...ard/core/meta/NacosConnectionService.java b/.../service/meta/NacosConnectionService.java → ...ard/core/meta/NacosConnectionService.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.core.service.meta;
+package org.apache.eventmesh.dashboard.core.meta;
 
 import org.apache.eventmesh.dashboard.core.config.AdminProperties;
 import org.apache.eventmesh.dashboard.service.meta.ConnectionService;

diff --git a/...ervice/meta/NacosSubscriptionService.java → ...d/core/meta/NacosSubscriptionService.java b/...ervice/meta/NacosSubscriptionService.java → ...d/core/meta/NacosSubscriptionService.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.core.service.meta;
+package org.apache.eventmesh.dashboard.core.meta;
 
 import static org.apache.eventmesh.dashboard.common.enums.Status.NACOS_EMPTY_RESP_ERR;
 import static org.apache.eventmesh.dashboard.common.enums.Status.NACOS_GET_CONFIGS_ERR;

diff --git a/...e/service/store/RocketmqTopicService.java → ...oard/core/store/RocketmqTopicService.java b/...e/service/store/RocketmqTopicService.java → ...oard/core/store/RocketmqTopicService.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.core.service.store;
+package org.apache.eventmesh.dashboard.core.store;
 
 import org.apache.eventmesh.dashboard.common.model.TopicProperties;
 import org.apache.eventmesh.dashboard.core.config.AdminProperties;

diff --git a/.../src/test/java/org/apache/eventmesh/dashboard/core/EventMeshDashboardApplicationTest.java b/.../src/test/java/org/apache/eventmesh/dashboard/core/EventMeshDashboardApplicationTest.java