Skip to content
Snippets Groups Projects
Commit 54da6a62 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-4870 use eclipse formatter to format

parent b09e3ec0
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 62 additions and 60 deletions
ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapper.java
+ 17
− 17
View file @ 54da6a62
......@@ -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;
}
}
ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmSpec.java
+ 16
− 19
View file @ 54da6a62
......@@ -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;
}
}
ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapperTest.java
+ 14
− 8
View file @ 54da6a62
......@@ -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);
}
}
ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmSmtpServerTestFactory.java
+ 14
− 14
View file @ 54da6a62
......@@ -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;
}
}
ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmSpecTestFactory.java
+ 1
− 2
View file @ 54da6a62
......@@ -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();
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz - Barrierefreiheit