Revert "Removes apache http libraries and replace with azure core httpclient (#335)"

This reverts commit 0057e8f

Author: AsafMah

CHANGELOG.md

@@ -8,15 +8,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Azure CLI authentication
 
-## [6.0.0] - 2024-03-07
-### Changed
-- Replaced Apache CloseableHttpClient with configurable azure-core client.
-- (Breaking) HttpClientFactory now accepts clients implementing azure-core HttpClient.
-- (Breaking) HttpClientProperties and HttpClientPropertiesBuilder now use azure-core ProxyOptions.
-- Data client now wraps internal HTTP client.
-- Moved HTTP request tracing logic into a builder class.
-- Moved HTTP request building logic into a builder class.
-
 ## [5.0.5] - 2024-03-06
 ### Fixed
 - Fixed bugs in how ClientRequestProperties' servertimeout is set/get, and aligned the 3 different ways to set/get this option

README.md

@@ -59,7 +59,7 @@ And the SDK will know to use these values automatically.
 Alternatively, you can define a proxy programmatically when creating a client, using `HttpClientProperties`:  
 ```java
 HttpClientProperties httpClientProperties = HttpClientProperties.builder()
-        .proxy(new ProxyOptions(ProxyOptions.Type.HTTP, new InetSocketAddress("myproxy.contoso.com", 8080)))
+        .proxy(new HttpHost("1.2.3.4", 8989))
         .build();
 
 Client = ClientFactory.createClient(<engine_connection_string>, httpClientProperties); 

data/pom.xml

@@ -159,17 +159,27 @@
             <groupId>com.azure</groupId>
             <artifactId>azure-core</artifactId>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>${apache.httpclient.version}</version>
+            <version>${httpclient.version}</version>
             <exclusions>
+                <exclusion>
+                    <artifactId>httpcore</artifactId>
+                    <groupId>org.apache.httpcomponents</groupId>
+                </exclusion>
                 <exclusion>
                     <artifactId>commons-codec</artifactId>
                     <groupId>org.apache.commons</groupId>
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>${httpcore.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>

data/src/main/java/com/microsoft/azure/kusto/data/BaseClient.java

@@ -3,9 +3,8 @@
 
 package com.microsoft.azure.kusto.data;
 
-import com.azure.core.http.HttpClient;
 import com.microsoft.azure.kusto.data.auth.ConnectionStringBuilder;
-import com.microsoft.azure.kusto.data.http.HttpClientProperties;
+import org.apache.http.impl.client.CloseableHttpClient;
 
 import java.net.URISyntaxException;
 
@@ -44,12 +43,12 @@ public static Client createClient(ConnectionStringBuilder csb, HttpClientPropert
      * customized with the given properties.
      *
      * @param csb the connection string builder
-     * @param client HttpClient client.
+     * @param client CloseableHttpClient client. It will not be closed when {@link Client#close} is called.
      * @return a fully constructed {@linkplain Client} instance
      * @throws URISyntaxException if the cluster URL is invalid
      */
-    public static Client createClient(ConnectionStringBuilder csb, HttpClient client) throws URISyntaxException {
-        return client == null ? createClient(csb, (HttpClientProperties) null) : new ClientImpl(csb, client);
+    public static Client createClient(ConnectionStringBuilder csb, CloseableHttpClient client) throws URISyntaxException {
+        return client == null ? createClient(csb, (HttpClientProperties) null) : new ClientImpl(csb, client, true);
     }
 
     /**
@@ -86,7 +85,7 @@ public static StreamingClient createStreamingClient(ConnectionStringBuilder csb,
      * @return a fully constructed {@linkplain StreamingClient} instance
      * @throws URISyntaxException if the cluster URL is invalid
      */
-    public static StreamingClient createStreamingClient(ConnectionStringBuilder csb, HttpClient httpClient) throws URISyntaxException {
-        return new ClientImpl(csb, httpClient);
+    public static StreamingClient createStreamingClient(ConnectionStringBuilder csb, CloseableHttpClient httpClient) throws URISyntaxException {
+        return new ClientImpl(csb, httpClient, true);
     }
 }