Skip to content

Commit 94747a6

Browse files
committed
upgrade httpcore5/httpclient5 to support ExtendedSocketOption in HttpAsyncClient
Signed-off-by: kkewwei <kewei.11@bytedance.com> Signed-off-by: kkewwei <kkewwei@163.com>
1 parent b75f27a commit 94747a6

15 files changed

+33
-8
lines changed

client/rest/licenses/httpclient5-5.3.1.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ce913081e592ee8eeee35c4e577d7dce13cba7a4

client/rest/licenses/httpcore5-5.2.5.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
eaf64237945d7d0f301d48420e8bdb7f565a7b0e

client/rest/licenses/httpcore5-h2-5.2.5.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
760c34db3ba41b0ffa07e956bc308d3a12356915

client/rest/licenses/httpcore5-reactive-5.2.5.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
c4c0c3c7bbcb0db54aa7ddd39e34a835428c99c0

client/rest/src/test/java/org/opensearch/client/RestClientBuilderTests.java

+7
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.apache.hc.core5.http.Header;
3838
import org.apache.hc.core5.http.HttpHost;
3939
import org.apache.hc.core5.http.message.BasicHeader;
40+
import org.apache.hc.core5.reactor.IOReactorConfig;
4041
import org.apache.hc.core5.util.Timeout;
4142

4243
import java.io.IOException;
@@ -143,6 +144,12 @@ public void testBuild() throws IOException {
143144
builder.setHttpClientConfigCallback(new RestClientBuilder.HttpClientConfigCallback() {
144145
@Override
145146
public HttpAsyncClientBuilder customizeHttpClient(HttpAsyncClientBuilder httpClientBuilder) {
147+
IOReactorConfig.Builder iOReactorConfig = IOReactorConfig.custom();
148+
iOReactorConfig.setTcpKeepCount(randomIntBetween(5, 10));
149+
iOReactorConfig.setTcpKeepInterval(randomIntBetween(5, 10));
150+
iOReactorConfig.setTcpKeepIdle(randomIntBetween(100, 200));
151+
iOReactorConfig.setIoThreadCount(2);
152+
httpClientBuilder.setIOReactorConfig(iOReactorConfig.build());
146153
return httpClientBuilder;
147154
}
148155
});

client/rest/src/test/java/org/opensearch/client/documentation/RestClientDocumentation.java

+18
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,24 @@ public HttpAsyncClientBuilder customizeHttpClient(
376376
});
377377
//end::rest-client-config-threads
378378
}
379+
{
380+
//tag::rest-client-config-tcpKeepIdle/tcpKeepInterval/tcpKeepCount
381+
RestClientBuilder builder = RestClient.builder(
382+
new HttpHost("localhost", 9200))
383+
.setHttpClientConfigCallback(new HttpClientConfigCallback() {
384+
@Override
385+
public HttpAsyncClientBuilder customizeHttpClient(
386+
HttpAsyncClientBuilder httpClientBuilder) {
387+
return httpClientBuilder.setIOReactorConfig(
388+
IOReactorConfig.custom()
389+
.setTcpKeepIdle(200)
390+
.setTcpKeepInterval(10)
391+
.setTcpKeepCount(10)
392+
.build());
393+
}
394+
});
395+
//end::rest-client-config-tcpKeepIdle/tcpKeepInterval/tcpKeepCount
396+
}
379397
{
380398
//tag::rest-client-config-basic-auth
381399
final BasicCredentialsProvider credentialsProvider = new BasicCredentialsProvider();

client/sniffer/licenses/httpclient5-5.3.1.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ce913081e592ee8eeee35c4e577d7dce13cba7a4

client/sniffer/licenses/httpcore5-5.2.5.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
eaf64237945d7d0f301d48420e8bdb7f565a7b0e

gradle/libs.versions.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ reactor_netty = "1.1.23"
4040
reactor = "3.5.20"
4141

4242
# client dependencies
43-
httpclient5 = "5.3.1"
44-
httpcore5 = "5.2.5"
43+
httpclient5 = "5.4.1"
44+
httpcore5 = "5.3.1"
4545
httpclient = "4.5.14"
4646
httpcore = "4.4.16"
4747
httpasyncclient = "4.1.5"

0 commit comments

Comments
 (0)