Removes apache http libraries and replace with azure core httpclient

data/pom.xml

@@ -159,21 +159,9 @@
             <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>${httpclient.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>httpcore</artifactId>
-                    <groupId>org.apache.httpcomponents</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
+            <groupId>org.apache.httpcomponents.core5</groupId>
+            <artifactId>httpcore5</artifactId>
             <version>${httpcore.version}</version>
         </dependency>
         <dependency>

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

@@ -8,7 +8,7 @@
 
 import java.io.Closeable;
 
-public interface Client extends Closeable {
+public interface Client {
     KustoOperationResult execute(String command) throws DataServiceException, DataClientException;
 
     KustoOperationResult execute(String database, String command) throws DataServiceException, DataClientException;

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

@@ -3,8 +3,9 @@
 
 package com.microsoft.azure.kusto.data;
 
+import com.azure.core.http.HttpClient;
 import com.microsoft.azure.kusto.data.auth.ConnectionStringBuilder;
-import org.apache.http.impl.client.CloseableHttpClient;
+import com.microsoft.azure.kusto.data.http.HttpClientProperties;
 
 import java.net.URISyntaxException;
 
@@ -47,7 +48,7 @@ public static Client createClient(ConnectionStringBuilder csb, HttpClientPropert
      * @return a fully constructed {@linkplain Client} instance
      * @throws URISyntaxException if the cluster URL is invalid
      */
-    public static Client createClient(ConnectionStringBuilder csb, CloseableHttpClient client) throws URISyntaxException {
+    public static Client createClient(ConnectionStringBuilder csb, HttpClient client) throws URISyntaxException {
         return client == null ? createClient(csb, (HttpClientProperties) null) : new ClientImpl(csb, client, true);
     }
 
@@ -85,7 +86,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, CloseableHttpClient httpClient) throws URISyntaxException {
+    public static StreamingClient createStreamingClient(ConnectionStringBuilder csb, HttpClient httpClient) throws URISyntaxException {
         return new ClientImpl(csb, httpClient, true);
     }
 }

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

@@ -3,32 +3,30 @@
 
 package com.microsoft.azure.kusto.data;
 
+import com.azure.core.http.HttpClient;
+import com.azure.core.http.HttpHeaderName;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.microsoft.azure.kusto.data.auth.CloudInfo;
 import com.microsoft.azure.kusto.data.auth.ConnectionStringBuilder;
 import com.microsoft.azure.kusto.data.auth.TokenProviderBase;
 import com.microsoft.azure.kusto.data.auth.TokenProviderFactory;
 import com.microsoft.azure.kusto.data.auth.endpoints.KustoTrustedEndpoints;
-import com.microsoft.azure.kusto.data.exceptions.DataClientException;
-import com.microsoft.azure.kusto.data.exceptions.DataServiceException;
-import com.microsoft.azure.kusto.data.exceptions.KustoClientInvalidConnectionStringException;
-import com.microsoft.azure.kusto.data.exceptions.KustoServiceQueryError;
+import com.microsoft.azure.kusto.data.exceptions.*;
 import com.microsoft.azure.kusto.data.http.HttpClientFactory;
+import com.microsoft.azure.kusto.data.http.HttpClientProperties;
 import com.microsoft.azure.kusto.data.http.UncloseableStream;
 import com.microsoft.azure.kusto.data.http.HttpPostUtils;
 import com.microsoft.azure.kusto.data.instrumentation.MonitoredActivity;
 import com.microsoft.azure.kusto.data.instrumentation.SupplierTwoExceptions;
 import com.microsoft.azure.kusto.data.instrumentation.TraceableAttributes;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.HttpHeaders;
-import org.apache.http.ParseException;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.http.entity.AbstractHttpEntity;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.InputStreamEntity;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
+
+import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.io.entity.AbstractHttpEntity;
+import org.apache.hc.core5.http.io.entity.InputStreamEntity;
+import org.apache.hc.core5.http.io.entity.StringEntity;
+import org.apache.hc.core5.net.URIBuilder;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
@@ -56,7 +54,7 @@ class ClientImpl implements Client, StreamingClient {
     private final TokenProviderBase aadAuthenticationHelper;
     private final String clusterUrl;
     private final ClientDetails clientDetails;
-    private final CloseableHttpClient httpClient;
+    private final HttpClient httpClient;
     private final boolean leaveHttpClientOpen;
     private boolean endpointValidated = false;
 
@@ -70,16 +68,16 @@ public ClientImpl(ConnectionStringBuilder csb, HttpClientProperties properties)
         this(csb, HttpClientFactory.create(properties), false);
     }
 
-    // Accepting a CloseableHttpClient so that we can create InputStream from response
-    public ClientImpl(ConnectionStringBuilder csb, CloseableHttpClient httpClient, boolean leaveHttpClientOpen) throws URISyntaxException {
+    public ClientImpl(ConnectionStringBuilder csb, HttpClient httpClient, boolean leaveHttpClientOpen) throws URISyntaxException {
         URI clusterUrlForParsing = new URI(csb.getClusterUrl());
         String host = clusterUrlForParsing.getHost();
         Objects.requireNonNull(clusterUrlForParsing.getAuthority(), "clusterUri.authority");
         String auth = clusterUrlForParsing.getAuthority().toLowerCase();
         if (host == null) {
             host = StringUtils.removeEndIgnoreCase(auth, FEDERATED_SECURITY_SUFFIX);
         }
-        URIBuilder uriBuilder = new URIBuilder().setScheme(clusterUrlForParsing.getScheme())
+        URIBuilder uriBuilder = new URIBuilder()
+                .setScheme(clusterUrlForParsing.getScheme())
                 .setHost(host);
         String path = clusterUrlForParsing.getPath();
         if (path != null && !path.isEmpty()) {
@@ -267,15 +265,15 @@ private KustoOperationResult executeStreamingIngestImpl(String clusterEndpoint,
                 "KJC.executeStreamingIngest" + (isStreamSource ? "" : "FromBlob"),
                 CommandType.STREAMING_INGEST.getActivityTypeSuffix());
         if (isStreamSource) {
-            headers.put(HttpHeaders.CONTENT_ENCODING, "gzip");
+            headers.put(HttpHeaderName.CONTENT_ENCODING.getCaseSensitiveName(), "gzip");
         }
 
         Long timeoutMs = populateHeadersAndGetTimeout(properties, headers);
         try (InputStream ignored = (isStreamSource && !leaveOpen) ? stream : null) {
             validateEndpoint();
 
             // We use UncloseableStream to prevent HttpClient From closing it
-            AbstractHttpEntity entity = isStreamSource ? new InputStreamEntity(new UncloseableStream(stream))
+            AbstractHttpEntity entity = isStreamSource ? new InputStreamEntity(new UncloseableStream(stream), ContentType.DEFAULT_BINARY)
                     : new StringEntity(new IngestionSourceStorage(blobUrl).toString(), ContentType.APPLICATION_JSON);
             String response;
             // trace executeStreamingIngest
@@ -356,6 +354,7 @@ public InputStream executeStreamingQuery(String database, String command, Client
 
         addCommandHeaders(headers);
         String jsonPayload = generateCommandPayload(database, command, properties);
+        StringEntity requestEntity = new StringEntity(jsonPayload, ContentType.APPLICATION_JSON);
 
         try {
             validateEndpoint();
@@ -366,15 +365,15 @@ public InputStream executeStreamingQuery(String database, String command, Client
         return MonitoredActivity.invoke(
                 (SupplierTwoExceptions<InputStream, DataServiceException, DataClientException>) () -> HttpPostUtils.postToStreamingOutput(httpClient,
                         clusterEndpoint,
-                        jsonPayload, timeoutMs + CLIENT_SERVER_DELTA_IN_MILLISECS, headers),
+                        requestEntity, timeoutMs + CLIENT_SERVER_DELTA_IN_MILLISECS, headers),
                 "ClientImpl.executeStreamingQuery", updateAndGetExecuteTracingAttributes(database, properties));
     }
 
     private long determineTimeout(ClientRequestProperties properties, CommandType commandType, String clusterUrl) throws DataClientException {
         Long timeoutMs;
         try {
             timeoutMs = properties == null ? null : properties.getTimeoutInMilliSec();
-        } catch (ParseException e) {
+        } catch (KustoParseException e) {
             throw new DataClientException(clusterUrl, "Failed to parse timeout from ClientRequestProperties");
         }
         if (timeoutMs == null) {
@@ -402,7 +401,8 @@ private Map<String, String> generateIngestAndCommandHeaders(ClientRequestPropert
         Map<String, String> headers = extractTracingHeaders(properties);
 
         if (aadAuthenticationHelper != null) {
-            headers.put(HttpHeaders.AUTHORIZATION, String.format("Bearer %s", aadAuthenticationHelper.acquireAccessToken()));
+            headers.put(HttpHeaderName.AUTHORIZATION.getCaseSensitiveName(),
+                    String.format("Bearer %s", aadAuthenticationHelper.acquireAccessToken()));
         }
 
         String clientRequestId;
@@ -461,18 +461,12 @@ private String generateCommandPayload(String database, String command, ClientReq
     }
 
     private void addCommandHeaders(Map<String, String> headers) {
-        headers.put(HttpHeaders.CONTENT_TYPE, "application/json");
+        headers.put(HttpHeaderName.CONTENT_TYPE.getCaseSensitiveName(), "application/json");
         headers.put("Fed", "True");
     }
 
     public String getClusterUrl() {
         return clusterUrl;
     }
 
-    @Override
-    public void close() throws IOException {
-        if (!leaveHttpClientOpen) {
-            httpClient.close();
-        }
-    }
 }

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

@@ -6,17 +6,16 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.microsoft.azure.kusto.data.exceptions.KustoParseException;
 import com.microsoft.azure.kusto.data.format.CslBoolFormat;
 import com.microsoft.azure.kusto.data.format.CslDateTimeFormat;
 import com.microsoft.azure.kusto.data.format.CslIntFormat;
 import com.microsoft.azure.kusto.data.format.CslLongFormat;
 import com.microsoft.azure.kusto.data.format.CslRealFormat;
 import com.microsoft.azure.kusto.data.format.CslTimespanFormat;
 import com.microsoft.azure.kusto.data.format.CslUuidFormat;
-import com.microsoft.azure.kusto.data.http.HttpPostUtils;
 import com.microsoft.azure.kusto.data.instrumentation.TraceableAttributes;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.ParseException;
 
 import java.io.Serializable;
 import java.time.Duration;
@@ -152,7 +151,7 @@ public void clearParameters() {
         parameters.clear();
     }
 
-    public Long getTimeoutInMilliSec() throws ParseException {
+    public Long getTimeoutInMilliSec() {
         Object timeoutObj = getOption(OPTION_SERVER_TIMEOUT);
         Long timeout = null;
         if (timeoutObj instanceof Long) {
@@ -166,10 +165,10 @@ public Long getTimeoutInMilliSec() throws ParseException {
         return timeout;
     }
 
-    private long parseTimeoutFromTimespanString(String str) throws ParseException {
+    private long parseTimeoutFromTimespanString(String str) {
         Matcher matcher = KUSTO_TIMESPAN_REGEX.matcher(str);
         if (!matcher.matches()) {
-            throw new ParseException(String.format("Failed to parse timeout string as a timespan. Value: '%s'", str));
+            throw new KustoParseException(String.format("Failed to parse timeout string as a timespan. Value: '%s'", str));
         }
 
         if ("-".equals(matcher.group(1))) {

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

@@ -1,8 +1,6 @@
 package com.microsoft.azure.kusto.data;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.microsoft.azure.kusto.data.http.HttpPostUtils;
 
 class IngestionSourceStorage {
     public String sourceUri;
@@ -12,9 +10,8 @@ public IngestionSourceStorage(String uri) {
     }
 
     public String toString() {
-        ObjectMapper objectMapper = Utils.getObjectMapper();
         try {
-            return objectMapper.writeValueAsString(this);
+            return Utils.getObjectMapper().writeValueAsString(this);
         } catch (JsonProcessingException e) {
             throw new RuntimeException(e);
         }

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

@@ -9,7 +9,6 @@
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.microsoft.azure.kusto.data.exceptions.JsonPropertyMissingException;
 import com.microsoft.azure.kusto.data.exceptions.KustoServiceQueryError;
-import com.microsoft.azure.kusto.data.http.HttpPostUtils;
 import com.microsoft.azure.kusto.data.instrumentation.MonitoredActivity;
 import com.microsoft.azure.kusto.data.instrumentation.SupplierOneException;
 import org.slf4j.Logger;

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

@@ -6,10 +6,9 @@
 import com.microsoft.azure.kusto.data.exceptions.DataClientException;
 import com.microsoft.azure.kusto.data.exceptions.DataServiceException;
 
-import java.io.Closeable;
 import java.io.InputStream;
 
-public interface StreamingClient extends Closeable {
+public interface StreamingClient {
     /**
      * <p>Ingest data from a given stream directly into Kusto database.</p>
      * This method ingests the data from a given stream directly into Kusto database, using streaming ingestion endpoint,

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

@@ -1,9 +1,10 @@
 package com.microsoft.azure.kusto.data;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.client.utils.URIBuilder;
+import org.apache.hc.core5.net.URIBuilder;
 
 import java.io.File;
+import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.file.Paths;
 
@@ -15,7 +16,11 @@ private UriUtils() {
     public static String setPathForUri(String uri, String path, boolean ensureTrailingSlash) throws URISyntaxException {
         path = StringUtils.prependIfMissing(path, "/");
 
-        String pathString = new URIBuilder(uri).setPath(path).build().toString();
+        String pathString = new URIBuilder(uri)
+                .setPath(path)
+                .build()
+                .toString();
+
         if (ensureTrailingSlash) {
             pathString = StringUtils.appendIfMissing(pathString, "/");
         }

data/src/main/java/com/microsoft/azure/kusto/data/auth/ApplicationCertificateTokenProvider.java

@@ -3,13 +3,13 @@
 
 package com.microsoft.azure.kusto.data.auth;
 
+import com.azure.core.http.HttpClient;
 import com.microsoft.aad.msal4j.ConfidentialClientApplication;
 import com.microsoft.aad.msal4j.IClientCertificate;
 import com.microsoft.aad.msal4j.IConfidentialClientApplication;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 
-import org.apache.http.client.HttpClient;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

data/src/main/java/com/microsoft/azure/kusto/data/auth/ApplicationKeyTokenProvider.java

@@ -3,13 +3,13 @@
 
 package com.microsoft.azure.kusto.data.auth;
 
+import com.azure.core.http.HttpClient;
 import com.microsoft.aad.msal4j.ConfidentialClientApplication;
 import com.microsoft.aad.msal4j.IClientSecret;
 import com.microsoft.aad.msal4j.IConfidentialClientApplication;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 
-import org.apache.http.client.HttpClient;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

data/src/main/java/com/microsoft/azure/kusto/data/auth/CallbackTokenProvider.java

@@ -3,9 +3,9 @@
 
 package com.microsoft.azure.kusto.data.auth;
 
+import com.azure.core.http.HttpClient;
 import com.microsoft.azure.kusto.data.exceptions.DataClientException;
 
-import org.apache.http.client.HttpClient;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

data/src/main/java/com/microsoft/azure/kusto/data/auth/CallbackTokenProviderFunction.java

@@ -1,6 +1,6 @@
 package com.microsoft.azure.kusto.data.auth;
 
-import org.apache.http.client.HttpClient;
+import com.azure.core.http.HttpClient;
 
 @FunctionalInterface
 public interface CallbackTokenProviderFunction {

data/src/main/java/com/microsoft/azure/kusto/data/auth/CloudDependentTokenProviderBase.java

@@ -3,17 +3,16 @@
 
 package com.microsoft.azure.kusto.data.auth;
 
+import com.azure.core.http.HttpClient;
 import com.microsoft.azure.kusto.data.instrumentation.SupplierTwoExceptions;
 import com.microsoft.azure.kusto.data.exceptions.DataClientException;
 import com.microsoft.azure.kusto.data.exceptions.DataServiceException;
 import java.net.URISyntaxException;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
 import com.microsoft.azure.kusto.data.instrumentation.MonitoredActivity;
-import org.apache.http.client.HttpClient;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;