From b23dbc4404598c0ba04983671328f930d6321e60 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 12 Sep 2024 10:55:00 +0200
Subject: [PATCH] OZG-6495 reorder methods
---
.../keycloak/realm/KeycloakRealmService.java | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
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 22c2c78..d57ef9c 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
@@ -43,14 +43,6 @@ class KeycloakRealmService {
private final KeycloakGenericRemoteService keycloakGenericRemoteService;
- void createRealm(OzgCloudKeycloakRealmSpec realm, String realmName) {
- Optional.of(realm)
- .map(mapper::map)
- .map(realmRepresentation -> addRealmName(realmRepresentation, realmName))
- .filter(realmRepresentation -> !keycloakGenericRemoteService.realmExists(realmName))
- .ifPresent(remoteService::createRealm);
- }
-
public void createOrUpdateRealm(OzgCloudKeycloakRealmSpec realm, String realmName) {
keycloakGenericRemoteService.getRealmRepresentation(realmName)
.ifPresentOrElse(existingRealm -> updateRealm(existingRealm, realm),
@@ -59,7 +51,6 @@ class KeycloakRealmService {
}
void updateRealm(RealmRepresentation existingRealm, OzgCloudKeycloakRealmSpec spec) {
-
try {
LOG.debug("{}: Updating existing realm...", existingRealm);
var realmRepresentation = mapper.update(existingRealm, spec);
@@ -68,7 +59,14 @@ class KeycloakRealmService {
LOG.warn(existingRealm + ": Updating existing realm failed: ", e);
throw e;
}
+ }
+ void createRealm(OzgCloudKeycloakRealmSpec realm, String realmName) {
+ Optional.of(realm)
+ .map(mapper::map)
+ .map(realmRepresentation -> addRealmName(realmRepresentation, realmName))
+ .filter(realmRepresentation -> !keycloakGenericRemoteService.realmExists(realmName))
+ .ifPresent(remoteService::createRealm);
}
void addOrUpdateRealmRoles(OzgCloudKeycloakRealmSpec spec, String realm) {
--
GitLab