From 1c2ba1d70df76f26b949e75da13a6f73002dd375 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 31 Aug 2023 20:08:10 +0200
Subject: [PATCH] handle realm_role as string
---
.../keycloak/user/OzgKeycloakUserSpec.java | 40 +++++++++----------
1 file changed, 19 insertions(+), 21 deletions(-)
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserSpec.java b/src/main/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserSpec.java
index 9b8304c..6772217 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserSpec.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserSpec.java
@@ -24,9 +24,7 @@
package de.ozgcloud.operator.keycloak.user;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
@@ -85,7 +83,7 @@ class OzgKeycloakUserSpec {
@JsonProperty("realm_roles")
@Builder.Default
- private List<KeycloakUserSpecRealmRole> realmRoles = new ArrayList<>();
+ private List<String> realmRoles = new ArrayList<>();
@JsonSetter(nulls = Nulls.AS_EMPTY)
public void setGroups(List<KeycloakUserSpecUserGroup> groups) {
@@ -98,7 +96,7 @@ class OzgKeycloakUserSpec {
}
@JsonSetter(nulls = Nulls.AS_EMPTY)
- public void setRealmRoles(List<KeycloakUserSpecRealmRole> realmRoles) {
+ public void setRealmRoles(List<String> realmRoles) {
this.realmRoles = realmRoles;
}
}
@@ -128,21 +126,21 @@ class OzgKeycloakUserSpec {
private String roleName;
}
- @Getter
- @Setter
- @Builder
- @NoArgsConstructor
- @AllArgsConstructor
- static class KeycloakUserSpecRealmRole {
-
- @JsonProperty("name")
- private String name;
-
- @JsonProperty("description")
- private String description;
-
- @JsonProperty("attributes")
- @Builder.Default
- private Map<String, List<String>> attributes = new HashMap<>();
- }
+// @Getter
+// @Setter
+// @Builder
+// @NoArgsConstructor
+// @AllArgsConstructor
+// static class KeycloakUserSpecRealmRole {
+//
+// @JsonProperty("name")
+// private String name;
+//
+// @JsonProperty("description")
+// private String description;
+//
+// @JsonProperty("attributes")
+// @Builder.Default
+// private Map<String, List<String>> attributes = new HashMap<>();
+// }
}
--
GitLab