You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2018/03/22 14:44:17 UTC
[2/3] syncope git commit: Increase readability (and possibly
efficiency)
Increase readability (and possibly efficiency)
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/a9ac69e9
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/a9ac69e9
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/a9ac69e9
Branch: refs/heads/master
Commit: a9ac69e9846d094974ed926cd6f3dffd2991a537
Parents: d948906
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Mar 22 15:43:41 2018 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Mar 22 15:43:41 2018 +0100
----------------------------------------------------------------------
.../core/persistence/jpa/dao/JPAAnyObjectDAO.java | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/a9ac69e9/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnyObjectDAO.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnyObjectDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnyObjectDAO.java
index 972a0fb..abba39c 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnyObjectDAO.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnyObjectDAO.java
@@ -250,21 +250,18 @@ public class JPAAnyObjectDAO extends AbstractAnyDAO<AnyObject> implements AnyObj
groupDAO().removeDynMemberships(anyObject);
dynRealmDAO().removeDynMemberships(anyObject.getKey());
- findARelationships(anyObject).stream().map(relationship -> {
+ findARelationships(anyObject).forEach(relationship -> {
relationship.getLeftEnd().getRelationships().remove(relationship);
- return relationship;
- }).map(relationship -> {
save(relationship.getLeftEnd());
- return relationship;
- }).forEachOrdered(relationship -> entityManager().remove(relationship));
- findURelationships(anyObject).stream().map(relationship -> {
+ entityManager().remove(relationship);
+ });
+ findURelationships(anyObject).forEach(relationship -> {
relationship.getLeftEnd().getRelationships().remove(relationship);
- return relationship;
- }).map(relationship -> {
userDAO().save(relationship.getLeftEnd());
- return relationship;
- }).forEachOrdered(relationship -> entityManager().remove(relationship));
+
+ entityManager().remove(relationship);
+ });
entityManager().remove(anyObject);
publisher.publishEvent(