Moving to cluster operator to ModelUtils

Author: Steffen Karlsson

api/src/main/java/io/strimzi/api/kafka/model/common/ClientTls.java

@@ -58,11 +58,4 @@ public void setAdditionalProperty(String name, Object value) {
         }
         this.additionalProperties.put(name, value);
     }
-
-    public String toVarString() {
-        Objects.requireNonNull(this.trustedCertificates, "trustedCertificates cannot be null");
-        return this.trustedCertificates.stream()
-                .map(certSecretSource -> certSecretSource.getSecretName() + "/" + certSecretSource.getCertificate())
-                .collect(Collectors.joining(";"));
-    }
 }

cluster-operator/src/main/java/io/strimzi/operator/cluster/model/KafkaBridgeCluster.java

@@ -423,8 +423,10 @@ private void addTlsEnvVars(List<EnvVar> varList) {
         if (tls != null) {
             varList.add(ContainerUtils.createEnvVar(ENV_VAR_KAFKA_BRIDGE_TLS, "true"));
             List<CertSecretSource> trustedCertificates = tls.getTrustedCertificates();
+
             if (trustedCertificates != null && !trustedCertificates.isEmpty()) {
-                varList.add(ContainerUtils.createEnvVar(ENV_VAR_KAFKA_BRIDGE_TRUSTED_CERTS, tls.toVarString()));
+                varList.add(ContainerUtils.createEnvVar(ENV_VAR_KAFKA_BRIDGE_TRUSTED_CERTS,
+                        ModelUtils.tlsToString(trustedCertificates)));
             }
         }
     }

cluster-operator/src/main/java/io/strimzi/operator/cluster/model/KafkaConnectCluster.java

@@ -635,7 +635,8 @@ private void populateTLSEnvVars(final List<EnvVar> varList) {
 
         List<CertSecretSource> trustedCertificates = tls.getTrustedCertificates();
         if (trustedCertificates != null && !trustedCertificates.isEmpty()) {
-            varList.add(ContainerUtils.createEnvVar(ENV_VAR_KAFKA_CONNECT_TRUSTED_CERTS, tls.toVarString()));
+            varList.add(ContainerUtils.createEnvVar(ENV_VAR_KAFKA_CONNECT_TRUSTED_CERTS,
+                    ModelUtils.tlsToString(trustedCertificates)));
         }
     }
 

cluster-operator/src/main/java/io/strimzi/operator/cluster/model/ModelUtils.java

@@ -20,6 +20,7 @@
 import io.fabric8.kubernetes.api.model.ResourceRequirements;
 import io.fabric8.kubernetes.api.model.Secret;
 import io.fabric8.kubernetes.api.model.SecretBuilder;
+import io.strimzi.api.kafka.model.common.CertSecretSource;
 import io.strimzi.api.kafka.model.common.CertificateAuthority;
 import io.strimzi.api.kafka.model.kafka.Storage;
 import io.strimzi.api.kafka.model.kafka.entityoperator.TlsSidecar;
@@ -35,7 +36,9 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * ModelUtils is a utility class that holds generic static helper functions
@@ -97,6 +100,13 @@ static EnvVar tlsSidecarLogEnvVar(TlsSidecar tlsSidecar) {
                         tlsSidecar.getLogLevel() : TlsSidecarLogLevel.NOTICE).toValue());
     }
 
+    static String tlsToString(List<CertSecretSource> trustedCertificates) {
+        Objects.requireNonNull(trustedCertificates, "trustedCertificates cannot be null");
+        return trustedCertificates.stream()
+                .map(certSecretSource -> certSecretSource.getSecretName() + "/" + certSecretSource.getCertificate())
+                .collect(Collectors.joining(";"));
+    }
+
     /**
      * Creates Secret
      *