diff --git a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconciler.java b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconciler.java index 81de63995e71d8a25b4daf159964b07bcde0a8f2..707a4b5a02daeb6fddc8d59e77a92862fc69cd73 100644 --- a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconciler.java +++ b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconciler.java @@ -26,7 +26,6 @@ package de.ozgcloud.operator.keycloak.realm; import org.springframework.stereotype.Component; import de.ozgcloud.operator.Config; -import de.ozgcloud.operator.keycloak.KeycloakGenericRemoteService; import de.ozgcloud.operator.keycloak.OzgCloudCustomResourceStatus; import io.javaoperatorsdk.operator.api.reconciler.Cleaner; import io.javaoperatorsdk.operator.api.reconciler.Context; @@ -44,7 +43,6 @@ import lombok.extern.log4j.Log4j2; public class KeycloakRealmReconciler implements Reconciler<OzgCloudKeycloakRealm>, Cleaner<OzgCloudKeycloakRealm> { private final KeycloakRealmService service; - private final KeycloakGenericRemoteService keycloakGenericRemoteService; @Override public UpdateControl<OzgCloudKeycloakRealm> reconcile(OzgCloudKeycloakRealm resource, Context<OzgCloudKeycloakRealm> context) { @@ -71,7 +69,7 @@ public class KeycloakRealmReconciler implements Reconciler<OzgCloudKeycloakRealm LOG.info("keep data"); return DeleteControl.defaultDelete(); } - if (!keycloakGenericRemoteService.realmExists(realm.getMetadata().getName())) { + if (!service.realmExists(realm.getMetadata().getName())) { return DeleteControl.defaultDelete(); } return deleteRealm(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 c92e75c364d25a34b9b99c6d678d7bec02d3426a..1ebad4e77971f32a056acae546f20bba726c4fd6 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 @@ -87,4 +87,8 @@ class KeycloakRealmService { public void deleteRealm(String realmName) { remoteService.deleteRealm(realmName); } + + public boolean realmExists(String realmName) { + return keycloakGenericRemoteService.realmExists(realmName); + } } diff --git a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconcilerTest.java b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconcilerTest.java index d9b65d2a8a901013c20eabcbffa895cb066f767a..c49bcf1435745cc0b64e6449ad98746e08e2e3f1 100644 --- a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconcilerTest.java +++ b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconcilerTest.java @@ -35,7 +35,6 @@ import org.mockito.Mock; import org.mockito.Spy; import de.ozgcloud.operator.Config; -import de.ozgcloud.operator.keycloak.KeycloakGenericRemoteService; import de.ozgcloud.operator.keycloak.OzgCloudCustomResourceStatus; import io.javaoperatorsdk.operator.api.reconciler.DeleteControl; @@ -48,9 +47,6 @@ class KeycloakRealmReconcilerTest { @Mock private KeycloakRealmService service; - @Mock - private KeycloakGenericRemoteService keycloakGenericRemoteService; - private final String REALM = OzgCloudKeycloakRealmTestFactory.METADATA_NAMESPACE; @DisplayName("Reconcile") @@ -116,7 +112,7 @@ class KeycloakRealmReconcilerTest { @Test void shouldDeleteRealmIfRealmExists() { - when(keycloakGenericRemoteService.realmExists(any())).thenReturn(true); + when(service.realmExists(any())).thenReturn(true); reconciler.cleanup(realm, null); verify(reconciler).deleteRealm(realm); @@ -126,7 +122,7 @@ class KeycloakRealmReconcilerTest { void shouldReturnValueFromDeleteRealm() { DeleteControl expected = DeleteControl.defaultDelete(); when(reconciler.deleteRealm(realm)).thenReturn(expected); - when(keycloakGenericRemoteService.realmExists(any())).thenReturn(true); + when(service.realmExists(any())).thenReturn(true); DeleteControl response = reconciler.cleanup(realm, null); @@ -137,12 +133,12 @@ class KeycloakRealmReconcilerTest { void shouldCallRealmExists() { reconciler.cleanup(realm, null); - verify(keycloakGenericRemoteService).realmExists(any()); + verify(service).realmExists(any()); } @Test void shouldNotDeleteRealmIfRealmNotExists() { - when(keycloakGenericRemoteService.realmExists(any())).thenReturn(false); + when(service.realmExists(any())).thenReturn(false); reconciler.cleanup(realm, null); 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 5d2da035924be16afec0f64718db93129d0ced41..f4d66c9f0f617ecf5a0693556083aeec003da13e 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 @@ -232,4 +232,15 @@ class KeycloakRealmServiceTest { verify(remoteService).deleteRealm(REALM_NAME); } } + @Nested + class TestRealmExists { + + @Test + void shouldCallGenericRemoteServiceRealmExists() { + keycloakGenericRemoteService.realmExists(REALM_NAME); + + verify(keycloakGenericRemoteService).realmExists(REALM_NAME); + } + } + }