Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: unify opengemini client configuration #124

Merged
merged 1 commit into from
Sep 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -19,7 +19,7 @@

public abstract class BaseAsyncClient extends BaseClient implements OpenGeminiAsyncClient {

public BaseAsyncClient(BaseConfiguration conf) {
public BaseAsyncClient(Configuration conf) {
super(conf);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down Expand Up @@ -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<>();
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -15,7 +16,9 @@
public class OpenGeminiJdkClientFactoryTest {

private static Configuration configuration;

private static AuthConfig authConfig;

private static BatchConfig batchConfig;

@BeforeAll
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
72 changes: 0 additions & 72 deletions opengemini-client-kotlin/pom.xml

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {
Expand All @@ -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.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {

Expand All @@ -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);
}
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Loading
Loading