This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 4919fcab3298bb3dd5c1a2c30aefcf94ca99df1f Author: Francesco Chicchiriccò <[email protected]> AuthorDate: Thu May 19 14:46:46 2022 +0200 Further flexibility for Realms --- .../org/apache/syncope/client/console/status/ReconTaskPanel.java | 2 +- .../client/console/wizards/resources/ConnectorDetailsPanel.java | 9 +++++---- .../apache/syncope/client/console/panels/RealmChoicePanel.java | 2 +- .../org/apache/syncope/client/console/rest/RealmRestClient.java | 5 ++--- .../syncope/client/console/tasks/SchedTaskWizardBuilder.java | 2 +- .../org/apache/syncope/client/console/wizards/any/Details.java | 3 ++- .../syncope/client/console/wizards/role/RoleWizardBuilder.java | 3 ++- 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/status/ReconTaskPanel.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/status/ReconTaskPanel.java index 3071cba9cb..fd2dfc49e4 100644 --- a/client/idm/console/src/main/java/org/apache/syncope/client/console/status/ReconTaskPanel.java +++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/status/ReconTaskPanel.java @@ -131,7 +131,7 @@ public class ReconTaskPanel extends MultilevelPanel.SecondLevel { return (RealmsUtils.checkInput(input) ? (isSearchEnabled ? RealmRestClient.search(RealmsUtils.buildQuery(input)).getResult() - : RealmRestClient.list()) + : RealmRestClient.list(SyncopeConstants.ROOT_REALM)) : List.<RealmTO>of()).stream(). sorted(Comparator.comparing(RealmTO::getName)). map(RealmTO::getFullPath).collect(Collectors.toList()).iterator(); diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ConnectorDetailsPanel.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ConnectorDetailsPanel.java index 32ecfd3594..d41143ce98 100644 --- a/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ConnectorDetailsPanel.java +++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ConnectorDetailsPanel.java @@ -33,6 +33,7 @@ import org.apache.syncope.client.ui.commons.ajax.form.IndicatorAjaxFormComponent import org.apache.syncope.client.ui.commons.markup.html.form.AjaxDropDownChoicePanel; import org.apache.syncope.client.ui.commons.markup.html.form.AjaxSpinnerFieldPanel; import org.apache.syncope.client.ui.commons.markup.html.form.AjaxTextFieldPanel; +import org.apache.syncope.common.lib.SyncopeConstants; import org.apache.syncope.common.lib.to.ConnBundleTO; import org.apache.syncope.common.lib.to.ConnInstanceTO; import org.apache.syncope.common.lib.to.ConnPoolConfTO; @@ -66,9 +67,9 @@ public class ConnectorDetailsPanel extends WizardStep { protected Iterator<String> getChoices(final String input) { return (isSearchEnabled ? RealmRestClient.search(RealmsUtils.buildQuery(input)).getResult() - : RealmRestClient.list()). - stream().filter(realm -> SyncopeConsoleSession.get().getAuthRealms().stream().anyMatch( - authRealm -> realm.getFullPath().startsWith(authRealm))). + : RealmRestClient.list(SyncopeConstants.ROOT_REALM)). + stream().filter(realm -> SyncopeConsoleSession.get().getAuthRealms().stream(). + anyMatch(authRealm -> realm.getFullPath().startsWith(authRealm))). map(RealmTO::getFullPath).collect(Collectors.toList()).iterator(); } }; @@ -211,7 +212,7 @@ public class ConnectorDetailsPanel extends WizardStep { private static List<String> getVersions(final ConnInstanceTO connInstanceTO, final List<ConnBundleTO> bundles) { return bundles.stream().filter(object -> object.getLocation().equals(connInstanceTO.getLocation()) - && object.getBundleName().equals(connInstanceTO.getBundleName())). + && object.getBundleName().equals(connInstanceTO.getBundleName())). map(ConnBundleTO::getVersion).collect(Collectors.toList()); } diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/RealmChoicePanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/RealmChoicePanel.java index da1cbe8636..9313bacd1e 100644 --- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/RealmChoicePanel.java +++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/RealmChoicePanel.java @@ -401,7 +401,7 @@ public class RealmChoicePanel extends Panel { protected Map<String, Pair<RealmTO, List<RealmTO>>> reloadRealmParentMap() { List<RealmTO> realmsToList = isSearchEnabled ? RealmRestClient.search(RealmsUtils.buildQuery(searchQuery)).getResult() - : RealmRestClient.list(); + : RealmRestClient.list(SyncopeConstants.ROOT_REALM); return reloadRealmParentMap(realmsToList.stream(). sorted(Comparator.comparing(RealmTO::getName)). diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/RealmRestClient.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/RealmRestClient.java index 46d5ca820d..b76fcafa19 100644 --- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/RealmRestClient.java +++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/RealmRestClient.java @@ -21,7 +21,6 @@ package org.apache.syncope.client.console.rest; import java.util.List; import javax.ws.rs.core.GenericType; import javax.ws.rs.core.Response; -import org.apache.syncope.common.lib.SyncopeConstants; import org.apache.syncope.common.lib.to.DynRealmTO; import org.apache.syncope.common.lib.to.PagedResult; import org.apache.syncope.common.lib.to.ProvisioningResult; @@ -41,8 +40,8 @@ public class RealmRestClient extends BaseRestClient { return getService(RealmService.class).search(query); } - public static List<RealmTO> list() { - return getService(RealmService.class).list(SyncopeConstants.ROOT_REALM); + public static List<RealmTO> list(final String fullpath) { + return getService(RealmService.class).list(fullpath); } public static List<DynRealmTO> listDynRealms() { diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskWizardBuilder.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskWizardBuilder.java index f534a9fbbc..0d0ff3a90c 100644 --- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskWizardBuilder.java +++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskWizardBuilder.java @@ -102,7 +102,7 @@ public class SchedTaskWizardBuilder<T extends SchedTaskTO> extends BaseAjaxWizar private List<RealmTO> searchRealms(final String realmQuery) { return isSearchEnabled ? RealmRestClient.search(RealmsUtils.buildQuery(realmQuery)).getResult() - : RealmRestClient.list(); + : RealmRestClient.list(SyncopeConstants.ROOT_REALM); } public class Profile extends WizardStep { diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/Details.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/Details.java index 993be5abad..9840b143f1 100644 --- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/Details.java +++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/Details.java @@ -30,6 +30,7 @@ import org.apache.syncope.client.console.wicket.markup.html.form.AjaxSearchField import org.apache.syncope.client.ui.commons.markup.html.form.AjaxTextFieldPanel; import org.apache.syncope.client.ui.commons.markup.html.form.FieldPanel; import org.apache.syncope.client.ui.commons.wizards.any.AnyWrapper; +import org.apache.syncope.common.lib.SyncopeConstants; import org.apache.syncope.common.lib.to.AnyTO; import org.apache.syncope.common.lib.to.RealmTO; import org.apache.wicket.Component; @@ -85,7 +86,7 @@ public class Details<T extends AnyTO> extends WizardStep { ? RealmRestClient.search(RealmsUtils.buildQuery(input)).getResult() : pageRef.getPage() instanceof Realms ? getRealmsFromLinks(Realms.class.cast(pageRef.getPage()).getRealmChoicePanel().getLinks()) - : RealmRestClient.list()). + : RealmRestClient.list(SyncopeConstants.ROOT_REALM)). stream().filter(realm -> authRealms.stream().anyMatch( authRealm -> realm.getFullPath().startsWith(authRealm))). map(RealmTO::getFullPath).collect(Collectors.toList()).iterator(); diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder.java index 3df7a76800..cff14c1222 100644 --- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder.java +++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder.java @@ -34,6 +34,7 @@ import org.apache.syncope.client.ui.commons.markup.html.form.AjaxPalettePanel; import org.apache.syncope.client.console.wizards.BaseAjaxWizardBuilder; import org.apache.syncope.client.ui.commons.markup.html.form.AjaxTextFieldPanel; import org.apache.syncope.client.ui.commons.wizards.AjaxWizardBuilder; +import org.apache.syncope.common.lib.SyncopeConstants; import org.apache.syncope.common.lib.to.EntityTO; import org.apache.syncope.common.lib.to.RealmTO; import org.apache.syncope.common.lib.to.RoleTO; @@ -161,7 +162,7 @@ public class RoleWizardBuilder extends BaseAjaxWizardBuilder<RoleWrapper> { setTitleModel(new ResourceModel("realms")); add(new AjaxPalettePanel.Builder<>().build("realms", new PropertyModel<>(modelObject, "realms"), - new ListModel<>(RealmRestClient.list().stream(). + new ListModel<>(RealmRestClient.list(SyncopeConstants.ROOT_REALM).stream(). map(RealmTO::getFullPath).collect(Collectors.toList()))). hideLabel().setOutputMarkupId(true)); }
