Repository: syncope Updated Branches: refs/heads/master 4545e3f26 -> 0a3ec6773
Removing useless import static Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/8471e790 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/8471e790 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/8471e790 Branch: refs/heads/master Commit: 8471e790b14875bdf4f90a136541735f843c2044 Parents: 4545e3f Author: Francesco Chicchiriccò <[email protected]> Authored: Tue Aug 16 08:30:36 2016 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Tue Aug 16 08:30:36 2016 +0200 ---------------------------------------------------------------------- .../client/console/commons/ITabComponent.java | 6 ++---- .../client/console/panels/AnyDirectoryPanel.java | 2 -- .../apache/syncope/client/console/panels/Realm.java | 2 -- .../client/console/rest/GroupRestClient.java | 4 +--- .../syncope/client/console/wizards/any/Groups.java | 10 ++++------ .../client/console/wizards/any/Ownership.java | 16 +++++++--------- .../client/console/wizards/any/Resources.java | 6 ++---- .../syncope/client/console/wizards/any/Roles.java | 6 ++---- 8 files changed, 18 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/8471e790/client/console/src/main/java/org/apache/syncope/client/console/commons/ITabComponent.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/commons/ITabComponent.java b/client/console/src/main/java/org/apache/syncope/client/console/commons/ITabComponent.java index a66afb0..91043b5 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/commons/ITabComponent.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/commons/ITabComponent.java @@ -15,13 +15,11 @@ */ package org.apache.syncope.client.console.commons; -import static org.apache.wicket.Component.RENDER; -import static org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy.ACTION_PERMISSIONS; - import java.util.UUID; import org.apache.wicket.Component; import org.apache.wicket.authroles.authorization.strategies.role.Roles; import org.apache.wicket.authroles.authorization.strategies.role.metadata.ActionPermissions; +import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy; import org.apache.wicket.extensions.markup.html.tabs.ITab; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.model.IModel; @@ -46,7 +44,7 @@ public abstract class ITabComponent extends Component implements ITab { this.title = title; final ActionPermissions permissions = new ActionPermissions(); - setMetaData(ACTION_PERMISSIONS, permissions); + setMetaData(MetaDataRoleAuthorizationStrategy.ACTION_PERMISSIONS, permissions); permissions.authorize(RENDER, new Roles(roles)); } http://git-wip-us.apache.org/repos/asf/syncope/blob/8471e790/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyDirectoryPanel.java index f04889f..e4a48dc 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyDirectoryPanel.java @@ -18,8 +18,6 @@ */ package org.apache.syncope.client.console.panels; -import static org.apache.wicket.Component.RENDER; - import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal; import java.io.Serializable; import java.lang.reflect.Field; http://git-wip-us.apache.org/repos/asf/syncope/blob/8471e790/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java index 54ef1a0..d2a869c 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java @@ -18,8 +18,6 @@ */ package org.apache.syncope.client.console.panels; -import static org.apache.wicket.Component.RENDER; - import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal; import de.agilecoders.wicket.core.markup.html.bootstrap.tabs.AjaxBootstrapTabbedPanel; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/syncope/blob/8471e790/client/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java index c4f78c9..6f3d0d0 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java @@ -18,8 +18,6 @@ */ package org.apache.syncope.client.console.rest; -import static org.apache.syncope.client.console.rest.BaseRestClient.getService; - import java.util.ArrayList; import java.util.List; import org.apache.syncope.common.lib.patch.GroupPatch; @@ -64,7 +62,7 @@ public class GroupRestClient extends AbstractAnyRestClient<GroupTO, GroupPatch> do { res = getService(GroupService.class). search(new AnyQuery.Builder().realm(realm).fiql(fiql).page(page).size(size). - orderBy(toOrderBy(sort)).details(false).build()); + orderBy(toOrderBy(sort)).details(false).build()); result.addAll(res.getResult()); } while (page == -1 && size == -1 && res.getNext() != null); http://git-wip-us.apache.org/repos/asf/syncope/blob/8471e790/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Groups.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Groups.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Groups.java index 5d6338c..39f9b9b 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Groups.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Groups.java @@ -18,9 +18,6 @@ */ package org.apache.syncope.client.console.wizards.any; -import static org.apache.wicket.Component.RENDER; -import static org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy.ACTION_PERMISSIONS; - import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; @@ -47,6 +44,8 @@ import org.apache.wicket.util.lang.Args; import org.apache.syncope.common.lib.to.GroupableRelatableTO; import org.apache.syncope.common.lib.types.StandardEntitlement; import org.apache.wicket.authroles.authorization.strategies.role.metadata.ActionPermissions; +import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy; +import org.apache.wicket.authroles.authorization.strategies.role.Roles; import org.apache.wicket.extensions.wizard.WizardModel.ICondition; public class Groups extends WizardStep implements ICondition { @@ -64,9 +63,8 @@ public class Groups extends WizardStep implements ICondition { // Pre-Authorizations // ----------------------------------------------------------------- final ActionPermissions permissions = new ActionPermissions(); - setMetaData(ACTION_PERMISSIONS, permissions); - permissions.authorize(RENDER, - new org.apache.wicket.authroles.authorization.strategies.role.Roles(StandardEntitlement.GROUP_SEARCH)); + setMetaData(MetaDataRoleAuthorizationStrategy.ACTION_PERMISSIONS, permissions); + permissions.authorize(RENDER, new Roles(StandardEntitlement.GROUP_SEARCH)); // ----------------------------------------------------------------- setOutputMarkupId(true); http://git-wip-us.apache.org/repos/asf/syncope/blob/8471e790/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Ownership.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Ownership.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Ownership.java index d0dcd3e..8eb7ab0 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Ownership.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Ownership.java @@ -18,9 +18,6 @@ */ package org.apache.syncope.client.console.wizards.any; -import static org.apache.wicket.Component.RENDER; -import static org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy.ACTION_PERMISSIONS; - import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.checkbox.bootstraptoggle.BootstrapToggle; import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.checkbox.bootstraptoggle.BootstrapToggleConfig; import java.util.ArrayList; @@ -53,6 +50,8 @@ import org.apache.syncope.common.lib.types.StandardEntitlement; import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.authroles.authorization.strategies.role.metadata.ActionPermissions; +import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy; +import org.apache.wicket.authroles.authorization.strategies.role.Roles; import org.apache.wicket.event.Broadcast; import org.apache.wicket.event.IEvent; import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink; @@ -106,11 +105,10 @@ public class Ownership extends WizardStep implements WizardModel.ICondition { // Pre-Authorizations // ----------------------------------------------------------------- final ActionPermissions permissions = new ActionPermissions(); - setMetaData(ACTION_PERMISSIONS, permissions); - permissions.authorize(RENDER, - new org.apache.wicket.authroles.authorization.strategies.role.Roles(new StringBuilder(). - append(StandardEntitlement.USER_SEARCH).append(","). - append(StandardEntitlement.GROUP_SEARCH).toString())); + setMetaData(MetaDataRoleAuthorizationStrategy.ACTION_PERMISSIONS, permissions); + permissions.authorize(RENDER, new Roles(new StringBuilder(). + append(StandardEntitlement.USER_SEARCH).append(","). + append(StandardEntitlement.GROUP_SEARCH).toString())); // ----------------------------------------------------------------- setTitleModel(new ResourceModel("group.ownership")); @@ -171,7 +169,7 @@ public class Ownership extends WizardStep implements WizardModel.ICondition { ownerContainer = new WebMarkupContainer("ownerContainer"); ownerContainer.setOutputMarkupId(true); - this.add(ownerContainer); + add(ownerContainer); groupSearchFragment = new Fragment("search", "groupSearchFragment", this); groupSearchPanel = new GroupSearchPanel.Builder( http://git-wip-us.apache.org/repos/asf/syncope/blob/8471e790/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Resources.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Resources.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Resources.java index 561a231..fbe729d 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Resources.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Resources.java @@ -18,9 +18,6 @@ */ package org.apache.syncope.client.console.wizards.any; -import static org.apache.wicket.Component.RENDER; -import static org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy.ACTION_PERMISSIONS; - import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -33,6 +30,7 @@ import org.apache.syncope.common.lib.to.AnyTO; import org.apache.syncope.common.lib.to.ResourceTO; import org.apache.syncope.common.lib.types.StandardEntitlement; import org.apache.wicket.authroles.authorization.strategies.role.metadata.ActionPermissions; +import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy; import org.apache.wicket.extensions.wizard.WizardModel; import org.apache.wicket.extensions.wizard.WizardStep; import org.apache.wicket.model.PropertyModel; @@ -49,7 +47,7 @@ public class Resources extends WizardStep implements WizardModel.ICondition { // Pre-Authorizations // ----------------------------------------------------------------- final ActionPermissions permissions = new ActionPermissions(); - setMetaData(ACTION_PERMISSIONS, permissions); + setMetaData(MetaDataRoleAuthorizationStrategy.ACTION_PERMISSIONS, permissions); permissions.authorize(RENDER, new org.apache.wicket.authroles.authorization.strategies.role.Roles(StandardEntitlement.RESOURCE_LIST)); // ----------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/8471e790/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Roles.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Roles.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Roles.java index a4ab51b..6e44582 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Roles.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Roles.java @@ -18,9 +18,6 @@ */ package org.apache.syncope.client.console.wizards.any; -import static org.apache.wicket.Component.RENDER; -import static org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy.ACTION_PERMISSIONS; - import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -34,6 +31,7 @@ import org.apache.syncope.common.lib.to.RoleTO; import org.apache.syncope.common.lib.to.UserTO; import org.apache.syncope.common.lib.types.StandardEntitlement; import org.apache.wicket.authroles.authorization.strategies.role.metadata.ActionPermissions; +import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy; import org.apache.wicket.extensions.wizard.WizardModel.ICondition; import org.apache.wicket.extensions.wizard.WizardStep; import org.apache.wicket.model.PropertyModel; @@ -50,7 +48,7 @@ public class Roles extends WizardStep implements ICondition { // Pre-Authorizations // ----------------------------------------------------------------- final ActionPermissions permissions = new ActionPermissions(); - setMetaData(ACTION_PERMISSIONS, permissions); + setMetaData(MetaDataRoleAuthorizationStrategy.ACTION_PERMISSIONS, permissions); permissions.authorize(RENDER, new org.apache.wicket.authroles.authorization.strategies.role.Roles(StandardEntitlement.ROLE_LIST)); // -----------------------------------------------------------------
