diff --git a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/KeycloakGenericRemoteService.java b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/KeycloakGenericRemoteService.java index 0e003fe54a7c8be9b6f0f61bc1dd367b1c190f4c..df8030d4f4fd49c32c89d33f8609014ef41302cc 100644 --- a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/KeycloakGenericRemoteService.java +++ b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/KeycloakGenericRemoteService.java @@ -40,7 +40,6 @@ public class KeycloakGenericRemoteService { } else { return Optional.empty(); } - } public Optional<RoleRepresentation> getClientRole(String roleName, String realClientId, String realm) { 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 eca8fbe736f702eb1a8c5952c3d6c3d88f84f7d4..6eb9892724db1493d2b88b222e673647bbbd83e9 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 @@ -69,12 +69,10 @@ class KeycloakRealmService { } void createRealm(OzgCloudKeycloakRealmSpec realm, String realmName) { + LOG.debug("{}: Creating new realm...", realmName); Optional.of(realm) .map(mapper::map) .map(realmRepresentation -> addRealmName(realmRepresentation, realmName)) - // TODO dieser Filter kann vermutlich gelöscht werden, die Prüfung auf - // realmExists passiert bereits vorher - .filter(realmRepresentation -> !keycloakGenericRemoteService.realmExists(realmName)) .ifPresent(realmRepresentation -> { remoteService.createRealm(realmRepresentation); addUserProfileAttributes(realmRepresentation); 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 49184fb5a7f6d74ba0100e9cbf6dbed74e56af87..f968f4ac8bbd5e322a8c7cd319de2476e7945b80 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 @@ -189,36 +189,15 @@ class KeycloakRealmServiceTest { verify(mapper).map(REALM); } - @Test - void shouldCallRealmExists() { - service.createRealm(REALM, REALM_NAME); - - verify(keycloakGenericRemoteService).realmExists(REALM_NAME); - } - @Test void shouldCallCreateRealmIfNotExists() { - when(keycloakGenericRemoteService.realmExists(REALM_NAME)).thenReturn(false); - service.createRealm(REALM, REALM_NAME); verify(remoteService).createRealm(realmRepresentation); } - @Test - void shouldNOTCallCreateRealmIfAlreadyExists() { - reset(remoteService); - when(keycloakGenericRemoteService.realmExists(REALM_NAME)).thenReturn(true); - - service.createRealm(REALM, REALM_NAME); - - verify(remoteService, never()).createRealm(any()); - } - @Test void shouldCallAddRealmName() { - when(keycloakGenericRemoteService.realmExists(REALM_NAME)).thenReturn(false); - service.createRealm(REALM, REALM_NAME); verify(service).addRealmName(realmRepresentation, REALM_NAME);