fix: using iteration to allow recursive structures (#26789)

closes: #21130

Signed-off-by: Steve Hawkins <shawkins@redhat.com>

operator/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImport.java

@@ -44,8 +44,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
         @BuildableReference(io.fabric8.kubernetes.client.CustomResource.class),
         @BuildableReference(KeycloakRealmImportSpec.class)
 })
-@SchemaSwap(originalType = GroupRepresentation.class, fieldName = "subGroups", targetType = org.keycloak.representations.overrides.NoSubGroupsGroupRepresentationList.class)
+@SchemaSwap(originalType = GroupRepresentation.class, fieldName = "subGroups", depth = 10)
-@SchemaSwap(originalType = ComponentExportRepresentation.class, fieldName = "subComponents", targetType = org.keycloak.representations.overrides.NoSubcomponentsComponentExportRepresentationMap.class)
+@SchemaSwap(originalType = ComponentExportRepresentation.class, fieldName = "subComponents", depth = 10)
 @SchemaSwap(originalType = ScopeRepresentation.class, fieldName = "policies")
 @SchemaSwap(originalType = ScopeRepresentation.class, fieldName = "resources")
 public class KeycloakRealmImport extends CustomResource<KeycloakRealmImportSpec, KeycloakRealmImportStatus> implements Namespaced {

operator/src/main/java/org/keycloak/representations/overrides/NoSubGroupsGroupRepresentation.java

@@ -1,98 +0,0 @@
-/*
- * Copyright 2016 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.keycloak.representations.overrides;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class NoSubGroupsGroupRepresentation {
-    protected String id;
-    protected String name;
-    protected String path;
-    protected Map<String, List<String>>  attributes;
-    protected List<String> realmRoles;
-    protected Map<String, List<String>> clientRoles;
-    // TODO: eventually generate code for Nth levels of depth
-    // protected List<GroupRepresentation> subGroups;
-    private Map<String, Boolean> access;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getPath() {
-        return path;
-    }
-
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    public List<String> getRealmRoles() {
-        return realmRoles;
-    }
-
-    public void setRealmRoles(List<String> realmRoles) {
-        this.realmRoles = realmRoles;
-    }
-
-    public Map<String, List<String>> getClientRoles() {
-        return clientRoles;
-    }
-
-    public void setClientRoles(Map<String, List<String>> clientRoles) {
-        this.clientRoles = clientRoles;
-    }
-
-
-    public Map<String, List<String>> getAttributes() {
-        return attributes;
-    }
-
-    public void setAttributes(Map<String, List<String>>  attributes) {
-        this.attributes = attributes;
-    }
-
-    public NoSubGroupsGroupRepresentation singleAttribute(String name, String value) {
-        if (this.attributes == null) attributes = new HashMap<>();
-        attributes.put(name, Arrays.asList(value));
-        return this;
-    }
-
-    public Map<String, Boolean> getAccess() {
-        return access;
-    }
-
-    public void setAccess(Map<String, Boolean> access) {
-        this.access = access;
-    }
-}

operator/src/main/java/org/keycloak/representations/overrides/NoSubGroupsGroupRepresentationList.java

@@ -1,23 +0,0 @@
-/*
- * Copyright 2016 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.keycloak.representations.overrides;
-
-import java.util.ArrayList;
-
-public class NoSubGroupsGroupRepresentationList extends ArrayList<NoSubGroupsGroupRepresentation> {
-}

operator/src/main/java/org/keycloak/representations/overrides/NoSubcomponentsComponentExportRepresentation.java

@@ -1,72 +0,0 @@
-/*
- * Copyright 2016 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.keycloak.representations.overrides;
-
-import org.keycloak.common.util.MultivaluedHashMap;
-
-public class NoSubcomponentsComponentExportRepresentation {
-
-    private String id;
-    private String name;
-    private String providerId;
-    private String subType;
-    // TODO: eventually generate code for Nth levels of depth
-    // private MultivaluedHashMap<String, ComponentExportRepresentation> subComponents = new MultivaluedHashMap<>();
-    private MultivaluedHashMap<String, String> config = new MultivaluedHashMap<>();
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getProviderId() {
-        return providerId;
-    }
-
-    public void setProviderId(String providerId) {
-        this.providerId = providerId;
-    }
-
-    public String getSubType() {
-        return subType;
-    }
-
-    public void setSubType(String subType) {
-        this.subType = subType;
-    }
-
-    public MultivaluedHashMap<String, String> getConfig() {
-        return config;
-    }
-
-    public void setConfig(MultivaluedHashMap<String, String> config) {
-        this.config = config;
-    }
-
-}

operator/src/main/java/org/keycloak/representations/overrides/NoSubcomponentsComponentExportRepresentationMap.java

@@ -1,24 +0,0 @@
-/*
- * Copyright 2016 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.keycloak.representations.overrides;
-
-import java.util.HashMap;
-import java.util.List;
-
-public class NoSubcomponentsComponentExportRepresentationMap extends HashMap<String, List<NoSubcomponentsComponentExportRepresentation>> {
-}

operator/src/test/resources/test-serialization-realmimport-cr.yml

@@ -1087,7 +1087,20 @@ spec:
           name: Consent Required
           providerId: consent-required
           subType: anonymous
-          subComponents: {}
+          subComponents: 
+            level1:
+              - id: id1
+                name: Consent Required
+                providerId: consent-required
+                subType: anonymous
+                subComponents:
+                  level2:
+                    - id: id2
+                      name: Consent Required
+                      providerId: consent-required
+                      subType: anonymous
+                      config: {}    
+                config: {}
           config: {}
         - id: 7063fa94-4f9e-48cd-9659-bb46ccc09764
           name: Full Scope Disabled