From 2694245ec672c955bd64cd39547c434dfea048ea Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 26 Jun 2024 14:31:19 +0200
Subject: [PATCH] OZG-5400 format code correctly
---
.../operator/keycloak/realm/KeycloakRealmMapper.java | 8 +-------
.../operator/keycloak/realm/KeycloakRealmService.java | 2 +-
.../keycloak/realm/OzgCloudKeycloakRealmSpec.java | 4 ++--
.../operator/keycloak/realm/KeycloakRealmMapperTest.java | 6 +++---
.../operator/keycloak/realm/KeycloakRealmServiceTest.java | 4 ----
5 files changed, 7 insertions(+), 17 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 18f9b5e..1c93aa3 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
@@ -42,12 +42,11 @@ interface KeycloakRealmMapper {
public static final String ACTION_TOKEN_GENERATED_BY_USER_LIFE_SPAN = "900";
public static final String PASSWORD_POLICY = "upperCase(1) and lowerCase(1) and length(8) and notUsername";
- public static final String DEFAULT_LOCALE = "de";
+ public static final String DEFAULT_LOCALE = "de";
public static final String RESET_PASSWORD_ALLOWED = "true";
public static final String ENABLED = "true";
public static final String INTERNATIONALIZATION_ENABLED = "true";
-
@Mapping(target = "enabled", constant = ENABLED)
@Mapping(target = "resetPasswordAllowed", constant = RESET_PASSWORD_ALLOWED)
@Mapping(target = "supportedLocales", source = ".", qualifiedByName = "supportedLocales")
@@ -59,7 +58,6 @@ interface KeycloakRealmMapper {
@Mapping(target = "roles.realm", source = "realmRoles")
public RealmRepresentation map(OzgCloudKeycloakRealmSpec realm);
-
@Mapping(target = "enabled", constant = ENABLED)
@Mapping(target = "resetPasswordAllowed", constant = RESET_PASSWORD_ALLOWED)
@Mapping(target = "supportedLocales", source = ".", qualifiedByName = "supportedLocales")
@@ -97,8 +95,4 @@ interface KeycloakRealmMapper {
}
-
-
-
-
}
diff --git a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmService.java b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmService.java
index 045ea76..c92e75c 100644
--- a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmService.java
+++ b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmService.java
@@ -67,7 +67,7 @@ class KeycloakRealmService {
LOG.warn(existingRealm + ": Updating existing realm failed: ", e);
throw e;
}
- addOrUpdateRealmRoles(spec,existingRealm.getRealm());
+ addOrUpdateRealmRoles(spec, existingRealm.getRealm());
}
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 3705bff..d133281 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
@@ -63,9 +63,9 @@ class OzgCloudKeycloakRealmSpec {
public static final String HOST_FIELD = "host";
- public static final String PORT_FIELD= "port";
+ public static final String PORT_FIELD = "port";
- public static final String STARTTLS_FIELD = "starttls";
+ public static final String STARTTLS_FIELD = "starttls";
public static final String AUTH_FIELD = "auth";
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 d3e01f2..bd951e0 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
@@ -38,9 +38,8 @@ class KeycloakRealmMapperTest {
@Spy
private final KeycloakRealmMapper mapper = Mappers.getMapper(KeycloakRealmMapper.class);
-
private RealmRepresentation mapRealm() {
- return mapper.map(OzgCloudKeycloakRealmSpecTestFactory.create());
+ return mapper.map(OzgCloudKeycloakRealmSpecTestFactory.create());
}
@@ -228,7 +227,8 @@ class KeycloakRealmMapperTest {
@Test
void shouldMapWhenSmtpServerIsNull() {
- var mapped = mapper.update(RealmRepresentationTestFactory.create(), OzgCloudKeycloakRealmSpecTestFactory.createBuilder().smtpServer(null).build());
+ var mapped = mapper.update(RealmRepresentationTestFactory.create(),
+ OzgCloudKeycloakRealmSpecTestFactory.createBuilder().smtpServer(null).build());
assertThat(mapped.getSmtpServer()).isEmpty();
}
diff --git a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmServiceTest.java b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmServiceTest.java
index 1f72d63..5d2da03 100644
--- a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmServiceTest.java
+++ b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmServiceTest.java
@@ -47,7 +47,6 @@ class KeycloakRealmServiceTest {
private static final String ROLE_NAME = OzgCloudKeycloakRealmSpecTestFactory.ROLE_NAME_1;
private static final RealmRole ROLE = OzgCloudKeycloakRealmSpecTestFactory.ROLE1;
-
@Spy
@InjectMocks
private KeycloakRealmService service;
@@ -129,8 +128,6 @@ class KeycloakRealmServiceTest {
}
-
-
@DisplayName("Add or Update Realm Roles")
@Nested
class TestAddOrUpdateRealmRoles {
@@ -159,7 +156,6 @@ class KeycloakRealmServiceTest {
var roleRepresentation = RealmRoleRepresentationTestFactory.create();
when(mapper.map(ROLE)).thenReturn(roleRepresentation);
when(remoteService.getRealmRole(ROLE_NAME, REALM_NAME)).thenReturn(Optional.of(roleRepresentation));
-
service.addOrUpdateRealmRoles(REALM, REALM_NAME);
--
GitLab