move URIBuilder to further facilitate removal of Apache

Azure · Sep 28, 2024 · 83dd697 · 83dd697
1 parent b362b2b
commit 83dd697
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 26 deletions.
diff --git a/data/src/main/java/com/microsoft/azure/kusto/data/ClientImpl.java b/data/src/main/java/com/microsoft/azure/kusto/data/ClientImpl.java
@@ -19,13 +19,11 @@
 import com.microsoft.azure.kusto.data.res.JsonResult;
 import org.apache.commons.lang3.StringUtils;
 
-import org.apache.http.client.utils.URIBuilder;
 import org.jetbrains.annotations.NotNull;
 import reactor.core.publisher.Mono;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.*;
 
@@ -37,7 +35,6 @@ class ClientImpl extends BaseClient {
     public static final String STREAMING_VERSION = "v1";
     private static final String DEFAULT_DATABASE_NAME = "NetDefaultDb";
 
-    public static final String FEDERATED_SECURITY_SUFFIX = ";fed=true";
     private final TokenProviderBase aadAuthenticationHelper;
 
     private final String clusterUrl;
@@ -54,29 +51,8 @@ public ClientImpl(ConnectionStringBuilder csb, HttpClientProperties properties)
 
     public ClientImpl(ConnectionStringBuilder csb, HttpClient httpClient) throws URISyntaxException {
         super(httpClient);
-
-        URI clusterUrlForParsing = new URI(csb.getClusterUrl());
-        String host = clusterUrlForParsing.getHost();
-        Objects.requireNonNull(clusterUrlForParsing.getAuthority(), "clusterUri must have uri authority component");
-        String auth = clusterUrlForParsing.getAuthority().toLowerCase();
-        if (host == null) {
-            host = StringUtils.removeEndIgnoreCase(auth, FEDERATED_SECURITY_SUFFIX);
-        }
-        URIBuilder uriBuilder = new URIBuilder()
-                .setScheme(clusterUrlForParsing.getScheme())
-                .setHost(host);
-        String path = clusterUrlForParsing.getPath();
-        if (path != null && !path.isEmpty()) {
-            path = StringUtils.removeEndIgnoreCase(path, FEDERATED_SECURITY_SUFFIX);
-            path = StringUtils.removeEndIgnoreCase(path, "/");
-
-            uriBuilder.setPath(path);
-        }
-
-        if (clusterUrlForParsing.getPort() != -1) {
-            uriBuilder.setPort(clusterUrlForParsing.getPort());
-        }
-        csb.setClusterUrl(uriBuilder.build().toString());
+        String clusterURL = UriUtils.createClusterURLFrom(csb.getClusterUrl());
+        csb.setClusterUrl(clusterURL);
 
         clusterUrl = csb.getClusterUrl();
         aadAuthenticationHelper = clusterUrl.toLowerCase().startsWith(CloudInfo.LOCALHOST) ? null : TokenProviderFactory.createTokenProvider(csb, httpClient);

diff --git a/data/src/main/java/com/microsoft/azure/kusto/data/UriUtils.java b/data/src/main/java/com/microsoft/azure/kusto/data/UriUtils.java
@@ -4,14 +4,44 @@
 import org.apache.http.client.utils.URIBuilder;
 
 import java.io.File;
+import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.file.Paths;
+import java.util.Objects;
 
 public class UriUtils {
+
+    public static final String FEDERATED_SECURITY_SUFFIX = ";fed=true";
+
     private UriUtils() {
         // Providing hidden constructor to hide default public constructor in utils class
     }
 
+    public static String createClusterURLFrom(final String clusterURI) throws URISyntaxException {
+        URI clusterUrlForParsing = new URI(clusterURI);
+        String host = clusterUrlForParsing.getHost();
+        Objects.requireNonNull(clusterUrlForParsing.getAuthority(), "clusterUri must have uri authority component");
+        String auth = clusterUrlForParsing.getAuthority().toLowerCase();
+        if (host == null) {
+            host = StringUtils.removeEndIgnoreCase(auth, FEDERATED_SECURITY_SUFFIX);
+        }
+        URIBuilder uriBuilder = new URIBuilder()
+                .setScheme(clusterUrlForParsing.getScheme())
+                .setHost(host);
+        String path = clusterUrlForParsing.getPath();
+        if (path != null && !path.isEmpty()) {
+            path = StringUtils.removeEndIgnoreCase(path, FEDERATED_SECURITY_SUFFIX);
+            path = StringUtils.removeEndIgnoreCase(path, "/");
+
+            uriBuilder.setPath(path);
+        }
+
+        if (clusterUrlForParsing.getPort() != -1) {
+            uriBuilder.setPort(clusterUrlForParsing.getPort());
+        }
+        return uriBuilder.build().toString();
+    }
+
     public static String setPathForUri(String uri, String path, boolean ensureTrailingSlash) throws URISyntaxException {
         path = StringUtils.prependIfMissing(path, "/");