Merge pull request #1 from strangelookingnerd/remove-deprecations

ok2c · web-flow · commit 1aa0551c6903 · 2024-11-01T14:38:00.000+01:00
Remove usage of deprecated API
diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
@@ -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;
@@ -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);
         }
@@ -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()));
@@ -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) {
@@ -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;
         }
diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/HijackingHttpRequestExecutor.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/HijackingHttpRequestExecutor.java
@@ -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);
@@ -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);
