Allow colliding parameters if values are equal

Author: girarda

airbyte-integrations/connectors/destination-mysql/src/main/java/io/airbyte/integrations/destination/mysql/MySQLDestination.java

@@ -22,6 +22,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.slf4j.Logger;
@@ -142,10 +143,11 @@ private List<String> convertToJdbcStrings(final Map<String, String> customParame
   }
 
   private void assertCustomParametersDontOverwriteDefaultParameters(final Map<String, String> customParameters,
-      final Map<String, String> defaultParametersMaps) {
-    final List<String> duplicateKeys = defaultParametersMaps.keySet().stream().filter(customParameters::containsKey).toList();
-    if (!duplicateKeys.isEmpty()) {
-      throw new RuntimeException("Cannot overwrite default JDBC parameter " + duplicateKeys);
+      final Map<String, String> defaultParameters) {
+    for (final String key : defaultParameters.keySet()) {
+      if (customParameters.containsKey(key) && !Objects.equals(customParameters.get(key), defaultParameters.get(key))) {
+        throw new RuntimeException("Cannot overwrite default JDBC parameter " + key);
+      }
     }
   }
 

airbyte-integrations/connectors/destination-mysql/src/test/java/io/airbyte/integrations/destination/mysql/MySQLDestinationTest.java

@@ -1,12 +1,15 @@
 package io.airbyte.integrations.destination.mysql;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.spy;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.collect.ImmutableMap;
 import io.airbyte.commons.json.Jsons;
+import io.airbyte.commons.map.MoreMaps;
+import java.util.Map;
 import java.util.Map.Entry;
 import org.junit.jupiter.api.Test;
 
@@ -87,17 +90,19 @@ void testExtraParams() {
 
   @Test
   void testExtraParamsWithDefaultParameter() {
-    for (final Entry<String, String> entry : MySQLDestination.SSL_JDBC_PARAMETERS.entrySet()) {
-      final String extraParam = MySQLDestination.formatParameter(entry.getKey(), entry.getValue());
-      assertThrows(RuntimeException.class, () ->
-          getDestination().toJdbcConfig(buildConfigWithExtraJdbcParameters(extraParam))
+    final Map<String, String> allDefaultParameters = MoreMaps.merge(MySQLDestination.SSL_JDBC_PARAMETERS,
+        MySQLDestination.DEFAULT_JDBC_PARAMETERS);
+    for (final Entry<String, String> entry : allDefaultParameters.entrySet()) {
+      final String identicalParameter = MySQLDestination.formatParameter(entry.getKey(), entry.getValue());
+      final String overridingParameter = MySQLDestination.formatParameter(entry.getKey(), "DIFFERENT_VALUE");
+
+      // Do not throw an exception if the values are equal
+      assertDoesNotThrow(() ->
+          getDestination().toJdbcConfig(buildConfigWithExtraJdbcParameters(identicalParameter)).get("jdbc_url").asText()
       );
-    }
-
-    for (final Entry<String, String> entry : MySQLDestination.DEFAULT_JDBC_PARAMETERS.entrySet()) {
-      final String extraParam = MySQLDestination.formatParameter(entry.getKey(), entry.getValue());
+      // Throw an exception if the values are different
       assertThrows(RuntimeException.class, () ->
-          getDestination().toJdbcConfig(buildConfigWithExtraJdbcParameters(extraParam))
+          getDestination().toJdbcConfig(buildConfigWithExtraJdbcParameters(overridingParameter))
       );
     }
   }