Change config loading order to give URLs precedence (#103)

linkedin · Feb 11, 2025 · 9d5dbd6 · 9d5dbd6
1 parent a15f08f
commit 9d5dbd6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/hoptimator-jdbc/src/main/java/com/linkedin/hoptimator/jdbc/HoptimatorDriver.java b/hoptimator-jdbc/src/main/java/com/linkedin/hoptimator/jdbc/HoptimatorDriver.java
@@ -77,7 +77,8 @@ public Connection connect(String url, Properties props) throws SQLException {
 
       WrappedSchemaPlus wrappedRootSchema = new WrappedSchemaPlus(rootSchema);
 
-      // Load properties from url and from getConnection()
+      // Load properties from the URL and from getConnection()'s properties.
+      // URL properties take precedence.
       Properties properties = new Properties();
       properties.putAll(props); // via getConnection()
       properties.putAll(ConnectStringParser.parse(url.substring(getConnectStringPrefix().length())));

diff --git a/hoptimator-kafka/src/main/java/com/linkedin/hoptimator/kafka/KafkaDriver.java b/hoptimator-kafka/src/main/java/com/linkedin/hoptimator/kafka/KafkaDriver.java
@@ -35,8 +35,8 @@ public Connection connect(String url, Properties props) throws SQLException {
       return null;
     }
     Properties properties = new Properties();
-    properties.putAll(ConnectStringParser.parse(url.substring(getConnectStringPrefix().length())));
     properties.putAll(props); // in case the driver is loaded via getConnection()
+    properties.putAll(ConnectStringParser.parse(url.substring(getConnectStringPrefix().length())));
     try {
       Connection connection = super.connect(url, props);
       if (connection == null) {

diff --git a/hoptimator-venice/src/main/java/com/linkedin/hoptimator/venice/VeniceDriver.java b/hoptimator-venice/src/main/java/com/linkedin/hoptimator/venice/VeniceDriver.java
@@ -39,8 +39,8 @@ public Connection connect(String url, Properties props) throws SQLException {
     }
     // Connection string properties are given precedence over config properties
     Properties properties = new Properties();
-    properties.putAll(ConnectStringParser.parse(url.substring(getConnectStringPrefix().length())));
     properties.putAll(props); // in case the driver is loaded via getConnection()
+    properties.putAll(ConnectStringParser.parse(url.substring(getConnectStringPrefix().length())));
     String cluster = properties.getProperty("cluster");
     if (cluster == null) {
       throw new IllegalArgumentException("Missing required cluster property. Need: jdbc:venice://cluster=...");