a few refactorings

Author: winterhazel

framework/db/src/main/java/com/cloud/utils/db/TransactionLegacy.java

@@ -1201,7 +1201,7 @@ protected static Pair<String, String> getConnectionUriAndDriver(Properties dbPro
             connectionUri = propertyUri;
         }
 
-        connectionUri = addDefaultConnectionCollation(connectionUri, driver);
+        connectionUri = addDefaultConnectionCollation(connectionUri);
 
         LOGGER.info("Using the following URI to connect to {} database [{}].", schema, connectionUri);
         return new Pair<>(connectionUri, driver);
@@ -1272,20 +1272,19 @@ protected static String buildConnectionUri(String loadBalanceStrategy, String dr
      * connections that do not already define the charset or the collation, either through {@code db.<schema>.url.params}
      * or directly in {@code db.<schema>.uri}.
      *
-     * @param connectionParams the parameters configured by the operator; either the value of
-     *                         {@code db.<schema>.url.params} or the whole {@code db.<schema>.uri}.
+     * @param connectionUri the connection URI configured by the operator.
      */
-    protected static boolean shouldPinConnectionCollation(String connectionParams) {
-        return !StringUtils.containsIgnoreCase(connectionParams, CONNECTION_COLLATION_PARAM)
-                && !StringUtils.containsIgnoreCase(connectionParams, CHARACTER_ENCODING_PARAM);
+    protected static boolean shouldPinConnectionCollation(String connectionUri) {
+        return !StringUtils.containsIgnoreCase(connectionUri, CONNECTION_COLLATION_PARAM)
+                && !StringUtils.containsIgnoreCase(connectionUri, CHARACTER_ENCODING_PARAM);
     }
 
     /**
-     * Adds {@link #DEFAULT_CONNECTION_COLLATION} to a connection URI provided either through
+     * Adds {@link #DEFAULT_CONNECTION_COLLATION} to a connection URI configured either through
      * {@code db.<schema>.url.params} or directly in {@code db.<schema>.uri}, keeping the URI untouched if the operator
      * already defined the charset or the collation in it.
      */
-    protected static String addDefaultConnectionCollation(String connectionUri, String driver) {
+    protected static String addDefaultConnectionCollation(String connectionUri) {
         if (!shouldPinConnectionCollation(connectionUri)) {
             return connectionUri;
         }

framework/db/src/test/java/com/cloud/utils/db/TransactionLegacyTest.java

@@ -213,28 +213,28 @@ public void shouldPinConnectionCollationTestIsCaseInsensitive() {
 
     @Test
     public void addDefaultConnectionCollationTestUriWithoutParametersAddsTheQueryStringSeparator() {
-        String result = TransactionLegacy.addDefaultConnectionCollation("jdbc:mysql://host:5555/name", "jdbc:mysql");
+        String result = TransactionLegacy.addDefaultConnectionCollation("jdbc:mysql://host:5555/name");
 
         Assert.assertEquals("jdbc:mysql://host:5555/name?connectionCollation=utf8mb4_general_ci", result);
     }
 
     @Test
     public void addDefaultConnectionCollationTestUriWithParametersAddsTheParameterSeparator() {
-        String result = TransactionLegacy.addDefaultConnectionCollation("jdbc:mysql://host:5555/name?someParams", "jdbc:mysql");
+        String result = TransactionLegacy.addDefaultConnectionCollation("jdbc:mysql://host:5555/name?someParams");
 
         Assert.assertEquals("jdbc:mysql://host:5555/name?someParams&connectionCollation=utf8mb4_general_ci", result);
     }
 
     @Test
     public void addDefaultConnectionCollationTestUriEndingWithQueryStringSeparatorDoesNotDuplicateIt() {
-        String result = TransactionLegacy.addDefaultConnectionCollation("jdbc:mysql://host:5555/name?", "jdbc:mysql");
+        String result = TransactionLegacy.addDefaultConnectionCollation("jdbc:mysql://host:5555/name?");
 
         Assert.assertEquals("jdbc:mysql://host:5555/name?connectionCollation=utf8mb4_general_ci", result);
     }
 
     @Test
     public void addDefaultConnectionCollationTestUriEndingWithParameterSeparatorDoesNotDuplicateIt() {
-        String result = TransactionLegacy.addDefaultConnectionCollation("jdbc:mysql://host:5555/name?someParams&", "jdbc:mysql");
+        String result = TransactionLegacy.addDefaultConnectionCollation("jdbc:mysql://host:5555/name?someParams&");
 
         Assert.assertEquals("jdbc:mysql://host:5555/name?someParams&connectionCollation=utf8mb4_general_ci", result);
     }
@@ -243,13 +243,13 @@ public void addDefaultConnectionCollationTestUriEndingWithParameterSeparatorDoes
     public void addDefaultConnectionCollationTestUriDefiningConnectionCollationKeepsItUntouched() {
         String uri = "jdbc:mysql://host:5555/name?connectionCollation=utf8mb4_unicode_ci";
 
-        Assert.assertEquals(uri, TransactionLegacy.addDefaultConnectionCollation(uri, "jdbc:mysql"));
+        Assert.assertEquals(uri, TransactionLegacy.addDefaultConnectionCollation(uri));
     }
 
     @Test
     public void addDefaultConnectionCollationTestUriDefiningCharacterEncodingKeepsItUntouched() {
         String uri = "jdbc:mysql://host:5555/name?characterEncoding=UTF-8";
 
-        Assert.assertEquals(uri, TransactionLegacy.addDefaultConnectionCollation(uri, "jdbc:mysql"));
+        Assert.assertEquals(uri, TransactionLegacy.addDefaultConnectionCollation(uri));
     }
 }