refactor: Let connection_parameters_as_url_query_parameters return Option<String>

Author: sbernauer

crates/stackable-operator/src/databases/databases/mysql.rs

@@ -68,7 +68,8 @@ impl JdbcDatabaseConnection for MysqlConnection {
 
         let connection_uri = format!(
             "jdbc:mysql://{host}:{port}/{database}{parameters}",
-            parameters = connection_parameters_as_url_query_parameters(parameters)
+            parameters =
+                connection_parameters_as_url_query_parameters(parameters).unwrap_or_default()
         );
         let connection_uri = connection_uri.parse().context(ParseConnectionUrlSnafu)?;
 

crates/stackable-operator/src/databases/databases/postgresql.rs

@@ -72,7 +72,8 @@ impl JdbcDatabaseConnection for PostgresqlConnection {
 
         let connection_uri = format!(
             "jdbc:postgresql://{host}:{port}/{database}{parameters}",
-            parameters = connection_parameters_as_url_query_parameters(parameters)
+            parameters =
+                connection_parameters_as_url_query_parameters(parameters).unwrap_or_default()
         );
         let connection_uri = connection_uri.parse().context(ParseConnectionUrlSnafu)?;
 
@@ -102,7 +103,8 @@ impl SqlAlchemyDatabaseConnection for PostgresqlConnection {
             username_and_password_envs(unique_database_name, credentials_secret);
         let username_env_name = &username_env.name;
         let password_env_name = &password_env.name;
-        let parameters = connection_parameters_as_url_query_parameters(parameters);
+        let parameters =
+            connection_parameters_as_url_query_parameters(parameters).unwrap_or_default();
 
         let uri_template = match templating_mechanism {
             TemplatingMechanism::ConfigUtils => format!(
@@ -138,7 +140,8 @@ impl CeleryDatabaseConnection for PostgresqlConnection {
             username_and_password_envs(unique_database_name, credentials_secret);
         let username_env_name = &username_env.name;
         let password_env_name = &password_env.name;
-        let parameters = connection_parameters_as_url_query_parameters(parameters);
+        let parameters =
+            connection_parameters_as_url_query_parameters(parameters).unwrap_or_default();
 
         let uri_template = match templating_mechanism {
             TemplatingMechanism::ConfigUtils => format!(

crates/stackable-operator/src/databases/helpers.rs

@@ -32,19 +32,19 @@ pub fn username_and_password_env_names(unique_database_name: &str) -> (String, S
 
 /// Returns
 ///
-/// * If no params are defined: ""
-/// * If params are defined: "?key=value&foo=bar"
+/// * [`None`] if no connection parameters are defined.
+/// * `?key1=value1&key2=value2` if connection parameters are defined.
 pub fn connection_parameters_as_url_query_parameters(
     parameters: &BTreeMap<String, String>,
-) -> String {
+) -> Option<String> {
     if parameters.is_empty() {
-        String::new()
-    } else {
-        let parameters = parameters
-            .iter()
-            .map(|(k, v)| format!("{k}={v}"))
-            .collect::<Vec<_>>()
-            .join("&");
-        format!("?{parameters}")
+        return None;
     }
+
+    let parameters = parameters
+        .iter()
+        .map(|(k, v)| format!("{k}={v}"))
+        .collect::<Vec<_>>()
+        .join("&");
+    Some(format!("?{parameters}"))
 }