fix: Optimize style

apache · Apr 7, 2024 · a375136 · a375136
1 parent 809022b
commit a375136
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 102 deletions.
diff --git a/eventmesh-dashboard-common/pom.xml b/eventmesh-dashboard-common/pom.xml
@@ -19,11 +19,11 @@
     </properties>
 
     <dependencies>
+        <!-- TODO: common module should not contains spring framework, considering remove this dependency -->
         <!-- Spring Boot Starter -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <scope>provided</scope>
         </dependency>
 
         <!-- Utility -->

diff --git a/...ommon/src/main/java/org/apache/eventmesh/dashboard/common/constant/StoreTypeConstant.java b/...ommon/src/main/java/org/apache/eventmesh/dashboard/common/constant/StoreTypeConstant.java
@@ -23,8 +23,6 @@ public class StoreTypeConstant {
     public static final String STORE_TYPE_REDIS = "redis";
     public static final String STORE_TYPE_MYSQL = "mysql";
     public static final String STORE_TYPE_ROCKETMQ = "rocketmq4";
-    public static final String STORE_SUBTYPE_ROCKETMQ_BROKER = "rocketmq4-broker";
-    public static final String STORE_SUBTYPE_ROCKETMQ_NAMESERVER = "rocketmq4-nameserver";
     public static final String STORE_TYPE_KAFKA = "kafka";
     public static final String STORE_TYPE_PULSAR = "pulsar";
     public static final String STORE_TYPE_RABBITMQ = "rabbitmq";

diff --git a/...n/java/org/apache/eventmesh/dashboard/common/constant/health/HealthCheckTypeConstant.java b/...n/java/org/apache/eventmesh/dashboard/common/constant/health/HealthCheckTypeConstant.java
@@ -32,9 +32,7 @@ public class HealthCheckTypeConstant {
 
     public static final String HEALTH_CHECK_SUBTYPE_REDIS = StoreTypeConstant.STORE_TYPE_REDIS;
     public static final String HEALTH_CHECK_SUBTYPE_MYSQL = StoreTypeConstant.STORE_TYPE_MYSQL;
-    public static final String HEALTH_CHECK_SUBTYPE_ROCKETMQ_BROKER = StoreTypeConstant.STORE_SUBTYPE_ROCKETMQ_BROKER;
-    public static final String HEALTH_CHECK_SUBTYPE_ROCKETMQ_NAMESERVER = StoreTypeConstant.STORE_SUBTYPE_ROCKETMQ_NAMESERVER;
-    public static final String HEALTH_CHECK_SUBTYPE_ROCKETMQ_TOPIC = "rocketmq4-topic";
+    public static final String HEALTH_CHECK_SUBTYPE_ROCKETMQ = StoreTypeConstant.STORE_TYPE_ROCKETMQ;
 
     public static final String HEALTH_CHECK_SUBTYPE_NACOS_CONFIG = "nacos-config";
     public static final String HEALTH_CHECK_SUBTYPE_NACOS_REGISTRY = "nacos-registry";

diff --git a/...dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/StoreType.java b/...dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/StoreType.java
@@ -17,8 +17,6 @@
 
 package org.apache.eventmesh.dashboard.common.enums;
 
-import static org.apache.eventmesh.dashboard.common.constant.StoreTypeConstant.STORE_SUBTYPE_ROCKETMQ_BROKER;
-import static org.apache.eventmesh.dashboard.common.constant.StoreTypeConstant.STORE_SUBTYPE_ROCKETMQ_NAMESERVER;
 import static org.apache.eventmesh.dashboard.common.constant.StoreTypeConstant.STORE_TYPE_KAFKA;
 import static org.apache.eventmesh.dashboard.common.constant.StoreTypeConstant.STORE_TYPE_PULSAR;
 import static org.apache.eventmesh.dashboard.common.constant.StoreTypeConstant.STORE_TYPE_RABBITMQ;
@@ -34,8 +32,6 @@ public enum StoreType {
 
     STANDALONE(0, STORE_TYPE_STANDALONE),
     ROCKETMQ(1, STORE_TYPE_ROCKETMQ),
-    ROCKETMQ_BROKER(11, STORE_SUBTYPE_ROCKETMQ_BROKER),
-    ROCKETMQ_NAMESERVER(12, STORE_SUBTYPE_ROCKETMQ_NAMESERVER),
     KAFKA(2, STORE_TYPE_KAFKA),
     PULSAR(3, STORE_TYPE_PULSAR),
     RABBITMQ(4, STORE_TYPE_RABBITMQ),

diff --git a/...in/java/org/apache/eventmesh/dashboard/common/enums/metadata/MetadataServiceTypeEnum.java b/...in/java/org/apache/eventmesh/dashboard/common/enums/metadata/MetadataServiceTypeEnum.java
diff --git a/.../src/main/java/org/apache/eventmesh/dashboard/common/enums/metadata/MetadataTypeEnum.java b/.../src/main/java/org/apache/eventmesh/dashboard/common/enums/metadata/MetadataTypeEnum.java
diff --git a/eventmesh-dashboard-console/pom.xml b/eventmesh-dashboard-console/pom.xml
@@ -19,6 +19,12 @@
     </properties>
 
     <dependencies>
+        <!-- Spring Boot Starter -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
         <!-- EventMesh Dashboard modules -->
         <dependency>
             <groupId>org.apache.eventmesh.dashboard.common</groupId>

diff --git a/...va/org/apache/eventmesh/dashboard/console/function/health/annotation/HealthCheckType.java b/...va/org/apache/eventmesh/dashboard/console/function/health/annotation/HealthCheckType.java
@@ -24,7 +24,7 @@
 
 /**
  * This annotation is used to mark the type of health check service implement.
- * @see org.apache.eventmesh.dashboard.console.enums.health.HealthCheckType
+ * @see org.apache.eventmesh.dashboard.common.enums.health.HealthCheckType
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)

diff --git a/.../dashboard/console/function/health/check/impl/storage/rocketmq4/Rocketmq4BrokerCheck.java b/.../dashboard/console/function/health/check/impl/storage/rocketmq4/Rocketmq4BrokerCheck.java
@@ -17,10 +17,6 @@
 
 package org.apache.eventmesh.dashboard.console.function.health.check.impl.storage.rocketmq4;
 
-import static org.apache.eventmesh.dashboard.common.constant.health.HealthCheckTypeConstant.HEALTH_CHECK_SUBTYPE_ROCKETMQ_BROKER;
-import static org.apache.eventmesh.dashboard.common.constant.health.HealthCheckTypeConstant.HEALTH_CHECK_TYPE_STORAGE;
-
-import org.apache.eventmesh.dashboard.console.function.health.annotation.HealthCheckType;
 import org.apache.eventmesh.dashboard.console.function.health.callback.HealthCheckCallback;
 import org.apache.eventmesh.dashboard.console.function.health.check.AbstractHealthCheckService;
 import org.apache.eventmesh.dashboard.console.function.health.check.config.HealthCheckObjectConfig;
@@ -36,7 +32,6 @@
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-@HealthCheckType(type = HEALTH_CHECK_TYPE_STORAGE, subType = HEALTH_CHECK_SUBTYPE_ROCKETMQ_BROKER)
 public class Rocketmq4BrokerCheck extends AbstractHealthCheckService {
 
     private RemotingClient remotingClient;

diff --git a/...hboard/console/function/health/check/impl/storage/rocketmq4/Rocketmq4NameServerCheck.java b/...hboard/console/function/health/check/impl/storage/rocketmq4/Rocketmq4NameServerCheck.java
@@ -34,7 +34,7 @@
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-@HealthCheckType(type = HealthCheckTypeConstant.HEALTH_CHECK_TYPE_STORAGE, subType = HealthCheckTypeConstant.HEALTH_CHECK_SUBTYPE_ROCKETMQ_NAMESERVER)
+@HealthCheckType(type = HealthCheckTypeConstant.HEALTH_CHECK_TYPE_STORAGE, subType = HealthCheckTypeConstant.HEALTH_CHECK_SUBTYPE_ROCKETMQ)
 public class Rocketmq4NameServerCheck extends AbstractHealthCheckService {
 
     private RemotingClient remotingClient;

diff --git a/...h/dashboard/console/function/health/check/impl/storage/rocketmq4/Rocketmq4TopicCheck.java b/...h/dashboard/console/function/health/check/impl/storage/rocketmq4/Rocketmq4TopicCheck.java
@@ -19,9 +19,7 @@
 
 import static org.apache.rocketmq.client.producer.SendStatus.SEND_OK;
 
-import org.apache.eventmesh.dashboard.common.constant.health.HealthCheckTypeConstant;
 import org.apache.eventmesh.dashboard.common.constant.health.HealthConstant;
-import org.apache.eventmesh.dashboard.console.function.health.annotation.HealthCheckType;
 import org.apache.eventmesh.dashboard.console.function.health.callback.HealthCheckCallback;
 import org.apache.eventmesh.dashboard.console.function.health.check.AbstractHealthCheckService;
 import org.apache.eventmesh.dashboard.console.function.health.check.config.HealthCheckObjectConfig;
@@ -57,7 +55,6 @@
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-@HealthCheckType(type = HealthCheckTypeConstant.HEALTH_CHECK_TYPE_STORAGE, subType = HealthCheckTypeConstant.HEALTH_CHECK_SUBTYPE_ROCKETMQ_TOPIC)
 public class Rocketmq4TopicCheck extends AbstractHealthCheckService {
 
     private RemotingClient remotingClient;

diff --git a/eventmesh-dashboard-core/pom.xml b/eventmesh-dashboard-core/pom.xml
@@ -40,12 +40,6 @@
     </properties>
 
     <dependencies>
-        <!-- Spring Boot Starter -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
         <!-- EventMesh Dashboard modules -->
         <dependency>
             <groupId>org.apache.eventmesh.dashboard.common</groupId>