refactor: unify opengemini client configuration (#124)

Signed-off-by: ZhangJian He <[email protected]>
openGemini · Sep 26, 2024 · 7d72d09 · 7d72d09
1 parent 9f05f66
commit 7d72d09
Show file tree

Hide file tree

Showing 26 changed files with 23 additions and 219 deletions.
diff --git a/...ngemini/client/api/BaseConfiguration.java → .../opengemini/client/api/Configuration.java b/...ngemini/client/api/BaseConfiguration.java → .../opengemini/client/api/Configuration.java
@@ -2,20 +2,20 @@
 
 import io.github.shoothzj.http.facade.core.TlsConfig;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import lombok.experimental.SuperBuilder;
 
 import java.time.Duration;
 import java.util.List;
 
 @Setter
 @Getter
-@SuperBuilder
+@Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class BaseConfiguration {
+public class Configuration {
     List<Address> addresses;
 
     AuthConfig authConfig;

diff --git a/...ent-asynchttpclient/src/main/java/io/opengemini/client/asynchttpclient/Configuration.java b/...ent-asynchttpclient/src/main/java/io/opengemini/client/asynchttpclient/Configuration.java
diff --git a/...pclient/src/main/java/io/opengemini/client/asynchttpclient/OpenGeminiAsyncHttpClient.java b/...pclient/src/main/java/io/opengemini/client/asynchttpclient/OpenGeminiAsyncHttpClient.java
@@ -9,6 +9,7 @@
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.handler.codec.http.HttpStatusClass;
 import io.opengemini.client.api.AuthConfig;
+import io.opengemini.client.api.Configuration;
 import io.opengemini.client.api.OpenGeminiException;
 import io.opengemini.client.api.Pong;
 import io.opengemini.client.api.Query;

diff --git a/...ent/src/test/java/io/opengemini/client/asynchttpclient/OpenGeminiAsyncHttpClientTest.java b/...ent/src/test/java/io/opengemini/client/asynchttpclient/OpenGeminiAsyncHttpClientTest.java
@@ -1,6 +1,7 @@
 package io.opengemini.client.asynchttpclient;
 
 import io.opengemini.client.api.Address;
+import io.opengemini.client.api.Configuration;
 import io.opengemini.client.api.OpenGeminiException;
 import io.opengemini.client.api.Point;
 import io.opengemini.client.api.Pong;

diff --git a/opengemini-client-common/src/main/java/io/opengemini/client/common/BaseAsyncClient.java b/opengemini-client-common/src/main/java/io/opengemini/client/common/BaseAsyncClient.java
@@ -3,7 +3,7 @@
 import io.github.shoothzj.http.facade.client.BasicAuthRequestFilter;
 import io.github.shoothzj.http.facade.client.HttpClientConfig;
 import io.opengemini.client.api.AuthConfig;
-import io.opengemini.client.api.BaseConfiguration;
+import io.opengemini.client.api.Configuration;
 import io.opengemini.client.api.OpenGeminiAsyncClient;
 import io.opengemini.client.api.Point;
 import io.opengemini.client.api.Pong;
@@ -19,7 +19,7 @@
 
 public abstract class BaseAsyncClient extends BaseClient implements OpenGeminiAsyncClient {
 
-    public BaseAsyncClient(BaseConfiguration conf) {
+    public BaseAsyncClient(Configuration conf) {
         super(conf);
     }
 

diff --git a/opengemini-client-common/src/main/java/io/opengemini/client/common/BaseClient.java b/opengemini-client-common/src/main/java/io/opengemini/client/common/BaseClient.java
@@ -1,7 +1,7 @@
 package io.opengemini.client.common;
 
 import io.opengemini.client.api.Address;
-import io.opengemini.client.api.BaseConfiguration;
+import io.opengemini.client.api.Configuration;
 import io.opengemini.client.api.Endpoint;
 import io.opengemini.client.api.Query;
 
@@ -32,7 +32,7 @@ public abstract class BaseClient implements Closeable {
 
     private final Optional<ScheduledExecutorService> scheduler;
 
-    public BaseClient(BaseConfiguration conf) {
+    public BaseClient(Configuration conf) {
         this.headers = new HashMap<>();
         if (conf.isGzipEnabled()) {
             ArrayList<String> contentEncodingHeader = new ArrayList<>();

diff --git a/opengemini-client-jdk/src/main/java/io/opengemini/client/jdk/Configuration.java b/opengemini-client-jdk/src/main/java/io/opengemini/client/jdk/Configuration.java
diff --git a/opengemini-client-jdk/src/main/java/io/opengemini/client/jdk/OpenGeminiJdkClient.java b/opengemini-client-jdk/src/main/java/io/opengemini/client/jdk/OpenGeminiJdkClient.java
@@ -7,6 +7,7 @@
 import io.github.shoothzj.http.facade.client.HttpClientFactory;
 import io.github.shoothzj.http.facade.core.HttpResponse;
 import io.opengemini.client.api.AuthConfig;
+import io.opengemini.client.api.Configuration;
 import io.opengemini.client.api.OpenGeminiException;
 import io.opengemini.client.api.Pong;
 import io.opengemini.client.api.Query;

diff --git a/opengemini-client-jdk/src/main/java/io/opengemini/client/jdk/OpenGeminiJdkClientFactory.java b/opengemini-client-jdk/src/main/java/io/opengemini/client/jdk/OpenGeminiJdkClientFactory.java
@@ -3,6 +3,7 @@
 import io.opengemini.client.api.AuthConfig;
 import io.opengemini.client.api.AuthType;
 import io.opengemini.client.api.BatchConfig;
+import io.opengemini.client.api.Configuration;
 import io.opengemini.client.api.OpenGeminiConst;
 import io.opengemini.client.api.OpenGeminiException;
 import org.jetbrains.annotations.NotNull;

diff --git a/...ini-client-jdk/src/test/java/io/opengemini/client/jdk/OpenGeminiJdkClientFactoryTest.java b/...ini-client-jdk/src/test/java/io/opengemini/client/jdk/OpenGeminiJdkClientFactoryTest.java
@@ -4,6 +4,7 @@
 import io.opengemini.client.api.AuthConfig;
 import io.opengemini.client.api.AuthType;
 import io.opengemini.client.api.BatchConfig;
+import io.opengemini.client.api.Configuration;
 import io.opengemini.client.api.OpenGeminiException;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
@@ -15,7 +16,9 @@
 public class OpenGeminiJdkClientFactoryTest {
 
     private static Configuration configuration;
+
     private static AuthConfig authConfig;
+
     private static BatchConfig batchConfig;
 
     @BeforeAll

diff --git a/opengemini-client-jdk/src/test/java/io/opengemini/client/jdk/OpenGeminiJdkClientTest.java b/opengemini-client-jdk/src/test/java/io/opengemini/client/jdk/OpenGeminiJdkClientTest.java
@@ -3,6 +3,7 @@
 import io.opengemini.client.api.Address;
 import io.opengemini.client.api.AuthConfig;
 import io.opengemini.client.api.AuthType;
+import io.opengemini.client.api.Configuration;
 import io.opengemini.client.api.OpenGeminiException;
 import io.opengemini.client.api.Point;
 import io.opengemini.client.api.Pong;

diff --git a/opengemini-client-kotlin/pom.xml b/opengemini-client-kotlin/pom.xml
diff --git a/opengemini-client-kotlin/src/main/kotlin/io/opengemini/client/kotlin/OpengeminiClientKt.kt b/opengemini-client-kotlin/src/main/kotlin/io/opengemini/client/kotlin/OpengeminiClientKt.kt
diff --git a/opengemini-client-okhttp/src/main/java/io/opengemini/client/okhttp/Configuration.java b/opengemini-client-okhttp/src/main/java/io/opengemini/client/okhttp/Configuration.java
diff --git a/...emini-client-okhttp/src/main/java/io/opengemini/client/okhttp/OpenGeminiOkhttpClient.java b/...emini-client-okhttp/src/main/java/io/opengemini/client/okhttp/OpenGeminiOkhttpClient.java
@@ -7,6 +7,7 @@
 import io.github.shoothzj.http.facade.client.HttpClientFactory;
 import io.github.shoothzj.http.facade.core.HttpResponse;
 import io.opengemini.client.api.AuthConfig;
+import io.opengemini.client.api.Configuration;
 import io.opengemini.client.api.OpenGeminiException;
 import io.opengemini.client.api.Pong;
 import io.opengemini.client.api.Query;
@@ -18,7 +19,6 @@
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.time.Duration;
 import java.util.concurrent.CompletableFuture;
 
 public class OpenGeminiOkhttpClient extends BaseAsyncClient {
@@ -42,27 +42,9 @@ public OpenGeminiOkhttpClient(@NotNull Configuration conf) {
             configClientAuth(builder, authConfig);
         }
 
-        ConnectionPoolConfig poolConfig = conf.getConnectionPoolConfig();
-        if (poolConfig != null) {
-            configClientConnectionPool(poolConfig, builder);
-        }
-
         this.okHttpClient = HttpClientFactory.createHttpClient(builder.build());
     }
 
-    private static void configClientConnectionPool(ConnectionPoolConfig poolConfig, HttpClientConfig.Builder builder) {
-        HttpClientConfig.OkHttpConfig.ConnectionPoolConfig connectionPoolConfig =
-            new HttpClientConfig.OkHttpConfig.ConnectionPoolConfig();
-        connectionPoolConfig.setMaxIdleConnections(poolConfig.getMaxIdleConnections());
-
-        long nanos = poolConfig.getKeepAliveTimeUnit().toNanos(poolConfig.getKeepAliveDuration());
-        connectionPoolConfig.setKeepAliveDuration(Duration.ofNanos(nanos));
-
-        HttpClientConfig.OkHttpConfig okHttpConfig = new HttpClientConfig.OkHttpConfig();
-        okHttpConfig.setConnectionPoolConfig(connectionPoolConfig);
-        builder.okHttpConfig(okHttpConfig);
-    }
-
     /**
      * Execute a GET query call with OkHttpClient.
      *

diff --git a/...lient-okhttp/src/main/java/io/opengemini/client/okhttp/OpenGeminiOkhttpClientFactory.java b/...lient-okhttp/src/main/java/io/opengemini/client/okhttp/OpenGeminiOkhttpClientFactory.java
@@ -4,6 +4,7 @@
 import io.opengemini.client.api.AuthConfig;
 import io.opengemini.client.api.AuthType;
 import io.opengemini.client.api.BatchConfig;
+import io.opengemini.client.api.Configuration;
 import io.opengemini.client.api.OpenGeminiConst;
 import io.opengemini.client.api.OpenGeminiException;
 import org.jetbrains.annotations.NotNull;

diff --git a/...t-okhttp/src/test/java/io/opengemini/client/okhttp/OpenGeminiOkhttpClientFactoryTest.java b/...t-okhttp/src/test/java/io/opengemini/client/okhttp/OpenGeminiOkhttpClientFactoryTest.java
@@ -2,6 +2,7 @@
 
 import io.github.shoothzj.http.facade.core.TlsConfig;
 import io.opengemini.client.api.Address;
+import io.opengemini.client.api.Configuration;
 import io.opengemini.client.api.OpenGeminiException;
 import io.opengemini.client.test.common.TlsTestUtil;
 import org.junit.jupiter.api.Assertions;

diff --git a/...i-client-okhttp/src/test/java/io/opengemini/client/okhttp/OpenGeminiOkhttpClientTest.java b/...i-client-okhttp/src/test/java/io/opengemini/client/okhttp/OpenGeminiOkhttpClientTest.java
@@ -1,6 +1,7 @@
 package io.opengemini.client.okhttp;
 
 import io.opengemini.client.api.Address;
+import io.opengemini.client.api.Configuration;
 import io.opengemini.client.api.OpenGeminiException;
 import io.opengemini.client.api.Point;
 import io.opengemini.client.api.Pong;
@@ -26,7 +27,6 @@
 import java.util.Locale;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
 
 class OpenGeminiOkhttpClientTest {
 
@@ -38,7 +38,6 @@ void setUp() {
                 .addresses(Collections.singletonList(new Address("127.0.0.1", 8086)))
                 .connectTimeout(Duration.ofSeconds(3))
                 .timeout(Duration.ofSeconds(5))
-                .connectionPoolConfig(ConnectionPoolConfig.of(1, 2, TimeUnit.MINUTES))
                 .build();
         this.openGeminiOkhttpClient = new OpenGeminiOkhttpClient(configuration);
     }

diff --git a/opengemini-client-reactor/src/main/java/io/opengemini/client/reactor/Configuration.java b/opengemini-client-reactor/src/main/java/io/opengemini/client/reactor/Configuration.java
diff --git a/...ni-client-reactor/src/main/java/io/opengemini/client/reactor/OpenGeminiReactorClient.java b/...ni-client-reactor/src/main/java/io/opengemini/client/reactor/OpenGeminiReactorClient.java
@@ -4,6 +4,7 @@
 import io.github.shoothzj.http.facade.core.TlsConfig;
 import io.netty.channel.ChannelOption;
 import io.netty.handler.ssl.SslContext;
+import io.opengemini.client.api.Configuration;
 import io.opengemini.client.api.OpenGeminiException;
 import io.opengemini.client.api.Query;
 import io.opengemini.client.api.QueryResult;

diff --git a/...nt-reactor/src/main/java/io/opengemini/client/reactor/OpenGeminiReactorClientFactory.java b/...nt-reactor/src/main/java/io/opengemini/client/reactor/OpenGeminiReactorClientFactory.java
@@ -3,6 +3,7 @@
 import io.opengemini.client.api.AuthConfig;
 import io.opengemini.client.api.AuthType;
 import io.opengemini.client.api.BatchConfig;
+import io.opengemini.client.api.Configuration;
 import io.opengemini.client.api.OpenGeminiConst;
 import io.opengemini.client.api.OpenGeminiException;
 import org.jetbrains.annotations.NotNull;

diff --git a/...eactor/src/test/java/io/opengemini/client/reactor/OpenGeminiReactorClientFactoryTest.java b/...eactor/src/test/java/io/opengemini/client/reactor/OpenGeminiReactorClientFactoryTest.java
@@ -4,6 +4,7 @@
 import io.opengemini.client.api.AuthConfig;
 import io.opengemini.client.api.AuthType;
 import io.opengemini.client.api.BatchConfig;
+import io.opengemini.client.api.Configuration;
 import io.opengemini.client.api.OpenGeminiException;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;

diff --git a/...lient-reactor/src/test/java/io/opengemini/client/reactor/OpenGeminiReactorClientTest.java b/...lient-reactor/src/test/java/io/opengemini/client/reactor/OpenGeminiReactorClientTest.java
@@ -1,6 +1,7 @@
 package io.opengemini.client.reactor;
 
 import io.opengemini.client.api.Address;
+import io.opengemini.client.api.Configuration;
 import io.opengemini.client.api.Query;
 import io.opengemini.client.api.QueryResult;
 import org.junit.jupiter.api.Assertions;