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 2017/12/15 14:10:38 UTC

syncope git commit: little improvement on dynamic membership refreshing

Repository: syncope
Updated Branches:
  refs/heads/2_0_X 3c41b5ed3 -> 850934a6a


little improvement on dynamic membership refreshing


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/850934a6
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/850934a6
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/850934a6

Branch: refs/heads/2_0_X
Commit: 850934a6a80cd638eb71859598e464b4fe9e0739
Parents: 3c41b5e
Author: fmartelli <fa...@gmail.com>
Authored: Fri Dec 15 15:10:20 2017 +0100
Committer: fmartelli <fa...@gmail.com>
Committed: Fri Dec 15 15:10:20 2017 +0100

----------------------------------------------------------------------
 .../core/persistence/jpa/dao/JPAGroupDAO.java   | 28 +++++---------------
 1 file changed, 6 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/850934a6/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAGroupDAO.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAGroupDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAGroupDAO.java
index 7862415..898a4ae 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAGroupDAO.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAGroupDAO.java
@@ -463,24 +463,16 @@ public class JPAGroupDAO extends AbstractAnyDAO<Group> implements GroupDAO {
     @Transactional
     @Override
     public Pair<Set<String>, Set<String>> refreshDynMemberships(final AnyObject anyObject) {
-        Query dynGroupsQuery = entityManager().createNativeQuery(
-                "SELECT group_id FROM " + ADYNMEMB_TABLE + " WHERE any_id=?");
-        dynGroupsQuery.setParameter(1, anyObject.getKey());
-        @SuppressWarnings("unchecked")
-        List<String> dynGroups = dynGroupsQuery.getResultList();
-
         Set<String> before = new HashSet<>();
-        for (String dynGroup : dynGroups) {
-            before.add(dynGroup);
-        }
-
         Set<String> after = new HashSet<>();
         for (ADynGroupMembership memb : findWithADynMemberships(anyObject.getType())) {
             Query delete = entityManager().createNativeQuery(
                     "DELETE FROM " + ADYNMEMB_TABLE + " WHERE group_id=? AND any_id=?");
             delete.setParameter(1, memb.getGroup().getKey());
             delete.setParameter(2, anyObject.getKey());
-            delete.executeUpdate();
+            if (delete.executeUpdate() > 0) {
+                before.add(memb.getGroup().getKey());
+            }
 
             if (jpaAnySearchDAO().matches(
                     anyObject,
@@ -559,24 +551,16 @@ public class JPAGroupDAO extends AbstractAnyDAO<Group> implements GroupDAO {
     @Transactional
     @Override
     public Pair<Set<String>, Set<String>> refreshDynMemberships(final User user) {
-        Query dynGroupsQuery = entityManager().createNativeQuery(
-                "SELECT group_id FROM " + UDYNMEMB_TABLE + " WHERE any_id=?");
-        dynGroupsQuery.setParameter(1, user.getKey());
-        @SuppressWarnings("unchecked")
-        List<String> dynGroups = dynGroupsQuery.getResultList();
-
         Set<String> before = new HashSet<>();
-        for (String dynGroup : dynGroups) {
-            before.add(dynGroup);
-        }
-
         Set<String> after = new HashSet<>();
         for (UDynGroupMembership memb : findWithUDynMemberships()) {
             Query delete = entityManager().createNativeQuery(
                     "DELETE FROM " + UDYNMEMB_TABLE + " WHERE group_id=? AND any_id=?");
             delete.setParameter(1, memb.getGroup().getKey());
             delete.setParameter(2, user.getKey());
-            delete.executeUpdate();
+            if (delete.executeUpdate() > 0) {
+                before.add(memb.getGroup().getKey());
+            }
 
             if (jpaAnySearchDAO().matches(
                     user,