[syncope] 02/02: [SYNCOPE-1411] code improvement

[fmartelli]

This is an automated email from the ASF dual-hosted git repository.

fmartelli pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git

commit 7aa1cb9d74f79046aff300317417ade569eca44d
Author: fmartelli <fabio.marte...@gmail.com>
AuthorDate: Mon Dec 10 16:28:01 2018 +0100

    [SYNCOPE-1411] code improvement
---
 .../core/provisioning/java/data/AnyObjectDataBinderImpl.java       | 7 ++-----
 .../syncope/core/provisioning/java/data/UserDataBinderImpl.java    | 6 +-----
 2 files changed, 3 insertions(+), 10 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 902b502..11d2464 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
@@ -369,11 +369,10 @@ public class AnyObjectDataBinderImpl extends 
AbstractAnyDataBinder implements An
                 if (membership != null) {
                     anyObject.getMemberships().remove(membership);
                     membership.setLeftEnd(null);
-                    Set<String> membAttrKeys = new HashSet<>();
                     for (APlainAttr attr : 
anyObject.getPlainAttrs(membership)) {
                         anyObject.remove(attr);
                         attr.setOwner(null);
-                        membAttrKeys.add(attr.getKey());
+                        attr.setMembership(null);
                         if (attr.getSchema().isUniqueConstraint()) {
                             
plainAttrValueDAO.delete(attr.getUniqueValue().getKey(), 
anyUtils.plainAttrValueClass());
                         } else {
@@ -383,9 +382,7 @@ public class AnyObjectDataBinderImpl extends 
AbstractAnyDataBinder implements An
                                 plainAttrValueDAO.delete(attrValueKey, 
anyUtils.plainAttrValueClass());
                             }
                         }
-                    }
-                    for (String attrKey : membAttrKeys) {
-                        plainAttrDAO.delete(attrKey, 
anyUtils.plainAttrClass());
+                        plainAttrDAO.delete(attr);
                     }
 
                     if (membPatch.getOperation() == PatchOperation.DELETE) {
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 4efe304..cdef516 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
@@ -437,12 +437,10 @@ public class UserDataBinderImpl extends 
AbstractAnyDataBinder implements UserDat
                 if (membership != null) {
                     user.getMemberships().remove(membership);
                     membership.setLeftEnd(null);
-                    Set<String> membAttrKeys = new HashSet<>();
                     for (UPlainAttr attr : user.getPlainAttrs(membership)) {
                         user.remove(attr);
                         attr.setOwner(null);
                         attr.setMembership(null);
-                        membAttrKeys.add(attr.getKey());
                         if (attr.getSchema().isUniqueConstraint()) {
                             
plainAttrValueDAO.delete(attr.getUniqueValue().getKey(), 
anyUtils.plainAttrValueClass());
                         } else {
@@ -452,9 +450,7 @@ public class UserDataBinderImpl extends 
AbstractAnyDataBinder implements UserDat
                                 plainAttrValueDAO.delete(attrValueKey, 
anyUtils.plainAttrValueClass());
                             }
                         }
-                    }
-                    for (String attrKey : membAttrKeys) {
-                        plainAttrDAO.delete(attrKey, 
anyUtils.plainAttrClass());
+                        plainAttrDAO.delete(attr);
                     }
 
                     if (membPatch.getOperation() == PatchOperation.DELETE) {