diff --git a/topic-operator/src/main/java/io/strimzi/operator/topic/TopicOperatorConfig.java b/topic-operator/src/main/java/io/strimzi/operator/topic/TopicOperatorConfig.java index e83dc07534..ea67e72ffe 100644 --- a/topic-operator/src/main/java/io/strimzi/operator/topic/TopicOperatorConfig.java +++ b/topic-operator/src/main/java/io/strimzi/operator/topic/TopicOperatorConfig.java @@ -372,17 +372,19 @@ private void setStandardSaslConfigs(Map kafkaClientProps) { * @return Cruise Control client configuration. */ public CruiseControlClient.Config cruiseControlClientConfig() { + var sslCertificate = cruiseControlSslEnabled ? getFileContent(cruiseControlCrtFilePath) : null; + var apiUsername = cruiseControlAuthEnabled() ? new String(getFileContent(cruiseControlApiUserPath), StandardCharsets.UTF_8) : null; + var apiPassword = cruiseControlAuthEnabled() ? new String(getFileContent(cruiseControlApiPassPath), StandardCharsets.UTF_8) : null; + return new CruiseControlClient.Config( cruiseControlHostname, cruiseControlPort, cruiseControlRackEnabled, cruiseControlSslEnabled, - cruiseControlSslEnabled ? getFileContent(cruiseControlCrtFilePath) : null, - cruiseControlAuthEnabled(), - cruiseControlAuthEnabled() - ? new String(getFileContent(cruiseControlApiUserPath), StandardCharsets.UTF_8) : null, - cruiseControlAuthEnabled() - ? new String(getFileContent(cruiseControlApiPassPath), StandardCharsets.UTF_8) : null + sslCertificate, + cruiseControlAuthEnabled, + apiUsername, + apiPassword ); }