You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by fm...@apache.org on 2018/12/10 14:39:17 UTC
[syncope] 04/04: [SYNCOPE-1411] fixes merge from 2_0_X
This is an automated email from the ASF dual-hosted git repository.
fmartelli pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 6e80336e27978a6c38a787c4a6ac71ab3ca7b0d1
Author: fmartelli <fa...@gmail.com>
AuthorDate: Mon Dec 10 15:38:49 2018 +0100
[SYNCOPE-1411] fixes merge from 2_0_X
---
.../core/provisioning/java/data/AnyObjectDataBinderImpl.java | 6 ------
.../syncope/core/provisioning/java/data/UserDataBinderImpl.java | 6 +-----
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AnyObjectDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AnyObjectDataBinderImpl.java
index 7e8fbf8..0002836 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AnyObjectDataBinderImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AnyObjectDataBinderImpl.java
@@ -54,7 +54,6 @@ import org.apache.syncope.core.persistence.api.entity.anyobject.AnyObject;
import org.apache.syncope.core.persistence.api.entity.group.Group;
import org.apache.syncope.core.persistence.api.entity.resource.ExternalResource;
import org.apache.syncope.core.provisioning.api.data.AnyObjectDataBinder;
-import org.apache.syncope.core.provisioning.api.utils.EntityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -342,17 +341,12 @@ public class AnyObjectDataBinderImpl extends AbstractAnyDataBinder implements An
anyObject.getMembership(membPatch.getGroup()).ifPresent(membership -> {
anyObject.remove(membership);
membership.setLeftEnd(null);
- Set<String> membAttrKeys = new HashSet<>();
anyObject.getPlainAttrs(membership).forEach(attr -> {
anyObject.remove(attr);
attr.setOwner(null);
attr.setMembership(null);
- membAttrKeys.add(attr.getKey());
plainAttrValueDAO.deleteAll(attr, anyUtils);
});
- membAttrKeys.forEach(attrKey -> {
- plainAttrDAO.delete(attrKey, anyUtils.plainAttrClass());
- });
if (membPatch.getOperation() == PatchOperation.DELETE) {
groupDAO.findAllResourceKeys(membership.getRightEnd().getKey()).stream().
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
index 7eabd7f..5771d6f 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
@@ -414,16 +414,12 @@ public class UserDataBinderImpl extends AbstractAnyDataBinder implements UserDat
user.getMembership(membPatch.getGroup()).ifPresent(membership -> {
user.remove(membership);
membership.setLeftEnd(null);
- Set<String> membAttrKeys = new HashSet<>();
user.getPlainAttrs(membership).forEach(attr -> {
user.remove(attr);
attr.setOwner(null);
attr.setMembership(null);
- membAttrKeys.add(attr.getKey());
plainAttrValueDAO.deleteAll(attr, anyUtils);
- });
- membAttrKeys.forEach(attrKey -> {
- plainAttrDAO.delete(attrKey, anyUtils.plainAttrClass());
+ plainAttrDAO.delete(attr);
});
if (membPatch.getOperation() == PatchOperation.DELETE) {