From 28d02b5534d7e1522beb4707b82a1688437fa4c6 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 12 Apr 2024 17:50:05 +0200
Subject: [PATCH] OZG-4870 remove extra null checks in kc smtp config
---
.../keycloak/realm/KeycloakRealmMapper.java | 24 +++++++------------
1 file changed, 8 insertions(+), 16 deletions(-)
diff --git a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapper.java b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapper.java
index 8f6d571..ca2988c 100644
--- a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapper.java
+++ b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapper.java
@@ -57,22 +57,14 @@ interface KeycloakRealmMapper {
Map<String, String> smtpServer = new HashMap<>();
if (server != null) {
- if (server.getHost() != null)
- smtpServer.put("host", server.getHost());
- if (server.getPort() != null)
- smtpServer.put("port", server.getPort());
- if (server.getUser() != null)
- smtpServer.put("user", server.getUser());
- if (server.getPassword() != null)
- smtpServer.put("password", server.getPassword());
- if (server.getStarttls() != null)
- smtpServer.put("starttls", server.getStarttls());
- if (server.getAuth() != null)
- smtpServer.put("auth", server.getAuth());
- if (server.getFrom() != null)
- smtpServer.put("from", server.getFrom());
- if (server.getFromDisplayName() != null)
- smtpServer.put("fromDisplayName", server.getFromDisplayName());
+ smtpServer.put("host", server.getHost());
+ smtpServer.put("port", server.getPort());
+ smtpServer.put("user", server.getUser());
+ smtpServer.put("password", server.getPassword());
+ smtpServer.put("starttls", server.getStarttls());
+ smtpServer.put("auth", server.getAuth());
+ smtpServer.put("from", server.getFrom());
+ smtpServer.put("fromDisplayName", server.getFromDisplayName());
}
return smtpServer;
--
GitLab