optimisation

apache · Apr 15, 2024 · 59f9fc0 · 59f9fc0
1 parent ad5a26b
commit 59f9fc0
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 41 deletions.
diff --git a/...board-core/src/main/java/org/apache/eventmesh/dashboard/core/function/SDK/SDKManager.java b/...board-core/src/main/java/org/apache/eventmesh/dashboard/core/function/SDK/SDKManager.java
@@ -46,10 +46,17 @@
  */
 public class SDKManager {
 
-    private static final SDKManager INSTANCE = new SDKManager();
+    private static volatile SDKManager INSTANCE = null;
 
 
-    public static SDKManager getInstance() {
+    public static synchronized SDKManager getInstance() {
+        if (INSTANCE == null) {
+            synchronized (SDKManager.class) {
+                if (INSTANCE == null) {
+                    INSTANCE = new SDKManager();
+                }
+            }
+        }
         return INSTANCE;
     }
 

diff --git a/...c/main/java/org/apache/eventmesh/dashboard/core/function/SDK/config/CreateEtcdConfig.java b/...c/main/java/org/apache/eventmesh/dashboard/core/function/SDK/config/CreateEtcdConfig.java
@@ -30,7 +30,8 @@ public class CreateEtcdConfig implements CreateSDKConfig {
 
     private String etcdServerAddress;
 
-    private Long connectTime;
+    @Builder.Default()
+    private int connectTime = 10;
 
     @Override
     public String getUniqueKey() {

diff --git a/.../main/java/org/apache/eventmesh/dashboard/core/function/SDK/config/CreateRedisConfig.java b/.../main/java/org/apache/eventmesh/dashboard/core/function/SDK/config/CreateRedisConfig.java
@@ -32,7 +32,8 @@ public class CreateRedisConfig implements CreateSDKConfig {
 
     private String password;
 
-    private Integer timeOut;
+    @Builder.Default
+    private int timeOut = 10;
 
     @Override
     public String getUniqueKey() {

diff --git a/...rg/apache/eventmesh/dashboard/core/function/SDK/operation/EtcdSDKCreateOperationTest.java b/...rg/apache/eventmesh/dashboard/core/function/SDK/operation/EtcdSDKCreateOperationTest.java
@@ -19,17 +19,12 @@
 
 import org.apache.eventmesh.dashboard.core.function.SDK.config.CreateEtcdConfig;
 
-import java.nio.charset.StandardCharsets;
 import java.util.AbstractMap.SimpleEntry;
-import java.util.List;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import io.etcd.jetcd.ByteSequence;
 import io.etcd.jetcd.KV;
-import io.etcd.jetcd.KeyValue;
-import io.etcd.jetcd.kv.GetResponse;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -38,39 +33,24 @@ public class EtcdSDKCreateOperationTest {
 
     private final EtcdSDKOperation etcdSDKOperation = new EtcdSDKOperation();
 
-    private static final String key = "/test/foo";
-
-    private static final String value = "test";
-
     private static final String url = "http://localhost:2379";
 
     @Test
     void testCreateClient() {
-        // final CreateEtcdConfig etcdConfig = CreateEtcdConfig.builder()
-        //     .etcdServerAddress(url)
-        //     .connectTime(10L)
-        //     .build();
-        // // etcdConfig.setEtcdServerAddress(url);
-        // SimpleEntry<String, KV> simpleEntry = null;
-        // try {
-        //     simpleEntry = etcdSDKOperation.createClient(etcdConfig);
-        //     Assertions.assertEquals(url, simpleEntry.getKey());
-        //     simpleEntry.getValue().put(bytesOf(key), bytesOf(value));
-        //     final GetResponse response = simpleEntry.getValue().get(bytesOf(key)).get();
-        //     final List<KeyValue> keyValues = response.getKvs();
-        //     log.info("get key = {} , value = {} from etcd success",
-        //         keyValues.get(0).getKey().toString(StandardCharsets.UTF_8),
-        //         keyValues.get(0).getValue().toString(StandardCharsets.UTF_8));
-        //     simpleEntry.getValue().close();
-        // } catch (Exception e) {
-        //     log.error("create etcd client failed", e);
-        //     if (simpleEntry != null) {
-        //         simpleEntry.getValue().close();
-        //     }
-        // }
-    }
-
-    private static ByteSequence bytesOf(String val) {
-        return ByteSequence.from(val, StandardCharsets.UTF_8);
+        final CreateEtcdConfig etcdConfig = CreateEtcdConfig.builder()
+            .etcdServerAddress(url)
+            .connectTime(5)
+            .build();
+        SimpleEntry<String, KV> simpleEntry = null;
+        try {
+            simpleEntry = etcdSDKOperation.createClient(etcdConfig);
+            Assertions.assertEquals(url, simpleEntry.getKey());
+            simpleEntry.getValue().close();
+        } catch (Exception e) {
+            log.error("create etcd client failed", e);
+            if (simpleEntry != null) {
+                simpleEntry.getValue().close();
+            }
+        }
     }
 }
diff --git a/...g/apache/eventmesh/dashboard/core/function/SDK/operation/RedisSDKCreateOperationTest.java b/...g/apache/eventmesh/dashboard/core/function/SDK/operation/RedisSDKCreateOperationTest.java
@@ -32,7 +32,7 @@
 @Slf4j
 class RedisSDKCreateOperationTest {
 
-    private RedisSDKOperation redisClientCreateOperation = new RedisSDKOperation();
+    private final RedisSDKOperation redisClientCreateOperation = new RedisSDKOperation();
 
     @Test
     void testCreateClient() {
@@ -41,7 +41,6 @@ void testCreateClient() {
             .password("")
             .timeOut(5)
             .build();
-        // createClientConfig.setRedisUrl("redis://localhost:6379");
         SimpleEntry<String, StatefulRedisConnection<String, String>> simpleEntry = null;
         try {
             simpleEntry = redisClientCreateOperation.createClient(createClientConfig);