Merge pull request #47 from Pil0tXia/pil0txia/feat_46

[ISSUE #46] Refactor and split `core` module
apache · Mar 2, 2024 · 62a478d · 62a478d
2 parents d816839 + 9e450a4
commit 62a478d
Show file tree

Hide file tree

Showing 52 changed files with 229 additions and 605 deletions.
diff --git a/eventmesh-dashboard-common/pom.xml b/eventmesh-dashboard-common/pom.xml
@@ -16,14 +16,30 @@
  <java.version>1.8</java.version>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <spring-boot.version>2.7.6</spring-boot.version>
  </properties>
 
  <dependencies>
+ <!-- Spring Boot Starter -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
+
+ <!-- Utility -->
  <dependency>
  <groupId>org.projectlombok</groupId>
  <artifactId>lombok</artifactId>
  </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.13.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba.fastjson2</groupId>
+ <artifactId>fastjson2</artifactId>
+ <version>2.0.40</version>
+ </dependency>
  </dependencies>
 
 </project>
diff --git a/.../dashboard/core/constant/ConfigConst.java → ...ashboard/common/constant/ConfigConst.java b/.../dashboard/core/constant/ConfigConst.java → ...ashboard/common/constant/ConfigConst.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.core.constant;
+package org.apache.eventmesh.dashboard.common.constant;
 
 public class ConfigConst {
 

diff --git a/...h/dashboard/core/constant/NacosConst.java → ...dashboard/common/constant/NacosConst.java b/...h/dashboard/core/constant/NacosConst.java → ...dashboard/common/constant/NacosConst.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.core.constant;
+package org.apache.eventmesh.dashboard.common.constant;
 
 public class NacosConst {
 

diff --git a/.../eventmesh/dashboard/core/dto/Result.java → ...ventmesh/dashboard/common/dto/Result.java b/.../eventmesh/dashboard/core/dto/Result.java → ...ventmesh/dashboard/common/dto/Result.java
@@ -15,12 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.core.dto;
+package org.apache.eventmesh.dashboard.common.dto;
 
-import static org.apache.eventmesh.dashboard.core.enums.Status.SUCCESS;
-
-import org.apache.eventmesh.dashboard.core.enums.Status;
-import org.apache.eventmesh.dashboard.core.exception.BaseException;
+import org.apache.eventmesh.dashboard.common.enums.Status;
+import org.apache.eventmesh.dashboard.common.exception.BaseException;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -59,28 +57,28 @@ public Result(T data, Integer pages) {
  * The request is valid and the result is wrapped in {@link Result}.
  */
  public static <T> Result<T> success() {
- return new Result<>(new StatusMessage(SUCCESS));
+ return new Result<>(new StatusMessage(Status.SUCCESS));
  }
 
  public static <T> Result<T> success(Result<T> result) {
- result.setMessage(new StatusMessage(SUCCESS));
+ result.setMessage(new StatusMessage(Status.SUCCESS));
  return result;
  }
 
  public static <T> Result<T> success(T data) {
- return new Result<>(data, null, new StatusMessage(SUCCESS));
+ return new Result<>(data, null, new StatusMessage(Status.SUCCESS));
  }
 
  /**
  * The request is valid and the result is returned in {@link ResponseEntity}.
  * Logic issues should use 422 Unprocessable Entity instead of 200 OK.
  */
  public static <T> ResponseEntity<Result<T>> ok() {
- return ResponseEntity.ok(new Result<>(new StatusMessage(SUCCESS)));
+ return ResponseEntity.ok(new Result<>(new StatusMessage(Status.SUCCESS)));
  }
 
  public static <T> ResponseEntity<Result<T>> ok(Result<T> result) {
- result.setMessage(new StatusMessage(SUCCESS));
+ result.setMessage(new StatusMessage(Status.SUCCESS));
  return ResponseEntity.ok(result);
  }
 

diff --git a/...ventmesh/dashboard/core/enums/Status.java → ...ntmesh/dashboard/common/enums/Status.java b/...ventmesh/dashboard/core/enums/Status.java → ...ntmesh/dashboard/common/enums/Status.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.core.enums;
+package org.apache.eventmesh.dashboard.common.enums;
 
-import static org.apache.eventmesh.dashboard.core.constant.ConfigConst.COLON;
+import static org.apache.eventmesh.dashboard.common.constant.ConfigConst.COLON;
 
 import org.springframework.http.HttpStatus;
 
@@ -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/...shboard/core/exception/BaseException.java → ...board/common/exception/BaseException.java b/...shboard/core/exception/BaseException.java → ...board/common/exception/BaseException.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.core.exception;
+package org.apache.eventmesh.dashboard.common.exception;
 
-import static org.apache.eventmesh.dashboard.core.constant.ConfigConst.COLON;
+import static org.apache.eventmesh.dashboard.common.constant.ConfigConst.COLON;
 
-import org.apache.eventmesh.dashboard.core.enums.Status;
-import org.apache.eventmesh.dashboard.core.util.ExceptionUtil;
+import org.apache.eventmesh.dashboard.common.enums.Status;
+import org.apache.eventmesh.dashboard.common.util.ExceptionUtil;
 
 import lombok.Getter;
 

diff --git a/...re/exception/EventMeshAdminException.java → ...on/exception/EventMeshAdminException.java b/...re/exception/EventMeshAdminException.java → ...on/exception/EventMeshAdminException.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.core.exception;
+package org.apache.eventmesh.dashboard.common.exception;
 
-import org.apache.eventmesh.dashboard.core.enums.Status;
+import org.apache.eventmesh.dashboard.common.enums.Status;
 
 /**
  * EventMeshAdmin Application side exception

diff --git a/...rd/core/exception/EventMeshException.java → .../common/exception/EventMeshException.java b/...rd/core/exception/EventMeshException.java → .../common/exception/EventMeshException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.core.exception;
+package org.apache.eventmesh.dashboard.common.exception;
 
 /**
  * EventMesh Runtime side exception

diff --git a/...shboard/core/exception/MetaException.java → ...board/common/exception/MetaException.java b/...shboard/core/exception/MetaException.java → ...board/common/exception/MetaException.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.core.exception;
+package org.apache.eventmesh.dashboard.common.exception;
 
-import org.apache.eventmesh.dashboard.core.enums.Status;
+import org.apache.eventmesh.dashboard.common.enums.Status;
 
 /**
  * Meta side exception with EventMeshAdmin Application

diff --git a/.../dashboard/core/model/ConnectionInfo.java → ...ashboard/common/model/ConnectionInfo.java b/.../dashboard/core/model/ConnectionInfo.java → ...ashboard/common/model/ConnectionInfo.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.core.model;
+package org.apache.eventmesh.dashboard.common.model;
 
 public class ConnectionInfo {
 

diff --git a/...ashboard/core/model/SubscriptionInfo.java → ...hboard/common/model/SubscriptionInfo.java b/...ashboard/core/model/SubscriptionInfo.java → ...hboard/common/model/SubscriptionInfo.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.core.model;
+package org.apache.eventmesh.dashboard.common.model;
 
 import lombok.Builder;
 import lombok.Data;

diff --git a/...dashboard/core/model/TopicProperties.java → ...shboard/common/model/TopicProperties.java b/...dashboard/core/model/TopicProperties.java → ...shboard/common/model/TopicProperties.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.core.model;
+package org.apache.eventmesh.dashboard.common.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/...sh/dashboard/core/util/ExceptionUtil.java → .../dashboard/common/util/ExceptionUtil.java b/...sh/dashboard/core/util/ExceptionUtil.java → .../dashboard/common/util/ExceptionUtil.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.core.util;
+package org.apache.eventmesh.dashboard.common.util;
 
 public class ExceptionUtil {
 

diff --git a/eventmesh-dashboard-console/pom.xml b/eventmesh-dashboard-console/pom.xml
@@ -19,24 +19,25 @@
  </properties>
 
  <dependencies>
- <!-- springframework dependencies -->
+ <!-- EventMesh Dashboard modules -->
  <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
+ <groupId>org.apache.eventmesh.dashboard.common</groupId>
+ <artifactId>eventmesh-dashboard-common</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
  </dependency>
  <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.eventmesh.dashboard.service</groupId>
+ <artifactId>eventmesh-dashboard-service</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
  </dependency>
- <!-- ASP dependency -->
+
+ <!-- AOP -->
  <dependency>
  <groupId>org.springframework</groupId>
  <artifactId>spring-aspects</artifactId>
- <version>5.1.2.RELEASE</version>
  </dependency>
 
- <!-- swagger -->
+ <!-- Swagger -->
  <dependency>
  <groupId>org.springdoc</groupId>
  <artifactId>springdoc-openapi-ui</artifactId>
@@ -48,18 +49,6 @@
  <version>1.7.0</version>
  </dependency>
 
- <!-- eventmesh.dashboard dependency -->
- <dependency>
- <groupId>org.apache.eventmesh.dashboard.common</groupId>
- <artifactId>eventmesh-dashboard-common</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.eventmesh.dashboard.service</groupId>
- <artifactId>eventmesh-dashboard-service</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </dependency>
-
  <!-- Database -->
  <dependency>
  <groupId>com.alibaba</groupId>
@@ -77,7 +66,7 @@
  </dependency>
 
  <!-- health check client -->
- <!-- Eventmesh SDK -->
+ <!-- EventMesh SDK -->
  <dependency>
  <groupId>org.apache.eventmesh</groupId>
  <artifactId>eventmesh-sdk-java</artifactId>
@@ -100,6 +89,12 @@
  </dependency>
  <!-- health check client end -->
 
+ <!-- Unit Test -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ </dependency>
 
  <!-- TODO: remove junit4 dependency -->
  <dependency>

diff --git a/...e/src/main/java/org/apache/eventmesh/dashboard/console/EventMeshDashboardApplication.java b/...e/src/main/java/org/apache/eventmesh/dashboard/console/EventMeshDashboardApplication.java
@@ -31,7 +31,7 @@ public class EventMeshDashboardApplication {
  public static void main(String[] args) {
  try {
  SpringApplication.run(EventMeshDashboardApplication.class, args);
- log.info("{} Successfully booted.", EventMeshDashboardApplication.class.getSimpleName());
+ log.info("{} Boot Successful!", EventMeshDashboardApplication.class.getSimpleName());
  } catch (Exception e) {
  log.error(e.getMessage(), e);
  }

diff --git a/...core/controller/ConnectionController.java → ...sole/controller/ConnectionController.java b/...core/controller/ConnectionController.java → ...sole/controller/ConnectionController.java
@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.core.controller;
+package org.apache.eventmesh.dashboard.console.controller;
 
-import org.apache.eventmesh.dashboard.core.service.ConnectionService;
+import org.apache.eventmesh.dashboard.service.meta.ConnectionCore;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -30,8 +29,10 @@
 @RestController
 public class ConnectionController {
 
- @Autowired
- ConnectionService connectionService;
+ /**
+ * TODO expose implement by FunctionManager
+ */
+ ConnectionCore connectionCore;
 
  /**
  * Query Connection List

diff --git a/...rd/core/controller/MetricsController.java → ...console/controller/MetricsController.java b/...rd/core/controller/MetricsController.java → ...console/controller/MetricsController.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.core.controller;
+package org.apache.eventmesh.dashboard.console.controller;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -24,8 +24,10 @@
 
 @RestController
 public class MetricsController {
+
  @GetMapping("/druid/stat")
  public Object druidStat() {
  return DruidStatManagerFacade.getInstance().getDataSourceStatDataList();
  }
+
 }
diff --git a/...re/controller/SubscriptionController.java → ...le/controller/SubscriptionController.java b/...re/controller/SubscriptionController.java → ...le/controller/SubscriptionController.java
@@ -15,15 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.core.controller;
+package org.apache.eventmesh.dashboard.console.controller;
 
-import org.apache.eventmesh.dashboard.core.dto.Result;
-import org.apache.eventmesh.dashboard.core.model.SubscriptionInfo;
-import org.apache.eventmesh.dashboard.core.service.SubscriptionService;
+import org.apache.eventmesh.dashboard.common.dto.Result;
+import org.apache.eventmesh.dashboard.common.model.SubscriptionInfo;
+import org.apache.eventmesh.dashboard.service.meta.SubscriptionCore;
 
 import java.util.List;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -33,8 +32,10 @@
 @RequestMapping("/api/v1")
 public class SubscriptionController {
 
- @Autowired
- SubscriptionService subscriptionService;
+ /**
+ * TODO expose implement by FunctionManager
+ */
+ SubscriptionCore subscriptionCore;
 
  // the subscription dataId naming pattern of EventMesh clients: ip-protocol
  private static final String CLIENT_DATA_ID_PATTERN = "*.*.*.*-*";
@@ -48,7 +49,7 @@ public class SubscriptionController {
  */
  @GetMapping("/subscription")
  public Result<String> retrieveSubscription(@RequestParam("dataId") String dataId, @RequestParam("group") String group) {
- return Result.success(subscriptionService.retrieveConfig(dataId, group));
+ return Result.success(subscriptionCore.retrieveConfig(dataId, group));
  }
 
  /**
@@ -66,7 +67,7 @@ public Result<List<SubscriptionInfo>> listSubscriptions(
  @RequestParam(name = "size", defaultValue = "10") Integer size,
  @RequestParam(name = "dataId", defaultValue = CLIENT_DATA_ID_PATTERN) String dataId,
  @RequestParam(name = "group", defaultValue = "") String group) {
- return Result.success(subscriptionService.retrieveConfigs(page, size, dataId, group));
+ return Result.success(subscriptionCore.retrieveConfigs(page, size, dataId, group));
  }
 
 }