Skip to content
Snippets Groups Projects
Commit 1c2ba1d7 authored by OZGCloud's avatar OZGCloud
Browse files

handle realm_role as string

parent 7158e7c6
No related branches found
No related tags found
No related merge requests found
......@@ -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<>();
// }
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment