Skip to content

Remove usage of deprecated API #1

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
ok2c merged 1 commit into from
Nov 1, 2024
Merged

Remove usage of deprecated API #1

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
25 changes: 15 additions & 10 deletions ...tpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,31 @@

import org.apache.hc.client5.http.SystemDefaultDnsResolver;
import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
import org.apache.hc.client5.http.config.ConnectionConfig;
import org.apache.hc.client5.http.config.RequestConfig;
import org.apache.hc.client5.http.impl.DefaultSchemePortResolver;
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
import org.apache.hc.client5.http.impl.classic.HttpClients;
import org.apache.hc.client5.http.impl.io.DefaultHttpClientConnectionOperator;
import org.apache.hc.client5.http.impl.io.ManagedHttpClientConnectionFactory;
import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
import org.apache.hc.client5.http.io.HttpClientConnectionOperator;
import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy;
import org.apache.hc.client5.http.ssl.TlsSocketStrategy;
import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.ConnectionClosedException;
import org.apache.hc.core5.http.ContentLengthStrategy;
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.NameValuePair;
import org.apache.hc.core5.http.impl.DefaultContentLengthStrategy;
import org.apache.hc.core5.http.impl.io.EmptyInputStream;
import org.apache.hc.core5.http.io.SocketConfig;
import org.apache.hc.core5.http.io.entity.ByteArrayEntity;
import org.apache.hc.core5.http.io.entity.EmptyInputStream;
import org.apache.hc.core5.http.io.entity.InputStreamEntity;
import org.apache.hc.core5.http.protocol.BasicHttpContext;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.apache.hc.core5.net.URIAuthority;
import org.apache.hc.core5.util.TimeValue;
import org.apache.hc.core5.util.Timeout;
Expand Down Expand Up @@ -119,13 +120,17 @@ protected ApacheDockerHttpClientImpl(
.setSoTimeout(Timeout.ZERO_MILLISECONDS)
.build()
);
connectionManager.setValidateAfterInactivity(TimeValue.NEG_ONE_SECOND);
connectionManager.setMaxTotal(maxConnections);
connectionManager.setDefaultMaxPerRoute(maxConnections);
RequestConfig.Builder defaultRequest = RequestConfig.custom();

ConnectionConfig.Builder defaultConnection = ConnectionConfig.custom();
defaultConnection.setValidateAfterInactivity(TimeValue.NEG_ONE_SECOND);
if (connectionTimeout != null) {
defaultRequest.setConnectTimeout(connectionTimeout.toNanos(), TimeUnit.NANOSECONDS);
defaultConnection.setConnectTimeout(connectionTimeout.toNanos(), TimeUnit.NANOSECONDS);
}
connectionManager.setDefaultConnectionConfig(defaultConnection.build());

RequestConfig.Builder defaultRequest = RequestConfig.custom();
if (responseTimeout != null) {
defaultRequest.setResponseTimeout(responseTimeout.toNanos(), TimeUnit.NANOSECONDS);
}
Expand Down Expand Up @@ -163,7 +168,7 @@ private HttpClientConnectionOperator createConnectionOperator(

@Override
public Response execute(Request request) {
HttpContext context = new BasicHttpContext();
HttpContext context = new HttpCoreContext();
HttpUriRequestBase httpUriRequest = new HttpUriRequestBase(request.method(), URI.create(pathPrefix + request.path()));
httpUriRequest.setScheme(host.getSchemeName());
httpUriRequest.setAuthority(new URIAuthority(host.getHostName(), host.getPort()));
Expand All @@ -187,7 +192,7 @@ public Response execute(Request request) {
}

try {
CloseableHttpResponse response = httpClient.execute(host, httpUriRequest, context);
ClassicHttpResponse response = httpClient.executeOpen(host, httpUriRequest, context);

return new ApacheResponse(httpUriRequest, response);
} catch (IOException e) {
Expand All @@ -206,9 +211,9 @@ static class ApacheResponse implements Response {

private final HttpUriRequestBase request;

private final CloseableHttpResponse response;
private final ClassicHttpResponse response;

ApacheResponse(HttpUriRequestBase httpUriRequest, CloseableHttpResponse response) {
ApacheResponse(HttpUriRequestBase httpUriRequest, ClassicHttpResponse response) {
this.request = httpUriRequest;
this.response = response;
}
Expand Down
8 changes: 4 additions & 4 deletions ...client5/src/main/java/com/github/dockerjava/httpclient5/HijackingHttpRequestExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public ClassicHttpResponse execute(

InputStream hijackedInput = (InputStream) context.getAttribute(HIJACKED_INPUT_ATTRIBUTE);
if (hijackedInput != null) {
return executeHijacked(request, conn, context, hijackedInput);
return executeHijacked(request, conn, (HttpCoreContext) context, hijackedInput);
}

return super.execute(request, conn, informationCallback, context);
Expand All @@ -53,12 +53,12 @@ public ClassicHttpResponse execute(
private ClassicHttpResponse executeHijacked(
ClassicHttpRequest request,
HttpClientConnection conn,
HttpContext context,
HttpCoreContext context,
InputStream hijackedInput
) throws HttpException, IOException {
try {
context.setAttribute(HttpCoreContext.SSL_SESSION, conn.getSSLSession());
context.setAttribute(HttpCoreContext.CONNECTION_ENDPOINT, conn.getEndpointDetails());
context.setSSLSession(conn.getSSLSession());
context.setEndpointDetails(conn.getEndpointDetails());
final ProtocolVersion transportVersion = request.getVersion();
if (transportVersion != null) {
context.setProtocolVersion(transportVersion);
Expand Down