Repository: syncope Updated Branches: refs/heads/1_2_X e71fce0a2 -> c71fdc777
[SYNCOPE-856] Added REST methods for bulk (de)provisioning role members + handles in console Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/c71fdc77 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/c71fdc77 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/c71fdc77 Branch: refs/heads/1_2_X Commit: c71fdc77786335a3d76c81ecc805955ffb48f9a6 Parents: e71fce0 Author: Francesco Chicchiriccò <[email protected]> Authored: Wed May 25 13:35:26 2016 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Wed May 25 13:35:26 2016 +0200 ---------------------------------------------------------------------- .../syncope/common/services/RoleService.java | 32 ++++ .../pages/AbstractSchedTaskModalPage.java | 6 +- .../console/pages/SchedTaskModalPage.java | 5 + .../console/pages/panels/RoleTabPanel.java | 30 ++++ .../console/pages/panels/SchedTasks.java | 8 +- .../syncope/console/rest/RoleRestClient.java | 8 + .../wicket/markup/html/form/ActionLink.java | 2 + .../markup/html/form/ActionLinksPanel.java | 31 ++++ .../markup/html/form/ActionLinksPanel.html | 12 +- .../webapp/img/actions/deprovision-icon.png | Bin 210 -> 669 bytes .../main/webapp/img/actions/provision-icon.png | Bin 360 -> 665 bytes .../init/ImplementationClassNamesLoader.java | 5 +- .../syncope/core/persistence/dao/RoleDAO.java | 4 + .../core/persistence/dao/impl/RoleDAOImpl.java | 19 +++ .../validation/entity/SchedTaskValidator.java | 4 +- .../propagation/impl/PropagationManager.java | 14 ++ .../core/quartz/RoleMemberProvisionTaskJob.java | 169 +++++++++++++++++++ .../core/rest/controller/RoleController.java | 67 +++++++- .../syncope/core/services/RoleServiceImpl.java | 16 ++ .../syncope/core/sync/impl/AbstractSyncJob.java | 1 - .../syncope/core/rest/RoleTestITCase.java | 70 ++++++++ .../syncope/core/rest/TaskTestITCase.java | 3 +- 22 files changed, 492 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/c71fdc77/common/src/main/java/org/apache/syncope/common/services/RoleService.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/syncope/common/services/RoleService.java b/common/src/main/java/org/apache/syncope/common/services/RoleService.java index 9bd1588..857aa81 100644 --- a/common/src/main/java/org/apache/syncope/common/services/RoleService.java +++ b/common/src/main/java/org/apache/syncope/common/services/RoleService.java @@ -40,6 +40,7 @@ import org.apache.syncope.common.mod.RoleMod; import org.apache.syncope.common.reqres.BulkAction; import org.apache.syncope.common.reqres.BulkActionResult; import org.apache.syncope.common.to.RoleTO; +import org.apache.syncope.common.to.TaskExecTO; import org.apache.syncope.common.types.ResourceAssociationActionType; import org.apache.syncope.common.types.ResourceDeassociationActionType; import org.apache.syncope.common.wrap.ResourceName; @@ -304,6 +305,36 @@ public interface RoleService extends JAXRSService { @NotNull List<ResourceName> resourceNames); /** + * Provision all members of the given role onto all the resources associated to it. + * + * @param roleId role id. + * @return <tt>Response</tt> object featuring {@link org.apache.syncope.common.reqres.BulkActionResult} + * as <tt>Entity</tt> + */ + @Descriptions({ + @Description(target = DocTarget.RESPONSE, + value = "Featuring <tt>BulkActionResult</tt> as <tt>Entity</tt>") + }) + @POST + @Path("{roleId}/associate/PROVISION/members") + TaskExecTO bulkProvisionMembers(@NotNull @PathParam("roleId") Long roleId); + + /** + * Deprovision all members of the given role from all the resources associated to it. + * + * @param roleId role id. + * @return <tt>Response</tt> object featuring {@link org.apache.syncope.common.reqres.BulkActionResult} + * as <tt>Entity</tt> + */ + @Descriptions({ + @Description(target = DocTarget.RESPONSE, + value = "Featuring <tt>BulkActionResult</tt> as <tt>Entity</tt>") + }) + @POST + @Path("{roleId}/associate/PROVISION/members") + TaskExecTO bulkDeprovisionMembers(@NotNull @PathParam("roleId") Long roleId); + + /** * Executes the provided bulk action. * * @param bulkAction list of role ids against which the bulk action will be performed. @@ -314,4 +345,5 @@ public interface RoleService extends JAXRSService { @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) BulkActionResult bulk(@NotNull BulkAction bulkAction); + } http://git-wip-us.apache.org/repos/asf/syncope/blob/c71fdc77/console/src/main/java/org/apache/syncope/console/pages/AbstractSchedTaskModalPage.java ---------------------------------------------------------------------- diff --git a/console/src/main/java/org/apache/syncope/console/pages/AbstractSchedTaskModalPage.java b/console/src/main/java/org/apache/syncope/console/pages/AbstractSchedTaskModalPage.java index 490e62f..9fd6bca 100644 --- a/console/src/main/java/org/apache/syncope/console/pages/AbstractSchedTaskModalPage.java +++ b/console/src/main/java/org/apache/syncope/console/pages/AbstractSchedTaskModalPage.java @@ -42,6 +42,8 @@ public abstract class AbstractSchedTaskModalPage extends TaskModalPage { private static final long serialVersionUID = 2892005971093059242L; + protected final AjaxTextFieldPanel description; + protected CrontabContainer crontab; public AbstractSchedTaskModalPage(final ModalWindow window, final SchedTaskTO taskTO, @@ -58,7 +60,7 @@ public abstract class AbstractSchedTaskModalPage extends TaskModalPage { name.setEnabled(true); profile.add(name); - final AjaxTextFieldPanel description = new AjaxTextFieldPanel("description", "description", + description = new AjaxTextFieldPanel("description", "description", new PropertyModel<String>(taskTO, "description")); description.setEnabled(true); profile.add(description); @@ -83,7 +85,7 @@ public abstract class AbstractSchedTaskModalPage extends TaskModalPage { taskTO.setCronExpression(StringUtils.hasText(taskTO.getCronExpression()) ? crontab.getCronExpression() : null); - + try { submitAction(taskTO); http://git-wip-us.apache.org/repos/asf/syncope/blob/c71fdc77/console/src/main/java/org/apache/syncope/console/pages/SchedTaskModalPage.java ---------------------------------------------------------------------- diff --git a/console/src/main/java/org/apache/syncope/console/pages/SchedTaskModalPage.java b/console/src/main/java/org/apache/syncope/console/pages/SchedTaskModalPage.java index a1267a7..647d356 100644 --- a/console/src/main/java/org/apache/syncope/console/pages/SchedTaskModalPage.java +++ b/console/src/main/java/org/apache/syncope/console/pages/SchedTaskModalPage.java @@ -20,6 +20,7 @@ package org.apache.syncope.console.pages; import java.util.List; import org.apache.syncope.common.to.SchedTaskTO; +import org.apache.syncope.console.pages.panels.SchedTasks; import org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel; import org.apache.wicket.PageReference; import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow; @@ -55,6 +56,10 @@ public class SchedTaskModalPage extends AbstractSchedTaskModalPage { className.setEnabled(taskTO.getId() == 0); className.setStyleSheet("ui-widget-content ui-corner-all long_dynamicsize"); profile.add(className); + + description.setEnabled(!SchedTasks.ROLE_MEMBER_PROVISION.equals(taskTO.getJobClassName())); + description.setVisible(!SchedTasks.ROLE_MEMBER_PROVISION.equals(taskTO.getJobClassName())); + className.setVisible(!SchedTasks.ROLE_MEMBER_PROVISION.equals(taskTO.getJobClassName())); } @Override http://git-wip-us.apache.org/repos/asf/syncope/blob/c71fdc77/console/src/main/java/org/apache/syncope/console/pages/panels/RoleTabPanel.java ---------------------------------------------------------------------- diff --git a/console/src/main/java/org/apache/syncope/console/pages/panels/RoleTabPanel.java b/console/src/main/java/org/apache/syncope/console/pages/panels/RoleTabPanel.java index 10d739c..c61c705 100644 --- a/console/src/main/java/org/apache/syncope/console/pages/panels/RoleTabPanel.java +++ b/console/src/main/java/org/apache/syncope/console/pages/panels/RoleTabPanel.java @@ -137,6 +137,36 @@ public class RoleTabPanel extends Panel { @Override public void onClick(final AjaxRequestTarget target) { try { + roleRestClient.bulkProvisionMembers(selectedNode.getId()); + info(getString(Constants.OPERATION_SUCCEEDED)); + } catch (SyncopeClientException e) { + error(getString(Constants.OPERATION_ERROR) + ": " + e.getMessage()); + } + ((Roles) pageRef.getPage()).getFeedbackPanel().refresh(target); + } + }, ActionLink.ActionType.PROVISION_MEMBERS, xmlRolesReader.getEntitlement("Tasks", "execute")); + links.addWithRoles(new ActionLink() { + + private static final long serialVersionUID = -3722207913631435501L; + + @Override + public void onClick(final AjaxRequestTarget target) { + try { + roleRestClient.bulkDeprovisionMembers(selectedNode.getId()); + info(getString(Constants.OPERATION_SUCCEEDED)); + } catch (SyncopeClientException e) { + error(getString(Constants.OPERATION_ERROR) + ": " + e.getMessage()); + } + ((Roles) pageRef.getPage()).getFeedbackPanel().refresh(target); + } + }, ActionLink.ActionType.DEPROVISION_MEMBERS, xmlRolesReader.getEntitlement("Tasks", "execute")); + links.addWithRoles(new ActionLink() { + + private static final long serialVersionUID = -3722207913631435501L; + + @Override + public void onClick(final AjaxRequestTarget target) { + try { final RoleTO roleTO = roleRestClient.delete(selectedNode.getETagValue(), selectedNode.getId()); ((Roles) pageRef.getPage()).setModalResult(true); http://git-wip-us.apache.org/repos/asf/syncope/blob/c71fdc77/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java ---------------------------------------------------------------------- diff --git a/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java b/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java index 78591a8..687d034 100644 --- a/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java +++ b/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java @@ -59,6 +59,8 @@ public class SchedTasks extends AbstractTasks { private static final long serialVersionUID = 525486152284253354L; + public static final String ROLE_MEMBER_PROVISION = "org.apache.syncope.core.quartz.RoleMemberProvisionTaskJob"; + private int paginatorRows; private WebMarkupContainer container; @@ -171,7 +173,7 @@ public class SchedTasks extends AbstractTasks { new StringResourceModel("latestExecStatus", this, null), "latestExecStatus", "latestExecStatus")); columns.add(new JobColumn<AbstractTaskTO, String>(new StringResourceModel("", this, null, ""), "runtime", - pageRef, restClient)); + pageRef, restClient)); columns.add(new ActionColumn<AbstractTaskTO, String>(new StringResourceModel("actions", this, null, "")) { @@ -220,7 +222,7 @@ public class SchedTasks extends AbstractTasks { ((NotificationPanel) getPage().get(Constants.FEEDBACK)).refresh(target); target.add(container); } - }, ActionLink.ActionType.EXECUTE, TASKS); + }, ActionLink.ActionType.EXECUTE, TASKS, !ROLE_MEMBER_PROVISION.equals(taskTO.getJobClassName())); panel.add(new ActionLink() { @@ -238,7 +240,7 @@ public class SchedTasks extends AbstractTasks { ((NotificationPanel) getPage().get(Constants.FEEDBACK)).refresh(target); target.add(container); } - }, ActionLink.ActionType.DRYRUN, TASKS); + }, ActionLink.ActionType.DRYRUN, TASKS, !ROLE_MEMBER_PROVISION.equals(taskTO.getJobClassName())); panel.add(new ActionLink() { http://git-wip-us.apache.org/repos/asf/syncope/blob/c71fdc77/console/src/main/java/org/apache/syncope/console/rest/RoleRestClient.java ---------------------------------------------------------------------- diff --git a/console/src/main/java/org/apache/syncope/console/rest/RoleRestClient.java b/console/src/main/java/org/apache/syncope/console/rest/RoleRestClient.java index a26a5cf..cc3a363 100644 --- a/console/src/main/java/org/apache/syncope/console/rest/RoleRestClient.java +++ b/console/src/main/java/org/apache/syncope/console/rest/RoleRestClient.java @@ -112,6 +112,14 @@ public class RoleRestClient extends AbstractSubjectRestClient { return result; } + public void bulkProvisionMembers(final Long id) { + getService(RoleService.class).bulkProvisionMembers(id); + } + + public void bulkDeprovisionMembers(final Long id) { + getService(RoleService.class).bulkDeprovisionMembers(id); + } + @Override public BulkActionResult bulkAction(final BulkAction action) { return getService(RoleService.class).bulk(action); http://git-wip-us.apache.org/repos/asf/syncope/blob/c71fdc77/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLink.java ---------------------------------------------------------------------- diff --git a/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLink.java b/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLink.java index 4ee0405..3503be4 100644 --- a/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLink.java +++ b/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLink.java @@ -52,6 +52,8 @@ public abstract class ActionLink implements Serializable { ASSIGN("update"), DEPROVISION("update"), PROVISION("update"), + DEPROVISION_MEMBERS("update"), + PROVISION_MEMBERS("update"), MANAGE_RESOURCES("update"), MANAGE_USERS("update"), MANAGE_ROLES("update"); http://git-wip-us.apache.org/repos/asf/syncope/blob/c71fdc77/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.java ---------------------------------------------------------------------- diff --git a/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.java b/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.java index 5e6e5eb..435fc79 100644 --- a/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.java +++ b/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.java @@ -74,6 +74,8 @@ public class ActionLinksPanel extends Panel { super.add(new Fragment("panelAssign", "emptyFragment", this)); super.add(new Fragment("panelDeprovision", "emptyFragment", this)); super.add(new Fragment("panelProvision", "emptyFragment", this)); + super.add(new Fragment("panelDeprovisionMembers", "emptyFragment", this)); + super.add(new Fragment("panelProvisionMembers", "emptyFragment", this)); } public void add( @@ -475,6 +477,35 @@ public class ActionLinksPanel extends Panel { } }.feedbackPanelAutomaticReload(link.feedbackPanelAutomaticReload())); break; + + case DEPROVISION_MEMBERS: + fragment = new Fragment("panelDeprovisionMembers", "fragmentDeprovisionMembers", this); + + fragment.addOrReplace(new ClearIndicatingAjaxLink<Void>("deprovisionMembersLink", pageRef) { + + private static final long serialVersionUID = -6957616042924610290L; + + @Override + protected void onClickInternal(final AjaxRequestTarget target) { + link.onClick(target); + } + }.feedbackPanelAutomaticReload(link.feedbackPanelAutomaticReload())); + break; + + case PROVISION_MEMBERS: + fragment = new Fragment("panelProvisionMembers", "fragmentProvisionMembers", this); + + fragment.addOrReplace(new ClearIndicatingAjaxLink<Void>("provisionMembersLink", pageRef) { + + private static final long serialVersionUID = -6957616042924610290L; + + @Override + protected void onClickInternal(final AjaxRequestTarget target) { + link.onClick(target); + } + }.feedbackPanelAutomaticReload(link.feedbackPanelAutomaticReload())); + break; + default: // do nothing } http://git-wip-us.apache.org/repos/asf/syncope/blob/c71fdc77/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.html ---------------------------------------------------------------------- diff --git a/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.html b/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.html index 7630854..5d7f204 100644 --- a/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.html +++ b/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.html @@ -40,6 +40,8 @@ under the License. <span wicket:id="panelReset">[plus]</span> <span wicket:id="panelEdit">[plus]</span> <span wicket:id="panelExport">[plus]</span> + <span wicket:id="panelDeprovisionMembers">[plus]</span> + <span wicket:id="panelProvisionMembers">[plus]</span> <span wicket:id="panelDelete">[plus]</span> <span wicket:id="panelSelect">[plus]</span> <span wicket:id="panelSuspend">[plus]</span> @@ -97,6 +99,14 @@ under the License. <a href="#" wicket:id="roleTemplateLink"><img id="actionLink" src="img/actions/roles-icon.png" alt="role template icon" title="Specify role template"/></a> </wicket:fragment> + <wicket:fragment wicket:id="fragmentDeprovisionMembers"> + <a href="#" wicket:id="deprovisionMembersLink"><img id="actionLink" src="img/actions/deprovision-icon.png" alt="Deprovision icon" title="Deprovision members"/></a> + </wicket:fragment> + + <wicket:fragment wicket:id="fragmentProvisionMembers"> + <a href="#" wicket:id="provisionMembersLink"><img id="actionLink" src="img/actions/provision-icon.png" alt="Provision icon" title="Provision members"/></a> + </wicket:fragment> + <wicket:fragment wicket:id="fragmentDelete"> <a href="#" wicket:id="deleteLink"><img id="actionLink" src="img/actions/delete.png" alt="delete icon" title="Delete"/></a> </wicket:fragment> @@ -150,7 +160,7 @@ under the License. </wicket:fragment> <wicket:fragment wicket:id="fragmentDeprovision"> - <a href="#" wicket:id="deprovisionLink"><img id="actionLink" src="img/actions/deprovision-icon.png" alt="De-provision icon" title="De-provision"/></a> + <a href="#" wicket:id="deprovisionLink"><img id="actionLink" src="img/actions/deprovision-icon.png" alt="Deprovision icon" title="Deprovision"/></a> </wicket:fragment> <wicket:fragment wicket:id="fragmentProvision"> http://git-wip-us.apache.org/repos/asf/syncope/blob/c71fdc77/console/src/main/webapp/img/actions/deprovision-icon.png ---------------------------------------------------------------------- diff --git a/console/src/main/webapp/img/actions/deprovision-icon.png b/console/src/main/webapp/img/actions/deprovision-icon.png index 4bc2f4e..9615d0d 100644 Binary files a/console/src/main/webapp/img/actions/deprovision-icon.png and b/console/src/main/webapp/img/actions/deprovision-icon.png differ http://git-wip-us.apache.org/repos/asf/syncope/blob/c71fdc77/console/src/main/webapp/img/actions/provision-icon.png ---------------------------------------------------------------------- diff --git a/console/src/main/webapp/img/actions/provision-icon.png b/console/src/main/webapp/img/actions/provision-icon.png index 3f8faf1..080c622 100644 Binary files a/console/src/main/webapp/img/actions/provision-icon.png and b/console/src/main/webapp/img/actions/provision-icon.png differ http://git-wip-us.apache.org/repos/asf/syncope/blob/c71fdc77/core/src/main/java/org/apache/syncope/core/init/ImplementationClassNamesLoader.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/syncope/core/init/ImplementationClassNamesLoader.java b/core/src/main/java/org/apache/syncope/core/init/ImplementationClassNamesLoader.java index b7659b8..1e2a63a 100644 --- a/core/src/main/java/org/apache/syncope/core/init/ImplementationClassNamesLoader.java +++ b/core/src/main/java/org/apache/syncope/core/init/ImplementationClassNamesLoader.java @@ -27,6 +27,7 @@ import java.util.Set; import org.apache.syncope.core.persistence.validation.attrvalue.Validator; import org.apache.syncope.core.propagation.PropagationActions; +import org.apache.syncope.core.quartz.RoleMemberProvisionTaskJob; import org.apache.syncope.core.quartz.TaskJob; import org.apache.syncope.core.report.Reportlet; import org.apache.syncope.core.sync.PushActions; @@ -96,7 +97,8 @@ public class ImplementationClassNamesLoader { if ((interfaces.contains(TaskJob.class)) && !metadata.isAbstract() && !SyncJob.class.getName().equals(metadata.getClassName()) - && !PushJob.class.getName().equals(metadata.getClassName())) { + && !PushJob.class.getName().equals(metadata.getClassName()) + && !RoleMemberProvisionTaskJob.class.getName().equals(metadata.getClassName())) { classNames.get(Type.TASKJOB).add(metadata.getClassName()); } @@ -114,7 +116,6 @@ public class ImplementationClassNamesLoader { } // TODO: add push correlation rules management - if (interfaces.contains(PropagationActions.class) && !metadata.isAbstract()) { classNames.get(Type.PROPAGATION_ACTIONS).add(metadata.getClassName()); } http://git-wip-us.apache.org/repos/asf/syncope/blob/c71fdc77/core/src/main/java/org/apache/syncope/core/persistence/dao/RoleDAO.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/syncope/core/persistence/dao/RoleDAO.java b/core/src/main/java/org/apache/syncope/core/persistence/dao/RoleDAO.java index ce64072..c97283b 100644 --- a/core/src/main/java/org/apache/syncope/core/persistence/dao/RoleDAO.java +++ b/core/src/main/java/org/apache/syncope/core/persistence/dao/RoleDAO.java @@ -19,6 +19,7 @@ package org.apache.syncope.core.persistence.dao; import java.util.List; +import java.util.Set; import org.apache.syncope.common.types.PolicyType; import org.apache.syncope.core.persistence.beans.Entitlement; @@ -29,6 +30,7 @@ import org.apache.syncope.core.persistence.beans.role.RAttrValue; import org.apache.syncope.core.persistence.beans.role.SyncopeRole; import org.apache.syncope.core.persistence.dao.search.OrderByClause; import org.apache.syncope.core.persistence.validation.entity.InvalidEntityException; +import org.identityconnectors.common.Pair; public interface RoleDAO extends SubjectDAO { @@ -68,6 +70,8 @@ public interface RoleDAO extends SubjectDAO { List<Membership> findMemberships(SyncopeRole role); + Pair<Set<String>, List<Long>> findResourcesAndMembers(Long roleId); + int count(); SyncopeRole save(SyncopeRole syncopeRole) throws InvalidEntityException; http://git-wip-us.apache.org/repos/asf/syncope/blob/c71fdc77/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/RoleDAOImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/RoleDAOImpl.java b/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/RoleDAOImpl.java index d094ac7..1a3a889 100644 --- a/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/RoleDAOImpl.java +++ b/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/RoleDAOImpl.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Set; import javax.persistence.NoResultException; import javax.persistence.Query; import javax.persistence.TypedQuery; @@ -63,6 +64,7 @@ import org.apache.syncope.core.persistence.dao.VirAttrDAO; import org.apache.syncope.core.persistence.dao.search.OrderByClause; import org.apache.syncope.core.util.AttributableUtil; import org.apache.syncope.core.util.EntitlementUtil; +import org.identityconnectors.common.Pair; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; @@ -383,6 +385,23 @@ public class RoleDAOImpl extends AbstractSubjectDAOImpl implements RoleDAO { return query.getResultList(); } + @Transactional(readOnly = true) + @Override + public Pair<Set<String>, List<Long>> findResourcesAndMembers(final Long roleId) { + SyncopeRole role = find(roleId); + if (role == null) { + return Pair.of(Collections.<String>emptySet(), Collections.<Long>emptyList()); + } + + List<Membership> memberships = findMemberships(role); + List<Long> members = new ArrayList<Long>(memberships.size()); + for (Membership membership : memberships) { + members.add(membership.getSyncopeUser().getId()); + } + + return Pair.of(role.getResourceNames(), members); + } + @SuppressWarnings("unchecked") private List<Long> unmatched(final Long roleId, final Class<?> attrClass, final Class<? extends AbstractAttrTemplate> attrTemplateClass) { http://git-wip-us.apache.org/repos/asf/syncope/blob/c71fdc77/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SchedTaskValidator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SchedTaskValidator.java b/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SchedTaskValidator.java index fe90c8c..ac107a6 100644 --- a/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SchedTaskValidator.java +++ b/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SchedTaskValidator.java @@ -24,8 +24,8 @@ import javax.validation.ConstraintValidatorContext; import org.apache.syncope.common.types.EntityViolationType; import org.apache.syncope.core.persistence.beans.SchedTask; +import org.apache.syncope.core.quartz.TaskJob; import org.quartz.CronExpression; -import org.quartz.Job; public class SchedTaskValidator extends AbstractValidator<SchedTaskCheck, SchedTask> { @@ -36,7 +36,7 @@ public class SchedTaskValidator extends AbstractValidator<SchedTaskCheck, SchedT Class<?> jobClass = null; try { jobClass = Class.forName(object.getJobClassName()); - isValid = Job.class.isAssignableFrom(jobClass); + isValid = TaskJob.class.isAssignableFrom(jobClass); } catch (Exception e) { LOG.error("Invalid Job class specified", e); isValid = false; http://git-wip-us.apache.org/repos/asf/syncope/blob/c71fdc77/core/src/main/java/org/apache/syncope/core/propagation/impl/PropagationManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/syncope/core/propagation/impl/PropagationManager.java b/core/src/main/java/org/apache/syncope/core/propagation/impl/PropagationManager.java index 166017a..96d5791 100644 --- a/core/src/main/java/org/apache/syncope/core/propagation/impl/PropagationManager.java +++ b/core/src/main/java/org/apache/syncope/core/propagation/impl/PropagationManager.java @@ -247,6 +247,20 @@ public class PropagationManager { return createTasks(subject, password, true, null, null, null, null, enable, false, propByRes); } + public List<PropagationTask> getUserUpdateTaskIds(final long userId, final PropagationByResource propByRes) { + SyncopeUser user = userDataBinder.getUserFromId(userId); + return getUpdateTaskIds( + user, + null, + true, + null, + null, + null, + propByRes, + null, + Collections.<MembershipMod>emptySet()); + } + /** * Performs update on each resource associated to the user. * http://git-wip-us.apache.org/repos/asf/syncope/blob/c71fdc77/core/src/main/java/org/apache/syncope/core/quartz/RoleMemberProvisionTaskJob.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/syncope/core/quartz/RoleMemberProvisionTaskJob.java b/core/src/main/java/org/apache/syncope/core/quartz/RoleMemberProvisionTaskJob.java new file mode 100644 index 0000000..ec837a5 --- /dev/null +++ b/core/src/main/java/org/apache/syncope/core/quartz/RoleMemberProvisionTaskJob.java @@ -0,0 +1,169 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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.apache.syncope.core.quartz; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import org.apache.commons.lang3.StringUtils; +import org.apache.syncope.common.to.PropagationStatus; +import org.apache.syncope.common.types.ResourceOperation; +import org.apache.syncope.core.persistence.beans.Entitlement; +import org.apache.syncope.core.persistence.beans.PropagationTask; +import org.apache.syncope.core.persistence.beans.TaskExec; +import org.apache.syncope.core.persistence.dao.EntitlementDAO; +import org.apache.syncope.core.persistence.dao.RoleDAO; +import org.apache.syncope.core.propagation.PropagationByResource; +import org.apache.syncope.core.propagation.PropagationException; +import org.apache.syncope.core.propagation.PropagationReporter; +import org.apache.syncope.core.propagation.PropagationTaskExecutor; +import org.apache.syncope.core.propagation.impl.PropagationManager; +import org.apache.syncope.core.util.ApplicationContextProvider; +import org.identityconnectors.common.Pair; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserDetails; + +public class RoleMemberProvisionTaskJob extends AbstractTaskJob { + + public static final String PROVISION_ACTION_JOBDETAIL_KEY = "provisionAction"; + + public static final String ROLE_ID_JOBDETAIL_KEY = "roleId"; + + public enum Action { + PROVISION, + DEPROVISION; + + } + + @Autowired + private EntitlementDAO entitlementDAO; + + @Autowired + private RoleDAO roleDAO; + + @Autowired + private PropagationManager propagationManager; + + @Autowired + private PropagationTaskExecutor taskExecutor; + + private Long roleId; + + private Action action; + + @Override + public void execute(final JobExecutionContext context) throws JobExecutionException { + roleId = context.getMergedJobDataMap().getLong(ROLE_ID_JOBDETAIL_KEY); + action = (Action) context.getMergedJobDataMap().get(PROVISION_ACTION_JOBDETAIL_KEY); + + super.execute(context); + } + + @Override + protected String doExecute(final boolean dryRun) throws JobExecutionException { + // PRE: grant all authorities (i.e. setup the SecurityContextHolder) + final List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>(); + + for (Entitlement entitlement : entitlementDAO.findAll()) { + authorities.add(new SimpleGrantedAuthority(entitlement.getName())); + } + + final UserDetails userDetails = new User("admin", "FAKE_PASSWORD", true, true, true, true, authorities); + + SecurityContextHolder.getContext().setAuthentication( + new UsernamePasswordAuthenticationToken(userDetails, "FAKE_PASSWORD", authorities)); + + try { + return executeWithSecurityContext(); + } finally { + // POST: clean up the SecurityContextHolder + SecurityContextHolder.clearContext(); + } + } + + protected String executeWithSecurityContext() { + Map<Long, List<PropagationTask>> propagationTasks = new HashMap<Long, List<PropagationTask>>(); + + Pair<Set<String>, List<Long>> resAndMembs = roleDAO.findResourcesAndMembers(roleId); + + PropagationByResource propByRes = new PropagationByResource(); + propByRes.addAll( + action == Action.PROVISION + ? ResourceOperation.UPDATE + : ResourceOperation.DELETE, + resAndMembs.getKey()); + + for (Long userId : resAndMembs.getValue()) { + propagationTasks.put( + userId, + propagationManager.getUserUpdateTaskIds(userId, propByRes)); + } + + StringBuilder result = new StringBuilder("Role ").append(roleId).append(" members "); + if (action == Action.DEPROVISION) { + result.append("de"); + } + result.append("provision\n\n"); + + PropagationReporter propagationReporter = + ApplicationContextProvider.getApplicationContext().getBean(PropagationReporter.class); + for (Map.Entry<Long, List<PropagationTask>> entry : propagationTasks.entrySet()) { + if (entry.getValue().isEmpty()) { + result.append("User ").append(entry.getKey()).append('\t'). + append("No propagations\n\n"); + } else { + try { + taskExecutor.execute(entry.getValue(), propagationReporter); + } catch (PropagationException e) { + LOG.error("Error propagation primary resource", e); + propagationReporter.onPrimaryResourceFailure(entry.getValue()); + } + + for (PropagationStatus status : propagationReporter.getStatuses()) { + result.append("User ").append(entry.getKey()).append('\t'). + append("Resource ").append(status.getResource()).append('\t'). + append(status.getStatus()); + if (StringUtils.isNotBlank(status.getFailureReason())) { + result.append('\n').append(status.getFailureReason()).append('\n'); + } + result.append("\n"); + } + result.append("\n"); + } + } + + return result.toString(); + } + + @Override + protected boolean hasToBeRegistered(final TaskExec execution) { + // always record execution result + return true; + } + +} http://git-wip-us.apache.org/repos/asf/syncope/blob/c71fdc77/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java b/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java index c8fb25f..1cecdba 100644 --- a/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java +++ b/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java @@ -22,6 +22,7 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.Date; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -34,26 +35,36 @@ import org.apache.syncope.common.types.ClientExceptionType; import org.apache.syncope.common.SyncopeClientException; import org.apache.syncope.common.reqres.BulkAction; import org.apache.syncope.common.reqres.BulkActionResult; +import org.apache.syncope.common.to.TaskExecTO; import org.apache.syncope.common.types.SubjectType; +import org.apache.syncope.core.init.JobInstanceLoader; import org.apache.syncope.core.persistence.beans.PropagationTask; +import org.apache.syncope.core.persistence.beans.SchedTask; import org.apache.syncope.core.persistence.beans.role.SyncopeRole; import org.apache.syncope.core.persistence.beans.user.SyncopeUser; import org.apache.syncope.core.persistence.dao.SubjectSearchDAO; import org.apache.syncope.core.persistence.dao.NotFoundException; import org.apache.syncope.core.persistence.dao.RoleDAO; +import org.apache.syncope.core.persistence.dao.TaskDAO; import org.apache.syncope.core.persistence.dao.UserDAO; import org.apache.syncope.core.persistence.dao.search.OrderByClause; import org.apache.syncope.core.propagation.PropagationException; import org.apache.syncope.core.propagation.PropagationReporter; import org.apache.syncope.core.propagation.PropagationTaskExecutor; import org.apache.syncope.core.propagation.impl.PropagationManager; +import org.apache.syncope.core.quartz.AbstractTaskJob; +import org.apache.syncope.core.quartz.RoleMemberProvisionTaskJob; import org.apache.syncope.core.rest.data.AttributableTransformer; import org.apache.syncope.core.rest.data.RoleDataBinder; import org.apache.syncope.core.util.ApplicationContextProvider; import org.apache.syncope.core.util.EntitlementUtil; import org.apache.syncope.core.workflow.WorkflowResult; import org.apache.syncope.core.workflow.role.RoleWorkflowAdapter; +import org.quartz.JobDataMap; +import org.quartz.JobKey; +import org.quartz.Scheduler; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.quartz.SchedulerFactoryBean; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -78,6 +89,9 @@ public class RoleController extends AbstractSubjectController<RoleTO, RoleMod> { protected SubjectSearchDAO searchDAO; @Autowired + protected TaskDAO taskDAO; + + @Autowired protected RoleDataBinder binder; @Autowired @@ -92,8 +106,14 @@ public class RoleController extends AbstractSubjectController<RoleTO, RoleMod> { @Autowired protected AttributableTransformer attrTransformer; + @Autowired + protected JobInstanceLoader jobInstanceLoader; + + @Autowired + protected SchedulerFactoryBean scheduler; + @Resource(name = "anonymousUser") - private String anonymousUser; + protected String anonymousUser; @PreAuthorize("hasAnyRole('ROLE_READ', T(org.apache.syncope.common.SyncopeConstants).ANONYMOUS_ENTITLEMENT)") @Transactional(readOnly = true) @@ -347,6 +367,51 @@ public class RoleController extends AbstractSubjectController<RoleTO, RoleMod> { return roleTO; } + protected TaskExecTO startRoleMemberProvisionTask(final Long roleId, RoleMemberProvisionTaskJob.Action action) { + SchedTask task = new SchedTask(); + task.setName("Bulk member provision for role " + roleId); + task.setJobClassName(RoleMemberProvisionTaskJob.class.getName()); + task = taskDAO.save(task); + + try { + jobInstanceLoader.registerJob(task, task.getJobClassName(), task.getCronExpression()); + + JobDataMap map = new JobDataMap(); + map.put(AbstractTaskJob.DRY_RUN_JOBDETAIL_KEY, false); + map.put(RoleMemberProvisionTaskJob.PROVISION_ACTION_JOBDETAIL_KEY, action); + map.put(RoleMemberProvisionTaskJob.ROLE_ID_JOBDETAIL_KEY, roleId); + + scheduler.getScheduler().triggerJob( + new JobKey(JobInstanceLoader.getJobName(task), Scheduler.DEFAULT_GROUP), map); + } catch (Exception e) { + LOG.error("While executing task {}", task, e); + + SyncopeClientException sce = SyncopeClientException.build(ClientExceptionType.Scheduling); + sce.getElements().add(e.getMessage()); + throw sce; + } + + TaskExecTO result = new TaskExecTO(); + result.setTask(task.getId()); + result.setStartDate(new Date()); + result.setStatus("JOB_FIRED"); + result.setMessage("Job fired; waiting for results..."); + + return result; + } + + @Transactional + @PreAuthorize("hasRole('TASK_CREATE') and hasRole('TASK_EXECUTE')") + public TaskExecTO bulkProvisionMembers(final Long roleId) { + return startRoleMemberProvisionTask(roleId, RoleMemberProvisionTaskJob.Action.PROVISION); + } + + @Transactional + @PreAuthorize("hasRole('TASK_CREATE') and hasRole('TASK_EXECUTE')") + public TaskExecTO bulkDeprovisionMembers(final Long roleId) { + return startRoleMemberProvisionTask(roleId, RoleMemberProvisionTaskJob.Action.DEPROVISION); + } + @PreAuthorize("(hasRole('ROLE_DELETE') and #bulkAction.operation == #bulkAction.operation.DELETE)") public BulkActionResult bulk(final BulkAction bulkAction) { BulkActionResult res = new BulkActionResult(); http://git-wip-us.apache.org/repos/asf/syncope/blob/c71fdc77/core/src/main/java/org/apache/syncope/core/services/RoleServiceImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/syncope/core/services/RoleServiceImpl.java b/core/src/main/java/org/apache/syncope/core/services/RoleServiceImpl.java index 639ab2e..ccabf39 100644 --- a/core/src/main/java/org/apache/syncope/core/services/RoleServiceImpl.java +++ b/core/src/main/java/org/apache/syncope/core/services/RoleServiceImpl.java @@ -29,11 +29,14 @@ import org.apache.syncope.common.reqres.PagedResult; import org.apache.syncope.common.to.PropagationStatus; import org.apache.syncope.common.wrap.ResourceName; import org.apache.syncope.common.to.RoleTO; +import org.apache.syncope.common.to.TaskExecTO; +import org.apache.syncope.common.to.UserTO; import org.apache.syncope.common.types.ResourceAssociationActionType; import org.apache.syncope.common.types.ResourceDeassociationActionType; import org.apache.syncope.common.util.CollectionWrapper; import org.apache.syncope.core.persistence.dao.search.OrderByClause; import org.apache.syncope.core.rest.controller.RoleController; +import org.apache.syncope.core.rest.controller.UserController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -43,6 +46,9 @@ public class RoleServiceImpl extends AbstractServiceImpl implements RoleService @Autowired private RoleController controller; + @Autowired + private UserController userController; + @Override public List<RoleTO> children(final Long roleId) { return controller.children(roleId); @@ -231,6 +237,16 @@ public class RoleServiceImpl extends AbstractServiceImpl implements RoleService } @Override + public TaskExecTO bulkProvisionMembers(final Long roleId) { + return controller.bulkProvisionMembers(roleId); + } + + @Override + public TaskExecTO bulkDeprovisionMembers(final Long roleId) { + return controller.bulkDeprovisionMembers(roleId); + } + + @Override public BulkActionResult bulk(final BulkAction bulkAction) { return controller.bulk(bulkAction); } http://git-wip-us.apache.org/repos/asf/syncope/blob/c71fdc77/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSyncJob.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSyncJob.java b/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSyncJob.java index d66fa83..b63bfb9 100644 --- a/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSyncJob.java +++ b/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSyncJob.java @@ -385,7 +385,6 @@ public abstract class AbstractSyncJob<T extends AbstractSyncTask, A extends Abst uMapping, rMapping, dryRun); - } finally { // POST: clean up the SecurityContextHolder SecurityContextHolder.clearContext(); http://git-wip-us.apache.org/repos/asf/syncope/blob/c71fdc77/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java b/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java index 5b18f3e..51d4330 100644 --- a/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java +++ b/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java @@ -46,9 +46,13 @@ import org.apache.syncope.common.reqres.PagedResult; import org.apache.syncope.common.services.RoleService; import org.apache.syncope.common.to.ConnObjectTO; import org.apache.syncope.common.to.MappingItemTO; +import org.apache.syncope.common.to.MembershipTO; +import org.apache.syncope.common.to.PropagationStatus; import org.apache.syncope.common.to.ResourceTO; import org.apache.syncope.common.to.RoleTO; +import org.apache.syncope.common.to.SchedTaskTO; import org.apache.syncope.common.to.SchemaTO; +import org.apache.syncope.common.to.TaskExecTO; import org.apache.syncope.common.to.UserTO; import org.apache.syncope.common.types.AttributableType; import org.apache.syncope.common.types.AttributeSchemaType; @@ -63,6 +67,7 @@ import org.apache.syncope.common.types.SchemaType; import org.apache.syncope.common.types.SubjectType; import org.apache.syncope.common.util.CollectionWrapper; import org.apache.syncope.common.wrap.ResourceName; +import org.apache.syncope.core.quartz.AbstractTaskJob; import org.identityconnectors.framework.common.objects.Name; import org.junit.FixMethodOrder; import org.junit.Ignore; @@ -690,6 +695,71 @@ public class RoleTestITCase extends AbstractTest { } @Test + public void provisionMembers() throws InterruptedException { + // 1. create role without resources + RoleTO roleTO = buildBasicRoleTO("forProvision"); + roleTO = createRole(roleTO); + + // 2. create user with such role assigned + UserTO userTO = UserTestITCase.getUniqueSampleTO("[email protected]"); + MembershipTO membership = new MembershipTO(); + membership.setRoleId(roleTO.getId()); + userTO.getMemberships().add(membership); + userTO = createUser(userTO); + + // 3. modify the role by assiging the LDAP resource + RoleMod roleMod = new RoleMod(); + roleMod.setId(roleTO.getId()); + roleMod.getResourcesToAdd().add(RESOURCE_NAME_LDAP); + roleTO = updateRole(roleMod); + + PropagationStatus propStatus = roleTO.getPropagationStatusTOs().get(0); + assertEquals(RESOURCE_NAME_LDAP, propStatus.getResource()); + assertTrue(propStatus.getStatus().isSuccessful()); + + // 4. verify that the user above is not found on LDAP + try { + resourceService.getConnectorObject(RESOURCE_NAME_LDAP, SubjectType.USER, userTO.getId()); + fail(); + } catch (SyncopeClientException e) { + assertEquals(ClientExceptionType.NotFound, e.getType()); + } + + try { + // 5. bulk provision role members + TaskExecTO exec = roleService.bulkProvisionMembers(roleTO.getId()); + assertNotNull(exec.getTask()); + + int i = 0; + int maxit = 50; + + // wait for task exec completion (executions incremented) + SchedTaskTO taskTO; + do { + Thread.sleep(1000); + + taskTO = taskService.read(exec.getTask(), true); + + assertNotNull(taskTO); + assertNotNull(taskTO.getExecutions()); + + i++; + } while (taskTO.getExecutions().isEmpty() && i < maxit); + assertFalse(taskTO.getExecutions().isEmpty()); + + assertEquals(AbstractTaskJob.Status.SUCCESS.name(), taskTO.getExecutions().get(0).getStatus()); + + // 6. verify that the user above is now fond on LDAP + ConnObjectTO userOnLdap = + resourceService.getConnectorObject(RESOURCE_NAME_LDAP, SubjectType.USER, userTO.getId()); + assertNotNull(userOnLdap); + } finally { + roleService.delete(roleTO.getId()); + userService.delete(userTO.getId()); + } + } + + @Test public void issueSYNCOPE455() { final String parentName = "issueSYNCOPE455-PRole"; final String childName = "issueSYNCOPE455-CRole"; http://git-wip-us.apache.org/repos/asf/syncope/blob/c71fdc77/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java b/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java index d1c9715..4cd4522 100644 --- a/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java +++ b/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java @@ -543,7 +543,6 @@ public class TaskTestITCase extends AbstractTest { int i = 0; int maxit = 50; - int executions = 0; // wait for task exec completion (executions incremented) do { @@ -558,7 +557,7 @@ public class TaskTestITCase extends AbstractTest { assertNotNull(taskTO.getExecutions()); i++; - } while (executions == taskTO.getExecutions().size() && i < maxit); + } while (taskTO.getExecutions().isEmpty() && i < maxit); assertFalse(taskTO.getExecutions().isEmpty());
