From 7eff2ea121939520d404eb3c0b66c8bc930379b6 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 9 Dec 2024 14:53:18 +0100
Subject: [PATCH] OZG-7303: Revert RealmRepresentationTestFactory. Fix name.
---
.../operator/keycloak/realm/KeycloakRealmMapper.java | 8 ++++----
.../keycloak/realm/RealmRepresentationTestFactory.java | 5 +----
2 files changed, 5 insertions(+), 8 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 177747c..3491687 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
@@ -56,7 +56,7 @@ interface KeycloakRealmMapper {
@Mapping(target = "actionTokenGeneratedByUserLifespan", constant = ACTION_TOKEN_GENERATED_BY_USER_LIFE_SPAN)
@Mapping(target = "smtpServer", source = "smtpServer", qualifiedByName = "smtpServer")
@Mapping(target = "roles.realm", source = "realmRoles")
- @Mapping(target = "loginTheme", source = ".", qualifiedByName = "bundeslandToTheme")
+ @Mapping(target = "loginTheme", source = ".", qualifiedByName = "bundeslandToLoginTheme")
public RealmRepresentation map(OzgCloudKeycloakRealmSpec realm);
@Mapping(target = "enabled", constant = ENABLED)
@@ -68,14 +68,14 @@ interface KeycloakRealmMapper {
@Mapping(target = "actionTokenGeneratedByUserLifespan", constant = ACTION_TOKEN_GENERATED_BY_USER_LIFE_SPAN)
@Mapping(target = "smtpServer", source = "smtpServer", qualifiedByName = "smtpServer")
@Mapping(target = "roles.realm", source = "realmRoles")
- @Mapping(target = "loginTheme", source = ".", qualifiedByName = "bundeslandToTheme")
+ @Mapping(target = "loginTheme", source = ".", qualifiedByName = "bundeslandToLoginTheme")
RealmRepresentation update(@MappingTarget RealmRepresentation existingRealm, OzgCloudKeycloakRealmSpec spec);
@Mapping(target = "name", source = "name")
RoleRepresentation map(OzgCloudKeycloakRealmSpec.RealmRole role);
- @Named("bundeslandToTheme")
- default String mapBundeslandToTheme(OzgCloudKeycloakRealmSpec spec) { return "ozg-" + spec.getBundesland(); }
+ @Named("bundeslandToLoginTheme")
+ default String mapBundeslandToLoginTheme(OzgCloudKeycloakRealmSpec spec) { return "ozg-" + spec.getBundesland(); }
@Named("supportedLocales")
default Set<String> mapPassword(OzgCloudKeycloakRealmSpec spec) {
diff --git a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/RealmRepresentationTestFactory.java b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/RealmRepresentationTestFactory.java
index ac43ec3..72a8830 100644
--- a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/RealmRepresentationTestFactory.java
+++ b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/RealmRepresentationTestFactory.java
@@ -30,11 +30,8 @@ public class RealmRepresentationTestFactory {
public static final String NAME = "TestRealm";
public static RealmRepresentation create() {
- return create(NAME);
- }
- public static RealmRepresentation create(String name) {
var realm = new RealmRepresentation();
- realm.setRealm(name);
+ realm.setRealm(NAME);
return realm;
}
--
GitLab