Use URIBuilder for SPOG query param parsing

Replace manual string splitting of ?o= from httpPath with
Apache URIBuilder.getQueryParams() as suggested in code review.

Signed-off-by: Madhavendra Rathore <[email protected]>

Co-authored-by: Isaac
Signed-off-by: Madhavendra Rathore <[email protected]>

Author: msrathore-db

src/main/java/com/databricks/jdbc/api/impl/DatabricksConnectionContext.java

@@ -29,10 +29,12 @@
 import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableMap;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.*;
 import java.util.Collections;
 import java.util.regex.Matcher;
 import java.util.stream.Collectors;
+import org.apache.http.NameValuePair;
 import org.apache.http.client.utils.URIBuilder;
 
 public class DatabricksConnectionContext implements IDatabricksConnectionContext {
@@ -1186,16 +1188,18 @@ private Map<String, String> parseCustomHeaders(ImmutableMap<String, String> para
       String httpPath =
           parameters.getOrDefault(
               DatabricksJdbcUrlParams.HTTP_PATH.getParamName().toLowerCase(), "");
-      int queryStart = httpPath.indexOf('?');
-      if (queryStart >= 0) {
-        String queryString = httpPath.substring(queryStart + 1);
-        for (String param : queryString.split("&")) {
-          String[] kv = param.split("=", 2);
-          if (kv.length == 2 && "o".equals(kv[0]) && !kv[1].isEmpty()) {
-            headers.put(ORG_ID_HEADER, kv[1]);
+      try {
+        for (NameValuePair param :
+            new URIBuilder("http://placeholder" + httpPath).getQueryParams()) {
+          if ("o".equals(param.getName())
+              && param.getValue() != null
+              && !param.getValue().isEmpty()) {
+            headers.put(ORG_ID_HEADER, param.getValue());
             break;
           }
         }
+      } catch (URISyntaxException e) {
+        // Malformed httpPath — skip SPOG header extraction
       }
     }