Skip to content

Commit 8491b20

Browse files
author
ZhangJian He
authored
build: update dependency to latest version (#127)
Signed-off-by: ZhangJian He <shoothzj@gmail.com>
1 parent 6c5615d commit 8491b20

File tree

8 files changed

+21
-27
lines changed

8 files changed

+21
-27
lines changed

opengemini-client-api/src/main/java/io/opengemini/client/api/Configuration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.opengemini.client.api;
22

3-
import io.github.shoothzj.http.facade.client.HttpClientConfig;
3+
import io.github.openfacade.http.HttpClientConfig;
44
import lombok.AllArgsConstructor;
55
import lombok.Builder;
66
import lombok.Getter;

opengemini-client-reactor/src/main/java/io/opengemini/client/reactor/OpenGeminiReactorClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.opengemini.client.reactor;
22

33
import com.fasterxml.jackson.core.JsonProcessingException;
4-
import io.github.shoothzj.http.facade.core.TlsConfig;
4+
import io.github.openfacade.http.TlsConfig;
55
import io.netty.channel.ChannelOption;
66
import io.netty.handler.ssl.SslContext;
77
import io.opengemini.client.api.Configuration;

opengemini-client-reactor/src/main/java/io/opengemini/client/reactor/OpenGeminiReactorClientFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.opengemini.client.reactor;
22

3-
import io.github.shoothzj.http.facade.client.HttpClientConfig;
3+
import io.github.openfacade.http.HttpClientConfig;
44
import io.opengemini.client.api.AuthConfig;
55
import io.opengemini.client.api.AuthType;
66
import io.opengemini.client.api.BatchConfig;

opengemini-client-reactor/src/test/java/io/opengemini/client/reactor/OpenGeminiReactorClientTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.opengemini.client.reactor;
22

3-
import io.github.shoothzj.http.facade.client.HttpClientConfig;
3+
import io.github.openfacade.http.HttpClientConfig;
44
import io.opengemini.client.api.Address;
55
import io.opengemini.client.api.Configuration;
66
import io.opengemini.client.api.Query;

opengemini-client/src/main/java/io/opengemini/client/impl/OpenGeminiClient.java

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package io.opengemini.client.impl;
22

33
import com.fasterxml.jackson.core.JsonProcessingException;
4-
import io.github.shoothzj.http.facade.client.BasicAuthRequestFilter;
5-
import io.github.shoothzj.http.facade.client.HttpClient;
6-
import io.github.shoothzj.http.facade.client.HttpClientConfig;
7-
import io.github.shoothzj.http.facade.client.HttpClientFactory;
8-
import io.github.shoothzj.http.facade.client.RequestFilter;
9-
import io.github.shoothzj.http.facade.core.HttpResponse;
4+
import io.github.openfacade.http.BasicAuthRequestFilter;
5+
import io.github.openfacade.http.HttpClient;
6+
import io.github.openfacade.http.HttpClientConfig;
7+
import io.github.openfacade.http.HttpClientFactory;
8+
import io.github.openfacade.http.HttpResponse;
109
import io.opengemini.client.api.AuthConfig;
1110
import io.opengemini.client.api.AuthType;
1211
import io.opengemini.client.api.Configuration;
@@ -21,8 +20,6 @@
2120

2221
import java.io.IOException;
2322
import java.nio.charset.StandardCharsets;
24-
import java.util.ArrayList;
25-
import java.util.List;
2623
import java.util.Optional;
2724
import java.util.concurrent.CompletableFuture;
2825

@@ -37,11 +34,8 @@ public OpenGeminiClient(@NotNull Configuration conf) {
3734
AuthConfig authConfig = conf.getAuthConfig();
3835
HttpClientConfig httpConfig = conf.getHttpConfig();
3936
if (authConfig != null && authConfig.getAuthType().equals(AuthType.PASSWORD)) {
40-
List<RequestFilter> requestFilters = httpConfig.requestFilters() == null
41-
? new ArrayList<>() : httpConfig.requestFilters();
42-
requestFilters.add(new BasicAuthRequestFilter(authConfig.getUsername(),
37+
httpConfig.addRequestFilter(new BasicAuthRequestFilter(authConfig.getUsername(),
4338
String.valueOf(authConfig.getPassword())));
44-
httpConfig.setRequestFilters(requestFilters);
4539
}
4640
this.client = HttpClientFactory.createHttpClient(httpConfig);
4741
}

opengemini-client/src/test/java/io/opengemini/client/impl/OpenGeminiClientTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.opengemini.client.impl;
22

3-
import io.github.shoothzj.http.facade.client.HttpClientConfig;
4-
import io.github.shoothzj.http.facade.client.HttpClientEngine;
3+
import io.github.openfacade.http.HttpClientConfig;
4+
import io.github.openfacade.http.HttpClientEngine;
55
import io.opengemini.client.api.Address;
66
import io.opengemini.client.api.AuthConfig;
77
import io.opengemini.client.api.AuthType;
@@ -42,8 +42,8 @@ class OpenGeminiClientTest {
4242
protected List<OpenGeminiClient> clientList() throws OpenGeminiException {
4343
List<HttpClientEngine> engines = new ArrayList<>();
4444
engines.add(HttpClientEngine.AsyncHttpClient);
45-
engines.add(HttpClientEngine.JDK);
46-
engines.add(HttpClientEngine.JDK8);
45+
engines.add(HttpClientEngine.JAVA);
46+
engines.add(HttpClientEngine.JAVA8);
4747
engines.add(HttpClientEngine.OkHttp);
4848
List<OpenGeminiClient> clients = new ArrayList<>();
4949
for (HttpClientEngine engine : engines) {

opengemini-client/src/test/java/io/opengemini/client/impl/OpenGeminiWrongAddressTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.opengemini.client.impl;
22

3-
import io.github.shoothzj.http.facade.client.HttpClientConfig;
4-
import io.github.shoothzj.http.facade.client.HttpClientEngine;
3+
import io.github.openfacade.http.HttpClientConfig;
4+
import io.github.openfacade.http.HttpClientEngine;
55
import io.opengemini.client.api.Address;
66
import io.opengemini.client.api.Configuration;
77
import io.opengemini.client.api.OpenGeminiException;
@@ -28,8 +28,8 @@ class OpenGeminiWrongAddressTest {
2828
protected List<OpenGeminiClient> clientList() throws OpenGeminiException {
2929
List<HttpClientEngine> engines = new ArrayList<>();
3030
engines.add(HttpClientEngine.AsyncHttpClient);
31-
engines.add(HttpClientEngine.JDK);
32-
engines.add(HttpClientEngine.JDK8);
31+
engines.add(HttpClientEngine.JAVA);
32+
engines.add(HttpClientEngine.JAVA8);
3333
engines.add(HttpClientEngine.OkHttp);
3434
List<OpenGeminiClient> clients = new ArrayList<>();
3535
for (HttpClientEngine engine : engines) {

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<annotations.version>13.0</annotations.version>
2828
<async-http-client.version>3.0.0.Beta3</async-http-client.version>
2929
<commons-lang3.version>3.17.0</commons-lang3.version>
30-
<http-facade.version>0.0.4</http-facade.version>
30+
<http-facade.version>0.1.0</http-facade.version>
3131
<jackson.version>2.17.2</jackson.version>
3232
<junit.version>5.11.1</junit.version>
3333
<kotlin.version>1.9.22</kotlin.version>
@@ -124,8 +124,8 @@
124124
<scope>test</scope>
125125
</dependency>
126126
<dependency>
127-
<groupId>io.github.shoothzj</groupId>
128-
<artifactId>http-facade-client</artifactId>
127+
<groupId>io.github.openfacade</groupId>
128+
<artifactId>http-facade</artifactId>
129129
<version>${http-facade.version}</version>
130130
</dependency>
131131
</dependencies>

0 commit comments

Comments
 (0)