From f0911625a114cfab3045fa46fe4a2bbf5150e2f8 Mon Sep 17 00:00:00 2001 From: moxiaoying <1159230165@qq.com> Date: Wed, 26 Feb 2025 21:03:29 +0800 Subject: [PATCH] fix: upgrade http-facade and fix incompatible issues Signed-off-by: moxiaoying <1159230165@qq.com> --- .../client/impl/OpenGeminiClientTest.java | 18 +++++++++++------- .../client/impl/OpenGeminiClientWriteTest.java | 16 +++++++++------- .../impl/OpenGeminiWrongAddressTest.java | 9 ++++----- pom.xml | 2 +- 4 files changed, 25 insertions(+), 20 deletions(-) diff --git a/opengemini-client/src/test/java/io/opengemini/client/impl/OpenGeminiClientTest.java b/opengemini-client/src/test/java/io/opengemini/client/impl/OpenGeminiClientTest.java index 0290600a..f031de32 100644 --- a/opengemini-client/src/test/java/io/opengemini/client/impl/OpenGeminiClientTest.java +++ b/opengemini-client/src/test/java/io/opengemini/client/impl/OpenGeminiClientTest.java @@ -57,9 +57,9 @@ class OpenGeminiClientTest extends TestBase { protected List clientList() throws OpenGeminiException { List 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 clients = new ArrayList<>(); for (HttpClientEngine engine : engines) { @@ -68,10 +68,12 @@ protected List 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; @@ -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); } @@ -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)) { diff --git a/opengemini-client/src/test/java/io/opengemini/client/impl/OpenGeminiClientWriteTest.java b/opengemini-client/src/test/java/io/opengemini/client/impl/OpenGeminiClientWriteTest.java index f37594d4..9aa5d9fe 100644 --- a/opengemini-client/src/test/java/io/opengemini/client/impl/OpenGeminiClientWriteTest.java +++ b/opengemini-client/src/test/java/io/opengemini/client/impl/OpenGeminiClientWriteTest.java @@ -47,9 +47,9 @@ class OpenGeminiClientWriteTest extends TestBase { protected List clientList() throws OpenGeminiException { List 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 clients = new ArrayList<>(); for (HttpClientEngine engine : engines) { @@ -58,10 +58,12 @@ protected List 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; diff --git a/opengemini-client/src/test/java/io/opengemini/client/impl/OpenGeminiWrongAddressTest.java b/opengemini-client/src/test/java/io/opengemini/client/impl/OpenGeminiWrongAddressTest.java index c51e5062..f4c10eef 100644 --- a/opengemini-client/src/test/java/io/opengemini/client/impl/OpenGeminiWrongAddressTest.java +++ b/opengemini-client/src/test/java/io/opengemini/client/impl/OpenGeminiWrongAddressTest.java @@ -43,9 +43,9 @@ class OpenGeminiWrongAddressTest { protected List clientList() throws OpenGeminiException { List 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 clients = new ArrayList<>(); for (HttpClientEngine engine : engines) { @@ -56,8 +56,7 @@ protected List 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; diff --git a/pom.xml b/pom.xml index ae221864..7a228f68 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ 3.0.0.Beta3 3.17.0 1.61.1 - 0.2.1 + 0.4.0 2.17.2 5.11.1 1.9.22