You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by sk...@apache.org on 2018/05/29 07:26:52 UTC
syncope git commit: [SYNCOPE-1283] PullActions code improvement
Repository: syncope
Updated Branches:
refs/heads/2_0_X 6871b730f -> b903017fc
[SYNCOPE-1283] PullActions code improvement
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b903017f
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b903017f
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b903017f
Branch: refs/heads/2_0_X
Commit: b903017fc7e94de2d1c1b43381cda4b74dfc747c
Parents: 6871b73
Author: skylark17 <ma...@tirasa.net>
Authored: Tue May 29 09:21:27 2018 +0200
Committer: skylark17 <ma...@tirasa.net>
Committed: Tue May 29 09:21:27 2018 +0200
----------------------------------------------------------------------
.../java/pushpull/AzurePullActions.java | 29 ++++++--------------
1 file changed, 9 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/b903017f/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AzurePullActions.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AzurePullActions.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AzurePullActions.java
index 231a07c..8528492 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AzurePullActions.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AzurePullActions.java
@@ -27,7 +27,6 @@ import org.apache.syncope.common.lib.patch.UserPatch;
import org.apache.syncope.common.lib.to.EntityTO;
import org.apache.syncope.common.lib.to.GroupTO;
import org.apache.syncope.common.lib.to.UserTO;
-import org.apache.syncope.common.lib.types.AnyTypeKind;
import org.apache.syncope.core.persistence.api.attrvalue.validation.InvalidPlainAttrValueException;
import org.apache.syncope.core.persistence.api.dao.GroupDAO;
import org.apache.syncope.core.persistence.api.dao.PlainSchemaDAO;
@@ -78,9 +77,7 @@ public class AzurePullActions extends DefaultPullActions {
@Autowired
private AnyUtilsFactory anyUtilsFactory;
- private final Map<String, String> azureIds = new HashMap<>();
-
- private AnyTypeKind entityType;
+ private final Map<EntityTO, String> azureRefs = new HashMap<>();
protected String getEmailAttrName() {
return "mailNickname";
@@ -147,24 +144,17 @@ public class AzurePullActions extends DefaultPullActions {
return;
}
- if (entity instanceof UserTO) {
- entityType = AnyTypeKind.USER;
- } else if (entity instanceof GroupTO) {
- entityType = AnyTypeKind.GROUP;
- }
-
- azureIds.put(entity.getKey(), delta.getUid().getUidValue());
+ azureRefs.put(entity, delta.getUid().getUidValue());
}
@Transactional
@Override
public void afterAll(final ProvisioningProfile<?, ?> profile) throws JobExecutionException {
- for (Map.Entry<String, String> entry : azureIds.entrySet()) {
-
- if (AnyTypeKind.USER.equals(entityType)) {
- User user = userDAO.find(entry.getKey());
+ for (Map.Entry<EntityTO, String> entry : azureRefs.entrySet()) {
+ if (entry.getKey() instanceof UserTO) {
+ User user = userDAO.find(entry.getKey().getKey());
if (user == null) {
- LOG.error("Could not find user {}, skipping", entry.getKey());
+ LOG.error("Could not find user {}, skipping", entry.getKey().getKey());
} else {
AnyUtils anyUtils = anyUtilsFactory.getInstance(user);
@@ -193,10 +183,10 @@ public class AzurePullActions extends DefaultPullActions {
}
}
}
- } else if (AnyTypeKind.GROUP.equals(entityType)) {
- Group group = groupDAO.find(entry.getKey());
+ } else if (entry.getKey() instanceof GroupTO) {
+ Group group = groupDAO.find(entry.getKey().getKey());
if (group == null) {
- LOG.error("Could not find group {}, skipping", entry.getKey());
+ LOG.error("Could not find group {}, skipping", entry.getKey().getKey());
} else {
AnyUtils anyUtils = anyUtilsFactory.getInstance(group);
@@ -226,7 +216,6 @@ public class AzurePullActions extends DefaultPullActions {
}
}
}
-
}
}