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 15:28:21 UTC
[syncope] branch 2_0_X updated (4253fe0 -> 7aa1cb9)
This is an automated email from the ASF dual-hosted git repository.
fmartelli pushed a change to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git.
from 4253fe0 [SYNCOPE-1412] changes in order to avoid null_attr views
new 4192f1d [SYNCOPE-1412] removes debug statement
new 7aa1cb9 [SYNCOPE-1411] code improvement
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/syncope/core/persistence/jpa/dao/JPAAnySearchDAO.java | 2 --
.../core/provisioning/java/data/AnyObjectDataBinderImpl.java | 7 ++-----
.../syncope/core/provisioning/java/data/UserDataBinderImpl.java | 6 +-----
3 files changed, 3 insertions(+), 12 deletions(-)
[syncope] 02/02: [SYNCOPE-1411] code improvement
Posted by fm...@apache.org.
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 <fa...@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) {
[syncope] 01/02: [SYNCOPE-1412] removes debug statement
Posted by fm...@apache.org.
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 4192f1d437d969e6011386fda9ebc9bf9d4df98a
Author: fmartelli <fa...@gmail.com>
AuthorDate: Mon Dec 10 16:27:38 2018 +0100
[SYNCOPE-1412] removes debug statement
---
.../org/apache/syncope/core/persistence/jpa/dao/JPAAnySearchDAO.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnySearchDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnySearchDAO.java
index 725d6b7..c9b3c87 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnySearchDAO.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnySearchDAO.java
@@ -176,8 +176,6 @@ public class JPAAnySearchDAO extends AbstractAnySearchDAO {
append(filter.getLeft()).
append(buildOrderBy(obs));
- System.out.println("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA " + queryString.toString());
-
// 3. prepare the search query
Query query = entityManager().createNativeQuery(queryString.toString());