syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [1/2] syncope git commit: Duplicate removal
Date Thu, 18 Feb 2016 08:12:07 GMT
Repository: syncope
Updated Branches:
  refs/heads/1_2_X 0f56fa10f -> 254a7b632


Duplicate removal


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/702c3d7c
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/702c3d7c
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/702c3d7c

Branch: refs/heads/1_2_X
Commit: 702c3d7c2ffcff5a29b636093900c46024c96d38
Parents: 0f56fa1
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Thu Feb 18 09:01:59 2016 +0100
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Thu Feb 18 09:01:59 2016 +0100

----------------------------------------------------------------------
 .../user/activiti/ActivitiUserWorkflowAdapter.java       | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/702c3d7c/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
b/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
index be2ba97..0765cfa 100644
--- a/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
+++ b/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
@@ -73,7 +73,6 @@ import org.apache.syncope.core.persistence.validation.attrvalue.ParsingValidatio
 import org.apache.syncope.core.persistence.validation.entity.InvalidEntityException;
 import org.apache.syncope.core.propagation.PropagationByResource;
 import org.apache.syncope.core.rest.controller.UnauthorizedRoleException;
-import org.apache.syncope.core.rest.data.UserDataBinder;
 import org.apache.syncope.core.util.EntitlementUtil;
 import org.apache.syncope.core.workflow.WorkflowDefinitionFormat;
 import org.apache.syncope.core.workflow.WorkflowException;
@@ -91,9 +90,6 @@ import org.springframework.transaction.annotation.Transactional;
  */
 public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter {
 
-    /**
-     * Logger.
-     */
     protected static final Logger LOG = LoggerFactory.getLogger(ActivitiUserWorkflowAdapter.class);
 
     protected static final String[] PROPERTY_IGNORE_PROPS = { "type" };
@@ -160,9 +156,6 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter
{
     protected ActivitiImportUtils importUtils;
 
     @Autowired
-    protected UserDataBinder userDataBinder;
-
-    @Autowired
     protected DataSource dataSource;
 
     @Override
@@ -444,7 +437,7 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter
{
     @Override
     protected void doRequestPasswordReset(final SyncopeUser user) throws WorkflowException
{
         Map<String, Object> variables = new HashMap<String, Object>(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);
@@ -458,7 +451,7 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter
{
         Map<String, Object> variables = new HashMap<String, Object>(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);


Mime
View raw message