refactor: use non optional property writers

Author: maltesander

Cargo.nix

@@ -215,9 +215,7 @@ impl HdfsSiteConfigBuilder {
     }
 
     pub fn build_as_xml(&self) -> String {
-        let transformed_config = to_optional_values(&self.config);
-
-        to_hadoop_xml(transformed_config.iter())
+        to_hadoop_xml(self.config.iter())
     }
 }
 
@@ -262,8 +260,7 @@ impl CoreSiteConfigBuilder {
     }
 
     pub fn build_as_xml(&self) -> String {
-        let transformed_config = to_optional_values(&self.config);
-        to_hadoop_xml(transformed_config.iter())
+        to_hadoop_xml(self.config.iter())
     }
 
     pub fn enable_prometheus_endpoint(&mut self) -> &mut Self {
@@ -272,10 +269,3 @@ impl CoreSiteConfigBuilder {
         self
     }
 }
-
-fn to_optional_values(config: &BTreeMap<String, String>) -> BTreeMap<String, Option<String>> {
-    config
-        .iter()
-        .map(|(k, v)| (k.clone(), Some(v.clone())))
-        .collect::<BTreeMap<String, Option<String>>>()
-}

rust/operator-binary/src/config/mod.rs

@@ -13,9 +13,7 @@ use crate::controller::build::properties::resolved_overrides;
 
 /// Renders `hadoop-policy.xml` from the user-provided overrides only.
 pub fn build(overrides: KeyValueConfigOverrides) -> String {
-    let config: BTreeMap<String, Option<String>> = resolved_overrides(overrides)
-        .map(|(key, value)| (key, Some(value)))
-        .collect();
+    let config: BTreeMap<String, String> = resolved_overrides(overrides).collect();
     to_hadoop_xml(config.iter())
 }
 

rust/operator-binary/src/controller/build/properties/hadoop_policy.rs

@@ -17,18 +17,15 @@ pub fn build(overrides: KeyValueConfigOverrides) -> Result<String, PropertiesWri
     // Recommended JVM DNS cache TTLs. Caching forever (the JVM default for
     // successful lookups) breaks failover when a NameNode's IP changes, so cap
     // both positive and negative caches.
-    let mut config: BTreeMap<String, Option<String>> = BTreeMap::from([
-        (
-            "networkaddress.cache.ttl".to_string(),
-            Some("30".to_string()),
-        ),
+    let mut config: BTreeMap<String, String> = BTreeMap::from([
+        ("networkaddress.cache.ttl".to_string(), "30".to_string()),
         (
             "networkaddress.cache.negative.ttl".to_string(),
-            Some("0".to_string()),
+            "0".to_string(),
         ),
     ]);
     // Overrides applied last so users win.
-    config.extend(resolved_overrides(overrides).map(|(key, value)| (key, Some(value))));
+    config.extend(resolved_overrides(overrides));
     to_java_properties_string(config.iter())
 }
 

rust/operator-binary/src/controller/build/properties/security_properties.rs

@@ -16,25 +16,25 @@ use crate::{
 
 /// Renders `ssl-client.xml` for the given HTTPS state and user overrides.
 pub fn build(https_enabled: bool, overrides: KeyValueConfigOverrides) -> String {
-    let mut config: BTreeMap<String, Option<String>> = BTreeMap::new();
+    let mut config: BTreeMap<String, String> = BTreeMap::new();
     if https_enabled {
         config.extend([
             (
                 "ssl.client.truststore.location".to_string(),
-                Some(format!("{TLS_STORE_DIR}/truststore.p12")),
+                format!("{TLS_STORE_DIR}/truststore.p12"),
             ),
             (
                 "ssl.client.truststore.type".to_string(),
-                Some("pkcs12".to_string()),
+                "pkcs12".to_string(),
             ),
             (
                 "ssl.client.truststore.password".to_string(),
-                Some(TLS_STORE_PASSWORD.to_string()),
+                TLS_STORE_PASSWORD.to_string(),
             ),
         ]);
     }
     // Overrides applied last so users win.
-    config.extend(resolved_overrides(overrides).map(|(key, value)| (key, Some(value))));
+    config.extend(resolved_overrides(overrides));
     to_hadoop_xml(config.iter())
 }