[ISSUE apache#45] Implement methods from storage-plugin.admin(rocketm…

…q) (apache#66) * modify RocketmqTopicCore, using SDKManager * fix style * delete some variable in RocketmqProperties and TopicProperties & remote additional endPoint name * remove junit dependency back to console module * remove unnecessary brackets & revert em-dashboard-pom.xml & move RocketmqProperties to core.dto * add todo * move todo to common sdk dependencies & fix style * add test and junit dependencies in core pom.xml * revert the indentation in pom.xml & move test related dependencies to bottom in core-pom.xml * revert indentation in pom.xml * revert indentation in pom.xml * remove unnecessary params * remove params * remove empty line
scwlkq · Mar 29, 2024 · 576bf8b · 576bf8b
1 parent 1dfc379
commit 576bf8b
Show file tree

Hide file tree

Showing 29 changed files with 270 additions and 132 deletions.
diff --git a/eventmesh-dashboard-common/pom.xml b/eventmesh-dashboard-common/pom.xml
@@ -40,6 +40,30 @@
             <artifactId>fastjson2</artifactId>
             <version>2.0.40</version>
         </dependency>
+
+        <!-- todo These SDKs should be placed in the core module after the console module's usage of these SDKs has been migrated to the core module.  -->
+        <!-- storage redis client -->
+        <dependency>
+            <groupId>io.lettuce</groupId>
+            <artifactId>lettuce-core</artifactId>
+        </dependency>
+        <!-- Meta - nacos client -->
+        <dependency>
+            <groupId>com.alibaba.nacos</groupId>
+            <artifactId>nacos-client</artifactId>
+            <version>${nacos.version}</version>
+        </dependency>
+        <!-- rocketmq client -->
+        <dependency>
+            <groupId>org.apache.rocketmq</groupId>
+            <artifactId>rocketmq-client</artifactId>
+            <version>${rocketmq.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.rocketmq</groupId>
+            <artifactId>rocketmq-tools</artifactId>
+            <version>${rocketmq.version}</version>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/eventmesh-dashboard-console/pom.xml b/eventmesh-dashboard-console/pom.xml
@@ -37,6 +37,19 @@
             <artifactId>spring-aspects</artifactId>
         </dependency>
 
+        <!-- Unit Test -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
+            <scope>test</scope>
+        </dependency>
+
         <!-- Swagger -->
         <dependency>
             <groupId>org.springdoc</groupId>
@@ -59,19 +72,13 @@
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
         </dependency>
+
         <dependency>
             <groupId>com.mysql</groupId>
             <artifactId>mysql-connector-j</artifactId>
             <scope>runtime</scope>
         </dependency>
 
-        <!-- Meta - nacos client -->
-        <dependency>
-            <groupId>com.alibaba.nacos</groupId>
-            <artifactId>nacos-client</artifactId>
-            <version>${nacos.version}</version>
-        </dependency>
-
         <!-- health check client -->
         <!-- EventMesh SDK -->
 <!--        <dependency>-->
@@ -93,38 +100,8 @@
 <!--                </exclusion>-->
 <!--            </exclusions>-->
 <!--        </dependency>-->
-        <!-- storage redis client -->
-        <dependency>
-            <groupId>io.lettuce</groupId>
-            <artifactId>lettuce-core</artifactId>
-        </dependency>
-        <!-- rocketmq client -->
-        <dependency>
-            <groupId>org.apache.rocketmq</groupId>
-            <artifactId>rocketmq-client</artifactId>
-            <version>4.9.4</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.rocketmq</groupId>
-            <artifactId>rocketmq-tools</artifactId>
-            <version>5.2.0</version>
-        </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>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.2</version>
-            <scope>test</scope>
-        </dependency>
+        <!-- health check client end -->
     </dependencies>
 
     <build>

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
@@ -18,9 +18,9 @@
 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.console.dto.CreateTopicRequest;
 import org.apache.eventmesh.dashboard.console.dto.DeleteTopicRequest;
+import org.apache.eventmesh.dashboard.service.dto.TopicProperties;
 import org.apache.eventmesh.dashboard.service.store.TopicCore;
 
 import java.util.List;
@@ -61,7 +61,7 @@ public ResponseEntity<Object> preflight() {
     @CrossOrigin
     @GetMapping
     public Result<List<TopicProperties>> getList() {
-        List<TopicProperties> topicList = topicCore.getTopic();
+        List<TopicProperties> topicList = topicCore.getTopics();
         return Result.success(topicList);
     }
 

diff --git a/eventmesh-dashboard-core/pom.xml b/eventmesh-dashboard-core/pom.xml
@@ -65,5 +65,18 @@
             <artifactId>rocketmq-client</artifactId>
             <version>4.9.7</version>
         </dependency>
+
+        <!-- Unit Test -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/...le/function/SDK/AbstractSDKOperation.java → ...re/function/SDK/AbstractSDKOperation.java b/...le/function/SDK/AbstractSDKOperation.java → ...re/function/SDK/AbstractSDKOperation.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.console.function.SDK;
+package org.apache.eventmesh.dashboard.core.function.SDK;
 
 public abstract class AbstractSDKOperation<T> implements SDKOperation<T> {
 

diff --git a/...oard/console/function/SDK/SDKManager.java → ...shboard/core/function/SDK/SDKManager.java b/...oard/console/function/SDK/SDKManager.java → ...shboard/core/function/SDK/SDKManager.java
@@ -15,27 +15,25 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.console.function.SDK;
+package org.apache.eventmesh.dashboard.core.function.SDK;
 
-import org.apache.eventmesh.dashboard.console.function.SDK.config.CreateSDKConfig;
-import org.apache.eventmesh.dashboard.console.function.SDK.operation.NacosConfigSDKOperation;
-import org.apache.eventmesh.dashboard.console.function.SDK.operation.NacosNamingSDKOperation;
-import org.apache.eventmesh.dashboard.console.function.SDK.operation.NacosSDKOperation;
-import org.apache.eventmesh.dashboard.console.function.SDK.operation.RedisSDKOperation;
-import org.apache.eventmesh.dashboard.console.function.SDK.operation.RocketMQProduceSDKOperation;
-import org.apache.eventmesh.dashboard.console.function.SDK.operation.RocketMQPushConsumerSDKOperation;
-import org.apache.eventmesh.dashboard.console.function.SDK.operation.RocketMQRemotingSDKOperation;
+import org.apache.eventmesh.dashboard.core.function.SDK.config.CreateSDKConfig;
+import org.apache.eventmesh.dashboard.core.function.SDK.operation.NacosConfigSDKOperation;
+import org.apache.eventmesh.dashboard.core.function.SDK.operation.NacosNamingSDKOperation;
+import org.apache.eventmesh.dashboard.core.function.SDK.operation.NacosSDKOperation;
+import org.apache.eventmesh.dashboard.core.function.SDK.operation.RedisSDKOperation;
+import org.apache.eventmesh.dashboard.core.function.SDK.operation.RocketMQProduceSDKOperation;
+import org.apache.eventmesh.dashboard.core.function.SDK.operation.RocketMQPushConsumerSDKOperation;
+import org.apache.eventmesh.dashboard.core.function.SDK.operation.RocketMQRemotingSDKOperation;
 
 import java.util.AbstractMap.SimpleEntry;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 
 
-
 /**
  * SDK manager is a singleton to manage all SDK clients, it is a facade to create, delete and get a client.
-
  */
 public class SDKManager {
 

diff --git a/...rd/console/function/SDK/SDKOperation.java → ...board/core/function/SDK/SDKOperation.java b/...rd/console/function/SDK/SDKOperation.java → ...board/core/function/SDK/SDKOperation.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.console.function.SDK;
+package org.apache.eventmesh.dashboard.core.function.SDK;
 
-import org.apache.eventmesh.dashboard.console.function.SDK.config.CreateSDKConfig;
+import org.apache.eventmesh.dashboard.core.function.SDK.config.CreateSDKConfig;
 
 import java.util.AbstractMap.SimpleEntry;
 

diff --git a/...ard/console/function/SDK/SDKTypeEnum.java → ...hboard/core/function/SDK/SDKTypeEnum.java b/...ard/console/function/SDK/SDKTypeEnum.java → ...hboard/core/function/SDK/SDKTypeEnum.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.console.function.SDK;
+package org.apache.eventmesh.dashboard.core.function.SDK;
 
 public enum SDKTypeEnum {
 

diff --git a/...unction/SDK/config/CreateNacosConfig.java → ...unction/SDK/config/CreateNacosConfig.java b/...unction/SDK/config/CreateNacosConfig.java → ...unction/SDK/config/CreateNacosConfig.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.console.function.SDK.config;
+package org.apache.eventmesh.dashboard.core.function.SDK.config;
 
 import lombok.Data;
 

diff --git a/...unction/SDK/config/CreateRedisConfig.java → ...unction/SDK/config/CreateRedisConfig.java b/...unction/SDK/config/CreateRedisConfig.java → ...unction/SDK/config/CreateRedisConfig.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.console.function.SDK.config;
+package org.apache.eventmesh.dashboard.core.function.SDK.config;
 
 import lombok.Data;
 

diff --git a/...tion/SDK/config/CreateRocketmqConfig.java → ...tion/SDK/config/CreateRocketmqConfig.java b/...tion/SDK/config/CreateRocketmqConfig.java → ...tion/SDK/config/CreateRocketmqConfig.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.console.function.SDK.config;
+package org.apache.eventmesh.dashboard.core.function.SDK.config;
 
 import org.apache.rocketmq.client.consumer.listener.MessageListener;
 import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;

diff --git a/.../function/SDK/config/CreateSDKConfig.java → .../function/SDK/config/CreateSDKConfig.java b/.../function/SDK/config/CreateSDKConfig.java → .../function/SDK/config/CreateSDKConfig.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.console.function.SDK.config;
+package org.apache.eventmesh.dashboard.core.function.SDK.config;
 
 /**
  * Config to create an SDK client, usually contains an address url.

diff --git a/...ction/SDK/operation/EtcdSDKOperation.java → ...ction/SDK/operation/EtcdSDKOperation.java b/...ction/SDK/operation/EtcdSDKOperation.java → ...ction/SDK/operation/EtcdSDKOperation.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.console.function.SDK.operation;
+package org.apache.eventmesh.dashboard.core.function.SDK.operation;
 
-import org.apache.eventmesh.dashboard.console.function.SDK.AbstractSDKOperation;
-import org.apache.eventmesh.dashboard.console.function.SDK.config.CreateSDKConfig;
+import org.apache.eventmesh.dashboard.core.function.SDK.AbstractSDKOperation;
+import org.apache.eventmesh.dashboard.core.function.SDK.config.CreateSDKConfig;
 
 import java.util.AbstractMap.SimpleEntry;
 

diff --git a/...DK/operation/NacosConfigSDKOperation.java → ...DK/operation/NacosConfigSDKOperation.java b/...DK/operation/NacosConfigSDKOperation.java → ...DK/operation/NacosConfigSDKOperation.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.console.function.SDK.operation;
+package org.apache.eventmesh.dashboard.core.function.SDK.operation;
 
-import org.apache.eventmesh.dashboard.console.function.SDK.AbstractSDKOperation;
-import org.apache.eventmesh.dashboard.console.function.SDK.config.CreateNacosConfig;
-import org.apache.eventmesh.dashboard.console.function.SDK.config.CreateSDKConfig;
+import org.apache.eventmesh.dashboard.core.function.SDK.AbstractSDKOperation;
+import org.apache.eventmesh.dashboard.core.function.SDK.config.CreateNacosConfig;
+import org.apache.eventmesh.dashboard.core.function.SDK.config.CreateSDKConfig;
 
 import java.util.AbstractMap.SimpleEntry;
 import java.util.Properties;

diff --git a/...DK/operation/NacosNamingSDKOperation.java → ...DK/operation/NacosNamingSDKOperation.java b/...DK/operation/NacosNamingSDKOperation.java → ...DK/operation/NacosNamingSDKOperation.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.console.function.SDK.operation;
+package org.apache.eventmesh.dashboard.core.function.SDK.operation;
 
-import org.apache.eventmesh.dashboard.console.function.SDK.AbstractSDKOperation;
-import org.apache.eventmesh.dashboard.console.function.SDK.config.CreateNacosConfig;
-import org.apache.eventmesh.dashboard.console.function.SDK.config.CreateSDKConfig;
+import org.apache.eventmesh.dashboard.core.function.SDK.AbstractSDKOperation;
+import org.apache.eventmesh.dashboard.core.function.SDK.config.CreateNacosConfig;
+import org.apache.eventmesh.dashboard.core.function.SDK.config.CreateSDKConfig;
 
 import java.util.AbstractMap.SimpleEntry;
 import java.util.Properties;

diff --git a/...tion/SDK/operation/NacosSDKOperation.java → ...tion/SDK/operation/NacosSDKOperation.java b/...tion/SDK/operation/NacosSDKOperation.java → ...tion/SDK/operation/NacosSDKOperation.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.console.function.SDK.operation;
+package org.apache.eventmesh.dashboard.core.function.SDK.operation;
 
-import org.apache.eventmesh.dashboard.console.function.SDK.AbstractSDKOperation;
-import org.apache.eventmesh.dashboard.console.function.SDK.config.CreateSDKConfig;
-import org.apache.eventmesh.dashboard.console.function.SDK.wrapper.NacosSDKWrapper;
+import org.apache.eventmesh.dashboard.core.function.SDK.AbstractSDKOperation;
+import org.apache.eventmesh.dashboard.core.function.SDK.config.CreateSDKConfig;
+import org.apache.eventmesh.dashboard.core.function.SDK.wrapper.NacosSDKWrapper;
 
 import java.util.AbstractMap.SimpleEntry;
 

diff --git a/...tion/SDK/operation/RedisSDKOperation.java → ...tion/SDK/operation/RedisSDKOperation.java b/...tion/SDK/operation/RedisSDKOperation.java → ...tion/SDK/operation/RedisSDKOperation.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.console.function.SDK.operation;
+package org.apache.eventmesh.dashboard.core.function.SDK.operation;
 
-import org.apache.eventmesh.dashboard.console.function.SDK.AbstractSDKOperation;
-import org.apache.eventmesh.dashboard.console.function.SDK.config.CreateRedisConfig;
-import org.apache.eventmesh.dashboard.console.function.SDK.config.CreateSDKConfig;
+import org.apache.eventmesh.dashboard.core.function.SDK.AbstractSDKOperation;
+import org.apache.eventmesh.dashboard.core.function.SDK.config.CreateRedisConfig;
+import org.apache.eventmesh.dashboard.core.function.SDK.config.CreateSDKConfig;
 
 import java.util.AbstractMap.SimpleEntry;
 

diff --git a/...peration/RocketMQProduceSDKOperation.java → ...peration/RocketMQProduceSDKOperation.java b/...peration/RocketMQProduceSDKOperation.java → ...peration/RocketMQProduceSDKOperation.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.console.function.SDK.operation;
+package org.apache.eventmesh.dashboard.core.function.SDK.operation;
 
-import org.apache.eventmesh.dashboard.console.function.SDK.AbstractSDKOperation;
-import org.apache.eventmesh.dashboard.console.function.SDK.config.CreateRocketmqConfig;
-import org.apache.eventmesh.dashboard.console.function.SDK.config.CreateSDKConfig;
+import org.apache.eventmesh.dashboard.core.function.SDK.AbstractSDKOperation;
+import org.apache.eventmesh.dashboard.core.function.SDK.config.CreateRocketmqConfig;
+import org.apache.eventmesh.dashboard.core.function.SDK.config.CreateSDKConfig;
 
 import org.apache.rocketmq.client.exception.MQClientException;
 import org.apache.rocketmq.client.producer.DefaultMQProducer;

diff --git a/...ion/RocketMQPushConsumerSDKOperation.java → ...ion/RocketMQPushConsumerSDKOperation.java b/...ion/RocketMQPushConsumerSDKOperation.java → ...ion/RocketMQPushConsumerSDKOperation.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.console.function.SDK.operation;
+package org.apache.eventmesh.dashboard.core.function.SDK.operation;
 
-import org.apache.eventmesh.dashboard.console.function.SDK.AbstractSDKOperation;
-import org.apache.eventmesh.dashboard.console.function.SDK.config.CreateRocketmqConfig;
-import org.apache.eventmesh.dashboard.console.function.SDK.config.CreateSDKConfig;
+import org.apache.eventmesh.dashboard.core.function.SDK.AbstractSDKOperation;
+import org.apache.eventmesh.dashboard.core.function.SDK.config.CreateRocketmqConfig;
+import org.apache.eventmesh.dashboard.core.function.SDK.config.CreateSDKConfig;
 
 import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
 import org.apache.rocketmq.client.exception.MQClientException;

diff --git a/...eration/RocketMQRemotingSDKOperation.java → ...eration/RocketMQRemotingSDKOperation.java b/...eration/RocketMQRemotingSDKOperation.java → ...eration/RocketMQRemotingSDKOperation.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.console.function.SDK.operation;
+package org.apache.eventmesh.dashboard.core.function.SDK.operation;
 
-import org.apache.eventmesh.dashboard.console.function.SDK.AbstractSDKOperation;
-import org.apache.eventmesh.dashboard.console.function.SDK.config.CreateSDKConfig;
+import org.apache.eventmesh.dashboard.core.function.SDK.AbstractSDKOperation;
+import org.apache.eventmesh.dashboard.core.function.SDK.config.CreateSDKConfig;
 
 import org.apache.rocketmq.remoting.RemotingClient;
 import org.apache.rocketmq.remoting.netty.NettyClientConfig;

diff --git a/...on/SDK/operation/RuntimeSDKOperation.java → ...on/SDK/operation/RuntimeSDKOperation.java b/...on/SDK/operation/RuntimeSDKOperation.java → ...on/SDK/operation/RuntimeSDKOperation.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.console.function.SDK.operation;
+package org.apache.eventmesh.dashboard.core.function.SDK.operation;
 
-import org.apache.eventmesh.dashboard.console.function.SDK.AbstractSDKOperation;
-import org.apache.eventmesh.dashboard.console.function.SDK.config.CreateSDKConfig;
+import org.apache.eventmesh.dashboard.core.function.SDK.AbstractSDKOperation;
+import org.apache.eventmesh.dashboard.core.function.SDK.config.CreateSDKConfig;
 
 import java.util.AbstractMap.SimpleEntry;