From fff26cd87b224c22cc84d5d8817d70033b225dee Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 11 Apr 2024 17:08:21 +0200
Subject: [PATCH] OZG-4870 check if smtpServer is null
---
.../keycloak/realm/KeycloakRealmMapper.java | 36 ++++++++++---------
1 file changed, 20 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 8021fb1..f4cc885 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
@@ -54,24 +54,28 @@ interface KeycloakRealmMapper {
@Named("smtpServer")
default Map<String, String> mapSmtpServer(OzgCloudKeycloakRealmSpec.KeycloakRealmSMTPServer server) {
+
Map<String, String> smtpServer = new HashMap<>();
- 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());
+ 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());
+ }
return smtpServer;
+
}
}
--
GitLab