feat(jdbc): Don't use URI as it breaks when using the hash char (#2513)…

… (#2514) * feat(jdbc): Don't use URI as it breaks when using the hash char * feat(jdbc): Remove URI related exceptions * feat(jdbc): Remove useless variable * feat(jdbc): added encoding of params; added tests; refactoring * feat(jdbc): delete encoding for params --------- Co-authored-by: Oleksii Ivanov <oleksii.ivanov-ext@camunda.com> (cherry picked from commit 9f9cb3b) Co-authored-by: Jonathan <jonathan.roques@camunda.com>
camunda · May 10, 2024 · f8cea5c · f8cea5c
1 parent c23904c
commit f8cea5c
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 40 deletions.
diff --git a/connectors/jdbc/src/main/java/io/camunda/connector/jdbc/utils/ConnectionHelper.java b/connectors/jdbc/src/main/java/io/camunda/connector/jdbc/utils/ConnectionHelper.java
@@ -10,7 +10,6 @@
 import io.camunda.connector.jdbc.model.request.JdbcRequest;
 import io.camunda.connector.jdbc.model.request.SupportedDatabase;
 import io.camunda.connector.jdbc.model.request.connection.JdbcConnection;
-import java.net.URISyntaxException;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
@@ -37,8 +36,6 @@ public static Connection openConnection(JdbcRequest request) {
       return conn;
     } catch (ClassNotFoundException e) {
       throw new ConnectorException("Cannot find class: " + driverClassName);
-    } catch (URISyntaxException e) {
-      throw new ConnectorException("Cannot parse the Database connection URL: " + e.getMessage());
     } catch (SQLException e) {
       throw new ConnectorException("Cannot create the Database connection: " + e.getMessage());
     }
@@ -52,8 +49,7 @@ public static Connection openConnection(JdbcRequest request) {
    *     href="https://mariadb.com/kb/en/about-mariadb-connector-j/#jdbcmysql-scheme-compatibility">Compatibility
    *     details</a>
    */
-  private static String ensureMySQLCompatibleUrl(String url, SupportedDatabase database)
-      throws URISyntaxException {
+  private static String ensureMySQLCompatibleUrl(String url, SupportedDatabase database) {
     if (database == SupportedDatabase.MYSQL) {
       return ConnectionParameterHelper.addQueryParameterToURL(url, "permitMysqlScheme");
     }

diff --git a/connectors/jdbc/src/main/java/io/camunda/connector/jdbc/utils/ConnectionParameterHelper.java b/connectors/jdbc/src/main/java/io/camunda/connector/jdbc/utils/ConnectionParameterHelper.java
@@ -6,9 +6,6 @@
  */
 package io.camunda.connector.jdbc.utils;
 
-import java.net.URI;
-import java.net.URISyntaxException;
-
 /**
  * Helper class to add parameters to a URL. Parameters values can be added to the URL as well, but
  * it is optional.
@@ -17,32 +14,13 @@
  */
 public class ConnectionParameterHelper {
 
-  public static String addQueryParameterToURL(String urlString, String paramName)
-      throws URISyntaxException {
+  public static String addQueryParameterToURL(String urlString, String paramName) {
     return addQueryParameterToURL(urlString, paramName, null);
   }
 
-  public static String addQueryParameterToURL(String urlString, String paramName, String paramValue)
-      throws URISyntaxException {
-    URI uri = new URI(urlString);
-    // Check if the URL already has query parameters
-    int queryParamsIndex = urlString.indexOf('?');
-    String query;
-    if (queryParamsIndex == -1) {
-      // No query parameters
-      query = "?";
-    } else {
-      // Query parameters already exist let's add the new one
-      query = "&";
-    }
-    query += paramName;
-    // Value is optional
-    if (paramValue != null) {
-      query += "=" + paramValue;
-    }
-    // jdbc:mysql//localhost:3306?paramName=paramValue for instance is not detected as a regular
-    // URI,
-    // so we need to reconstruct the URI using the scheme and the scheme specific part
-    return new URI(uri.getScheme() + ":" + uri.getSchemeSpecificPart() + query).toString();
+  public static String addQueryParameterToURL(
+      String urlString, String paramName, String paramValue) {
+    String separator = urlString.contains("?") ? "&" : "?";
+    return urlString + separator + paramName + (paramValue != null ? "=" + paramValue : "");
   }
 }
diff --git a/...ors/jdbc/src/test/java/io/camunda/connector/jdbc/utils/ConnectionParameterHelperTest.java b/...ors/jdbc/src/test/java/io/camunda/connector/jdbc/utils/ConnectionParameterHelperTest.java
@@ -12,7 +12,7 @@
 
 public class ConnectionParameterHelperTest {
   @Test
-  void shouldCreateQueryParameters_whenNoExistingQueryParameters() throws Exception {
+  void shouldCreateQueryParameters_whenNoExistingQueryParameters() {
     String urlString = "jdbc:mysql//localhost:3306";
     String paramName = "paramName";
     String paramValue = "paramValue";
@@ -22,7 +22,7 @@ void shouldCreateQueryParameters_whenNoExistingQueryParameters() throws Exceptio
   }
 
   @Test
-  void shouldNotCreateQueryParameters_whenExistingQueryParameters() throws Exception {
+  void shouldNotCreateQueryParameters_whenExistingQueryParameters() {
     String urlString = "jdbc:mysql//localhost:3306?existingParam=existingValue";
     String paramName = "paramName";
     String paramValue = "paramValue";
@@ -32,43 +32,80 @@ void shouldNotCreateQueryParameters_whenExistingQueryParameters() throws Excepti
   }
 
   @Test
-  void shouldCreateQueryParameters_whenNoParamValue() throws Exception {
+  void shouldCreateQueryParameters_whenNoParamValue() {
     String urlString = "jdbc:mysql//localhost:3306";
     String paramName = "paramName";
     String result = ConnectionParameterHelper.addQueryParameterToURL(urlString, paramName);
     assertThat(result).isEqualTo(urlString + "?paramName");
   }
 
   @Test
-  void shouldCreateQueryParameters_whenNoParamValueAndExistingQueryParameters() throws Exception {
+  void shouldCreateQueryParameters_whenNoParamValueAndExistingQueryParameters() {
     String urlString = "jdbc:mysql//localhost:3306?existingParam=existingValue";
     String paramName = "paramName";
     String result = ConnectionParameterHelper.addQueryParameterToURL(urlString, paramName);
     assertThat(result).isEqualTo(urlString + "&paramName");
   }
 
   @Test
-  void shouldCreateQueryParametersAfterPath_whenQueryPathExistsAndNoParamValue() throws Exception {
+  void shouldCreateQueryParametersAfterPath_whenQueryPathExistsAndNoParamValue() {
     String urlString = "jdbc:mysql//localhost:3306/database";
     String paramName = "paramName";
     String result = ConnectionParameterHelper.addQueryParameterToURL(urlString, paramName);
     assertThat(result).isEqualTo(urlString + "?paramName");
   }
 
   @Test
-  void shouldCreateQueryParametersAfterPath_whenQueryPathExistsAndQueryParametersExist()
-      throws Exception {
+  void shouldCreateQueryParametersAfterPath_whenQueryPathExistsAndQueryParametersExist() {
     String urlString = "jdbc:mysql//localhost:3306/database?existingParam=existingValue";
     String paramName = "paramName";
     String result = ConnectionParameterHelper.addQueryParameterToURL(urlString, paramName);
     assertThat(result).isEqualTo(urlString + "&paramName");
   }
 
   @Test
-  void shouldCreateQueryParametersAfterPath_whenEmptyPath() throws Exception {
+  void shouldCreateQueryParametersAfterPath_whenEmptyPath() {
     String urlString = "jdbc:mysql//localhost:3306/";
     String paramName = "paramName";
     String result = ConnectionParameterHelper.addQueryParameterToURL(urlString, paramName);
     assertThat(result).isEqualTo(urlString + "?paramName");
   }
+
+  @Test
+  void
+      shouldCreateQueryParametersAfterPath_whenQueryPathExistsAndQueryParametersExistAndPasswordHasWeirdChars() {
+    String urlString = "jdbc:mysql//localhost:3306/database?user=test&password=ab#!xij:()_s23";
+    String paramName = "paramName";
+    String result = ConnectionParameterHelper.addQueryParameterToURL(urlString, paramName);
+    assertThat(result).isEqualTo(urlString + "&paramName");
+  }
+
+  @Test
+  void shouldCreateQueryParameters_whenMultipleExistingQueryParameters() {
+    String urlString =
+        "jdbc:mysql//localhost:3306?existingParam1=existingValue1&existingParam2=existingValue2";
+    String paramName = "paramName";
+    String paramValue = "paramValue";
+    String result =
+        ConnectionParameterHelper.addQueryParameterToURL(urlString, paramName, paramValue);
+    assertThat(result).isEqualTo(urlString + "&paramName=paramValue");
+  }
+
+  @Test
+  void shouldHandleEmptyParamValue() {
+    String urlString = "jdbc:mysql//localhost:3306";
+    String paramName = "paramName";
+    String paramValue = "";
+    String result =
+        ConnectionParameterHelper.addQueryParameterToURL(urlString, paramName, paramValue);
+    assertThat(result).isEqualTo(urlString + "?paramName=");
+  }
+
+  @Test
+  void shouldHandleNullParamValue() {
+    String urlString = "jdbc:mysql//localhost:3306";
+    String paramName = "paramName";
+    String result = ConnectionParameterHelper.addQueryParameterToURL(urlString, paramName, null);
+    assertThat(result).isEqualTo(urlString + "?paramName");
+  }
 }