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 3d1662e83c21e9ed161b219e519a5cffe9798905..3bcbe7f12e5ee8c3a25071b404fd4d41eaceb1aa 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 @@ -4,7 +4,6 @@ import java.util.Objects; import java.util.Optional; import org.keycloak.admin.client.Keycloak; -import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.RoleRepresentation; @@ -39,7 +38,6 @@ public class KeycloakGenericRemoteService { return Optional.of(keycloak.realm(realmName).toRepresentation()); } - public Optional<RoleRepresentation> getClientRole(String roleName, String realClientId, String realm) { return Optional.ofNullable(keycloak.realm(realm).clients().get(realClientId)) .orElseThrow(() -> new KeycloakException("Client with ID " + realClientId + " for realm " + realm + " not found.")) 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 29d9aa92df7c25db5aaeaafb6db7b42196609628..d2696dce3af374fafe87a870f207a9aa246f2f85 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 @@ -25,22 +25,16 @@ package de.ozgcloud.operator.keycloak.realm; import java.util.HashMap; import java.util.Map; -import java.util.ArrayList; -import java.util.List; import java.util.Set; -import java.util.stream.Collectors; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.RoleRepresentation; -import org.keycloak.representations.idm.RolesRepresentation; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.MappingTarget; import org.mapstruct.Named; import org.mapstruct.ReportingPolicy; -import de.ozgcloud.operator.keycloak.realm.OzgCloudKeycloakRealmSpec.RealmRole; - @Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE, unmappedSourcePolicy = ReportingPolicy.IGNORE) interface KeycloakRealmMapper { @@ -56,7 +50,6 @@ interface KeycloakRealmMapper { @Mapping(target = "roles.realm", source = "realmRoles") public RealmRepresentation map(OzgCloudKeycloakRealmSpec realm); - @Mapping(target = "displayName", source = "displayName") @Mapping(target = "enabled", constant = "true") @Mapping(target = "resetPasswordAllowed", constant = "true") @@ -70,7 +63,7 @@ interface KeycloakRealmMapper { RealmRepresentation update(@MappingTarget RealmRepresentation existingRealm, OzgCloudKeycloakRealmSpec spec); @Mapping(target = "name", source = "name") - RoleRepresentation map(OzgCloudKeycloakRealmSpec.RealmRole role); + RoleRepresentation map(OzgCloudKeycloakRealmSpec.RealmRole role); @Named("supportedLocales") default Set<String> mapPassword(OzgCloudKeycloakRealmSpec spec) { diff --git a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmRemoteService.java b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmRemoteService.java index c995ae2e90cdf454787811e9bb38e7a11db0b752..b58998e58b61c9204b5dc3b5e6c247b178219ec9 100644 --- a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmRemoteService.java +++ b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmRemoteService.java @@ -24,7 +24,6 @@ package de.ozgcloud.operator.keycloak.realm; import org.keycloak.admin.client.Keycloak; -import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.representations.idm.RealmRepresentation; import org.springframework.stereotype.Component; @@ -43,9 +42,9 @@ class KeycloakRealmRemoteService { public void deleteRealm(String realmName) { keycloak.realm(realmName).remove(); } + public void updateRealm(RealmRepresentation realm) { keycloak.realm(realm.getRealm()).update(realm); } - } diff --git a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakLivelTest.java b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakLivelTest.java index fb6cfcdea02ce6af9173de162ee5cd28dcc668c6..11b81fc69c810883a5bd2a5fd72360dcbe61b3df 100644 --- a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakLivelTest.java +++ b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakLivelTest.java @@ -79,6 +79,7 @@ class KeycloakLivelTest { userRemoteService.updateUser(u, TESTNAMESPACE); } + @SuppressWarnings("unused") private UserRepresentation createUser() { UserRepresentation u = new UserRepresentation(); u.setUsername(TESTUSERNAME);