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 f4cc88502415e2c6b7a4289e0ea06186bbce7bfe..8f6d5714d9c4211f2a01efc0631efafda6cdd661 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
@@ -51,31 +51,31 @@ interface KeycloakRealmMapper {
default Set<String> mapPassword(OzgCloudKeycloakRealmSpec spec) {
return Set.of("de");
}
-
+
@Named("smtpServer")
- default Map<String, String> mapSmtpServer(OzgCloudKeycloakRealmSpec.KeycloakRealmSMTPServer server) {
-
+ default Map<String, String> mapSmtpServer(OzgCloudKeycloakRealmSpec.KeycloakRealmSMTPServer server) {
+
Map<String, String> smtpServer = new HashMap<>();
- if( server != null ) {
- if( server.getHost() != null )
+ if (server != null) {
+ if (server.getHost() != null)
smtpServer.put("host", server.getHost());
- if( server.getPort() != null )
+ if (server.getPort() != null)
smtpServer.put("port", server.getPort());
- if( server.getUser() != null )
+ if (server.getUser() != null)
smtpServer.put("user", server.getUser());
- if( server.getPassword() != null )
+ 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.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;
-
+
}
}
diff --git a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmSpec.java b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmSpec.java
index d8363f4adcf1bcebb889c3e328c3dbcf3f7d435a..4703f154ee68169988fceac1324a9374bfc5c539 100644
--- a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmSpec.java
+++ b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmSpec.java
@@ -44,32 +44,29 @@ class OzgCloudKeycloakRealmSpec {
private boolean keepAfterDelete;
private String displayName;
-
- private KeycloakRealmSMTPServer smtpServer;
+ private KeycloakRealmSMTPServer smtpServer;
-@Getter
-@Setter
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-static class KeycloakRealmSMTPServer {
+ @Getter
+ @Setter
+ @Builder
+ @NoArgsConstructor
+ @AllArgsConstructor
+ static class KeycloakRealmSMTPServer {
-
+ private String user;
+ private String password;
- private String user;
- private String host;
- private String password;
+ private String host;
+ private String port;
- private String port;
+ private String starttls;
- private String starttls;
+ private String auth;
- private String auth;
+ private String from;
- private String from;
-
- private String fromDisplayName;
-}
+ private String fromDisplayName;
+ }
}
diff --git a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapperTest.java b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapperTest.java
index 17313516ed9bb4273af431ae52d4f5b5ee72dec9..c144180b39f29ea11797e9d37d0e8ed10c82ec5a 100644
--- a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapperTest.java
+++ b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapperTest.java
@@ -102,15 +102,21 @@ class KeycloakRealmMapperTest {
void shouldContainSmtpServerKeysValues() {
var mapped = mapper.map(OzgCloudKeycloakRealmSpecTestFactory.create());
var mappedSmtpServer = mapped.getSmtpServer();
- assertThat(mappedSmtpServer.get("host")).isEqualTo(KeycloakRealmSmtpServerTestFactory.SMTP_SERVER_HOST);
- assertThat(mappedSmtpServer.get("port")).isEqualTo(KeycloakRealmSmtpServerTestFactory.SMTP_SERVER_PORT);
+ assertThat(mappedSmtpServer.get("host"))
+ .isEqualTo(KeycloakRealmSmtpServerTestFactory.SMTP_SERVER_HOST);
+ assertThat(mappedSmtpServer.get("port"))
+ .isEqualTo(KeycloakRealmSmtpServerTestFactory.SMTP_SERVER_PORT);
assertThat(mappedSmtpServer.get("password")).isEqualTo(KeycloakRealmSmtpServerTestFactory.SMTP_SERVER_PASSWORD);
- assertThat(mappedSmtpServer.get("user")).isEqualTo(KeycloakRealmSmtpServerTestFactory.SMTP_SERVER_USER);
+ assertThat(mappedSmtpServer.get("user"))
+ .isEqualTo(KeycloakRealmSmtpServerTestFactory.SMTP_SERVER_USER);
assertThat(mappedSmtpServer.get("starttls")).isEqualTo(KeycloakRealmSmtpServerTestFactory.SMTP_SERVER_STARTTLS);
- assertThat(mappedSmtpServer.get("auth")).isEqualTo(KeycloakRealmSmtpServerTestFactory.SMTP_SERVER_AUTH);
- assertThat(mappedSmtpServer.get("from")).isEqualTo(KeycloakRealmSmtpServerTestFactory.SMTP_SERVER_FROM);
- assertThat(mappedSmtpServer.get("fromDisplayName")).isEqualTo(KeycloakRealmSmtpServerTestFactory.SMTP_SERVER_FROM_DISPLAY_NAME);
-
- }
+ assertThat(mappedSmtpServer.get("auth"))
+ .isEqualTo(KeycloakRealmSmtpServerTestFactory.SMTP_SERVER_AUTH);
+ assertThat(mappedSmtpServer.get("from"))
+ .isEqualTo(KeycloakRealmSmtpServerTestFactory.SMTP_SERVER_FROM);
+ assertThat(mappedSmtpServer.get("fromDisplayName"))
+ .isEqualTo(KeycloakRealmSmtpServerTestFactory.SMTP_SERVER_FROM_DISPLAY_NAME);
+
+ }
}
diff --git a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmSmtpServerTestFactory.java b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmSmtpServerTestFactory.java
index eecf3c8aad60ab83437ebe4c0fb0c6f7ff14ad44..06e737290f2f99bd1279ea1ccb3d4b9a3f215a37 100644
--- a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmSmtpServerTestFactory.java
+++ b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmSmtpServerTestFactory.java
@@ -4,20 +4,20 @@ import de.ozgcloud.operator.keycloak.realm.OzgCloudKeycloakRealmSpec.KeycloakRea
public class KeycloakRealmSmtpServerTestFactory {
-
- public final static String SMTP_SERVER_PORT = "432";
- public final static String SMTP_SERVER_HOST = "host";
- public final static String SMTP_SERVER_FROM = "test@test.de";
- public final static String SMTP_SERVER_FROM_DISPLAY_NAME = "displayed name";
- public final static String SMTP_SERVER_USER = "user";
- public final static String SMTP_SERVER_PASSWORD = "psw";
- public final static String SMTP_SERVER_AUTH = "true";
- public final static String SMTP_SERVER_STARTTLS = "true";
- public final static KeycloakRealmSMTPServer SMTP_SERVER = KeycloakRealmSMTPServer.builder().host(SMTP_SERVER_HOST).user(SMTP_SERVER_USER).
- password(SMTP_SERVER_PASSWORD).port(SMTP_SERVER_PORT).starttls(SMTP_SERVER_STARTTLS).auth(SMTP_SERVER_AUTH).from(SMTP_SERVER_FROM).fromDisplayName(SMTP_SERVER_FROM_DISPLAY_NAME).build();
-
- public static OzgCloudKeycloakRealmSpec.KeycloakRealmSMTPServer create() {
+ public final static String SMTP_SERVER_PORT = "432";
+ public final static String SMTP_SERVER_HOST = "host";
+ public final static String SMTP_SERVER_FROM = "test@test.de";
+ public final static String SMTP_SERVER_FROM_DISPLAY_NAME = "displayed name";
+ public final static String SMTP_SERVER_USER = "user";
+ public final static String SMTP_SERVER_PASSWORD = "psw";
+ public final static String SMTP_SERVER_AUTH = "true";
+ public final static String SMTP_SERVER_STARTTLS = "true";
+ public final static KeycloakRealmSMTPServer SMTP_SERVER = KeycloakRealmSMTPServer.builder().host(SMTP_SERVER_HOST).user(SMTP_SERVER_USER)
+ .password(SMTP_SERVER_PASSWORD).port(SMTP_SERVER_PORT).starttls(SMTP_SERVER_STARTTLS).auth(SMTP_SERVER_AUTH).from(SMTP_SERVER_FROM)
+ .fromDisplayName(SMTP_SERVER_FROM_DISPLAY_NAME).build();
+
+ public static OzgCloudKeycloakRealmSpec.KeycloakRealmSMTPServer create() {
return SMTP_SERVER;
}
-
+
}
diff --git a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmSpecTestFactory.java b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmSpecTestFactory.java
index 86fbe5456fa61d53e1de4215a7668875c110d286..2b03fdab23db589c84807b0a07cd2c971b5cd369 100644
--- a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmSpecTestFactory.java
+++ b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmSpecTestFactory.java
@@ -23,12 +23,11 @@
*/
package de.ozgcloud.operator.keycloak.realm;
-
public class OzgCloudKeycloakRealmSpecTestFactory {
public final static String DISPLAY_NAME = "TestDisplayName";
public final static boolean KEEP_AFTER_DELETE = false;
-
+
public static OzgCloudKeycloakRealmSpec create() {
return createBuilder().build();
}