[PECOBLR-325] Fix: JDBC Url not being parsed correctly (#784)

* Corrected url parsing.

* remove staging ref

Author: shivam2680

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

@@ -9,6 +9,7 @@
 import com.databricks.jdbc.api.internal.IDatabricksConnectionContext;
 import com.databricks.jdbc.common.*;
 import com.databricks.jdbc.common.util.ValidationUtil;
+import com.databricks.jdbc.common.util.WildcardUtil;
 import com.databricks.jdbc.exception.DatabricksParsingException;
 import com.databricks.jdbc.exception.DatabricksSQLException;
 import com.databricks.jdbc.log.JdbcLogger;
@@ -79,16 +80,19 @@ private DatabricksConnectionContext(
   public static ImmutableMap<String, String> buildPropertiesMap(
       String connectionParamString, Properties properties) {
     ImmutableMap.Builder<String, String> parametersBuilder = ImmutableMap.builder();
-    String[] urlParts = connectionParamString.split(DatabricksJdbcConstants.URL_DELIMITER);
-    for (String urlPart : urlParts) {
-      String[] pair = urlPart.split(DatabricksJdbcConstants.PAIR_DELIMITER);
-      if (pair.length == 1) {
-        pair = new String[] {pair[0], ""};
-      }
-      if (pair[0].startsWith(DatabricksJdbcUrlParams.HTTP_HEADERS.getParamName())) {
-        parametersBuilder.put(pair[0], pair[1]);
-      } else {
-        parametersBuilder.put(pair[0].toLowerCase(), pair[1]);
+    // check if connectionParamString is empty or null
+    if (!WildcardUtil.isNullOrEmpty(connectionParamString)) {
+      String[] urlParts = connectionParamString.split(DatabricksJdbcConstants.URL_DELIMITER);
+      for (String urlPart : urlParts) {
+        String[] pair = urlPart.split(DatabricksJdbcConstants.PAIR_DELIMITER);
+        if (pair.length == 1) {
+          pair = new String[] {pair[0], ""};
+        }
+        if (pair[0].startsWith(DatabricksJdbcUrlParams.HTTP_HEADERS.getParamName())) {
+          parametersBuilder.put(pair[0], pair[1]);
+        } else {
+          parametersBuilder.put(pair[0].toLowerCase(), pair[1]);
+        }
       }
     }
     for (Map.Entry<Object, Object> entry : properties.entrySet()) {

src/main/java/com/databricks/jdbc/common/DatabricksJdbcUrlParams.java

@@ -12,7 +12,7 @@ public enum DatabricksJdbcUrlParams {
   PASSWORD("password", "Password for authentication"),
   CLIENT_ID("OAuth2ClientId", "OAuth2 Client ID"),
   CLIENT_SECRET("OAuth2Secret", "OAuth2 Client Secret"),
-  AUTH_MECH("authmech", "Authentication mechanism", true),
+  AUTH_MECH("authmech", "Authentication mechanism", "3", true),
   AUTH_ACCESS_TOKEN("Auth_AccessToken", "OAuth2 Access Token"),
   CONN_CATALOG("conncatalog", "Connection catalog"),
   CONN_SCHEMA("connschema", "Connection schema"),

src/test/java/com/databricks/jdbc/api/impl/DatabricksConnectionContextTest.java

@@ -154,6 +154,31 @@ public void testParseValid() throws DatabricksSQLException {
     assertEquals(M2M_AUTH_TYPE, connectionContext.getGcpAuthType());
   }
 
+  @Test
+  public void testParseValidBasicUrl() throws DatabricksSQLException {
+    // test default AuthMech
+    Properties props = new Properties();
+    String httpPath = "/sql/1.0/warehouses/fgff575757";
+    props.put("password", "passwd");
+    props.put("httpPath", httpPath);
+    DatabricksConnectionContext connectionContext =
+        (DatabricksConnectionContext)
+            DatabricksConnectionContext.parse(TestConstants.VALID_BASE_URL_1, props);
+    assertEquals(AuthMech.PAT, connectionContext.getAuthMech());
+    assertEquals("passwd", connectionContext.getToken());
+    assertEquals(httpPath, connectionContext.getHttpPath());
+    assertEquals(2, connectionContext.parameters.size());
+
+    // test url without <;>
+    connectionContext =
+        (DatabricksConnectionContext)
+            DatabricksConnectionContext.parse(TestConstants.VALID_BASE_URL_3, props);
+    assertEquals(AuthMech.PAT, connectionContext.getAuthMech());
+    assertEquals("passwd", connectionContext.getToken());
+    assertEquals(httpPath, connectionContext.getHttpPath());
+    assertEquals(2, connectionContext.parameters.size());
+  }
+
   @Test
   public void testParseWithDefaultStringColumnLength() throws DatabricksSQLException {
     // Test case 1: Valid DefaultStringColumnLength