From 559da54a88711463207585f866dd2649b0e0390b Mon Sep 17 00:00:00 2001 From: "lambert@arch" Date: Fri, 15 Mar 2024 09:32:13 +0800 Subject: [PATCH] style: just rename SDK --- .../{client => SDK}/AbstractSDKOperation.java | 2 +- .../function/{client => SDK}/SDKManager.java | 48 +++++++++---------- .../{client => SDK}/SDKOperation.java | 6 +-- .../SDKTypeEnum.java} | 10 ++-- .../config/CreateNacosConfig.java | 4 +- .../config/CreateRedisConfig.java | 4 +- .../config/CreateRocketmqConfig.java | 4 +- .../config/CreateSDKConfig.java} | 4 +- .../operation/EtcdSDKOperation.java | 8 ++-- .../operation/NacosConfigSDKOperation.java | 10 ++-- .../operation/NacosNamingSDKOperation.java | 10 ++-- .../operation/NacosSDKOperation.java | 14 +++--- .../operation/RedisSDKOperation.java | 10 ++-- .../RocketMQProduceSDKOperation.java | 10 ++-- .../RocketMQPushConsumerSDKOperation.java | 10 ++-- .../RocketMQRemotingSDKOperation.java | 8 ++-- .../operation/RuntimeSDKOperation.java | 8 ++-- .../wrapper/NacosSDKWrapper.java} | 4 +- .../{client => SDK}/SDKManagerTest.java | 8 ++-- .../RedisSDKCreateOperationTest.java} | 6 +-- 20 files changed, 94 insertions(+), 94 deletions(-) rename eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/{client => SDK}/AbstractSDKOperation.java (94%) rename eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/{client => SDK}/SDKManager.java (54%) rename eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/{client => SDK}/SDKOperation.java (81%) rename eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/{client/ClientTypeEnum.java => SDK/SDKTypeEnum.java} (85%) rename eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/{client => SDK}/config/CreateNacosConfig.java (87%) rename eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/{client => SDK}/config/CreateRedisConfig.java (87%) rename eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/{client => SDK}/config/CreateRocketmqConfig.java (91%) rename eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/{client/config/CreateClientConfig.java => SDK/config/CreateSDKConfig.java} (89%) rename eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/{client => SDK}/operation/EtcdSDKOperation.java (76%) rename eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/{client => SDK}/operation/NacosConfigSDKOperation.java (84%) rename eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/{client => SDK}/operation/NacosNamingSDKOperation.java (84%) rename eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/{client => SDK}/operation/NacosSDKOperation.java (79%) rename eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/{client => SDK}/operation/RedisSDKOperation.java (78%) rename eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/{client => SDK}/operation/RocketMQProduceSDKOperation.java (83%) rename eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/{client => SDK}/operation/RocketMQPushConsumerSDKOperation.java (84%) rename eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/{client => SDK}/operation/RocketMQRemotingSDKOperation.java (85%) rename eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/{client => SDK}/operation/RuntimeSDKOperation.java (76%) rename eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/{client/wrapper/NacosClientWrapper.java => SDK/wrapper/NacosSDKWrapper.java} (92%) rename eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/function/{client => SDK}/SDKManagerTest.java (84%) rename eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/function/{client/operation/RedisClientCreateOperationTest.java => SDK/operation/RedisSDKCreateOperationTest.java} (89%) diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/AbstractSDKOperation.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/AbstractSDKOperation.java similarity index 94% rename from eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/AbstractSDKOperation.java rename to eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/AbstractSDKOperation.java index e2689f39..c2e5b964 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/AbstractSDKOperation.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/AbstractSDKOperation.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.console.function.client; +package org.apache.eventmesh.dashboard.console.function.SDK; public abstract class AbstractSDKOperation implements SDKOperation { diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/SDKManager.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/SDKManager.java similarity index 54% rename from eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/SDKManager.java rename to eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/SDKManager.java index c29d5d04..9ac4dbdc 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/SDKManager.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/SDKManager.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.console.function.client; +package org.apache.eventmesh.dashboard.console.function.SDK; -import org.apache.eventmesh.dashboard.console.function.client.config.CreateClientConfig; -import org.apache.eventmesh.dashboard.console.function.client.operation.NacosConfigSDKOperation; -import org.apache.eventmesh.dashboard.console.function.client.operation.NacosNamingSDKOperation; -import org.apache.eventmesh.dashboard.console.function.client.operation.NacosSDKOperation; -import org.apache.eventmesh.dashboard.console.function.client.operation.RedisSDKOperation; -import org.apache.eventmesh.dashboard.console.function.client.operation.RocketMQProduceSDKOperation; -import org.apache.eventmesh.dashboard.console.function.client.operation.RocketMQPushConsumerSDKOperation; -import org.apache.eventmesh.dashboard.console.function.client.operation.RocketMQRemotingSDKOperation; +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 java.util.AbstractMap.SimpleEntry; import java.util.Map; @@ -49,39 +49,39 @@ public static SDKManager getInstance() { /** * inner key is the unique key of a client, such as (ip + port) they are defined in CreateClientConfig * - * @see CreateClientConfig#getUniqueKey() + * @see CreateSDKConfig#getUniqueKey() */ - private final Map> clientMap = new ConcurrentHashMap<>(); + private final Map> clientMap = new ConcurrentHashMap<>(); - private final Map> clientCreateOperationMap = new ConcurrentHashMap<>(); + private final Map> clientCreateOperationMap = new ConcurrentHashMap<>(); // register all client create operation { - for (ClientTypeEnum clientTypeEnum : ClientTypeEnum.values()) { + for (SDKTypeEnum clientTypeEnum : SDKTypeEnum.values()) { clientMap.put(clientTypeEnum, new ConcurrentHashMap<>()); } - clientCreateOperationMap.put(ClientTypeEnum.STORAGE_REDIS, new RedisSDKOperation()); + clientCreateOperationMap.put(SDKTypeEnum.STORAGE_REDIS, new RedisSDKOperation()); - clientCreateOperationMap.put(ClientTypeEnum.STORAGE_ROCKETMQ_REMOTING, new RocketMQRemotingSDKOperation()); - clientCreateOperationMap.put(ClientTypeEnum.STORAGE_ROCKETMQ_PRODUCER, new RocketMQProduceSDKOperation()); - clientCreateOperationMap.put(ClientTypeEnum.STORAGE_ROCKETMQ_CONSUMER, new RocketMQPushConsumerSDKOperation()); + clientCreateOperationMap.put(SDKTypeEnum.STORAGE_ROCKETMQ_REMOTING, new RocketMQRemotingSDKOperation()); + clientCreateOperationMap.put(SDKTypeEnum.STORAGE_ROCKETMQ_PRODUCER, new RocketMQProduceSDKOperation()); + clientCreateOperationMap.put(SDKTypeEnum.STORAGE_ROCKETMQ_CONSUMER, new RocketMQPushConsumerSDKOperation()); - clientCreateOperationMap.put(ClientTypeEnum.CENTER_NACOS, new NacosSDKOperation()); - clientCreateOperationMap.put(ClientTypeEnum.CENTER_NACOS_CONFIG, new NacosConfigSDKOperation()); - clientCreateOperationMap.put(ClientTypeEnum.CENTER_NACOS_NAMING, new NacosNamingSDKOperation()); + clientCreateOperationMap.put(SDKTypeEnum.META_NACOS, new NacosSDKOperation()); + clientCreateOperationMap.put(SDKTypeEnum.META_NACOS_CONFIG, new NacosConfigSDKOperation()); + clientCreateOperationMap.put(SDKTypeEnum.META_NACOS_NAMING, new NacosNamingSDKOperation()); } private SDKManager() { } - public SimpleEntry createClient(ClientTypeEnum clientTypeEnum, CreateClientConfig config) { + public SimpleEntry createClient(SDKTypeEnum clientTypeEnum, CreateSDKConfig config) { return createClient(clientTypeEnum, config.getUniqueKey(), config); } - public SimpleEntry createClient(ClientTypeEnum clientTypeEnum, String uniqueKey, CreateClientConfig config) { + public SimpleEntry createClient(SDKTypeEnum clientTypeEnum, String uniqueKey, CreateSDKConfig config) { Map clients = this.clientMap.get(clientTypeEnum); @@ -99,7 +99,7 @@ public SimpleEntry createClient(ClientTypeEnum clientTypeEnum, St } } - public void deleteClient(ClientTypeEnum clientTypeEnum, String uniqueKey) { + public void deleteClient(SDKTypeEnum clientTypeEnum, String uniqueKey) { Map clients = this.clientMap.get(clientTypeEnum); SDKOperation operation = this.clientCreateOperationMap.get(clientTypeEnum); try { @@ -110,7 +110,7 @@ public void deleteClient(ClientTypeEnum clientTypeEnum, String uniqueKey) { clients.remove(uniqueKey); } - public Object getClient(ClientTypeEnum clientTypeEnum, String uniqueKey) { + public Object getClient(SDKTypeEnum clientTypeEnum, String uniqueKey) { return this.clientMap.get(clientTypeEnum).get(uniqueKey); } } diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/SDKOperation.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/SDKOperation.java similarity index 81% rename from eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/SDKOperation.java rename to eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/SDKOperation.java index e6add8e7..19d264c5 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/SDKOperation.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/SDKOperation.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.console.function.client; +package org.apache.eventmesh.dashboard.console.function.SDK; -import org.apache.eventmesh.dashboard.console.function.client.config.CreateClientConfig; +import org.apache.eventmesh.dashboard.console.function.SDK.config.CreateSDKConfig; import java.util.AbstractMap.SimpleEntry; @@ -28,7 +28,7 @@ */ public interface SDKOperation { - public SimpleEntry createClient(CreateClientConfig clientConfig); + public SimpleEntry createClient(CreateSDKConfig clientConfig); public void close(Object client); diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/ClientTypeEnum.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/SDKTypeEnum.java similarity index 85% rename from eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/ClientTypeEnum.java rename to eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/SDKTypeEnum.java index 6bb22cf8..9a44873d 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/ClientTypeEnum.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/SDKTypeEnum.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.console.function.client; +package org.apache.eventmesh.dashboard.console.function.SDK; -public enum ClientTypeEnum { +public enum SDKTypeEnum { RUNTIME, @@ -29,10 +29,10 @@ public enum ClientTypeEnum { STORAGE_REDIS, - CENTER_NACOS, - CENTER_NACOS_CONFIG, + META_NACOS, + META_NACOS_CONFIG, - CENTER_NACOS_NAMING, + META_NACOS_NAMING, } diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/config/CreateNacosConfig.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/config/CreateNacosConfig.java similarity index 87% rename from eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/config/CreateNacosConfig.java rename to eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/config/CreateNacosConfig.java index fbc18419..856d4de5 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/config/CreateNacosConfig.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/config/CreateNacosConfig.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.console.function.client.config; +package org.apache.eventmesh.dashboard.console.function.SDK.config; import lombok.Data; @Data -public class CreateNacosConfig implements CreateClientConfig { +public class CreateNacosConfig implements CreateSDKConfig { private String serverAddress; diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/config/CreateRedisConfig.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/config/CreateRedisConfig.java similarity index 87% rename from eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/config/CreateRedisConfig.java rename to eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/config/CreateRedisConfig.java index c40e5c6a..30c53b89 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/config/CreateRedisConfig.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/config/CreateRedisConfig.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.console.function.client.config; +package org.apache.eventmesh.dashboard.console.function.SDK.config; import lombok.Data; @Data -public class CreateRedisConfig implements CreateClientConfig { +public class CreateRedisConfig implements CreateSDKConfig { private String redisUrl; diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/config/CreateRocketmqConfig.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/config/CreateRocketmqConfig.java similarity index 91% rename from eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/config/CreateRocketmqConfig.java rename to eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/config/CreateRocketmqConfig.java index f27137ce..89424e70 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/config/CreateRocketmqConfig.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/config/CreateRocketmqConfig.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.console.function.client.config; +package org.apache.eventmesh.dashboard.console.function.SDK.config; import org.apache.rocketmq.client.consumer.listener.MessageListener; import org.apache.rocketmq.common.protocol.heartbeat.MessageModel; @@ -23,7 +23,7 @@ import lombok.Data; @Data -public class CreateRocketmqConfig implements CreateClientConfig { +public class CreateRocketmqConfig implements CreateSDKConfig { // common private String nameServerUrl; diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/config/CreateClientConfig.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/config/CreateSDKConfig.java similarity index 89% rename from eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/config/CreateClientConfig.java rename to eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/config/CreateSDKConfig.java index fca4a7b0..9a404f2e 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/config/CreateClientConfig.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/config/CreateSDKConfig.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.console.function.client.config; +package org.apache.eventmesh.dashboard.console.function.SDK.config; /** * Config to create an SDK client, usually contains an address url. */ -public interface CreateClientConfig { +public interface CreateSDKConfig { String getUniqueKey(); } diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/operation/EtcdSDKOperation.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/operation/EtcdSDKOperation.java similarity index 76% rename from eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/operation/EtcdSDKOperation.java rename to eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/operation/EtcdSDKOperation.java index a0df642f..75beaf69 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/operation/EtcdSDKOperation.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/operation/EtcdSDKOperation.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.console.function.client.operation; +package org.apache.eventmesh.dashboard.console.function.SDK.operation; -import org.apache.eventmesh.dashboard.console.function.client.AbstractSDKOperation; -import org.apache.eventmesh.dashboard.console.function.client.config.CreateClientConfig; +import org.apache.eventmesh.dashboard.console.function.SDK.AbstractSDKOperation; +import org.apache.eventmesh.dashboard.console.function.SDK.config.CreateSDKConfig; import java.util.AbstractMap.SimpleEntry; public class EtcdSDKOperation extends AbstractSDKOperation { @Override - public SimpleEntry createClient(CreateClientConfig clientConfig) { + public SimpleEntry createClient(CreateSDKConfig clientConfig) { return null; } diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/operation/NacosConfigSDKOperation.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/operation/NacosConfigSDKOperation.java similarity index 84% rename from eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/operation/NacosConfigSDKOperation.java rename to eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/operation/NacosConfigSDKOperation.java index 359896ad..1dbaf458 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/operation/NacosConfigSDKOperation.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/operation/NacosConfigSDKOperation.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.console.function.client.operation; +package org.apache.eventmesh.dashboard.console.function.SDK.operation; -import org.apache.eventmesh.dashboard.console.function.client.AbstractSDKOperation; -import org.apache.eventmesh.dashboard.console.function.client.config.CreateClientConfig; -import org.apache.eventmesh.dashboard.console.function.client.config.CreateNacosConfig; +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.config.CreateNacosConfig; import java.util.AbstractMap.SimpleEntry; import java.util.Properties; @@ -34,7 +34,7 @@ public class NacosConfigSDKOperation extends AbstractSDKOperation { @Override - public SimpleEntry createClient(CreateClientConfig clientConfig) { + public SimpleEntry createClient(CreateSDKConfig clientConfig) { ConfigService configService = null; CreateNacosConfig config = (CreateNacosConfig) clientConfig; try { diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/operation/NacosNamingSDKOperation.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/operation/NacosNamingSDKOperation.java similarity index 84% rename from eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/operation/NacosNamingSDKOperation.java rename to eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/operation/NacosNamingSDKOperation.java index e3a3bad3..4b9f679f 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/operation/NacosNamingSDKOperation.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/operation/NacosNamingSDKOperation.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.console.function.client.operation; +package org.apache.eventmesh.dashboard.console.function.SDK.operation; -import org.apache.eventmesh.dashboard.console.function.client.AbstractSDKOperation; -import org.apache.eventmesh.dashboard.console.function.client.config.CreateClientConfig; -import org.apache.eventmesh.dashboard.console.function.client.config.CreateNacosConfig; +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.config.CreateNacosConfig; import java.util.AbstractMap.SimpleEntry; import java.util.Properties; @@ -35,7 +35,7 @@ public class NacosNamingSDKOperation extends AbstractSDKOperation { @Override - public SimpleEntry createClient(CreateClientConfig clientConfig) { + public SimpleEntry createClient(CreateSDKConfig clientConfig) { NamingService namingService = null; CreateNacosConfig config = (CreateNacosConfig) clientConfig; try { diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/operation/NacosSDKOperation.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/operation/NacosSDKOperation.java similarity index 79% rename from eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/operation/NacosSDKOperation.java rename to eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/operation/NacosSDKOperation.java index e7d971d1..e0b326e7 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/operation/NacosSDKOperation.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/operation/NacosSDKOperation.java @@ -15,30 +15,30 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.console.function.client.operation; +package org.apache.eventmesh.dashboard.console.function.SDK.operation; -import org.apache.eventmesh.dashboard.console.function.client.AbstractSDKOperation; -import org.apache.eventmesh.dashboard.console.function.client.config.CreateClientConfig; -import org.apache.eventmesh.dashboard.console.function.client.wrapper.NacosClientWrapper; +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 java.util.AbstractMap.SimpleEntry; import com.alibaba.nacos.api.config.ConfigService; import com.alibaba.nacos.api.naming.NamingService; -public class NacosSDKOperation extends AbstractSDKOperation { +public class NacosSDKOperation extends AbstractSDKOperation { private final NacosConfigSDKOperation nacosConfigClientCreateOperation = new NacosConfigSDKOperation(); private final NacosNamingSDKOperation nacosNamingClientCreateOperation = new NacosNamingSDKOperation(); @Override - public SimpleEntry createClient(CreateClientConfig createClientConfig) { + public SimpleEntry createClient(CreateSDKConfig createClientConfig) { SimpleEntry configSimpleEntry = nacosConfigClientCreateOperation.createClient(createClientConfig); SimpleEntry namingSimpleEntry = nacosNamingClientCreateOperation.createClient(createClientConfig); if (configSimpleEntry.getKey() != namingSimpleEntry.getKey()) { throw new RuntimeException("Nacos config and naming server address not match"); } - NacosClientWrapper nacosClient = new NacosClientWrapper( + NacosSDKWrapper nacosClient = new NacosSDKWrapper( (ConfigService) configSimpleEntry.getValue(), (NamingService) namingSimpleEntry.getValue() ); return new SimpleEntry<>(configSimpleEntry.getKey(), nacosClient); diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/operation/RedisSDKOperation.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/operation/RedisSDKOperation.java similarity index 78% rename from eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/operation/RedisSDKOperation.java rename to eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/operation/RedisSDKOperation.java index 99403118..09195f92 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/operation/RedisSDKOperation.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/operation/RedisSDKOperation.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.console.function.client.operation; +package org.apache.eventmesh.dashboard.console.function.SDK.operation; -import org.apache.eventmesh.dashboard.console.function.client.AbstractSDKOperation; -import org.apache.eventmesh.dashboard.console.function.client.config.CreateClientConfig; -import org.apache.eventmesh.dashboard.console.function.client.config.CreateRedisConfig; +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.config.CreateRedisConfig; import java.util.AbstractMap.SimpleEntry; @@ -29,7 +29,7 @@ public class RedisSDKOperation extends AbstractSDKOperation> { @Override - public SimpleEntry> createClient(CreateClientConfig clientConfig) { + public SimpleEntry> createClient(CreateSDKConfig clientConfig) { String redisUrl = ((CreateRedisConfig) clientConfig).getRedisUrl(); RedisClient redisClient = RedisClient.create(redisUrl); return new SimpleEntry<>(clientConfig.getUniqueKey(), redisClient.connect()); diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/operation/RocketMQProduceSDKOperation.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/operation/RocketMQProduceSDKOperation.java similarity index 83% rename from eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/operation/RocketMQProduceSDKOperation.java rename to eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/operation/RocketMQProduceSDKOperation.java index d888a4ed..1c19f0f9 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/operation/RocketMQProduceSDKOperation.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/operation/RocketMQProduceSDKOperation.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.console.function.client.operation; +package org.apache.eventmesh.dashboard.console.function.SDK.operation; -import org.apache.eventmesh.dashboard.console.function.client.AbstractSDKOperation; -import org.apache.eventmesh.dashboard.console.function.client.config.CreateClientConfig; -import org.apache.eventmesh.dashboard.console.function.client.config.CreateRocketmqConfig; +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.config.CreateRocketmqConfig; import org.apache.rocketmq.client.exception.MQClientException; import org.apache.rocketmq.client.producer.DefaultMQProducer; @@ -32,7 +32,7 @@ public class RocketMQProduceSDKOperation extends AbstractSDKOperation { @Override - public SimpleEntry createClient(CreateClientConfig clientConfig) { + public SimpleEntry createClient(CreateSDKConfig clientConfig) { DefaultMQProducer producer = null; try { CreateRocketmqConfig config = (CreateRocketmqConfig) clientConfig; diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/operation/RocketMQPushConsumerSDKOperation.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/operation/RocketMQPushConsumerSDKOperation.java similarity index 84% rename from eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/operation/RocketMQPushConsumerSDKOperation.java rename to eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/operation/RocketMQPushConsumerSDKOperation.java index 3d14500e..eec4599f 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/operation/RocketMQPushConsumerSDKOperation.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/operation/RocketMQPushConsumerSDKOperation.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.console.function.client.operation; +package org.apache.eventmesh.dashboard.console.function.SDK.operation; -import org.apache.eventmesh.dashboard.console.function.client.AbstractSDKOperation; -import org.apache.eventmesh.dashboard.console.function.client.config.CreateClientConfig; -import org.apache.eventmesh.dashboard.console.function.client.config.CreateRocketmqConfig; +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.config.CreateRocketmqConfig; import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer; import org.apache.rocketmq.client.exception.MQClientException; @@ -32,7 +32,7 @@ public class RocketMQPushConsumerSDKOperation extends AbstractSDKOperation { @Override - public SimpleEntry createClient(CreateClientConfig clientConfig) { + public SimpleEntry createClient(CreateSDKConfig clientConfig) { DefaultMQPushConsumer consumer = null; try { CreateRocketmqConfig config = (CreateRocketmqConfig) clientConfig; diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/operation/RocketMQRemotingSDKOperation.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/operation/RocketMQRemotingSDKOperation.java similarity index 85% rename from eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/operation/RocketMQRemotingSDKOperation.java rename to eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/operation/RocketMQRemotingSDKOperation.java index 22685e66..3c88ff4e 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/operation/RocketMQRemotingSDKOperation.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/operation/RocketMQRemotingSDKOperation.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.console.function.client.operation; +package org.apache.eventmesh.dashboard.console.function.SDK.operation; -import org.apache.eventmesh.dashboard.console.function.client.AbstractSDKOperation; -import org.apache.eventmesh.dashboard.console.function.client.config.CreateClientConfig; +import org.apache.eventmesh.dashboard.console.function.SDK.AbstractSDKOperation; +import org.apache.eventmesh.dashboard.console.function.SDK.config.CreateSDKConfig; import org.apache.rocketmq.remoting.RemotingClient; import org.apache.rocketmq.remoting.netty.NettyClientConfig; @@ -29,7 +29,7 @@ public class RocketMQRemotingSDKOperation extends AbstractSDKOperation { @Override - public SimpleEntry createClient(CreateClientConfig clientConfig) { + public SimpleEntry createClient(CreateSDKConfig clientConfig) { NettyClientConfig config = new NettyClientConfig(); config.setUseTLS(false); RemotingClient remotingClient = new NettyRemotingClient(config); diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/operation/RuntimeSDKOperation.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/operation/RuntimeSDKOperation.java similarity index 76% rename from eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/operation/RuntimeSDKOperation.java rename to eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/operation/RuntimeSDKOperation.java index a5f06b64..65d358c8 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/operation/RuntimeSDKOperation.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/operation/RuntimeSDKOperation.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.console.function.client.operation; +package org.apache.eventmesh.dashboard.console.function.SDK.operation; -import org.apache.eventmesh.dashboard.console.function.client.AbstractSDKOperation; -import org.apache.eventmesh.dashboard.console.function.client.config.CreateClientConfig; +import org.apache.eventmesh.dashboard.console.function.SDK.AbstractSDKOperation; +import org.apache.eventmesh.dashboard.console.function.SDK.config.CreateSDKConfig; import java.util.AbstractMap.SimpleEntry; public class RuntimeSDKOperation extends AbstractSDKOperation { @Override - public SimpleEntry createClient(CreateClientConfig clientConfig) { + public SimpleEntry createClient(CreateSDKConfig clientConfig) { return null; } diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/wrapper/NacosClientWrapper.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/wrapper/NacosSDKWrapper.java similarity index 92% rename from eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/wrapper/NacosClientWrapper.java rename to eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/wrapper/NacosSDKWrapper.java index 0dbdadc9..7f9e3ffa 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/client/wrapper/NacosClientWrapper.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/SDK/wrapper/NacosSDKWrapper.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.console.function.client.wrapper; +package org.apache.eventmesh.dashboard.console.function.SDK.wrapper; import com.alibaba.nacos.api.config.ConfigService; import com.alibaba.nacos.api.exception.NacosException; @@ -24,7 +24,7 @@ import lombok.AllArgsConstructor; @AllArgsConstructor -public class NacosClientWrapper { +public class NacosSDKWrapper { public void shutdown() throws NacosException { configService.shutDown(); diff --git a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/function/client/SDKManagerTest.java b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/function/SDK/SDKManagerTest.java similarity index 84% rename from eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/function/client/SDKManagerTest.java rename to eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/function/SDK/SDKManagerTest.java index f2e0cbec..4eccdb0f 100644 --- a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/function/client/SDKManagerTest.java +++ b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/function/SDK/SDKManagerTest.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.console.function.client; +package org.apache.eventmesh.dashboard.console.function.SDK; import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.apache.eventmesh.dashboard.console.function.client.config.CreateRedisConfig; +import org.apache.eventmesh.dashboard.console.function.SDK.config.CreateRedisConfig; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -36,7 +36,7 @@ class SDKManagerTest { void setUp() { try { createRedisConfig.setRedisUrl("redis://localhost:6379"); - redisKey = SDKManager.getInstance().createClient(ClientTypeEnum.STORAGE_REDIS, createRedisConfig).getKey(); + redisKey = SDKManager.getInstance().createClient(SDKTypeEnum.STORAGE_REDIS, createRedisConfig).getKey(); } catch (Exception e) { log.warn("SDK manager test init failed, possible reason: redis-server is offline. {}", this.getClass().getSimpleName(), e); } @@ -45,7 +45,7 @@ void setUp() { @Test public void testGetClient() { try { - Object redisClient = SDKManager.getInstance().getClient(ClientTypeEnum.STORAGE_REDIS, redisKey); + Object redisClient = SDKManager.getInstance().getClient(SDKTypeEnum.STORAGE_REDIS, redisKey); assertNotNull(redisClient); } catch (Exception e) { log.warn("SDK manager test failed, possible reason: redis-server is offline. {}", this.getClass().getSimpleName(), e); diff --git a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/function/client/operation/RedisClientCreateOperationTest.java b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/function/SDK/operation/RedisSDKCreateOperationTest.java similarity index 89% rename from eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/function/client/operation/RedisClientCreateOperationTest.java rename to eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/function/SDK/operation/RedisSDKCreateOperationTest.java index 1fec1fe3..33a06b8e 100644 --- a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/function/client/operation/RedisClientCreateOperationTest.java +++ b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/function/SDK/operation/RedisSDKCreateOperationTest.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.console.function.client.operation; +package org.apache.eventmesh.dashboard.console.function.SDK.operation; import static org.junit.jupiter.api.Assertions.assertEquals; -import org.apache.eventmesh.dashboard.console.function.client.config.CreateRedisConfig; +import org.apache.eventmesh.dashboard.console.function.SDK.config.CreateRedisConfig; import java.util.AbstractMap.SimpleEntry; @@ -32,7 +32,7 @@ @Slf4j -class RedisClientCreateOperationTest { +class RedisSDKCreateOperationTest { private RedisSDKOperation redisClientCreateOperation = new RedisSDKOperation();