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 177747c34358e19236fa2483ba064f105e6f6736..34916871b65033786c5a7388092369dd595cb33b 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 ac43ec3ca65dee9c03a9c0ac8f6fab3b5322ae41..72a8830e8b4ffaee3a3d673945ca9508cc313f1a 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; }