http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAPlainAttrValueDAO.java
----------------------------------------------------------------------
diff --git 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAPlainAttrValueDAO.java
 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAPlainAttrValueDAO.java
index be2965c..312d6fc 100644
--- 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAPlainAttrValueDAO.java
+++ 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAPlainAttrValueDAO.java
@@ -44,26 +44,29 @@ import org.springframework.stereotype.Repository;
 @Repository
 public class JPAPlainAttrValueDAO extends AbstractDAO<PlainAttrValue, Long> 
implements PlainAttrValueDAO {
 
+    @SuppressWarnings("unchecked")
     private <T extends PlainAttrValue> Class<? extends AbstractPlainAttrValue> 
getJPAEntityReference(
             final Class<T> reference) {
 
-        return reference.equals(CPlainAttrValue.class)
-                ? JPACPlainAttrValue.class
-                : reference.equals(CPlainAttrUniqueValue.class)
-                        ? JPACPlainAttrUniqueValue.class
-                        : reference.equals(GPlainAttrValue.class)
-                                ? JPAGPlainAttrValue.class
-                                : reference.equals(GPlainAttrUniqueValue.class)
-                                        ? JPAGPlainAttrUniqueValue.class
-                                        : 
reference.equals(APlainAttrValue.class)
-                                                ? JPAAPlainAttrValue.class
-                                                : 
reference.equals(APlainAttrUniqueValue.class)
-                                                        ? 
JPAAPlainAttrUniqueValue.class
-                                                        : 
reference.equals(UPlainAttrValue.class)
-                                                                ? 
JPAUPlainAttrValue.class
-                                                                : 
reference.equals(UPlainAttrUniqueValue.class)
-                                                                        ? 
JPAUPlainAttrUniqueValue.class
-                                                                        : null;
+        return AbstractPlainAttrValue.class.isAssignableFrom(reference)
+                ? (Class<? extends AbstractPlainAttrValue>) reference
+                : reference.equals(CPlainAttrValue.class)
+                        ? JPACPlainAttrValue.class
+                        : reference.equals(CPlainAttrUniqueValue.class)
+                                ? JPACPlainAttrUniqueValue.class
+                                : reference.equals(GPlainAttrValue.class)
+                                        ? JPAGPlainAttrValue.class
+                                        : 
reference.equals(GPlainAttrUniqueValue.class)
+                                                ? 
JPAGPlainAttrUniqueValue.class
+                                                : 
reference.equals(APlainAttrValue.class)
+                                                        ? 
JPAAPlainAttrValue.class
+                                                        : 
reference.equals(APlainAttrUniqueValue.class)
+                                                                ? 
JPAAPlainAttrUniqueValue.class
+                                                                : 
reference.equals(UPlainAttrValue.class)
+                                                                        ? 
JPAUPlainAttrValue.class
+                                                                        : 
reference.equals(UPlainAttrUniqueValue.class)
+                                                                               
 ? JPAUPlainAttrUniqueValue.class
+                                                                               
 : null;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/anyobject/JPAAnyObject.java
----------------------------------------------------------------------
diff --git 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/anyobject/JPAAnyObject.java
 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/anyobject/JPAAnyObject.java
index d32ec02..3e9feda 100644
--- 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/anyobject/JPAAnyObject.java
+++ 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/anyobject/JPAAnyObject.java
@@ -19,6 +19,7 @@
 package org.apache.syncope.core.persistence.jpa.entity.anyobject;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import javax.persistence.Cacheable;
 import javax.persistence.CascadeType;
@@ -199,19 +200,32 @@ public class JPAAnyObject extends AbstractAny<APlainAttr, 
ADerAttr, AVirAttr> im
     }
 
     @Override
-    public ARelationship getRelationship(final RelationshipType 
relationshipType) {
+    public ARelationship getRelationship(final RelationshipType 
relationshipType, final Long anyObjectKey) {
         return CollectionUtils.find(getRelationships(), new 
Predicate<ARelationship>() {
 
             @Override
             public boolean evaluate(final ARelationship relationship) {
+                return anyObjectKey != null && 
anyObjectKey.equals(relationship.getRightEnd().getKey())
+                        && ((relationshipType == null && 
relationship.getType() == null)
+                        || (relationshipType != null && 
relationshipType.equals(relationship.getType())));
+            }
+        });
+    }
+
+    @Override
+    public Collection<? extends ARelationship> getRelationships(final 
RelationshipType relationshipType) {
+        return CollectionUtils.select(getRelationships(), new 
Predicate<ARelationship>() {
+
+            @Override
+            public boolean evaluate(final ARelationship relationship) {
                 return relationshipType != null && 
relationshipType.equals(relationship.getType());
             }
         });
     }
 
     @Override
-    public ARelationship getRelationship(final Long anyObjectKey) {
-        return CollectionUtils.find(getRelationships(), new 
Predicate<ARelationship>() {
+    public Collection<? extends ARelationship> getRelationships(final Long 
anyObjectKey) {
+        return CollectionUtils.select(getRelationships(), new 
Predicate<ARelationship>() {
 
             @Override
             public boolean evaluate(final ARelationship relationship) {

http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/user/JPAUser.java
----------------------------------------------------------------------
diff --git 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/user/JPAUser.java
 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/user/JPAUser.java
index e7a688c..74335ec 100644
--- 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/user/JPAUser.java
+++ 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/user/JPAUser.java
@@ -20,6 +20,7 @@ package org.apache.syncope.core.persistence.jpa.entity.user;
 
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import javax.persistence.Basic;
@@ -546,19 +547,32 @@ public class JPAUser extends AbstractAny<UPlainAttr, 
UDerAttr, UVirAttr> impleme
     }
 
     @Override
-    public URelationship getRelationship(final RelationshipType 
relationshipType) {
+    public URelationship getRelationship(final RelationshipType 
relationshipType, final Long anyObjectKey) {
         return CollectionUtils.find(getRelationships(), new 
Predicate<URelationship>() {
 
             @Override
             public boolean evaluate(final URelationship relationship) {
+                return anyObjectKey != null && 
anyObjectKey.equals(relationship.getRightEnd().getKey())
+                        && ((relationshipType == null && 
relationship.getType() == null)
+                        || (relationshipType != null && 
relationshipType.equals(relationship.getType())));
+            }
+        });
+    }
+
+    @Override
+    public Collection<? extends URelationship> getRelationships(final 
RelationshipType relationshipType) {
+        return CollectionUtils.select(getRelationships(), new 
Predicate<URelationship>() {
+
+            @Override
+            public boolean evaluate(final URelationship relationship) {
                 return relationshipType != null && 
relationshipType.equals(relationship.getType());
             }
         });
     }
 
     @Override
-    public URelationship getRelationship(final Long anyObjectKey) {
-        return CollectionUtils.find(getRelationships(), new 
Predicate<URelationship>() {
+    public Collection<? extends URelationship> getRelationships(final Long 
anyObjectKey) {
+        return CollectionUtils.select(getRelationships(), new 
Predicate<URelationship>() {
 
             @Override
             public boolean evaluate(final URelationship relationship) {

http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/RelationshipTypeTest.java
----------------------------------------------------------------------
diff --git 
a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/RelationshipTypeTest.java
 
b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/RelationshipTypeTest.java
index 9808962..0a16023 100644
--- 
a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/RelationshipTypeTest.java
+++ 
b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/RelationshipTypeTest.java
@@ -91,7 +91,8 @@ public class RelationshipTypeTest extends AbstractTest {
 
         AnyObject anyObject = anyObjectDAO.find(1L);
         assertNotNull(anyObject);
-        assertNotNull(anyObject.getRelationship(neighborhood));
+        assertNotNull(anyObject.getRelationships(neighborhood));
+        assertFalse(anyObject.getRelationships(neighborhood).isEmpty());
 
         relationshipTypeDAO.delete("neighborhood");
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/AnyObjectProvisioningManager.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/AnyObjectProvisioningManager.java
 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/AnyObjectProvisioningManager.java
index 5645979..d5571ab 100644
--- 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/AnyObjectProvisioningManager.java
+++ 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/AnyObjectProvisioningManager.java
@@ -20,11 +20,11 @@ package org.apache.syncope.core.provisioning.api;
 
 import java.util.Collection;
 import java.util.List;
-import org.apache.syncope.common.lib.mod.AnyObjectMod;
+import org.apache.syncope.common.lib.patch.AnyObjectPatch;
 import org.apache.syncope.common.lib.to.AnyObjectTO;
 import org.apache.syncope.common.lib.to.PropagationStatus;
 
-public interface AnyObjectProvisioningManager extends 
ProvisioningManager<AnyObjectTO, AnyObjectMod> {
+public interface AnyObjectProvisioningManager extends 
ProvisioningManager<AnyObjectTO, AnyObjectPatch> {
 
     List<PropagationStatus> provision(Long key, Collection<String> resources);
 }

http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/GroupProvisioningManager.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/GroupProvisioningManager.java
 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/GroupProvisioningManager.java
index c74b5df..ea258e5 100644
--- 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/GroupProvisioningManager.java
+++ 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/GroupProvisioningManager.java
@@ -23,11 +23,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import org.apache.commons.lang3.tuple.Pair;
-import org.apache.syncope.common.lib.mod.GroupMod;
+import org.apache.syncope.common.lib.patch.GroupPatch;
 import org.apache.syncope.common.lib.to.PropagationStatus;
 import org.apache.syncope.common.lib.to.GroupTO;
 
-public interface GroupProvisioningManager extends ProvisioningManager<GroupTO, 
GroupMod> {
+public interface GroupProvisioningManager extends ProvisioningManager<GroupTO, 
GroupPatch> {
 
     Pair<Long, List<PropagationStatus>> create(
             GroupTO groupTO, Map<Long, String> groupOwnerMap, Set<String> 
excludedResources);

http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/LogicActions.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/LogicActions.java
 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/LogicActions.java
index 01464a7..f70d7f1 100644
--- 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/LogicActions.java
+++ 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/LogicActions.java
@@ -18,7 +18,7 @@
  */
 package org.apache.syncope.core.provisioning.api;
 
-import org.apache.syncope.common.lib.mod.AnyMod;
+import org.apache.syncope.common.lib.patch.AnyPatch;
 import org.apache.syncope.common.lib.to.AnyTO;
 
 /**
@@ -30,7 +30,7 @@ public interface LogicActions {
 
     <A extends AnyTO> A afterCreate(A input);
 
-    <M extends AnyMod> M beforeUpdate(M input);
+    <P extends AnyPatch> P beforeUpdate(P input);
 
     <A extends AnyTO> A afterUpdate(A input);
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/ProvisioningManager.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/ProvisioningManager.java
 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/ProvisioningManager.java
index e517270..add5b03 100644
--- 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/ProvisioningManager.java
+++ 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/ProvisioningManager.java
@@ -22,27 +22,27 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 import org.apache.commons.lang3.tuple.Pair;
-import org.apache.syncope.common.lib.mod.AnyMod;
+import org.apache.syncope.common.lib.patch.AnyPatch;
 import org.apache.syncope.common.lib.to.AnyTO;
 import org.apache.syncope.common.lib.to.PropagationStatus;
 
-public interface ProvisioningManager<T extends AnyTO, M extends AnyMod> {
+public interface ProvisioningManager<T extends AnyTO, P extends AnyPatch> {
 
     Pair<Long, List<PropagationStatus>> create(T anyTO);
 
     Pair<Long, List<PropagationStatus>> create(T anyTO, Set<String> 
excludedResources);
 
-    Pair<Long, List<PropagationStatus>> update(M anyMod);
+    Pair<Long, List<PropagationStatus>> update(P anyMod);
 
-    Pair<Long, List<PropagationStatus>> update(M anyMod, Set<String> 
excludedResources);
+    Pair<Long, List<PropagationStatus>> update(P anyMod, Set<String> 
excludedResources);
 
     List<PropagationStatus> delete(Long anyKey);
 
     List<PropagationStatus> delete(Long anyKey, Set<String> excludedResources);
 
-    Long unlink(M anyMod);
+    Long unlink(P anyMod);
 
-    Long link(M anyMod);
+    Long link(P anyMod);
 
     List<PropagationStatus> deprovision(Long anyKey, Collection<String> 
resources);
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/UserProvisioningManager.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/UserProvisioningManager.java
 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/UserProvisioningManager.java
index 21acad2..b29eee3 100644
--- 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/UserProvisioningManager.java
+++ 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/UserProvisioningManager.java
@@ -22,19 +22,19 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 import org.apache.commons.lang3.tuple.Pair;
-import org.apache.syncope.common.lib.mod.StatusMod;
-import org.apache.syncope.common.lib.mod.UserMod;
+import org.apache.syncope.common.lib.patch.StatusPatch;
+import org.apache.syncope.common.lib.patch.UserPatch;
 import org.apache.syncope.common.lib.to.PropagationStatus;
 import org.apache.syncope.common.lib.to.UserTO;
 import org.apache.syncope.core.provisioning.api.sync.ProvisioningResult;
 
-public interface UserProvisioningManager extends ProvisioningManager<UserTO, 
UserMod> {
+public interface UserProvisioningManager extends ProvisioningManager<UserTO, 
UserPatch> {
 
-    Pair<Long, List<PropagationStatus>> activate(StatusMod statusMod);
+    Pair<Long, List<PropagationStatus>> activate(StatusPatch statusPatch);
 
-    Pair<Long, List<PropagationStatus>> reactivate(StatusMod statusMod);
+    Pair<Long, List<PropagationStatus>> reactivate(StatusPatch statusPatch);
 
-    Pair<Long, List<PropagationStatus>> suspend(StatusMod statusMod);
+    Pair<Long, List<PropagationStatus>> suspend(StatusPatch statusPatch);
 
     void internalSuspend(Long key);
 
@@ -43,7 +43,7 @@ public interface UserProvisioningManager extends 
ProvisioningManager<UserTO, Use
     Pair<Long, List<PropagationStatus>> create(UserTO userTO, boolean 
storePassword,
             boolean disablePwdPolicyCheck, Boolean enabled, Set<String> 
excludedResources);
 
-    Pair<Long, List<PropagationStatus>> update(UserMod userMod, Long key,
+    Pair<Long, List<PropagationStatus>> update(UserPatch userPatch, Long key,
             ProvisioningResult result, Boolean enabled, Set<String> 
excludedResources);
 
     void requestPasswordReset(Long key);

http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/VirAttrHandler.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/VirAttrHandler.java
 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/VirAttrHandler.java
index 8916d27..54d8fe0 100644
--- 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/VirAttrHandler.java
+++ 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/VirAttrHandler.java
@@ -20,7 +20,7 @@ package org.apache.syncope.core.provisioning.api;
 
 import java.util.Collection;
 import java.util.Set;
-import org.apache.syncope.common.lib.mod.AttrMod;
+import org.apache.syncope.common.lib.patch.AttrPatch;
 import org.apache.syncope.common.lib.to.AttrTO;
 import org.apache.syncope.common.lib.types.AnyTypeKind;
 import org.apache.syncope.common.lib.types.IntMappingType;
@@ -31,7 +31,7 @@ import 
org.apache.syncope.core.persistence.api.entity.resource.ExternalResource;
 
 public interface VirAttrHandler {
 
-    PropagationByResource fillVirtual(Any any, Set<String> vAttrsToBeRemoved, 
Set<AttrMod> vAttrsToBeUpdated);
+    PropagationByResource fillVirtual(Any any, Set<AttrPatch> vAttrs);
 
     /**
      * Add virtual attributes and specify values to be propagated.
@@ -46,12 +46,10 @@ public interface VirAttrHandler {
      *
      * @param key any key
      * @param anyTypeKind type kind
-     * @param vAttrsToBeRemoved virtual attributes to be removed.
-     * @param vAttrsToBeUpdated virtual attributes to be updated.
+     * @param vAttrs virtual attributes to be updated.
      * @return operations to be performed on external resources for virtual 
attributes changes
      */
-    PropagationByResource fillVirtual(
-            Long key, AnyTypeKind anyTypeKind, Set<String> vAttrsToBeRemoved, 
Set<AttrMod> vAttrsToBeUpdated);
+    PropagationByResource fillVirtual(Long key, AnyTypeKind anyTypeKind, 
Set<AttrPatch> vAttrs);
 
     VirSchema getVirSchema(String virSchemaName);
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/AnyObjectDataBinder.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/AnyObjectDataBinder.java
 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/AnyObjectDataBinder.java
index 597b639..25b381e 100644
--- 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/AnyObjectDataBinder.java
+++ 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/AnyObjectDataBinder.java
@@ -18,7 +18,7 @@
  */
 package org.apache.syncope.core.provisioning.api.data;
 
-import org.apache.syncope.common.lib.mod.AnyObjectMod;
+import org.apache.syncope.common.lib.patch.AnyObjectPatch;
 import org.apache.syncope.common.lib.to.AnyObjectTO;
 import org.apache.syncope.common.lib.types.PropagationByResource;
 import org.apache.syncope.core.persistence.api.entity.anyobject.AnyObject;
@@ -31,5 +31,5 @@ public interface AnyObjectDataBinder {
 
     void create(AnyObject anyObject, AnyObjectTO anyObjectTO);
 
-    PropagationByResource update(AnyObject toBeUpdated, AnyObjectMod 
anyObjectMod);
+    PropagationByResource update(AnyObject toBeUpdated, AnyObjectPatch 
anyObjectPatch);
 }

http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/GroupDataBinder.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/GroupDataBinder.java
 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/GroupDataBinder.java
index f472aef..d2ab1fa 100644
--- 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/GroupDataBinder.java
+++ 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/GroupDataBinder.java
@@ -18,7 +18,7 @@
  */
 package org.apache.syncope.core.provisioning.api.data;
 
-import org.apache.syncope.common.lib.mod.GroupMod;
+import org.apache.syncope.common.lib.patch.GroupPatch;
 import org.apache.syncope.common.lib.to.GroupTO;
 import org.apache.syncope.common.lib.types.PropagationByResource;
 import org.apache.syncope.core.persistence.api.entity.group.Group;
@@ -31,6 +31,6 @@ public interface GroupDataBinder {
 
     Group create(Group group, GroupTO groupTO);
 
-    PropagationByResource update(Group group, GroupMod groupMod);
+    PropagationByResource update(Group group, GroupPatch groupPatch);
 
 }

http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/UserDataBinder.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/UserDataBinder.java
 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/UserDataBinder.java
index fbfe084..ff645f4 100644
--- 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/UserDataBinder.java
+++ 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/data/UserDataBinder.java
@@ -18,7 +18,7 @@
  */
 package org.apache.syncope.core.provisioning.api.data;
 
-import org.apache.syncope.common.lib.mod.UserMod;
+import org.apache.syncope.common.lib.patch.UserPatch;
 import org.apache.syncope.common.lib.to.UserTO;
 import org.apache.syncope.common.lib.types.PropagationByResource;
 import org.apache.syncope.core.persistence.api.entity.user.User;
@@ -36,14 +36,14 @@ public interface UserDataBinder {
     void create(User user, UserTO userTO, boolean storePassword);
 
     /**
-     * Update user, given UserMod.
+     * Update user, given {@link UserPatch}.
      *
      * @param toBeUpdated user to be updated
-     * @param userMod bean containing update request
+     * @param userPatch bean containing update request
      * @return updated user + propagation by resource
      * @see PropagationByResource
      */
-    PropagationByResource update(User toBeUpdated, UserMod userMod);
+    PropagationByResource update(User toBeUpdated, UserPatch userPatch);
 
     boolean verifyPassword(String username, String password);
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/propagation/PropagationManager.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/propagation/PropagationManager.java
 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/propagation/PropagationManager.java
index 3155223..0d0c7f4 100644
--- 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/propagation/PropagationManager.java
+++ 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/propagation/PropagationManager.java
@@ -22,8 +22,8 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 import org.apache.commons.lang3.tuple.Pair;
-import org.apache.syncope.common.lib.mod.AttrMod;
-import org.apache.syncope.common.lib.mod.UserMod;
+import org.apache.syncope.common.lib.patch.AttrPatch;
+import org.apache.syncope.common.lib.patch.UserPatch;
 import org.apache.syncope.common.lib.to.AttrTO;
 import org.apache.syncope.common.lib.types.PropagationByResource;
 import org.apache.syncope.core.persistence.api.entity.Any;
@@ -59,13 +59,12 @@ public interface PropagationManager {
      * Performs update on each resource associated to the group.
      *
      * @param wfResult group to be propagated (and info associated), as per 
result from workflow
-     * @param vAttrsToBeRemoved virtual attributes to be removed
-     * @param vAttrsToBeUpdated virtual attributes to be added
+     * @param vAttrs virtual attributes patches
      * @param noPropResourceNames external resource names not to be considered 
for propagation
      * @return list of propagation tasks
      */
-    List<PropagationTask> getGroupUpdateTasks(WorkflowResult<Long> wfResult, 
Set<String> vAttrsToBeRemoved,
-            Set<AttrMod> vAttrsToBeUpdated, Set<String> noPropResourceNames);
+    List<PropagationTask> getGroupUpdateTasks(
+            WorkflowResult<Long> wfResult, Set<AttrPatch> vAttrs, Set<String> 
noPropResourceNames);
 
     /**
      * Perform delete on each resource associated to the group. It is possible 
to ask for a mandatory provisioning for
@@ -118,8 +117,8 @@ public interface PropagationManager {
     List<PropagationTask> getAnyObjectCreateTasks(Long anyObjectKey, 
Collection<AttrTO> vAttrs,
             PropagationByResource propByRes, Collection<String> 
noPropResourceNames);
 
-    List<PropagationTask> getAnyObjectUpdateTasks(WorkflowResult<Long> 
wfResult, Set<String> vAttrsToBeRemoved,
-            Set<AttrMod> vAttrsToBeUpdated, Set<String> noPropResourceNames);
+    List<PropagationTask> getAnyObjectUpdateTasks(
+            WorkflowResult<Long> wfResult, Set<AttrPatch> vAttrs, Set<String> 
noPropResourceNames);
 
     List<PropagationTask> getAnyObjectDeleteTasks(Long anyObjectKey);
 
@@ -163,13 +162,13 @@ public interface PropagationManager {
      * @param noPropResourceNames external resources not to be considered for 
propagation
      * @return list of propagation tasks
      */
-    List<PropagationTask> getUserUpdateTasks(WorkflowResult<Pair<UserMod, 
Boolean>> wfResult,
+    List<PropagationTask> getUserUpdateTasks(WorkflowResult<Pair<UserPatch, 
Boolean>> wfResult,
             boolean changePwd, Collection<String> noPropResourceNames);
 
-    List<PropagationTask> getUserUpdateTasks(WorkflowResult<Pair<UserMod, 
Boolean>> wfResult);
+    List<PropagationTask> getUserUpdateTasks(WorkflowResult<Pair<UserPatch, 
Boolean>> wfResult);
 
     List<PropagationTask> getUpdateTasks(Any<?, ?, ?> any, String password, 
boolean changePwd,
-            Boolean enable, Set<String> vAttrsToBeRemoved, Set<AttrMod> 
vAttrsToBeUpdated,
+            Boolean enable, Set<AttrPatch> vAttrs,
             PropagationByResource propByRes, Collection<String> 
noPropResourceNames);
 
     /**

http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/sync/SyncActions.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/sync/SyncActions.java
 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/sync/SyncActions.java
index 6638c42..fd36d39 100644
--- 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/sync/SyncActions.java
+++ 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/sync/SyncActions.java
@@ -18,7 +18,7 @@
  */
 package org.apache.syncope.core.provisioning.api.sync;
 
-import org.apache.syncope.common.lib.mod.AnyMod;
+import org.apache.syncope.common.lib.patch.AnyPatch;
 import org.apache.syncope.common.lib.to.AnyTO;
 import org.identityconnectors.framework.common.objects.SyncDelta;
 import org.quartz.JobExecutionException;
@@ -139,19 +139,19 @@ public interface SyncActions extends ProvisioningActions {
      * {@link org.apache.syncope.common.types.MatchingRule#UPDATE} (default 
matching rule) is applied.
      *
      * @param <M> concrete any object
-     * @param <A> any object modifications
+     * @param <P> any object modifications
      * @param profile profile of the synchronization being executed.
      * @param delta retrieved synchronization information
      * @param any any object
-     * @param anyMod modification
+     * @param anyPatch modification
      * @return synchronization information used for logging and to be passed 
to the 'after' method.
      * @throws JobExecutionException in case of generic failure.
      */
-    <M extends AnyTO, A extends AnyMod> SyncDelta beforeUpdate(
+    <M extends AnyTO, P extends AnyPatch> SyncDelta beforeUpdate(
             ProvisioningProfile<?, ?> profile,
             SyncDelta delta,
             M any,
-            A anyMod)
+            P anyPatch)
             throws JobExecutionException;
 
     /**

http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultAnyObjectProvisioningManager.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultAnyObjectProvisioningManager.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultAnyObjectProvisioningManager.java
index 9722adb..ed8d260 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultAnyObjectProvisioningManager.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultAnyObjectProvisioningManager.java
@@ -27,7 +27,7 @@ import java.util.Set;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
-import org.apache.syncope.common.lib.mod.AnyObjectMod;
+import org.apache.syncope.common.lib.patch.AnyObjectPatch;
 import org.apache.syncope.common.lib.to.PropagationStatus;
 import org.apache.syncope.common.lib.to.AnyObjectTO;
 import org.apache.syncope.common.lib.types.AnyTypeKind;
@@ -94,27 +94,26 @@ public class DefaultAnyObjectProvisioningManager implements 
AnyObjectProvisionin
     }
 
     @Override
-    public Pair<Long, List<PropagationStatus>> update(final AnyObjectMod 
anyObjectMod) {
-        return update(anyObjectMod, Collections.<String>emptySet());
+    public Pair<Long, List<PropagationStatus>> update(final AnyObjectPatch 
anyObjectPatch) {
+        return update(anyObjectPatch, Collections.<String>emptySet());
     }
 
     @Override
     public Pair<Long, List<PropagationStatus>> update(
-            final AnyObjectMod anyObjectMod, final Set<String> 
excludedResources) {
+            final AnyObjectPatch anyObjectPatch, final Set<String> 
excludedResources) {
 
-        WorkflowResult<Long> updated = awfAdapter.update(anyObjectMod);
+        WorkflowResult<Long> updated = awfAdapter.update(anyObjectPatch);
 
-        List<PropagationTask> tasks = 
propagationManager.getAnyObjectUpdateTasks(updated,
-                anyObjectMod.getVirAttrsToRemove(), 
anyObjectMod.getVirAttrsToUpdate(), null);
+        List<PropagationTask> tasks = 
propagationManager.getAnyObjectUpdateTasks(
+                updated, anyObjectPatch.getVirAttrs(), excludedResources);
         if (tasks.isEmpty()) {
             // SYNCOPE-459: take care of user virtual attributes ...
             PropagationByResource propByResVirAttr = 
virtAttrHandler.fillVirtual(
                     updated.getResult(),
                     AnyTypeKind.ANY_OBJECT,
-                    anyObjectMod.getVirAttrsToRemove(),
-                    anyObjectMod.getVirAttrsToUpdate());
+                    anyObjectPatch.getVirAttrs());
             tasks.addAll(!propByResVirAttr.isEmpty()
-                    ? propagationManager.getAnyObjectUpdateTasks(updated, 
null, null, null)
+                    ? propagationManager.getAnyObjectUpdateTasks(updated, 
null, null)
                     : Collections.<PropagationTask>emptyList());
         }
 
@@ -159,13 +158,13 @@ public class DefaultAnyObjectProvisioningManager 
implements AnyObjectProvisionin
     }
 
     @Override
-    public Long unlink(final AnyObjectMod anyObjectMod) {
-        return awfAdapter.update(anyObjectMod).getResult();
+    public Long unlink(final AnyObjectPatch anyObjectPatch) {
+        return awfAdapter.update(anyObjectPatch).getResult();
     }
 
     @Override
-    public Long link(final AnyObjectMod anyObjectMod) {
-        return awfAdapter.update(anyObjectMod).getResult();
+    public Long link(final AnyObjectPatch anyObjectPatch) {
+        return awfAdapter.update(anyObjectPatch).getResult();
     }
 
     @Override
@@ -177,7 +176,7 @@ public class DefaultAnyObjectProvisioningManager implements 
AnyObjectProvisionin
 
         WorkflowResult<Long> wfResult = new WorkflowResult<>(key, propByRes, 
"update");
 
-        List<PropagationTask> tasks = 
propagationManager.getAnyObjectUpdateTasks(wfResult, null, null, null);
+        List<PropagationTask> tasks = 
propagationManager.getAnyObjectUpdateTasks(wfResult, null, null);
         PropagationReporter propagationReporter =
                 
ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
         try {

http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultGroupProvisioningManager.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultGroupProvisioningManager.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultGroupProvisioningManager.java
index 457f74d..6785ba0 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultGroupProvisioningManager.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultGroupProvisioningManager.java
@@ -32,7 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
-import org.apache.syncope.common.lib.mod.GroupMod;
+import org.apache.syncope.common.lib.patch.GroupPatch;
 import org.apache.syncope.common.lib.to.AttrTO;
 import org.apache.syncope.common.lib.to.PropagationStatus;
 import org.apache.syncope.common.lib.to.GroupTO;
@@ -121,27 +121,26 @@ public class DefaultGroupProvisioningManager implements 
GroupProvisioningManager
     }
 
     @Override
-    public Pair<Long, List<PropagationStatus>> update(final GroupMod groupMod) 
{
-        return update(groupMod, Collections.<String>emptySet());
+    public Pair<Long, List<PropagationStatus>> update(final GroupPatch 
groupPatch) {
+        return update(groupPatch, Collections.<String>emptySet());
     }
 
     @Override
     public Pair<Long, List<PropagationStatus>> update(
-            final GroupMod groupMod, final Set<String> excludedResources) {
+            final GroupPatch groupPatch, final Set<String> excludedResources) {
 
-        WorkflowResult<Long> updated = gwfAdapter.update(groupMod);
+        WorkflowResult<Long> updated = gwfAdapter.update(groupPatch);
 
-        List<PropagationTask> tasks = 
propagationManager.getGroupUpdateTasks(updated,
-                groupMod.getVirAttrsToRemove(), 
groupMod.getVirAttrsToUpdate(), excludedResources);
+        List<PropagationTask> tasks = propagationManager.getGroupUpdateTasks(
+                updated, groupPatch.getVirAttrs(), excludedResources);
         if (tasks.isEmpty()) {
             // SYNCOPE-459: take care of user virtual attributes ...
             PropagationByResource propByResVirAttr = 
virtAttrHandler.fillVirtual(
                     updated.getResult(),
                     AnyTypeKind.GROUP,
-                    groupMod.getVirAttrsToRemove(),
-                    groupMod.getVirAttrsToUpdate());
+                    groupPatch.getVirAttrs());
             tasks.addAll(!propByResVirAttr.isEmpty()
-                    ? propagationManager.getGroupUpdateTasks(updated, null, 
null, null)
+                    ? propagationManager.getGroupUpdateTasks(updated, null, 
null)
                     : Collections.<PropagationTask>emptyList());
         }
 
@@ -204,8 +203,8 @@ public class DefaultGroupProvisioningManager implements 
GroupProvisioningManager
     }
 
     @Override
-    public Long unlink(final GroupMod groupMod) {
-        WorkflowResult<Long> updated = gwfAdapter.update(groupMod);
+    public Long unlink(final GroupPatch groupPatch) {
+        WorkflowResult<Long> updated = gwfAdapter.update(groupPatch);
         return updated.getResult();
     }
 
@@ -216,7 +215,7 @@ public class DefaultGroupProvisioningManager implements 
GroupProvisioningManager
 
         WorkflowResult<Long> wfResult = new WorkflowResult<>(key, propByRes, 
"update");
 
-        List<PropagationTask> tasks = 
propagationManager.getGroupUpdateTasks(wfResult, null, null, null);
+        List<PropagationTask> tasks = 
propagationManager.getGroupUpdateTasks(wfResult, null, null);
         PropagationReporter propagationReporter =
                 
ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
         try {
@@ -248,8 +247,8 @@ public class DefaultGroupProvisioningManager implements 
GroupProvisioningManager
     }
 
     @Override
-    public Long link(final GroupMod groupMod) {
-        return gwfAdapter.update(groupMod).getResult();
+    public Long link(final GroupPatch groupPatch) {
+        return gwfAdapter.update(groupPatch).getResult();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultLogicActions.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultLogicActions.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultLogicActions.java
index a7ddf71..7052c70 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultLogicActions.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultLogicActions.java
@@ -18,7 +18,7 @@
  */
 package org.apache.syncope.core.provisioning.java;
 
-import org.apache.syncope.common.lib.mod.AnyMod;
+import org.apache.syncope.common.lib.patch.AnyPatch;
 import org.apache.syncope.common.lib.to.AnyTO;
 import org.apache.syncope.core.provisioning.api.LogicActions;
 
@@ -35,7 +35,7 @@ public class DefaultLogicActions implements LogicActions {
     }
 
     @Override
-    public <M extends AnyMod> M beforeUpdate(final M input) {
+    public <P extends AnyPatch> P beforeUpdate(final P input) {
         return input;
     }
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultUserProvisioningManager.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultUserProvisioningManager.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultUserProvisioningManager.java
index 5fd3ec1..2fd5005 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultUserProvisioningManager.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultUserProvisioningManager.java
@@ -24,13 +24,17 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.Transformer;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
-import org.apache.syncope.common.lib.mod.StatusMod;
-import org.apache.syncope.common.lib.mod.UserMod;
+import org.apache.syncope.common.lib.patch.PasswordPatch;
+import org.apache.syncope.common.lib.patch.StatusPatch;
+import org.apache.syncope.common.lib.patch.StringPatchItem;
+import org.apache.syncope.common.lib.patch.UserPatch;
 import org.apache.syncope.common.lib.to.PropagationStatus;
 import org.apache.syncope.common.lib.to.UserTO;
 import org.apache.syncope.common.lib.types.AnyTypeKind;
+import org.apache.syncope.common.lib.types.PatchOperation;
 import org.apache.syncope.core.persistence.api.dao.UserDAO;
 import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
 import org.apache.syncope.core.persistence.api.entity.user.User;
@@ -38,6 +42,7 @@ import 
org.apache.syncope.core.provisioning.api.UserProvisioningManager;
 import org.apache.syncope.core.provisioning.api.WorkflowResult;
 import org.apache.syncope.common.lib.types.PropagationByResource;
 import org.apache.syncope.common.lib.types.ResourceOperation;
+import org.apache.syncope.common.lib.types.StatusPatchType;
 import 
org.apache.syncope.core.provisioning.api.propagation.PropagationException;
 import org.apache.syncope.core.provisioning.api.propagation.PropagationManager;
 import 
org.apache.syncope.core.provisioning.api.propagation.PropagationReporter;
@@ -111,8 +116,8 @@ public class DefaultUserProvisioningManager implements 
UserProvisioningManager {
     }
 
     @Override
-    public Pair<Long, List<PropagationStatus>> update(final UserMod userMod) {
-        WorkflowResult<Pair<UserMod, Boolean>> updated = 
uwfAdapter.update(userMod);
+    public Pair<Long, List<PropagationStatus>> update(final UserPatch 
userPatch) {
+        WorkflowResult<Pair<UserPatch, Boolean>> updated = 
uwfAdapter.update(userPatch);
 
         List<PropagationTask> tasks = 
propagationManager.getUserUpdateTasks(updated);
         if (tasks.isEmpty()) {
@@ -120,11 +125,10 @@ public class DefaultUserProvisioningManager implements 
UserProvisioningManager {
             PropagationByResource propByResVirAttr = 
virtAttrHandler.fillVirtual(
                     updated.getResult().getKey().getKey(),
                     AnyTypeKind.USER,
-                    userMod.getVirAttrsToRemove(),
-                    userMod.getVirAttrsToUpdate());
-            tasks.addAll(!propByResVirAttr.isEmpty()
-                    ? propagationManager.getUserUpdateTasks(updated, false, 
null)
-                    : Collections.<PropagationTask>emptyList());
+                    userPatch.getVirAttrs());
+            if (!propByResVirAttr.isEmpty()) {
+                tasks.addAll(propagationManager.getUserUpdateTasks(updated, 
false, null));
+            }
         }
         PropagationReporter propagationReporter = 
ApplicationContextProvider.getBeanFactory().
                 getBean(PropagationReporter.class);
@@ -141,25 +145,25 @@ public class DefaultUserProvisioningManager implements 
UserProvisioningManager {
     }
 
     @Override
-    public Pair<Long, List<PropagationStatus>> update(final UserMod userMod, 
final Set<String> excludedResources) {
-        return update(userMod, userMod.getKey(), new ProvisioningResult(), 
null, excludedResources);
+    public Pair<Long, List<PropagationStatus>> update(final UserPatch 
userPatch, final Set<String> excludedResources) {
+        return update(userPatch, userPatch.getKey(), new ProvisioningResult(), 
null, excludedResources);
     }
 
     @Override
-    public Pair<Long, List<PropagationStatus>> update(final UserMod userMod, 
final Long key,
+    public Pair<Long, List<PropagationStatus>> update(final UserPatch 
userPatch, final Long key,
             final ProvisioningResult result, final Boolean enabled, final 
Set<String> excludedResources) {
 
-        WorkflowResult<Pair<UserMod, Boolean>> updated;
+        WorkflowResult<Pair<UserPatch, Boolean>> updated;
         try {
-            updated = uwfAdapter.update(userMod);
+            updated = uwfAdapter.update(userPatch);
         } catch (Exception e) {
             LOG.error("Update of user {} failed, trying to sync its status 
anyway (if configured)", key, e);
 
             result.setStatus(ProvisioningResult.Status.FAILURE);
             result.setMessage("Update failed, trying to sync status anyway (if 
configured)\n" + e.getMessage());
 
-            updated = new WorkflowResult<Pair<UserMod, Boolean>>(
-                    new ImmutablePair<>(userMod, false), new 
PropagationByResource(),
+            updated = new WorkflowResult<Pair<UserPatch, Boolean>>(
+                    new ImmutablePair<>(userPatch, false), new 
PropagationByResource(),
                     new HashSet<String>());
         }
 
@@ -231,49 +235,49 @@ public class DefaultUserProvisioningManager implements 
UserProvisioningManager {
     }
 
     @Override
-    public Long unlink(final UserMod userMod) {
-        WorkflowResult<Pair<UserMod, Boolean>> updated = 
uwfAdapter.update(userMod);
+    public Long unlink(final UserPatch userPatch) {
+        WorkflowResult<Pair<UserPatch, Boolean>> updated = 
uwfAdapter.update(userPatch);
         return updated.getResult().getKey().getKey();
     }
 
     @Override
-    public Long link(final UserMod userMod) {
-        return uwfAdapter.update(userMod).getResult().getKey().getKey();
+    public Long link(final UserPatch userPatch) {
+        return uwfAdapter.update(userPatch).getResult().getKey().getKey();
     }
 
     @Override
-    public Pair<Long, List<PropagationStatus>> activate(final StatusMod 
statusMod) {
-        WorkflowResult<Long> updated = statusMod.isOnSyncope()
-                ? uwfAdapter.activate(statusMod.getKey(), statusMod.getToken())
-                : new WorkflowResult<>(statusMod.getKey(), null, 
statusMod.getType().name().toLowerCase());
+    public Pair<Long, List<PropagationStatus>> activate(final StatusPatch 
statusPatch) {
+        WorkflowResult<Long> updated = statusPatch.isOnSyncope()
+                ? uwfAdapter.activate(statusPatch.getKey(), 
statusPatch.getToken())
+                : new WorkflowResult<>(statusPatch.getKey(), null, 
statusPatch.getType().name().toLowerCase());
 
-        return new ImmutablePair<>(updated.getResult(), 
propagateStatus(statusMod));
+        return new ImmutablePair<>(updated.getResult(), 
propagateStatus(statusPatch));
     }
 
     @Override
-    public Pair<Long, List<PropagationStatus>> reactivate(final StatusMod 
statusMod) {
-        WorkflowResult<Long> updated = statusMod.isOnSyncope()
-                ? uwfAdapter.reactivate(statusMod.getKey())
-                : new WorkflowResult<>(statusMod.getKey(), null, 
statusMod.getType().name().toLowerCase());
+    public Pair<Long, List<PropagationStatus>> reactivate(final StatusPatch 
statusPatch) {
+        WorkflowResult<Long> updated = statusPatch.isOnSyncope()
+                ? uwfAdapter.reactivate(statusPatch.getKey())
+                : new WorkflowResult<>(statusPatch.getKey(), null, 
statusPatch.getType().name().toLowerCase());
 
-        return new ImmutablePair<>(updated.getResult(), 
propagateStatus(statusMod));
+        return new ImmutablePair<>(updated.getResult(), 
propagateStatus(statusPatch));
     }
 
     @Override
-    public Pair<Long, List<PropagationStatus>> suspend(final StatusMod 
statusMod) {
-        WorkflowResult<Long> updated = statusMod.isOnSyncope()
-                ? uwfAdapter.suspend(statusMod.getKey())
-                : new WorkflowResult<>(statusMod.getKey(), null, 
statusMod.getType().name().toLowerCase());
+    public Pair<Long, List<PropagationStatus>> suspend(final StatusPatch 
statusPatch) {
+        WorkflowResult<Long> updated = statusPatch.isOnSyncope()
+                ? uwfAdapter.suspend(statusPatch.getKey())
+                : new WorkflowResult<>(statusPatch.getKey(), null, 
statusPatch.getType().name().toLowerCase());
 
-        return new ImmutablePair<>(updated.getResult(), 
propagateStatus(statusMod));
+        return new ImmutablePair<>(updated.getResult(), 
propagateStatus(statusPatch));
     }
 
-    protected List<PropagationStatus> propagateStatus(final StatusMod 
statusMod) {
+    protected List<PropagationStatus> propagateStatus(final StatusPatch 
statusPatch) {
         Collection<String> noPropResourceNames = CollectionUtils.removeAll(
-                
userDAO.findAllResourceNames(userDAO.find(statusMod.getKey())), 
statusMod.getResources());
+                
userDAO.findAllResourceNames(userDAO.find(statusPatch.getKey())), 
statusPatch.getResources());
 
         List<PropagationTask> tasks = propagationManager.getUserUpdateTasks(
-                statusMod.getKey(), statusMod.getType() != 
StatusMod.ModType.SUSPEND, noPropResourceNames);
+                statusPatch.getKey(), statusPatch.getType() != 
StatusPatchType.SUSPEND, noPropResourceNames);
         PropagationReporter propReporter =
                 
ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
         try {
@@ -293,12 +297,12 @@ public class DefaultUserProvisioningManager implements 
UserProvisioningManager {
 
         // propagate suspension if and only if it is required by policy
         if (updated != null && updated.getValue()) {
-            UserMod userMod = new UserMod();
-            userMod.setKey(updated.getKey().getResult());
+            UserPatch userPatch = new UserPatch();
+            userPatch.setKey(updated.getKey().getResult());
 
             List<PropagationTask> tasks = 
propagationManager.getUserUpdateTasks(
-                    new WorkflowResult<Pair<UserMod, Boolean>>(
-                            new ImmutablePair<>(userMod, Boolean.FALSE),
+                    new WorkflowResult<Pair<UserPatch, Boolean>>(
+                            new ImmutablePair<>(userPatch, Boolean.FALSE),
                             updated.getKey().getPropByRes(), 
updated.getKey().getPerformedTasks()));
             taskExecutor.execute(tasks);
         }
@@ -308,23 +312,30 @@ public class DefaultUserProvisioningManager implements 
UserProvisioningManager {
     public List<PropagationStatus> provision(
             final Long key, final boolean changePwd, final String password, 
final Collection<String> resources) {
 
-        UserMod userMod = new UserMod();
-        userMod.setKey(key);
-        userMod.getResourcesToAdd().addAll(resources);
+        UserPatch userPatch = new UserPatch();
+        userPatch.setKey(key);
+        userPatch.getResources().addAll(CollectionUtils.collect(resources,
+                new Transformer<String, StringPatchItem>() {
+
+                    @Override
+                    public StringPatchItem transform(final String input) {
+                        return new 
StringPatchItem.Builder().operation(PatchOperation.ADD_REPLACE).value(input).build();
+                    }
+                }, new HashSet<StringPatchItem>()));
 
         if (changePwd) {
-            StatusMod statusMod = new StatusMod();
-            statusMod.setOnSyncope(false);
-            statusMod.getResources().addAll(resources);
-            userMod.setPwdPropRequest(statusMod);
-            userMod.setPassword(password);
+            PasswordPatch passwordPatch = new PasswordPatch();
+            passwordPatch.setOnSyncope(false);
+            passwordPatch.getResources().addAll(resources);
+            passwordPatch.setValue(password);
+            userPatch.setPassword(passwordPatch);
         }
 
         PropagationByResource propByRes = new PropagationByResource();
         propByRes.addAll(ResourceOperation.UPDATE, resources);
 
-        WorkflowResult<Pair<UserMod, Boolean>> wfResult = new 
WorkflowResult<Pair<UserMod, Boolean>>(
-                ImmutablePair.of(userMod, (Boolean) null), propByRes, 
"update");
+        WorkflowResult<Pair<UserPatch, Boolean>> wfResult = new 
WorkflowResult<Pair<UserPatch, Boolean>>(
+                ImmutablePair.of(userPatch, (Boolean) null), propByRes, 
"update");
 
         List<PropagationTask> tasks = 
propagationManager.getUserUpdateTasks(wfResult, changePwd, null);
         PropagationReporter propagationReporter =
@@ -368,13 +379,13 @@ public class DefaultUserProvisioningManager implements 
UserProvisioningManager {
     public void confirmPasswordReset(final Long key, final String token, final 
String password) {
         uwfAdapter.confirmPasswordReset(key, token, password);
 
-        UserMod userMod = new UserMod();
-        userMod.setKey(key);
-        userMod.setPassword(password);
+        UserPatch userPatch = new UserPatch();
+        userPatch.setKey(key);
+        userPatch.setPassword(new 
PasswordPatch.Builder().value(password).build());
 
         List<PropagationTask> tasks = propagationManager.getUserUpdateTasks(
-                new WorkflowResult<Pair<UserMod, Boolean>>(
-                        new ImmutablePair<UserMod, Boolean>(userMod, null), 
null, "confirmPasswordReset"),
+                new WorkflowResult<Pair<UserPatch, Boolean>>(
+                        new ImmutablePair<UserPatch, Boolean>(userPatch, 
null), null, "confirmPasswordReset"),
                 true, null);
         PropagationReporter propReporter =
                 
ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);

http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/VirAttrHandlerImpl.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/VirAttrHandlerImpl.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/VirAttrHandlerImpl.java
index b43e911..adeb8c7 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/VirAttrHandlerImpl.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/VirAttrHandlerImpl.java
@@ -30,7 +30,7 @@ import java.util.Set;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.Predicate;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.syncope.common.lib.mod.AttrMod;
+import org.apache.syncope.common.lib.patch.AttrPatch;
 import org.apache.syncope.common.lib.to.AttrTO;
 import org.apache.syncope.common.lib.types.AnyTypeKind;
 import org.apache.syncope.common.lib.types.IntMappingType;
@@ -144,75 +144,68 @@ public class VirAttrHandlerImpl implements VirAttrHandler 
{
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @Override
-    public PropagationByResource fillVirtual(final Any any,
-            final Set<String> vAttrsToBeRemoved, final Set<AttrMod> 
vAttrsToBeUpdated) {
-
+    public PropagationByResource fillVirtual(final Any any, final 
Set<AttrPatch> vAttrs) {
         AnyUtils anyUtils = anyUtilsFactory.getInstance(any);
 
         PropagationByResource propByRes = new PropagationByResource();
 
         Iterable<? extends ExternalResource> externalResources = 
getAllResources(any);
 
-        // 1. virtual attributes to be removed
-        for (String vAttrToBeRemoved : vAttrsToBeRemoved) {
-            VirSchema virSchema = getVirSchema(vAttrToBeRemoved);
+        for (AttrPatch patch : vAttrs) {
+            VirSchema virSchema = getVirSchema(patch.getAttrTO().getSchema());
             if (virSchema != null) {
                 VirAttr virAttr = any.getVirAttr(virSchema.getKey());
-                if (virAttr == null) {
-                    LOG.debug("No virtual attribute found for schema {}", 
virSchema.getKey());
-                } else {
-                    any.remove(virAttr);
-                    virAttrDAO.delete(virAttr);
-                }
-
-                for (ExternalResource resource : externalResources) {
-                    for (MappingItem mapItem : MappingUtils.getMappingItems(
-                            resource.getProvision(any.getType()), 
MappingPurpose.PROPAGATION)) {
-
-                        if (virSchema.getKey().equals(mapItem.getIntAttrName())
-                                && mapItem.getIntMappingType() == 
anyUtils.virIntMappingType()) {
+                switch (patch.getOperation()) {
+                    case ADD_REPLACE:
+                        if (virAttr == null) {
+                            virAttr = anyUtils.newVirAttr();
+                            virAttr.setOwner(any);
+                            virAttr.setSchema(virSchema);
+
+                            any.add(virAttr);
+                        }
 
-                            propByRes.add(ResourceOperation.UPDATE, 
resource.getKey());
+                        updateOnResourcesIfMappingMatches(
+                                any, virSchema.getKey(), externalResources, 
anyUtils.virIntMappingType(), propByRes);
 
-                            // Using virtual attribute as ConnObjectKey must 
be avoided
-                            if (mapItem.isConnObjectKey() && virAttr != null 
&& !virAttr.getValues().isEmpty()) {
-                                
propByRes.addOldConnObjectKey(resource.getKey(), 
virAttr.getValues().get(0).toString());
-                            }
+                        if 
(!virAttr.getValues().equals(patch.getAttrTO().getValues())) {
+                            virAttr.getValues().clear();
+                            
virAttr.getValues().addAll(patch.getAttrTO().getValues());
+                        }
+                        break;
+
+                    case DELETE:
+                    default:
+                        if (virAttr == null) {
+                            LOG.debug("No virtual attribute found for schema 
{}", virSchema.getKey());
+                        } else {
+                            any.remove(virAttr);
+                            virAttrDAO.delete(virAttr);
                         }
-                    }
-                }
-            }
-        }
 
-        LOG.debug("Virtual attributes to be removed:\n{}", propByRes);
+                        for (ExternalResource resource : externalResources) {
+                            for (MappingItem mapItem : 
MappingUtils.getMappingItems(
+                                    resource.getProvision(any.getType()), 
MappingPurpose.PROPAGATION)) {
 
-        // 2. virtual attributes to be updated
-        for (AttrMod vAttrToBeUpdated : vAttrsToBeUpdated) {
-            VirSchema virSchema = getVirSchema(vAttrToBeUpdated.getSchema());
-            if (virSchema != null) {
-                VirAttr virAttr = any.getVirAttr(virSchema.getKey());
-                if (virAttr == null) {
-                    virAttr = anyUtils.newVirAttr();
-                    virAttr.setOwner(any);
-                    virAttr.setSchema(virSchema);
-
-                    any.add(virAttr);
-                }
+                                if 
(virSchema.getKey().equals(mapItem.getIntAttrName())
+                                        && mapItem.getIntMappingType() == 
anyUtils.virIntMappingType()) {
 
-                updateOnResourcesIfMappingMatches(
-                        any, virSchema.getKey(), externalResources, 
anyUtils.derIntMappingType(), propByRes);
+                                    propByRes.add(ResourceOperation.UPDATE, 
resource.getKey());
 
-                List<String> values = new ArrayList<>(virAttr.getValues());
-                values.removeAll(vAttrToBeUpdated.getValuesToBeRemoved());
-                values.addAll(vAttrToBeUpdated.getValuesToBeAdded());
+                                    // Using virtual attribute as 
ConnObjectKey must be avoided
+                                    if (mapItem.isConnObjectKey()
+                                            && virAttr != null && 
!virAttr.getValues().isEmpty()) {
 
-                virAttr.getValues().clear();
-                virAttr.getValues().addAll(values);
+                                        propByRes.addOldConnObjectKey(
+                                                resource.getKey(), 
virAttr.getValues().get(0).toString());
+                                    }
+                                }
+                            }
+                        }
+                }
             }
         }
 
-        LOG.debug("Virtual attributes to be added:\n{}", propByRes);
-
         return propByRes;
     }
 
@@ -267,13 +260,9 @@ public class VirAttrHandlerImpl implements VirAttrHandler {
     @Transactional
     @Override
     public PropagationByResource fillVirtual(
-            final Long key, final AnyTypeKind anyTypeKind,
-            final Set<String> vAttrsToBeRemoved, final Set<AttrMod> 
vAttrsToBeUpdated) {
+            final Long key, final AnyTypeKind anyTypeKind, final 
Set<AttrPatch> vAttrs) {
 
-        return fillVirtual(
-                find(key, anyTypeKind),
-                vAttrsToBeRemoved,
-                vAttrsToBeUpdated);
+        return fillVirtual(find(key, anyTypeKind), vAttrs);
     }
 
     @Override
@@ -320,8 +309,6 @@ public class VirAttrHandlerImpl implements VirAttrHandler {
 
             VirAttrCacheValue toBeCached = new VirAttrCacheValue();
 
-            AnyUtils anyUtils = anyUtilsFactory.getInstance(any);
-
             for (ExternalResource resource : getTargetResources(virAttr, type, 
any.getType())) {
                 Provision provision = resource.getProvision(any.getType());
                 LOG.debug("Search values into {},{}", resource, provision);

Reply via email to