[SYNCOPE-1948] Introducing Any Managers and removing DynRealms and DynGroups (#1295)

Author: ilgrosso

client/idm/console/src/main/java/org/apache/syncope/client/console/commons/IdMAnyDirectoryPanelAdditionalActionLinksProvider.java

@@ -100,7 +100,7 @@ public void onClick(final AjaxRequestTarget target, final UserTO ignore) {
         }, ActionLink.ActionType.ENABLE);
         enable.setEntitlements(IdRepoEntitlement.USER_UPDATE);
         enable.setOnConfirm(false);
-        enable.setRealms(realm, model.getObject().getDynRealms());
+        enable.setRealm(realm);
         actions.add(enable);
 
         Action<UserTO> manageResources = new Action<>(new ActionLink<>() {
@@ -128,7 +128,7 @@ public void onClick(final AjaxRequestTarget target, final UserTO ignore) {
         manageResources.setEntitlements(
                 String.format("%s,%s", IdRepoEntitlement.USER_READ, IdRepoEntitlement.USER_UPDATE));
         manageResources.setOnConfirm(false);
-        manageResources.setRealms(realm, model.getObject().getDynRealms());
+        manageResources.setRealm(realm);
         actions.add(manageResources);
 
         Action<UserTO> manageAccounts = new Action<>(new ActionLink<>() {
@@ -149,7 +149,7 @@ public void onClick(final AjaxRequestTarget target, final UserTO ignore) {
         manageAccounts.setEntitlements(String.format("%s,%s,%s",
                 IdRepoEntitlement.USER_READ, IdRepoEntitlement.USER_UPDATE, IdMEntitlement.RESOURCE_GET_CONNOBJECT));
         manageAccounts.setOnConfirm(false);
-        manageAccounts.setRealms(realm, model.getObject().getDynRealms());
+        manageAccounts.setRealm(realm);
         actions.add(manageAccounts);
 
         Action<UserTO> mergeAccounts = new Action<>(new ActionLink<>() {
@@ -209,7 +209,7 @@ public void onClick(final AjaxRequestTarget target, final GroupTO ignore) {
         manageResources.setEntitlements(
                 String.format("%s,%s", IdRepoEntitlement.GROUP_READ, IdRepoEntitlement.GROUP_UPDATE));
         manageResources.setOnConfirm(false);
-        manageResources.setRealms(realm, modelObject.getDynRealms());
+        manageResources.setRealm(realm);
         actions.add(manageResources);
 
         return actions;
@@ -250,7 +250,7 @@ public void onClick(final AjaxRequestTarget target, final AnyObjectTO ignore) {
         }, ActionLink.ActionType.MANAGE_RESOURCES);
         manageResources.setEntitlements(
                 String.format("%s,%s", AnyEntitlement.READ.getFor(type), AnyEntitlement.UPDATE.getFor(type)));
-        manageResources.setRealms(realm, modelObject.getDynRealms());
+        manageResources.setRealm(realm);
         actions.add(manageResources);
         return actions;
     }

client/idm/console/src/main/java/org/apache/syncope/client/console/commons/IdMConstants.java

@@ -20,6 +20,8 @@
 
 public final class IdMConstants {
 
+    public static final String PREF_CONNID_LOCATIONS_PAGINATOR_ROWS = "connid.locations.paginator.rows";
+
     public static final String PREF_RECONCILIATION_PAGINATOR_ROWS = "reconciliation.paginator.rows";
 
     public static final String PREF_RESOURCE_STATUS_PAGINATOR_ROWS = "resource.status.paginator.rows";

client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ConnidLocations.java

@@ -28,7 +28,7 @@
 import java.util.List;
 import org.apache.syncope.client.console.SyncopeConsoleSession;
 import org.apache.syncope.client.console.commons.DirectoryDataProvider;
-import org.apache.syncope.client.console.commons.IdRepoConstants;
+import org.apache.syncope.client.console.commons.IdMConstants;
 import org.apache.syncope.client.console.rest.ConnectorRestClient;
 import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
 import org.apache.syncope.client.console.wicket.markup.html.form.ActionLink;
@@ -78,7 +78,7 @@ protected ConnidLocationsDataProvider dataProvider() {
 
     @Override
     protected String paginatorRowsKey() {
-        return IdRepoConstants.PREF_DYNREALM_PAGINATOR_ROWS;
+        return IdMConstants.PREF_CONNID_LOCATIONS_PAGINATOR_ROWS;
     }
 
     @Override

client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/layout/AbstractAnyFormLayout.java

@@ -28,12 +28,22 @@ public abstract class AbstractAnyFormLayout<A extends AnyTO, F extends AnyForm<A
 
     private static final long serialVersionUID = -6061683026789976508L;
 
+    private boolean manager = true;
+
     private boolean relationships = true;
 
     private final List<String> whichPlainAttrs = new ArrayList<>();
 
     private final List<String> whichDerAttrs = new ArrayList<>();
 
+    public boolean isManager() {
+        return manager;
+    }
+
+    public void setManager(final boolean manager) {
+        this.manager = manager;
+    }
+
     public boolean isRelationships() {
         return relationships;
     }

client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/wizards/any/AbstractGroups.java

@@ -35,10 +35,6 @@ public abstract class AbstractGroups extends WizardStep implements ICondition {
 
     protected final AnyTO anyTO;
 
-    protected WebMarkupContainer dyngroupsContainer;
-
-    protected WebMarkupContainer dynrealmsContainer;
-
     protected WebMarkupContainer groupsContainer;
 
     public <T extends AnyTO> AbstractGroups(final AnyWrapper<T> modelObject) {
@@ -70,10 +66,6 @@ public <T extends AnyTO> AbstractGroups(final AnyWrapper<T> modelObject) {
 
     protected abstract void addGroupsPanel();
 
-    protected abstract void addDynamicRealmsContainer();
-
-    protected abstract void addDynamicGroupsContainer();
-
     @Override
     public boolean evaluate() {
         return true;

client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/wizards/any/AbstractGroupsModel.java

@@ -55,6 +55,4 @@ public List<MembershipTO> getMemberships() {
         }
         return memberships;
     }
-
-    public abstract List<String> getDynMemberships();
 }

client/idrepo/console/src/main/java/org/apache/syncope/client/console/IdRepoConsoleContext.java

@@ -52,7 +52,6 @@
 import org.apache.syncope.client.console.rest.AuditRestClient;
 import org.apache.syncope.client.console.rest.CommandRestClient;
 import org.apache.syncope.client.console.rest.DelegationRestClient;
-import org.apache.syncope.client.console.rest.DynRealmRestClient;
 import org.apache.syncope.client.console.rest.FIQLQueryRestClient;
 import org.apache.syncope.client.console.rest.GroupRestClient;
 import org.apache.syncope.client.console.rest.ImplementationRestClient;
@@ -234,12 +233,6 @@ public DelegationRestClient delegationRestClient() {
         return new DelegationRestClient();
     }
 
-    @ConditionalOnMissingBean
-    @Bean
-    public DynRealmRestClient dynRealmRestClient() {
-        return new DynRealmRestClient();
-    }
-
     @ConditionalOnMissingBean
     @Bean
     public FIQLQueryRestClient fiqlQueryRestClient() {
@@ -335,7 +328,7 @@ public UserRestClient userRestClient() {
     public UserSelfRestClient userSelfRestClient() {
         return new UserSelfRestClient();
     }
-    
+
     @ConditionalOnMissingBean
     @Bean
     public DynamicMenuStringResourceLoader dynamicMenuStringResourceLoader() {

client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/IdRepoConstants.java

@@ -54,8 +54,6 @@ public final class IdRepoConstants {
 
     public static final String PREF_APPLICATION_PAGINATOR_ROWS = "application.paginator.rows";
 
-    public static final String PREF_DYNREALM_PAGINATOR_ROWS = "dynRealm.paginator.rows";
-
     public static final String PREF_ACCESS_TOKEN_PAGINATOR_ROWS = "accessToken.paginator.rows";
 
     public static final String PREF_COMMAND_PAGINATOR_ROWS = "command.paginator.rows";

client/idrepo/console/src/main/java/org/apache/syncope/client/console/layout/GroupFormLayoutInfo.java

@@ -26,31 +26,16 @@ public class GroupFormLayoutInfo extends AbstractAnyFormLayout<GroupTO, GroupFor
 
     private static final long serialVersionUID = -5573691733739618500L;
 
-    private boolean ownership = true;
-
-    private boolean dynamicMemberships = true;
-
     private boolean typeExtensions = true;
 
     @Override
     protected Class<? extends GroupForm> getDefaultFormClass() {
         return GroupWizardBuilder.class;
     }
 
-    public boolean isOwnership() {
-        return ownership;
-    }
-
-    public void setOwnership(final boolean ownership) {
-        this.ownership = ownership;
-    }
-
-    public boolean isDynamicMemberships() {
-        return dynamicMemberships;
-    }
-
-    public void setDynamicMemberships(final boolean dynamicMemberships) {
-        this.dynamicMemberships = dynamicMemberships;
+    @Override
+    public boolean isGroups() {
+        return false;
     }
 
     public boolean isTypeExtensions() {
@@ -60,5 +45,4 @@ public boolean isTypeExtensions() {
     public void setTypeExtensions(final boolean typeExtensions) {
         this.typeExtensions = typeExtensions;
     }
-
 }

client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/Security.java

@@ -24,11 +24,9 @@
 import org.apache.syncope.client.console.BookmarkablePageLinkBuilder;
 import org.apache.syncope.client.console.SyncopeConsoleSession;
 import org.apache.syncope.client.console.panels.DelegationDirectoryPanel;
-import org.apache.syncope.client.console.panels.DynRealmDirectoryPanel;
 import org.apache.syncope.client.console.panels.RoleDirectoryPanel;
 import org.apache.syncope.client.console.panels.SecurityQuestionsPanel;
 import org.apache.syncope.client.console.rest.DelegationRestClient;
-import org.apache.syncope.client.console.rest.DynRealmRestClient;
 import org.apache.syncope.client.console.rest.RealmRestClient;
 import org.apache.syncope.client.console.rest.RoleRestClient;
 import org.apache.syncope.client.console.rest.SecurityQuestionRestClient;
@@ -59,9 +57,6 @@ public class Security extends BasePage {
     @SpringBean
     protected DelegationRestClient delegationRestClient;
 
-    @SpringBean
-    protected DynRealmRestClient dynRealmRestClient;
-
     @SpringBean
     protected SecurityQuestionRestClient securityQuestionRestClient;
 
@@ -98,7 +93,6 @@ public Panel getPanel(final String panelId) {
                             new RoleTO(),
                             roleRestClient,
                             realmRestClient,
-                            dynRealmRestClient,
                             getPageReference()), true).build(panelId);
                 }
             });
@@ -123,20 +117,6 @@ public Panel getPanel(final String panelId) {
             }
         });
 
-        tabs.add(new AbstractTab(new ResourceModel("dynRealms")) {
-
-            private static final long serialVersionUID = -6815067322125799251L;
-
-            @Override
-            public Panel getPanel(final String panelId) {
-                return new DynRealmDirectoryPanel.Builder(dynRealmRestClient, getPageReference()) {
-
-                    private static final long serialVersionUID = -5960765294082359003L;
-
-                }.build(panelId);
-            }
-        });
-
         tabs.add(new AbstractTab(new ResourceModel("securityQuestions")) {
 
             private static final long serialVersionUID = -6815067322125799251L;