manage also adynMembershipConds

Author: SamuelGaro

core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPushResultHandler.java

@@ -181,9 +181,7 @@ protected void link(final Any<?> any, final boolean unlink, final ProvisioningRe
                 operation(unlink ? PatchOperation.DELETE : PatchOperation.ADD_REPLACE).
                 value(profile.getTask().getResource().getKey()).build());
 
-        if (any instanceof Group && ((Group) any).getUDynMembership() != null) {
-            ((GroupUR) req).setUDynMembershipCond(((Group) any).getUDynMembership().getFIQLCond());
-        }
+        copyDynMembershipConds(any, req);
 
         update(req);
 
@@ -196,9 +194,7 @@ protected void unassign(final Any<?> any, final ConnectorObject beforeObj, final
                 operation(PatchOperation.DELETE).
                 value(profile.getTask().getResource().getKey()).build());
 
-        if (any instanceof Group && ((Group) any).getUDynMembership() != null) {
-            ((GroupUR) req).setUDynMembershipCond(((Group) any).getUDynMembership().getFIQLCond());
-        }
+        copyDynMembershipConds(any, req);
 
         update(req);
 
@@ -211,15 +207,24 @@ protected void assign(final Any<?> any, final Boolean enabled, final Provisionin
                 operation(PatchOperation.ADD_REPLACE).
                 value(profile.getTask().getResource().getKey()).build());
 
-        if (any instanceof Group && ((Group) any).getUDynMembership() != null) {
-            ((GroupUR) req).setUDynMembershipCond(((Group) any).getUDynMembership().getFIQLCond());
-        }
+        copyDynMembershipConds(any, req);
 
         update(req);
 
         provision(any, enabled, result);
     }
 
+    protected void copyDynMembershipConds(final Any<?> any, final AnyUR req) {
+        if (any instanceof Group &&
+                (((Group) any).getUDynMembership() != null || !((Group) any).getADynMemberships().isEmpty())) {
+            ((GroupUR) req).setUDynMembershipCond(((Group) any).getUDynMembership().getFIQLCond());
+
+            ((Group) any).getADynMemberships().forEach(aDynGroupMembership ->
+                    ((GroupUR) req).getADynMembershipConds().put(
+                            aDynGroupMembership.getAnyType().getKey(), aDynGroupMembership.getFIQLCond()));
+        }
+    }
+
     @Transactional(propagation = Propagation.REQUIRES_NEW)
     @Override
     public boolean handle(final String anyKey) {

fit/core-reference/src/test/java/org/apache/syncope/fit/core/PushTaskITCase.java

@@ -519,7 +519,7 @@ public void issueSYNCOPE648() {
     @Test
     void issueSYNCOPE1918() {
         GroupUR groupUR = new GroupUR.Builder("29f96485-729e-4d31-88a1-6fc60e4677f3")
-                .udynMembershipCond("username=~ros*").build();
+                .udynMembershipCond("username=~ros*").adynMembershipCond(PRINTER, "name=~hp*").build();
         GroupTO groupTO = updateGroup(groupUR).getEntity();
         assertTrue(StringUtils.isNotBlank(groupTO.getUDynMembershipCond()));
 
@@ -528,11 +528,14 @@ void issueSYNCOPE1918() {
 
         groupTO = GROUP_SERVICE.read("29f96485-729e-4d31-88a1-6fc60e4677f3");
         assertTrue(StringUtils.isNotBlank(groupTO.getUDynMembershipCond()));
+        assertFalse(groupTO.getADynMembershipConds().isEmpty());
 
         //Restore group citizen
         groupUR.setUDynMembershipCond(null);
+        groupUR.getADynMembershipConds().clear();
         groupTO = updateGroup(groupUR).getEntity();
 
         assertTrue(StringUtils.isBlank(groupTO.getUDynMembershipCond()));
+        assertTrue(groupTO.getADynMembershipConds().isEmpty());
     }
 }