Skip to content

fix: upgrade http-facade and fix incompatible issues #158

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.

Sign up for GitHub

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

Merged
hezhangjian merged 1 commit into from
Feb 26, 2025
Merged

fix: upgrade http-facade and fix incompatible issues #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 11 additions & 7 deletions opengemini-client/src/test/java/io/opengemini/client/impl/OpenGeminiClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ class OpenGeminiClientTest extends TestBase {

protected List<OpenGeminiClient> clientList() throws OpenGeminiException {
List<HttpClientEngine> engines = new ArrayList<>();
engines.add(HttpClientEngine.AsyncHttpClient);
engines.add(HttpClientEngine.JAVA);
engines.add(HttpClientEngine.JAVA8);
engines.add(HttpClientEngine.Async);
engines.add(HttpClientEngine.Java);
engines.add(HttpClientEngine.Java8);
engines.add(HttpClientEngine.OkHttp);
List<OpenGeminiClient> clients = new ArrayList<>();
for (HttpClientEngine engine : engines) {
Expand All @@ -68,10 +68,12 @@ protected List<OpenGeminiClient> clientList() throws OpenGeminiException {
.connectTimeout(Duration.ofSeconds(3))
.timeout(Duration.ofSeconds(3))
.build();
Configuration configuration = Configuration.builder()
.addresses(Collections.singletonList(new Address("127.0.0.1", 8086)))
.httpConfig(httpConfig)
.build();
Configuration configuration =
Configuration.builder()
.addresses(Collections.singletonList(new Address("127.0.0.1", 8086)))
.httpConfig(httpConfig)
.gzipEnabled(false)
.build();
clients.add(OpenGeminiClientFactory.create(configuration));
}
return clients;
Expand All @@ -89,6 +91,7 @@ void setUp() {
.addresses(Collections.singletonList(new Address("127.0.0.1", 8086)))
.httpConfig(httpConfig)
.authConfig(new AuthConfig(AuthType.PASSWORD, "test", "testPwd123@".toCharArray(), null))
.gzipEnabled(false)
.build();
this.openGeminiClient = new OpenGeminiClient(configuration);
}
Expand Down Expand Up @@ -261,6 +264,7 @@ void query_should_throws_exception_when_address_is_wrong() throws IOException {
Configuration configuration = Configuration.builder()
.addresses(Collections.singletonList(new Address("127.0.0.1", 28086)))
.httpConfig(new HttpClientConfig.Builder().build())
.gzipEnabled(false)
.build();

try (OpenGeminiClient wrongClient = new OpenGeminiClient(configuration)) {
Expand Down
16 changes: 9 additions & 7 deletions opengemini-client/src/test/java/io/opengemini/client/impl/OpenGeminiClientWriteTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ class OpenGeminiClientWriteTest extends TestBase {

protected List<OpenGeminiClient> clientList() throws OpenGeminiException {
List<HttpClientEngine> engines = new ArrayList<>();
engines.add(HttpClientEngine.AsyncHttpClient);
engines.add(HttpClientEngine.JAVA);
engines.add(HttpClientEngine.JAVA8);
engines.add(HttpClientEngine.Async);
engines.add(HttpClientEngine.Java);
engines.add(HttpClientEngine.Java8);
engines.add(HttpClientEngine.OkHttp);
List<OpenGeminiClient> clients = new ArrayList<>();
for (HttpClientEngine engine : engines) {
Expand All @@ -58,10 +58,12 @@ protected List<OpenGeminiClient> clientList() throws OpenGeminiException {
.connectTimeout(Duration.ofSeconds(3))
.timeout(Duration.ofSeconds(3))
.build();
Configuration configuration = Configuration.builder()
.addresses(Collections.singletonList(new Address("127.0.0.1", 8086)))
.httpConfig(httpConfig)
.build();
Configuration configuration =
Configuration.builder()
.addresses(Collections.singletonList(new Address("127.0.0.1", 8086)))
.httpConfig(httpConfig)
.gzipEnabled(false)
.build();
clients.add(OpenGeminiClientFactory.create(configuration));
}
return clients;
Expand Down
9 changes: 4 additions & 5 deletions opengemini-client/src/test/java/io/opengemini/client/impl/OpenGeminiWrongAddressTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ class OpenGeminiWrongAddressTest {

protected List<OpenGeminiClient> clientList() throws OpenGeminiException {
List<HttpClientEngine> engines = new ArrayList<>();
engines.add(HttpClientEngine.AsyncHttpClient);
engines.add(HttpClientEngine.JAVA);
engines.add(HttpClientEngine.JAVA8);
engines.add(HttpClientEngine.Async);
engines.add(HttpClientEngine.Java);
engines.add(HttpClientEngine.Java8);
engines.add(HttpClientEngine.OkHttp);
List<OpenGeminiClient> clients = new ArrayList<>();
for (HttpClientEngine engine : engines) {
Expand All @@ -56,8 +56,7 @@ protected List<OpenGeminiClient> clientList() throws OpenGeminiException {
.build();
Configuration configuration = Configuration.builder()
.addresses(Collections.singletonList(new Address("127.0.0.1", 28086)))
.httpConfig(httpConfig)
.build();
.httpConfig(httpConfig).gzipEnabled(false).build();
clients.add(OpenGeminiClientFactory.create(configuration));
}
return clients;
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<async-http-client.version>3.0.0.Beta3</async-http-client.version>
<commons-lang3.version>3.17.0</commons-lang3.version>
<grpc.version>1.61.1</grpc.version>
<http-facade.version>0.2.1</http-facade.version>
<http-facade.version>0.4.0</http-facade.version>
<jackson.version>2.17.2</jackson.version>
<junit.version>5.11.1</junit.version>
<kotlin.version>1.9.22</kotlin.version>
Expand Down