move springboot dependencies to common module

eventmesh-dashboard-common/pom.xml

@@ -19,6 +19,17 @@
  </properties>
 
  <dependencies>
+ <!-- springframework dependencies -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
  <!-- utility -->
  <dependency>
  <groupId>org.projectlombok</groupId>

eventmesh-dashboard-console/pom.xml

@@ -19,17 +19,6 @@
  </properties>
 
  <dependencies>
- <!-- springframework dependencies -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
- </dependency>
-
  <!-- AOP -->
  <dependency>
  <groupId>org.springframework</groupId>

eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/exception/GlobalExceptionHandler.java → eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/exception/GlobalExceptionHandler.java

@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.common.exception;
+package org.apache.eventmesh.dashboard.console.exception;
 
-import org.apache.eventmesh.dashboard.common.enums.Status;
 import org.apache.eventmesh.dashboard.common.dto.Result;
 import org.apache.eventmesh.dashboard.common.dto.Result.StatusMessage;
+import org.apache.eventmesh.dashboard.common.enums.Status;
+import org.apache.eventmesh.dashboard.common.exception.BaseException;
 
 import javax.servlet.http.HttpServletRequest;
 

eventmesh-dashboard-core/pom.xml

@@ -52,17 +52,6 @@
  <version>0.0.1-SNAPSHOT</version>
  </dependency>
 
- <!-- springframework dependencies -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
- </dependency>
-
  <!-- meta -->
  <dependency>
  <groupId>com.alibaba.nacos</groupId>

eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/config/AdminProperties.java

@@ -24,6 +24,11 @@
 
 import lombok.Data;
 
+/**
+ * TODO get configs from DB (console module's work)
+ */
+
+@Deprecated
 @Data
 @Component
 @ConfigurationProperties(prefix = ConfigConst.ADMIN_PROPS_PREFIX)

eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/config/BeanTypeConfig.java

@@ -18,22 +18,24 @@
 package org.apache.eventmesh.dashboard.core.config;
 
 import org.apache.eventmesh.dashboard.common.constant.ConfigConst;
-import org.apache.eventmesh.dashboard.service.meta.ConnectionService;
-import org.apache.eventmesh.dashboard.service.meta.SubscriptionService;
-import org.apache.eventmesh.dashboard.service.store.TopicService;
 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.service.meta.ConnectionService;
+import org.apache.eventmesh.dashboard.service.meta.SubscriptionService;
+import org.apache.eventmesh.dashboard.service.store.TopicService;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**
  * Use different registry SDK depending on the configured meta type;
  * Use different storage SDK depending on the configured storage type.
+ * TODO get configs from DB (console module's work)
  */
+@Deprecated
 @Configuration
 public class BeanTypeConfig {
 

eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/meta/NacosSubscriptionService.java

@@ -23,13 +23,13 @@
 import static org.apache.eventmesh.dashboard.common.enums.Status.NACOS_LOGIN_ERR;
 import static org.apache.eventmesh.dashboard.common.enums.Status.NACOS_SDK_CONFIG_ERR;
 
-import org.apache.eventmesh.dashboard.core.config.AdminProperties;
 import org.apache.eventmesh.dashboard.common.constant.ConfigConst;
 import org.apache.eventmesh.dashboard.common.constant.NacosConst;
 import org.apache.eventmesh.dashboard.common.dto.Result;
 import org.apache.eventmesh.dashboard.common.exception.EventMeshAdminException;
 import org.apache.eventmesh.dashboard.common.exception.MetaException;
 import org.apache.eventmesh.dashboard.common.model.SubscriptionInfo;
+import org.apache.eventmesh.dashboard.core.config.AdminProperties;
 import org.apache.eventmesh.dashboard.service.meta.SubscriptionService;
 
 import java.util.ArrayList;

eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/store/RocketmqTopicService.java

@@ -17,8 +17,8 @@
 
 package org.apache.eventmesh.dashboard.core.service.store;
 
-import org.apache.eventmesh.dashboard.core.config.AdminProperties;
 import org.apache.eventmesh.dashboard.common.model.TopicProperties;
+import org.apache.eventmesh.dashboard.core.config.AdminProperties;
 import org.apache.eventmesh.dashboard.service.store.TopicService;
 
 import java.util.List;