Refactor httpResponse handling with closeQuietly to ensure consistent resource cleanup.

Author: orsondmc

client-v2/src/main/java/com/clickhouse/client/api/Client.java

@@ -1616,13 +1616,7 @@ public CompletableFuture<QueryResponse> query(String sqlQuery, Map<String, Objec
                         return new QueryResponse(httpResponse, responseFormat, finalSettings, metrics);
 
                     } catch (Exception e) {
-                        if (httpResponse != null) {
-                            try {
-                                httpResponse.close();
-                            } catch (IOException ex) {
-                                throw new ClientException("Failed to close response", e);
-                            }
-                        }
+                        httpClientHelper.closeQuietly(httpResponse);
                         lastException = httpClientHelper.wrapException(String.format("Query request failed (Attempt: %s/%s - Duration: %s)",
                                 (i + 1), (retries + 1), System.nanoTime() - startTime), e);
                         if (httpClientHelper.shouldRetry(e, finalSettings.getAllSettings())) {

client-v2/src/main/java/com/clickhouse/client/api/internal/HttpAPIClientHelper.java

@@ -428,8 +428,9 @@ public ClassicHttpResponse executeRequest(Endpoint server, Map<String, Object> r
 
         HttpClientContext context = HttpClientContext.create();
 
+        ClassicHttpResponse httpResponse = null;
         try {
-            ClassicHttpResponse httpResponse = httpClient.executeOpen(null, req, context);
+            httpResponse = httpClient.executeOpen(null, req, context);
             boolean serverCompression = ClientConfigProperties.COMPRESS_SERVER_RESPONSE.getOrDefault(requestConfig);
             httpResponse.setEntity(wrapResponseEntity(httpResponse.getEntity(), httpResponse.getCode(), serverCompression, useHttpCompression, lz4Factory, requestConfig));
 
@@ -448,14 +449,26 @@ public ClassicHttpResponse executeRequest(Endpoint server, Map<String, Object> r
             return httpResponse;
 
         } catch (UnknownHostException e) {
+            closeQuietly(httpResponse);
             LOG.warn("Host '{}' unknown", server.getBaseURL());
             throw e;
         } catch (ConnectException | NoRouteToHostException e) {
+            closeQuietly(httpResponse);
             LOG.warn("Failed to connect to '{}': {}", server.getBaseURL(), e.getMessage());
             throw e;
         }
     }
 
+    public void closeQuietly(ClassicHttpResponse httpResponse) {
+        if (httpResponse != null) {
+            try {
+                httpResponse.close();
+            } catch (IOException e) {
+                LOG.warn("Failed to close response");
+            }
+        }
+    }
+
     private static final ContentType CONTENT_TYPE = ContentType.create(ContentType.TEXT_PLAIN.getMimeType(), "UTF-8");
 
     private void addHeaders(HttpPost req, Map<String, Object> requestConfig) {