Repository: syncope Updated Branches: refs/heads/master 3147ee761 -> 757608a7c
Duplicate removal Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/1802b3bb Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/1802b3bb Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/1802b3bb Branch: refs/heads/master Commit: 1802b3bb47c7144af3d73b378b5ad83816835946 Parents: 3147ee7 Author: Francesco Chicchiriccò <[email protected]> Authored: Thu Feb 18 09:02:07 2016 +0100 Committer: Francesco Chicchiriccò <[email protected]> Committed: Thu Feb 18 09:02:07 2016 +0100 ---------------------------------------------------------------------- .../core/workflow/activiti/ActivitiUserWorkflowAdapter.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/1802b3bb/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java ---------------------------------------------------------------------- diff --git a/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java b/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java index c664f22..6fcad68 100644 --- a/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java +++ b/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java @@ -69,7 +69,6 @@ import org.apache.syncope.core.persistence.api.attrvalue.validation.InvalidEntit import org.apache.syncope.core.persistence.api.attrvalue.validation.ParsingValidationException; import org.apache.syncope.core.persistence.api.entity.user.User; import org.apache.syncope.core.provisioning.api.WorkflowResult; -import org.apache.syncope.core.provisioning.api.data.UserDataBinder; import org.apache.syncope.core.workflow.activiti.spring.DomainProcessEngine; import org.apache.syncope.core.workflow.api.WorkflowDefinitionFormat; import org.apache.syncope.core.workflow.api.WorkflowException; @@ -131,9 +130,6 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter { @Autowired protected DomainProcessEngine engine; - @Autowired - protected UserDataBinder userDataBinder; - @Override public String getPrefix() { return "ACT_"; @@ -414,7 +410,7 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter { @Override protected void doRequestPasswordReset(final User user) { Map<String, Object> variables = new HashMap<>(2); - variables.put(USER_TO, userDataBinder.getUserTO(user, true)); + variables.put(USER_TO, dataBinder.getUserTO(user, true)); variables.put(EVENT, "requestPasswordReset"); doExecuteTask(user, "requestPasswordReset", variables); @@ -428,7 +424,7 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter { Map<String, Object> variables = new HashMap<>(4); variables.put(TOKEN, token); variables.put(PASSWORD, password); - variables.put(USER_TO, userDataBinder.getUserTO(user, true)); + variables.put(USER_TO, dataBinder.getUserTO(user, true)); variables.put(EVENT, "confirmPasswordReset"); Set<String> tasks = doExecuteTask(user, "confirmPasswordReset", variables);
