[SYNCOPE-694] Implementation completed

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

Branch: refs/heads/master
Commit: 9f73fa43555a47a455e121ee8d52b72925ac9b4f
Parents: a5d2a92
Author: Francesco Chicchiriccò <[email protected]>
Authored: Fri Sep 18 10:48:31 2015 +0200
Committer: Francesco Chicchiriccò <[email protected]>
Committed: Fri Sep 18 10:48:31 2015 +0200

----------------------------------------------------------------------
 .../console/commons/status/StatusUtils.java     |  18 +-
 .../console/pages/ProvisioningModalPage.java    |  10 +-
 .../console/rest/AbstractAnyRestClient.java     | 118 ++++
 .../console/rest/ConnectorRestClient.java       |   6 +-
 .../client/console/rest/GroupRestClient.java    |  97 +--
 .../client/console/rest/ResourceRestClient.java |   4 +-
 .../client/console/rest/UserRestClient.java     | 122 +---
 .../client/console/rest/UserSelfRestClient.java |   6 +-
 .../client/lib/RestClientExceptionMapper.java   |   2 +-
 .../syncope/client/lib/SyncopeClient.java       |  12 +-
 .../syncope/common/lib/AnyOperations.java       | 600 +++++++++++-------
 .../common/lib/jaxb/GenericMapEntryType.java    |   3 -
 .../syncope/common/lib/jaxb/GenericMapType.java |   3 -
 .../common/lib/jaxb/XmlGenericMapAdapter.java   |   3 -
 .../apache/syncope/common/lib/mod/AnyMod.java   | 157 -----
 .../syncope/common/lib/mod/AnyObjectMod.java    |  71 ---
 .../apache/syncope/common/lib/mod/AttrMod.java  |  69 --
 .../apache/syncope/common/lib/mod/GroupMod.java |  87 ---
 .../syncope/common/lib/mod/ReferenceMod.java    |  54 --
 .../common/lib/mod/ResourceAssociationMod.java  |  80 ---
 .../syncope/common/lib/mod/StatusMod.java       | 110 ----
 .../apache/syncope/common/lib/mod/UserMod.java  | 163 -----
 .../syncope/common/lib/mod/package-info.java    |  23 -
 .../syncope/common/lib/patch/AbstractPatch.java |  69 ++
 .../common/lib/patch/AbstractPatchItem.java     |  50 ++
 .../lib/patch/AbstractReplacePatchItem.java     |  48 ++
 .../common/lib/patch/AnyObjectPatch.java        |  58 ++
 .../syncope/common/lib/patch/AnyPatch.java      | 110 ++++
 .../common/lib/patch/AssociationPatch.java      |  53 ++
 .../syncope/common/lib/patch/AttrPatch.java     |  60 ++
 .../lib/patch/BooleanReplacePatchItem.java      |  38 ++
 .../common/lib/patch/DeassociationPatch.java    |  67 ++
 .../syncope/common/lib/patch/GroupPatch.java    |  87 +++
 .../syncope/common/lib/patch/LongPatchItem.java |  38 ++
 .../common/lib/patch/LongReplacePatchItem.java  |  37 ++
 .../common/lib/patch/MembershipPatch.java       |  54 ++
 .../syncope/common/lib/patch/PasswordPatch.java |  97 +++
 .../common/lib/patch/RelationshipPatch.java     |  54 ++
 .../syncope/common/lib/patch/StatusPatch.java   |  69 ++
 .../common/lib/patch/StringPatchItem.java       |  38 ++
 .../lib/patch/StringReplacePatchItem.java       |  40 ++
 .../syncope/common/lib/patch/UserPatch.java     | 118 ++++
 .../syncope/common/lib/patch/package-info.java  |  23 +
 .../syncope/common/lib/to/AbstractSchemaTO.java |   2 -
 .../apache/syncope/common/lib/to/AttrTO.java    |  36 ++
 .../syncope/common/lib/to/MembershipTO.java     |  30 +-
 .../syncope/common/lib/to/RelationshipTO.java   |  36 +-
 .../common/lib/types/PatchOperation.java        |  29 +
 .../lib/types/ResourceDeassociationAction.java  |  39 ++
 .../types/ResourceDeassociationActionType.java  |  39 --
 .../common/lib/types/StatusPatchType.java       |  30 +
 .../syncope/common/lib/wrap/BooleanWrap.java    |  30 -
 .../syncope/common/lib/wrap/ResourceKey.java    |  30 -
 .../org/apache/syncope/common/lib/JAXBTest.java |   7 +-
 .../org/apache/syncope/common/lib/JSONTest.java |  35 +
 .../rest/api/service/AnyObjectService.java      |   4 +-
 .../common/rest/api/service/AnyService.java     |  54 +-
 .../rest/api/service/ConnectorService.java      |   4 +-
 .../common/rest/api/service/GroupService.java   |   4 +-
 .../rest/api/service/ResourceService.java       |  10 +-
 .../rest/api/service/UserSelfService.java       |  22 +-
 .../common/rest/api/service/UserService.java    |  10 +-
 .../syncope/core/logic/AbstractAnyLogic.java    |  18 +-
 .../syncope/core/logic/AnyObjectLogic.java      |  95 +--
 .../syncope/core/logic/ConnectorLogic.java      |  16 +-
 .../apache/syncope/core/logic/GroupLogic.java   |  95 +--
 .../syncope/core/logic/ResourceLogic.java       |  13 +-
 .../apache/syncope/core/logic/UserLogic.java    | 134 ++--
 .../syncope/core/logic/UserWorkflowLogic.java   |  20 +-
 .../core/logic/report/UserReportlet.java        |   6 +-
 .../syncope/core/misc/ConnObjectUtils.java      |   6 +-
 .../apache/syncope/core/misc/MappingUtils.java  |  36 +-
 .../api/entity/anyobject/AnyObject.java         |   7 +-
 .../core/persistence/api/entity/user/User.java  |   7 +-
 .../jpa/dao/JPAPlainAttrValueDAO.java           |  37 +-
 .../jpa/entity/anyobject/JPAAnyObject.java      |  20 +-
 .../persistence/jpa/entity/user/JPAUser.java    |  20 +-
 .../jpa/inner/RelationshipTypeTest.java         |   3 +-
 .../api/AnyObjectProvisioningManager.java       |   4 +-
 .../api/GroupProvisioningManager.java           |   4 +-
 .../core/provisioning/api/LogicActions.java     |   4 +-
 .../provisioning/api/ProvisioningManager.java   |  12 +-
 .../api/UserProvisioningManager.java            |  14 +-
 .../core/provisioning/api/VirAttrHandler.java   |  10 +-
 .../api/data/AnyObjectDataBinder.java           |   4 +-
 .../provisioning/api/data/GroupDataBinder.java  |   4 +-
 .../provisioning/api/data/UserDataBinder.java   |   8 +-
 .../api/propagation/PropagationManager.java     |  21 +-
 .../core/provisioning/api/sync/SyncActions.java |  10 +-
 .../DefaultAnyObjectProvisioningManager.java    |  29 +-
 .../java/DefaultGroupProvisioningManager.java   |  29 +-
 .../provisioning/java/DefaultLogicActions.java  |   4 +-
 .../java/DefaultUserProvisioningManager.java    | 125 ++--
 .../provisioning/java/VirAttrHandlerImpl.java   | 105 ++-
 .../java/data/AbstractAnyDataBinder.java        | 379 ++++++-----
 .../java/data/AnyObjectDataBinderImpl.java      | 102 ++-
 .../java/data/GroupDataBinderImpl.java          |  59 +-
 .../java/data/UserDataBinderImpl.java           | 196 +++---
 .../propagation/PropagationManagerImpl.java     |  96 +--
 .../java/sync/AbstractPushResultHandler.java    |  32 +-
 .../java/sync/AbstractSyncResultHandler.java    |  10 +-
 .../sync/AnyObjectPushResultHandlerImpl.java    |  43 +-
 .../sync/AnyObjectSyncResultHandlerImpl.java    |  35 +-
 .../java/sync/DBPasswordSyncActions.java        |  15 +-
 .../java/sync/DefaultSyncActions.java           |   6 +-
 .../java/sync/GroupPushResultHandlerImpl.java   |  42 +-
 .../java/sync/GroupSyncResultHandlerImpl.java   |  45 +-
 .../java/sync/LDAPMembershipSyncActions.java    |  68 +-
 .../java/sync/LDAPPasswordSyncActions.java      |  15 +-
 .../java/sync/UserPushResultHandlerImpl.java    |  44 +-
 .../java/sync/UserSyncResultHandlerImpl.java    |  35 +-
 .../rest/cxf/RestServiceExceptionMapper.java    |   2 +-
 .../rest/cxf/service/AbstractAnyService.java    | 117 ++--
 .../rest/cxf/service/AnyObjectServiceImpl.java  |   6 +-
 .../rest/cxf/service/ConnectorServiceImpl.java  |   7 +-
 .../core/rest/cxf/service/GroupServiceImpl.java |   6 +-
 .../rest/cxf/service/ResourceServiceImpl.java   |  11 +-
 .../rest/cxf/service/UserSelfServiceImpl.java   |  13 +-
 .../core/rest/cxf/service/UserServiceImpl.java  |  14 +-
 .../activiti/ActivitiUserWorkflowAdapter.java   |  42 +-
 .../core/workflow/activiti/task/Update.java     |  29 +-
 .../workflow/api/AnyObjectWorkflowAdapter.java  |   6 +-
 .../core/workflow/api/GroupWorkflowAdapter.java |   6 +-
 .../core/workflow/api/UserWorkflowAdapter.java  |   6 +-
 .../core/workflow/api/WorkflowAdapter.java      |   6 +-
 .../java/AbstractAnyObjectWorkflowAdapter.java  |   8 +-
 .../java/AbstractGroupWorkflowAdapter.java      |   8 +-
 .../java/AbstractUserWorkflowAdapter.java       |   8 +-
 .../java/DefaultAnyObjectWorkflowAdapter.java   |   8 +-
 .../java/DefaultGroupWorkflowAdapter.java       |   8 +-
 .../java/DefaultUserWorkflowAdapter.java        |  30 +-
 .../CamelAnyObjectProvisioningManager.java      |  18 +-
 .../camel/CamelGroupProvisioningManager.java    |  20 +-
 .../camel/CamelUserProvisioningManager.java     |  70 +-
 .../processor/AnyObjectProvisionProcessor.java  |   2 +-
 .../processor/AnyObjectUpdateProcessor.java     |  15 +-
 .../processor/GroupProvisionProcessor.java      |   2 +-
 .../camel/processor/GroupUpdateProcessor.java   |  13 +-
 .../processor/UserConfirmPwdResetProcessor.java |  14 +-
 .../processor/UserInternalSuspendProcessor.java |  10 +-
 .../camel/processor/UserProvisionProcessor.java |  31 +-
 .../processor/UserSetStatusInSyncProcessor.java |   4 +-
 .../UserStatusPropagationProcessor.java         |   9 +-
 .../processor/UserUpdateInSyncProcessor.java    |   8 +-
 .../camel/processor/UserUpdateProcessor.java    |  16 +-
 .../src/main/resources/anyObjectRoutes.xml      |   2 +-
 .../src/main/resources/groupRoutes.xml          |   2 +-
 .../fit/console/reference/AbstractITCase.java   |   3 -
 .../core/reference/DoubleValueLogicActions.java |  18 +-
 .../fit/core/reference/TestSyncActions.java     |  32 +-
 .../src/main/resources/userWorkflow.bpmn20.xml  |   2 +-
 .../fit/core/reference/AbstractITCase.java      |  33 +-
 .../fit/core/reference/AnyObjectITCase.java     |  10 +-
 .../core/reference/AuthenticationITCase.java    |  52 +-
 .../fit/core/reference/ConnectorITCase.java     |  27 +-
 .../syncope/fit/core/reference/GroupITCase.java | 185 +++---
 .../core/reference/NotificationTaskITCase.java  |   4 +-
 .../fit/core/reference/PlainSchemaITCase.java   |  10 +-
 .../fit/core/reference/SyncTaskITCase.java      |  70 +-
 .../syncope/fit/core/reference/UserITCase.java  | 635 +++++++++----------
 .../fit/core/reference/UserSelfITCase.java      |  60 +-
 .../fit/core/reference/UserWorkflowITCase.java  |  34 +-
 .../fit/core/reference/VirAttrITCase.java       | 200 +++---
 pom.xml                                         |   4 +-
 164 files changed, 4117 insertions(+), 3458 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/client/console/src/main/java/org/apache/syncope/client/console/commons/status/StatusUtils.java
----------------------------------------------------------------------
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/commons/status/StatusUtils.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/commons/status/StatusUtils.java
index 4165c7d..73da6a7 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/commons/status/StatusUtils.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/commons/status/StatusUtils.java
@@ -28,7 +28,7 @@ import 
org.apache.syncope.client.console.commons.ConnIdSpecialAttributeName;
 import org.apache.syncope.client.console.commons.Constants;
 import org.apache.syncope.client.console.panels.ImagePanel;
 import org.apache.syncope.client.console.rest.AbstractAnyRestClient;
-import org.apache.syncope.common.lib.mod.StatusMod;
+import org.apache.syncope.common.lib.patch.StatusPatch;
 import org.apache.syncope.common.lib.to.AnyTO;
 import org.apache.syncope.common.lib.to.AttrTO;
 import org.apache.syncope.common.lib.to.ConnObjectTO;
@@ -139,28 +139,28 @@ public class StatusUtils implements Serializable {
                 : null;
     }
 
-    public static StatusMod buildStatusMod(final Collection<StatusBean> 
statuses) {
-        return buildStatusMod(statuses, null);
+    public static StatusPatch buildStatusPatch(final Collection<StatusBean> 
statuses) {
+        return buildStatusPatch(statuses, null);
     }
 
-    public static StatusMod buildStatusMod(final Collection<StatusBean> 
statuses, final Boolean enable) {
-        StatusMod statusMod = new StatusMod();
-        statusMod.setOnSyncope(false);
+    public static StatusPatch buildStatusPatch(final Collection<StatusBean> 
statuses, final Boolean enable) {
+        StatusPatch statusPatch = new StatusPatch();
+        statusPatch.setOnSyncope(false);
 
         for (StatusBean status : statuses) {
             if (enable == null
                     || (enable && !status.getStatus().isActive()) || (!enable 
&& status.getStatus().isActive())) {
 
                 if ("syncope".equalsIgnoreCase(status.getResourceName())) {
-                    statusMod.setOnSyncope(true);
+                    statusPatch.setOnSyncope(true);
                 } else {
-                    statusMod.getResources().add(status.getResourceName());
+                    statusPatch.getResources().add(status.getResourceName());
                 }
 
             }
         }
 
-        return statusMod;
+        return statusPatch;
     }
 
     public ConnObjectTO getConnObjectTO(

http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/client/console/src/main/java/org/apache/syncope/client/console/pages/ProvisioningModalPage.java
----------------------------------------------------------------------
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/pages/ProvisioningModalPage.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/pages/ProvisioningModalPage.java
index 32a4921..9bd1484 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/pages/ProvisioningModalPage.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/pages/ProvisioningModalPage.java
@@ -36,7 +36,7 @@ import org.apache.syncope.common.lib.to.AnyTO;
 import org.apache.syncope.common.lib.to.BulkActionResult;
 import org.apache.syncope.common.lib.to.ResourceTO;
 import org.apache.syncope.common.lib.types.AnyTypeKind;
-import org.apache.syncope.common.lib.types.ResourceDeassociationActionType;
+import org.apache.syncope.common.lib.types.ResourceDeassociationAction;
 import org.apache.syncope.common.lib.wrap.AbstractWrappable;
 import org.apache.syncope.common.lib.wrap.AnyKey;
 import org.apache.wicket.PageReference;
@@ -137,7 +137,7 @@ public class ProvisioningModalPage<T extends AnyTO> extends 
AbstractStatusModalP
             @Override
             public void onClick(final AjaxRequestTarget target, final 
Serializable ignore) {
                 try {
-                    bulkAssociationAction(target, 
ResourceDeassociationActionType.UNLINK, table, columns);
+                    bulkAssociationAction(target, 
ResourceDeassociationAction.UNLINK, table, columns);
                 } catch (Exception e) {
                     LOG.error("Error unlinkink resources", e);
                     error(getString(Constants.ERROR) + ": " + e.getMessage());
@@ -153,7 +153,7 @@ public class ProvisioningModalPage<T extends AnyTO> extends 
AbstractStatusModalP
             @Override
             public void onClick(final AjaxRequestTarget target, final 
Serializable ignore) {
                 try {
-                    bulkAssociationAction(target, 
ResourceDeassociationActionType.DEPROVISION, table, columns);
+                    bulkAssociationAction(target, 
ResourceDeassociationAction.DEPROVISION, table, columns);
                 } catch (Exception e) {
                     LOG.error("Error de-provisioning user", e);
                     error(getString(Constants.ERROR) + ": " + e.getMessage());
@@ -169,7 +169,7 @@ public class ProvisioningModalPage<T extends AnyTO> extends 
AbstractStatusModalP
             @Override
             public void onClick(final AjaxRequestTarget target, final 
Serializable ignore) {
                 try {
-                    bulkAssociationAction(target, 
ResourceDeassociationActionType.UNASSIGN, table, columns);
+                    bulkAssociationAction(target, 
ResourceDeassociationAction.UNASSIGN, table, columns);
                 } catch (Exception e) {
                     LOG.error("Error unassigning resources", e);
                     error(getString(Constants.ERROR) + ": " + e.getMessage());
@@ -227,7 +227,7 @@ public class ProvisioningModalPage<T extends AnyTO> extends 
AbstractStatusModalP
 
     private void bulkAssociationAction(
             final AjaxRequestTarget target,
-            final ResourceDeassociationActionType type,
+            final ResourceDeassociationAction type,
             final ActionDataTablePanel<StatusBean, String> table,
             final List<IColumn<StatusBean, String>> columns) {
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/client/console/src/main/java/org/apache/syncope/client/console/rest/AbstractAnyRestClient.java
----------------------------------------------------------------------
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/rest/AbstractAnyRestClient.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/rest/AbstractAnyRestClient.java
index b9a316d..885e44c 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/rest/AbstractAnyRestClient.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/rest/AbstractAnyRestClient.java
@@ -19,10 +19,18 @@
 package org.apache.syncope.client.console.rest;
 
 import java.util.List;
+import org.apache.syncope.client.console.commons.status.StatusBean;
+import org.apache.syncope.client.console.commons.status.StatusUtils;
+import org.apache.syncope.common.lib.patch.AssociationPatch;
+import org.apache.syncope.common.lib.patch.DeassociationPatch;
+import org.apache.syncope.common.lib.patch.StatusPatch;
 import org.apache.syncope.common.lib.to.AnyTO;
 import org.apache.syncope.common.lib.to.BulkAction;
 import org.apache.syncope.common.lib.to.BulkActionResult;
 import org.apache.syncope.common.lib.to.ConnObjectTO;
+import org.apache.syncope.common.lib.types.ResourceAssociationAction;
+import org.apache.syncope.common.lib.types.ResourceDeassociationAction;
+import org.apache.syncope.common.rest.api.service.AnyService;
 import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
 
 public abstract class AbstractAnyRestClient extends BaseRestClient {
@@ -44,4 +52,114 @@ public abstract class AbstractAnyRestClient extends 
BaseRestClient {
     public abstract AnyTO delete(String etag, Long key);
 
     public abstract BulkActionResult bulkAction(BulkAction action);
+
+    protected abstract Class<? extends AnyService<?, ?>> getAnyServiceClass();
+
+    public void unlink(final String etag, final long key, final 
List<StatusBean> statuses) {
+        synchronized (this) {
+            AnyService<?, ?> service = getService(etag, getAnyServiceClass());
+
+            DeassociationPatch deassociationPatch = new DeassociationPatch();
+            deassociationPatch.setKey(key);
+            deassociationPatch.setAction(ResourceDeassociationAction.UNLINK);
+            
deassociationPatch.getResources().addAll(StatusUtils.buildStatusPatch(statuses).getResources());
+
+            service.deassociate(deassociationPatch);
+
+            resetClient(getAnyServiceClass());
+        }
+    }
+
+    public void link(final String etag, final long key, final List<StatusBean> 
statuses) {
+        synchronized (this) {
+            AnyService<?, ?> service = getService(etag, getAnyServiceClass());
+
+            StatusPatch statusPatch = StatusUtils.buildStatusPatch(statuses);
+
+            AssociationPatch associationPatch = new AssociationPatch();
+            associationPatch.setKey(key);
+            associationPatch.setAction(ResourceAssociationAction.LINK);
+            associationPatch.setOnSyncope(statusPatch.isOnSyncope());
+            associationPatch.getResources().addAll(statusPatch.getResources());
+
+            service.associate(associationPatch);
+
+            resetClient(getAnyServiceClass());
+        }
+    }
+
+    public BulkActionResult deprovision(final String etag, final long key, 
final List<StatusBean> statuses) {
+        BulkActionResult result;
+        synchronized (this) {
+            AnyService<?, ?> service = getService(etag, getAnyServiceClass());
+
+            DeassociationPatch deassociationPatch = new DeassociationPatch();
+            deassociationPatch.setKey(key);
+            
deassociationPatch.setAction(ResourceDeassociationAction.DEPROVISION);
+            
deassociationPatch.getResources().addAll(StatusUtils.buildStatusPatch(statuses).getResources());
+
+            result = 
service.deassociate(deassociationPatch).readEntity(BulkActionResult.class);
+
+            resetClient(getAnyServiceClass());
+        }
+        return result;
+    }
+
+    public BulkActionResult provision(final String etag, final long key, final 
List<StatusBean> statuses) {
+        BulkActionResult result;
+        synchronized (this) {
+            AnyService<?, ?> service = getService(etag, getAnyServiceClass());
+
+            StatusPatch statusPatch = StatusUtils.buildStatusPatch(statuses);
+
+            AssociationPatch associationPatch = new AssociationPatch();
+            associationPatch.setKey(key);
+            associationPatch.setAction(ResourceAssociationAction.PROVISION);
+            associationPatch.setOnSyncope(statusPatch.isOnSyncope());
+            associationPatch.getResources().addAll(statusPatch.getResources());
+
+            result = 
service.associate(associationPatch).readEntity(BulkActionResult.class);
+
+            resetClient(getAnyServiceClass());
+        }
+        return result;
+    }
+
+    public BulkActionResult unassign(final String etag, final long key, final 
List<StatusBean> statuses) {
+        BulkActionResult result;
+        synchronized (this) {
+            AnyService<?, ?> service = getService(etag, getAnyServiceClass());
+
+            DeassociationPatch deassociationPatch = new DeassociationPatch();
+            deassociationPatch.setKey(key);
+            deassociationPatch.setAction(ResourceDeassociationAction.UNASSIGN);
+            
deassociationPatch.getResources().addAll(StatusUtils.buildStatusPatch(statuses).getResources());
+
+            result = 
service.deassociate(deassociationPatch).readEntity(BulkActionResult.class);
+
+            resetClient(getAnyServiceClass());
+        }
+        return result;
+    }
+
+    public BulkActionResult assign(final String etag, final long key, final 
List<StatusBean> statuses) {
+        BulkActionResult result;
+        synchronized (this) {
+            AnyService<?, ?> service = getService(etag, getAnyServiceClass());
+
+            StatusPatch statusPatch = StatusUtils.buildStatusPatch(statuses);
+
+            AssociationPatch associationPatch = new AssociationPatch();
+            associationPatch.setKey(key);
+            associationPatch.setAction(ResourceAssociationAction.ASSIGN);
+            associationPatch.setOnSyncope(statusPatch.isOnSyncope());
+            associationPatch.getResources().addAll(statusPatch.getResources());
+
+            result = 
service.associate(associationPatch).readEntity(BulkActionResult.class);
+
+            resetClient(getAnyServiceClass());
+        }
+        return result;
+    }
+
 }

http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/client/console/src/main/java/org/apache/syncope/client/console/rest/ConnectorRestClient.java
----------------------------------------------------------------------
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/rest/ConnectorRestClient.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/rest/ConnectorRestClient.java
index 652e443..d3d18c8 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/rest/ConnectorRestClient.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/rest/ConnectorRestClient.java
@@ -161,7 +161,8 @@ public class ConnectorRestClient extends BaseRestClient {
 
         boolean check = false;
         try {
-            check = 
getService(ConnectorService.class).check(toBeChecked).getElement();
+            getService(ConnectorService.class).check(toBeChecked);
+            check = true;
         } catch (Exception e) {
             LOG.error("While checking {}", toBeChecked, e);
         }
@@ -172,7 +173,8 @@ public class ConnectorRestClient extends BaseRestClient {
     public boolean check(final ResourceTO resourceTO) {
         boolean check = false;
         try {
-            check = 
getService(ResourceService.class).check(resourceTO).getElement();
+            getService(ResourceService.class).check(resourceTO);
+            check = true;
         } catch (Exception e) {
             LOG.error("Connector not found {}", resourceTO.getConnector(), e);
         }

http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/client/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java
----------------------------------------------------------------------
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java
index ae2c923..0d2d040 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java
@@ -21,20 +21,14 @@ package org.apache.syncope.client.console.rest;
 import java.util.List;
 
 import javax.ws.rs.core.Response;
-import org.apache.syncope.client.console.commons.status.StatusBean;
-import org.apache.syncope.client.console.commons.status.StatusUtils;
 import org.apache.syncope.client.lib.SyncopeClient;
-import org.apache.syncope.common.lib.mod.GroupMod;
-import org.apache.syncope.common.lib.mod.ResourceAssociationMod;
+import org.apache.syncope.common.lib.patch.GroupPatch;
 import org.apache.syncope.common.lib.to.BulkAction;
 import org.apache.syncope.common.lib.to.BulkActionResult;
 import org.apache.syncope.common.lib.to.ConnObjectTO;
 import org.apache.syncope.common.lib.to.GroupTO;
 import org.apache.syncope.common.lib.types.AnyTypeKind;
-import org.apache.syncope.common.lib.types.ResourceAssociationAction;
-import org.apache.syncope.common.lib.types.ResourceDeassociationActionType;
-import org.apache.syncope.common.lib.wrap.ResourceKey;
-import org.apache.syncope.common.rest.api.CollectionWrapper;
+import org.apache.syncope.common.rest.api.service.AnyService;
 import org.apache.syncope.common.rest.api.service.ResourceService;
 import org.apache.syncope.common.rest.api.service.GroupService;
 import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
@@ -49,6 +43,11 @@ public class GroupRestClient extends AbstractAnyRestClient {
     private static final long serialVersionUID = -8549081557283519638L;
 
     @Override
+    protected Class<? extends AnyService<?, ?>> getAnyServiceClass() {
+        return GroupService.class;
+    }
+
+    @Override
     public int count(final String realm) {
         return getService(GroupService.class).
                 
list(SyncopeClient.getAnyListQueryBuilder().realm(realm).page(1).size(1).build()).
@@ -94,11 +93,11 @@ public class GroupRestClient extends AbstractAnyRestClient {
         return getService(GroupService.class).read(key);
     }
 
-    public GroupTO update(final String etag, final GroupMod groupMod) {
+    public GroupTO update(final String etag, final GroupPatch groupPatch) {
         GroupTO result;
         synchronized (this) {
             GroupService service = getService(etag, GroupService.class);
-            result = service.update(groupMod).readEntity(GroupTO.class);
+            result = service.update(groupPatch).readEntity(GroupTO.class);
             resetClient(GroupService.class);
         }
         return result;
@@ -120,82 +119,4 @@ public class GroupRestClient extends AbstractAnyRestClient 
{
         return getService(GroupService.class).bulk(action);
     }
 
-    public void unlink(final String etag, final long groupKey, final 
List<StatusBean> statuses) {
-        synchronized (this) {
-            GroupService service = getService(etag, GroupService.class);
-            service.deassociate(groupKey, 
ResourceDeassociationActionType.UNLINK,
-                    
CollectionWrapper.wrap(StatusUtils.buildStatusMod(statuses).getResources(), 
ResourceKey.class));
-            resetClient(GroupService.class);
-        }
-    }
-
-    public void link(final String etag, final long groupKey, final 
List<StatusBean> statuses) {
-        synchronized (this) {
-            GroupService service = getService(etag, GroupService.class);
-
-            ResourceAssociationMod associationMod = new 
ResourceAssociationMod();
-            associationMod.getTargetResources().addAll(
-                    
CollectionWrapper.wrap(StatusUtils.buildStatusMod(statuses).getResources(), 
ResourceKey.class));
-            service.associate(groupKey, ResourceAssociationAction.LINK, 
associationMod);
-
-            resetClient(GroupService.class);
-        }
-    }
-
-    public BulkActionResult deprovision(final String etag, final long 
groupKey, final List<StatusBean> statuses) {
-        BulkActionResult result;
-        synchronized (this) {
-            GroupService service = getService(etag, GroupService.class);
-            result = service.deassociate(groupKey, 
ResourceDeassociationActionType.DEPROVISION,
-                    
CollectionWrapper.wrap(StatusUtils.buildStatusMod(statuses).getResources(), 
ResourceKey.class)).
-                    readEntity(BulkActionResult.class);
-            resetClient(GroupService.class);
-        }
-        return result;
-    }
-
-    public BulkActionResult provision(final String etag, final long groupKey, 
final List<StatusBean> statuses) {
-        BulkActionResult result;
-        synchronized (this) {
-            GroupService service = getService(etag, GroupService.class);
-
-            ResourceAssociationMod associationMod = new 
ResourceAssociationMod();
-            associationMod.getTargetResources().addAll(
-                    
CollectionWrapper.wrap(StatusUtils.buildStatusMod(statuses).getResources(), 
ResourceKey.class));
-
-            result = service.associate(groupKey, 
ResourceAssociationAction.PROVISION, associationMod).
-                    readEntity(BulkActionResult.class);
-            resetClient(GroupService.class);
-        }
-        return result;
-    }
-
-    public BulkActionResult unassign(final String etag, final long groupKey, 
final List<StatusBean> statuses) {
-        BulkActionResult result;
-        synchronized (this) {
-            GroupService service = getService(etag, GroupService.class);
-            result = service.deassociate(groupKey, 
ResourceDeassociationActionType.UNASSIGN,
-                    
CollectionWrapper.wrap(StatusUtils.buildStatusMod(statuses).getResources(), 
ResourceKey.class)).
-                    readEntity(BulkActionResult.class);
-            resetClient(GroupService.class);
-        }
-        return result;
-    }
-
-    public BulkActionResult assign(final String etag, final long groupKey, 
final List<StatusBean> statuses) {
-        BulkActionResult result;
-        synchronized (this) {
-            GroupService service = getService(etag, GroupService.class);
-
-            ResourceAssociationMod associationMod = new 
ResourceAssociationMod();
-            associationMod.getTargetResources().addAll(
-                    
CollectionWrapper.wrap(StatusUtils.buildStatusMod(statuses).getResources(), 
ResourceKey.class));
-
-            result = service.associate(groupKey, 
ResourceAssociationAction.ASSIGN, associationMod).
-                    readEntity(BulkActionResult.class);
-
-            resetClient(GroupService.class);
-        }
-        return result;
-    }
 }

http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/client/console/src/main/java/org/apache/syncope/client/console/rest/ResourceRestClient.java
----------------------------------------------------------------------
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/rest/ResourceRestClient.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/rest/ResourceRestClient.java
index 15bf7aa..5efa119 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/rest/ResourceRestClient.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/rest/ResourceRestClient.java
@@ -24,7 +24,7 @@ import org.apache.syncope.common.lib.SyncopeClientException;
 import org.apache.syncope.common.lib.to.BulkAction;
 import org.apache.syncope.common.lib.to.BulkActionResult;
 import org.apache.syncope.common.lib.to.ResourceTO;
-import org.apache.syncope.common.lib.types.ResourceDeassociationActionType;
+import org.apache.syncope.common.lib.types.ResourceDeassociationAction;
 import org.apache.syncope.common.lib.wrap.AnyKey;
 import org.apache.syncope.common.rest.api.service.ResourceService;
 import org.springframework.stereotype.Component;
@@ -82,7 +82,7 @@ public class ResourceRestClient extends BaseRestClient {
 
     public BulkActionResult bulkAssociationAction(
             final String resourceName, final String anyTypeName,
-            final ResourceDeassociationActionType type, final List<AnyKey> 
anyKeys) {
+            final ResourceDeassociationAction type, final List<AnyKey> 
anyKeys) {
 
         return 
getService(ResourceService.class).bulkDeassociation(resourceName, anyTypeName, 
type, anyKeys);
     }

http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/client/console/src/main/java/org/apache/syncope/client/console/rest/UserRestClient.java
----------------------------------------------------------------------
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/rest/UserRestClient.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/rest/UserRestClient.java
index 36f1124..8358795 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/rest/UserRestClient.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/rest/UserRestClient.java
@@ -24,18 +24,15 @@ import 
org.apache.syncope.client.console.commons.status.StatusBean;
 import org.apache.syncope.client.console.commons.status.StatusUtils;
 import org.apache.syncope.client.lib.SyncopeClient;
 import org.apache.syncope.common.lib.SyncopeClientException;
-import org.apache.syncope.common.lib.mod.ResourceAssociationMod;
-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.BulkAction;
 import org.apache.syncope.common.lib.to.BulkActionResult;
 import org.apache.syncope.common.lib.to.ConnObjectTO;
 import org.apache.syncope.common.lib.to.UserTO;
 import org.apache.syncope.common.lib.types.AnyTypeKind;
-import org.apache.syncope.common.lib.types.ResourceAssociationAction;
-import org.apache.syncope.common.lib.types.ResourceDeassociationActionType;
-import org.apache.syncope.common.lib.wrap.ResourceKey;
-import org.apache.syncope.common.rest.api.CollectionWrapper;
+import org.apache.syncope.common.lib.types.StatusPatchType;
+import org.apache.syncope.common.rest.api.service.AnyService;
 import org.apache.syncope.common.rest.api.service.ResourceService;
 import org.apache.syncope.common.rest.api.service.UserService;
 import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
@@ -50,6 +47,11 @@ public class UserRestClient extends AbstractAnyRestClient {
     private static final long serialVersionUID = -1575748964398293968L;
 
     @Override
+    protected Class<? extends AnyService<?, ?>> getAnyServiceClass() {
+        return UserService.class;
+    }
+
+    @Override
     public int count(final String realm) {
         return getService(UserService.class).
                 
list(SyncopeClient.getAnyListQueryBuilder().realm(realm).page(1).size(1).build()).
@@ -69,11 +71,11 @@ public class UserRestClient extends AbstractAnyRestClient {
         return response.readEntity(UserTO.class);
     }
 
-    public UserTO update(final String etag, final UserMod userMod) {
+    public UserTO update(final String etag, final UserPatch userPatch) {
         UserTO result;
         synchronized (this) {
             UserService service = getService(etag, UserService.class);
-            result = service.update(userMod).readEntity(UserTO.class);
+            result = service.update(userPatch).readEntity(UserTO.class);
             resetClient(UserService.class);
         }
         return result;
@@ -123,23 +125,23 @@ public class UserRestClient extends AbstractAnyRestClient 
{
     }
 
     public void suspend(final String etag, final long userKey, final 
List<StatusBean> statuses) {
-        StatusMod statusMod = StatusUtils.buildStatusMod(statuses, false);
-        statusMod.setKey(userKey);
-        statusMod.setType(StatusMod.ModType.SUSPEND);
+        StatusPatch statusPatch = StatusUtils.buildStatusPatch(statuses, 
false);
+        statusPatch.setKey(userKey);
+        statusPatch.setType(StatusPatchType.SUSPEND);
         synchronized (this) {
             UserService service = getService(etag, UserService.class);
-            service.status(statusMod);
+            service.status(statusPatch);
             resetClient(UserService.class);
         }
     }
 
     public void reactivate(final String etag, final long userKey, final 
List<StatusBean> statuses) {
-        StatusMod statusMod = StatusUtils.buildStatusMod(statuses, true);
-        statusMod.setKey(userKey);
-        statusMod.setType(StatusMod.ModType.REACTIVATE);
+        StatusPatch statusPatch = StatusUtils.buildStatusPatch(statuses, true);
+        statusPatch.setKey(userKey);
+        statusPatch.setType(StatusPatchType.REACTIVATE);
         synchronized (this) {
             UserService service = getService(etag, UserService.class);
-            service.status(statusMod);
+            service.status(statusPatch);
             resetClient(UserService.class);
         }
     }
@@ -148,90 +150,4 @@ public class UserRestClient extends AbstractAnyRestClient {
     public BulkActionResult bulkAction(final BulkAction action) {
         return getService(UserService.class).bulk(action);
     }
-
-    public void unlink(final String etag, final long userKey, final 
List<StatusBean> statuses) {
-        synchronized (this) {
-            UserService service = getService(etag, UserService.class);
-            service.deassociate(userKey, 
ResourceDeassociationActionType.UNLINK,
-                    
CollectionWrapper.wrap(StatusUtils.buildStatusMod(statuses).getResources(), 
ResourceKey.class));
-            resetClient(UserService.class);
-        }
-    }
-
-    public void link(final String etag, final long userKey, final 
List<StatusBean> statuses) {
-        synchronized (this) {
-            UserService service = getService(etag, UserService.class);
-
-            ResourceAssociationMod associationMod = new 
ResourceAssociationMod();
-            associationMod.getTargetResources().addAll(
-                    
CollectionWrapper.wrap(StatusUtils.buildStatusMod(statuses).getResources(), 
ResourceKey.class));
-            service.associate(userKey, ResourceAssociationAction.LINK, 
associationMod);
-
-            resetClient(UserService.class);
-        }
-    }
-
-    public BulkActionResult deprovision(final String etag, final long userKey, 
final List<StatusBean> statuses) {
-        BulkActionResult result;
-        synchronized (this) {
-            UserService service = getService(etag, UserService.class);
-            result = service.deassociate(userKey, 
ResourceDeassociationActionType.DEPROVISION,
-                    
CollectionWrapper.wrap(StatusUtils.buildStatusMod(statuses).getResources(), 
ResourceKey.class)).
-                    readEntity(BulkActionResult.class);
-            resetClient(UserService.class);
-        }
-        return result;
-    }
-
-    public BulkActionResult provision(final String etag, final long userKey,
-            final List<StatusBean> statuses, final boolean changepwd, final 
String password) {
-
-        BulkActionResult result;
-        synchronized (this) {
-            UserService service = getService(etag, UserService.class);
-
-            ResourceAssociationMod associationMod = new 
ResourceAssociationMod();
-            associationMod.getTargetResources().addAll(
-                    
CollectionWrapper.wrap(StatusUtils.buildStatusMod(statuses).getResources(), 
ResourceKey.class));
-            associationMod.setChangePwd(changepwd);
-            associationMod.setPassword(password);
-
-            result = service.associate(userKey, 
ResourceAssociationAction.PROVISION, associationMod).
-                    readEntity(BulkActionResult.class);
-            resetClient(UserService.class);
-        }
-        return result;
-    }
-
-    public BulkActionResult unassign(final String etag, final long userKey, 
final List<StatusBean> statuses) {
-        BulkActionResult result;
-        synchronized (this) {
-            UserService service = getService(etag, UserService.class);
-            result = service.deassociate(userKey, 
ResourceDeassociationActionType.UNASSIGN,
-                    
CollectionWrapper.wrap(StatusUtils.buildStatusMod(statuses).getResources(), 
ResourceKey.class)).
-                    readEntity(BulkActionResult.class);
-            resetClient(UserService.class);
-        }
-        return result;
-    }
-
-    public BulkActionResult assign(final String etag, final long userKey,
-            final List<StatusBean> statuses, final boolean changepwd, final 
String password) {
-
-        BulkActionResult result;
-        synchronized (this) {
-            UserService service = getService(etag, UserService.class);
-
-            ResourceAssociationMod associationMod = new 
ResourceAssociationMod();
-            associationMod.getTargetResources().addAll(
-                    
CollectionWrapper.wrap(StatusUtils.buildStatusMod(statuses).getResources(), 
ResourceKey.class));
-            associationMod.setChangePwd(changepwd);
-            associationMod.setPassword(password);
-
-            result = service.associate(userKey, 
ResourceAssociationAction.ASSIGN, associationMod).
-                    readEntity(BulkActionResult.class);
-            resetClient(UserService.class);
-        }
-        return result;
-    }
 }

http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/client/console/src/main/java/org/apache/syncope/client/console/rest/UserSelfRestClient.java
----------------------------------------------------------------------
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/rest/UserSelfRestClient.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/rest/UserSelfRestClient.java
index dc71a54..6a09b7c 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/rest/UserSelfRestClient.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/rest/UserSelfRestClient.java
@@ -20,7 +20,7 @@ package org.apache.syncope.client.console.rest;
 
 import org.apache.syncope.client.console.SyncopeConsoleSession;
 import org.apache.syncope.common.lib.SyncopeClientException;
-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.rest.api.service.UserSelfService;
 import org.springframework.stereotype.Component;
@@ -51,8 +51,8 @@ public class UserSelfRestClient extends BaseRestClient {
         getService(UserSelfService.class).create(userTO, storePassword);
     }
 
-    public void update(final UserMod userMod) {
-        getService(UserSelfService.class).update(userMod);
+    public void update(final UserPatch userPatch) {
+        getService(UserSelfService.class).update(userPatch);
     }
 
     public void delete() {

http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/client/lib/src/main/java/org/apache/syncope/client/lib/RestClientExceptionMapper.java
----------------------------------------------------------------------
diff --git 
a/client/lib/src/main/java/org/apache/syncope/client/lib/RestClientExceptionMapper.java
 
b/client/lib/src/main/java/org/apache/syncope/client/lib/RestClientExceptionMapper.java
index afc0f69..208ec2f 100644
--- 
a/client/lib/src/main/java/org/apache/syncope/client/lib/RestClientExceptionMapper.java
+++ 
b/client/lib/src/main/java/org/apache/syncope/client/lib/RestClientExceptionMapper.java
@@ -80,7 +80,7 @@ public class RestClientExceptionMapper implements 
ExceptionMapper<Exception>, Re
             ex = new WebServiceException(String.format("Remote exception with 
status code: %s",
                     Response.Status.fromStatusCode(statusCode).name()));
         }
-        LOG.error("Exception thrown by REST methods: " + ex.getMessage(), ex);
+        LOG.error("Exception thrown", ex);
         return ex;
     }
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/client/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClient.java
----------------------------------------------------------------------
diff --git 
a/client/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClient.java 
b/client/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClient.java
index 683c0a7..ba6530f 100644
--- a/client/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClient.java
+++ b/client/lib/src/main/java/org/apache/syncope/client/lib/SyncopeClient.java
@@ -30,6 +30,7 @@ import javax.ws.rs.core.Response;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.cxf.jaxrs.client.WebClient;
+import org.apache.cxf.transport.http.URLConnectionHTTPConduit;
 import org.apache.syncope.client.lib.builders.ListQueryBuilder;
 import org.apache.syncope.client.lib.builders.AnyListQueryBuilder;
 import org.apache.syncope.client.lib.builders.AnySearchQueryBuilder;
@@ -157,18 +158,21 @@ public class SyncopeClient {
      */
     public <T> T getService(final Class<T> serviceClass) {
         synchronized (restClientFactory) {
-            return restClientFactory.createServiceInstance(serviceClass, 
mediaType, username, password);
+            T service = restClientFactory.createServiceInstance(serviceClass, 
mediaType, username, password);
+            WebClient.getConfig(WebClient.client(service)).getRequestContext().
+                    
put(URLConnectionHTTPConduit.HTTPURL_CONNECTION_METHOD_REFLECTION, true);
+            return service;
         }
     }
 
     @SuppressWarnings("unchecked")
     public Pair<Map<String, Set<String>>, UserTO> self() {
         // Explicitly disable header value split because it interferes with 
JSON deserialization below
-        UserSelfService serviceInstance = getService(UserSelfService.class);
-        WebClient.getConfig(WebClient.client(serviceInstance)).
+        UserSelfService service = getService(UserSelfService.class);
+        WebClient.getConfig(WebClient.client(service)).
                 
getRequestContext().put(RestClientFactoryBean.HEADER_SPLIT_PROPERTY, false);
 
-        Response response = serviceInstance.read();
+        Response response = service.read();
         if (response.getStatusInfo().getStatusCode() != 
Response.Status.OK.getStatusCode()) {
             Exception ex = exceptionMapper.fromResponse(response);
             if (ex != null) {

http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/common/lib/src/main/java/org/apache/syncope/common/lib/AnyOperations.java
----------------------------------------------------------------------
diff --git 
a/common/lib/src/main/java/org/apache/syncope/common/lib/AnyOperations.java 
b/common/lib/src/main/java/org/apache/syncope/common/lib/AnyOperations.java
index b29ff9e..e1f9f88 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/AnyOperations.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/AnyOperations.java
@@ -18,22 +18,28 @@
  */
 package org.apache.syncope.common.lib;
 
-import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import org.apache.commons.collections4.Closure;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.SerializationUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.syncope.common.lib.mod.AnyMod;
-import org.apache.syncope.common.lib.mod.AnyObjectMod;
-import org.apache.syncope.common.lib.mod.AttrMod;
-import org.apache.syncope.common.lib.mod.ReferenceMod;
-import org.apache.syncope.common.lib.mod.GroupMod;
-import org.apache.syncope.common.lib.mod.UserMod;
+import org.apache.syncope.common.lib.patch.AnyObjectPatch;
+import org.apache.syncope.common.lib.patch.AnyPatch;
+import org.apache.syncope.common.lib.patch.AttrPatch;
+import org.apache.syncope.common.lib.patch.GroupPatch;
+import org.apache.syncope.common.lib.patch.MembershipPatch;
+import org.apache.syncope.common.lib.patch.PasswordPatch;
+import org.apache.syncope.common.lib.patch.RelationshipPatch;
+import org.apache.syncope.common.lib.patch.AbstractReplacePatchItem;
+import org.apache.syncope.common.lib.patch.BooleanReplacePatchItem;
+import org.apache.syncope.common.lib.patch.LongPatchItem;
+import org.apache.syncope.common.lib.patch.LongReplacePatchItem;
+import org.apache.syncope.common.lib.patch.StringPatchItem;
+import org.apache.syncope.common.lib.patch.StringReplacePatchItem;
+import org.apache.syncope.common.lib.patch.UserPatch;
 import org.apache.syncope.common.lib.to.AnyObjectTO;
 import org.apache.syncope.common.lib.to.AnyTO;
 import org.apache.syncope.common.lib.to.AttrTO;
@@ -41,168 +47,148 @@ import org.apache.syncope.common.lib.to.GroupTO;
 import org.apache.syncope.common.lib.to.MembershipTO;
 import org.apache.syncope.common.lib.to.RelationshipTO;
 import org.apache.syncope.common.lib.to.UserTO;
+import org.apache.syncope.common.lib.types.PatchOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
- * Utility class for comparing manipulating {@link AnyTO} and {@link AnyMod}.
+ * Utility class for comparing {@link AnyTO} instances in order to generate 
{@link AnyPatch} instances.
  */
 public final class AnyOperations {
 
+    private static final Logger LOG = 
LoggerFactory.getLogger(AnyOperations.class);
+
     private AnyOperations() {
         // empty constructor for static utility classes
     }
 
-    private static void populate(final Map<String, AttrTO> updatedAttrs,
-            final Map<String, AttrTO> originalAttrs, final AnyMod result) {
-
-        populate(updatedAttrs, originalAttrs, result, false);
-    }
+    private static <T, K extends AbstractReplacePatchItem<T>> K 
replacePatchItem(
+            final T updated, final T original, final K proto) {
 
-    private static void populate(final Map<String, AttrTO> updatedAttrs,
-            final Map<String, AttrTO> originalAttrs, final AnyMod result,
-            final boolean virtuals) {
-
-        for (Map.Entry<String, AttrTO> entry : updatedAttrs.entrySet()) {
-            AttrMod mod = new AttrMod();
-            mod.setSchema(entry.getKey());
+        if ((original == null && updated == null) || (original != null && 
original.equals(updated))) {
+            return null;
+        }
 
-            Set<String> updatedValues = new 
HashSet<>(entry.getValue().getValues());
+        proto.setValue(updated);
+        return proto;
+    }
 
-            Set<String> originalValues = 
originalAttrs.containsKey(entry.getKey())
-                    ? new 
HashSet<>(originalAttrs.get(entry.getKey()).getValues())
-                    : Collections.<String>emptySet();
+    private static void diff(
+            final AnyTO updated, final AnyTO original, final AnyPatch result, 
final boolean incremental) {
 
-            if (!originalAttrs.containsKey(entry.getKey())) {
-                // SYNCOPE-459: take care of user virtual attributes without 
any value
-                updatedValues.remove("");
-                mod.getValuesToBeAdded().addAll(new 
ArrayList<>(updatedValues));
+        // check same key
+        if (updated.getKey() != original.getKey()) {
+            throw new IllegalArgumentException("AnyTO's key must be the same");
+        }
+        result.setKey(updated.getKey());
 
-                if (virtuals) {
-                    result.getVirAttrsToUpdate().add(mod);
-                } else {
-                    result.getPlainAttrsToUpdate().add(mod);
-                }
-            } else if (!updatedValues.equals(originalValues)) {
-                // avoid unwanted inputs
-                updatedValues.remove("");
-                if (!entry.getValue().isReadonly()) {
-                    mod.getValuesToBeAdded().addAll(updatedValues);
-
-                    if (!mod.isEmpty()) {
-                        if (virtuals) {
-                            result.getVirAttrsToRemove().add(mod.getSchema());
-                        } else {
-                            
result.getPlainAttrsToRemove().add(mod.getSchema());
-                        }
-                    }
-                }
+        // 1. realm
+        result.setRealm(replacePatchItem(updated.getRealm(), 
original.getRealm(), new StringReplacePatchItem()));
 
-                mod.getValuesToBeRemoved().addAll(originalValues);
+        // 2. auxilairy classes
+        result.getAuxClasses().clear();
 
-                if (!mod.isEmpty()) {
-                    if (virtuals) {
-                        result.getVirAttrsToUpdate().add(mod);
-                    } else {
-                        result.getPlainAttrsToUpdate().add(mod);
-                    }
-                }
+        if (!incremental) {
+            for (String auxClass : 
CollectionUtils.subtract(original.getAuxClasses(), updated.getAuxClasses())) {
+                result.getAuxClasses().add(
+                        new 
StringPatchItem.Builder().operation(PatchOperation.DELETE).value(auxClass).build());
             }
         }
-    }
-
-    private static void diff(
-            final AnyTO updated,
-            final AnyTO original,
-            final AnyMod result,
-            final boolean incremental) {
 
-        // 1. check same id
-        if (updated.getKey() != original.getKey()) {
-            throw new IllegalArgumentException("AnyTO's id must be the same");
+        for (String auxClass : 
CollectionUtils.subtract(updated.getAuxClasses(), original.getAuxClasses())) {
+            result.getAuxClasses().add(
+                    new 
StringPatchItem.Builder().operation(PatchOperation.ADD_REPLACE).value(auxClass).build());
         }
-        result.setKey(updated.getKey());
 
-        // 2. attributes
+        // 3. plain attributes
         Map<String, AttrTO> updatedAttrs = new 
HashMap<>(updated.getPlainAttrMap());
         Map<String, AttrTO> originalAttrs = new 
HashMap<>(original.getPlainAttrMap());
 
-        Set<String> originalAttrNames = new HashSet<>(originalAttrs.keySet());
-        originalAttrNames.removeAll(updatedAttrs.keySet());
+        result.getPlainAttrs().clear();
 
         if (!incremental) {
-            result.getPlainAttrsToRemove().clear();
-            result.getPlainAttrsToRemove().addAll(originalAttrNames);
+            
CollectionUtils.forAllDo(CollectionUtils.subtract(originalAttrs.keySet(), 
updatedAttrs.keySet()),
+                    new Closure<String>() {
+
+                        @Override
+                        public void execute(final String schema) {
+                            result.getPlainAttrs().add(new AttrPatch.Builder().
+                                    operation(PatchOperation.DELETE).
+                                    attrTO(new 
AttrTO.Builder().schema(schema).build()).
+                                    build());
+                        }
+                    });
         }
 
-        Set<String> emptyUpdatedAttrs = new HashSet<>();
-        for (Map.Entry<String, AttrTO> entry : updatedAttrs.entrySet()) {
-            if (entry.getValue().getValues() == null || 
entry.getValue().getValues().isEmpty()) {
-
-                emptyUpdatedAttrs.add(entry.getKey());
+        for (AttrTO attrTO : updatedAttrs.values()) {
+            AttrPatch patch = new 
AttrPatch.Builder().operation(PatchOperation.ADD_REPLACE).attrTO(attrTO).build();
+            if (!patch.isEmpty()) {
+                result.getPlainAttrs().add(patch);
             }
         }
-        for (String emptyUpdatedAttr : emptyUpdatedAttrs) {
-            updatedAttrs.remove(emptyUpdatedAttr);
-            result.getPlainAttrsToRemove().add(emptyUpdatedAttr);
-        }
 
-        populate(updatedAttrs, originalAttrs, result);
-
-        // 3. derived attributes
+        // 4. derived attributes
         updatedAttrs = updated.getDerAttrMap();
         originalAttrs = original.getDerAttrMap();
 
-        originalAttrNames = new HashSet<>(originalAttrs.keySet());
-        originalAttrNames.removeAll(updatedAttrs.keySet());
+        result.getDerAttrs().clear();
 
         if (!incremental) {
-            result.getDerAttrsToRemove().clear();
-            result.getDerAttrsToRemove().addAll(originalAttrNames);
+            for (String schema : 
CollectionUtils.subtract(originalAttrs.keySet(), updatedAttrs.keySet())) {
+                result.getDerAttrs().add(new AttrPatch.Builder().
+                        operation(PatchOperation.DELETE).
+                        attrTO(new AttrTO.Builder().schema(schema).build()).
+                        build());
+            }
         }
 
-        Set<String> updatedAttrNames = new HashSet<>(updatedAttrs.keySet());
-        updatedAttrNames.removeAll(originalAttrs.keySet());
-        result.getDerAttrsToAdd().clear();
-        result.getDerAttrsToAdd().addAll(updatedAttrNames);
+        for (String schema : CollectionUtils.subtract(updatedAttrs.keySet(), 
originalAttrs.keySet())) {
+            result.getDerAttrs().add(new AttrPatch.Builder().
+                    operation(PatchOperation.ADD_REPLACE).
+                    attrTO(new AttrTO.Builder().schema(schema).build()).
+                    build());
+        }
 
-        // 4. virtual attributes
+        // 5. virtual attributes
         updatedAttrs = updated.getVirAttrMap();
         originalAttrs = original.getVirAttrMap();
 
-        originalAttrNames = new HashSet<>(originalAttrs.keySet());
-        originalAttrNames.removeAll(updatedAttrs.keySet());
+        result.getVirAttrs().clear();
 
         if (!incremental) {
-            result.getVirAttrsToRemove().clear();
-            result.getVirAttrsToRemove().addAll(originalAttrNames);
+            
CollectionUtils.forAllDo(CollectionUtils.subtract(originalAttrs.keySet(), 
updatedAttrs.keySet()),
+                    new Closure<String>() {
+
+                        @Override
+                        public void execute(final String schema) {
+                            result.getVirAttrs().add(new AttrPatch.Builder().
+                                    operation(PatchOperation.DELETE).
+                                    attrTO(new 
AttrTO.Builder().schema(schema).build()).
+                                    build());
+                        }
+                    });
         }
 
-        populate(updatedAttrs, originalAttrs, result, true);
-
-        // 5. resources
-        Set<String> updatedRes = new HashSet<>(updated.getResources());
-        Set<String> originalRes = new HashSet<>(original.getResources());
-
-        updatedRes.removeAll(originalRes);
-        result.getResourcesToAdd().clear();
-        result.getResourcesToAdd().addAll(updatedRes);
+        for (AttrTO attrTO : updatedAttrs.values()) {
+            AttrPatch patch = new 
AttrPatch.Builder().operation(PatchOperation.ADD_REPLACE).attrTO(attrTO).build();
+            result.getVirAttrs().add(patch);
+        }
 
-        originalRes.removeAll(updated.getResources());
+        // 6. resources
+        result.getResources().clear();
 
         if (!incremental) {
-            result.getResourcesToRemove().clear();
-            result.getResourcesToRemove().addAll(originalRes);
+            for (String resource : 
CollectionUtils.subtract(original.getResources(), updated.getResources())) {
+                result.getResources().add(
+                        new 
StringPatchItem.Builder().operation(PatchOperation.DELETE).value(resource).build());
+            }
+        }
+
+        for (String resource : 
CollectionUtils.subtract(updated.getResources(), original.getResources())) {
+            result.getResources().add(
+                    new 
StringPatchItem.Builder().operation(PatchOperation.ADD_REPLACE).value(resource).build());
         }
-    }
 
-    /**
-     * Calculate modifications needed by first in order to be equal to second.
-     *
-     * @param updated updated AnyObjectTO
-     * @param original original AnyObjectTO
-     * @return AnyObjectMod containing differences
-     */
-    public static AnyObjectMod diff(final AnyObjectTO updated, final 
AnyObjectTO original) {
-        return diff(updated, original, false);
     }
 
     /**
@@ -211,10 +197,12 @@ public final class AnyOperations {
      * @param updated updated AnyObjectTO
      * @param original original AnyObjectTO
      * @param incremental perform incremental diff (without removing existing 
info)
-     * @return AnyObjectMod containing differences
+     * @return AnyObjectPatch containing differences
      */
-    public static AnyObjectMod diff(final AnyObjectTO updated, final 
AnyObjectTO original, final boolean incremental) {
-        AnyObjectMod result = new AnyObjectMod();
+    public static AnyObjectPatch diff(
+            final AnyObjectTO updated, final AnyObjectTO original, final 
boolean incremental) {
+
+        AnyObjectPatch result = new AnyObjectPatch();
 
         diff(updated, original, result, incremental);
 
@@ -224,13 +212,18 @@ public final class AnyOperations {
 
         for (Map.Entry<Long, RelationshipTO> entry : updatedRels.entrySet()) {
             if (!originalRels.containsKey(entry.getKey())) {
-                result.getRelationshipsToAdd().add(entry.getKey());
+                result.getRelationships().add(new RelationshipPatch.Builder().
+                        operation(PatchOperation.ADD_REPLACE).
+                        relationshipTO(entry.getValue()).build());
             }
         }
+
         if (!incremental) {
-            Set<Long> originalGroups = new HashSet<>(originalRels.keySet());
-            originalGroups.removeAll(updatedRels.keySet());
-            result.getRelationshipsToRemove().addAll(originalGroups);
+            for (Long key : CollectionUtils.subtract(originalRels.keySet(), 
updatedRels.keySet())) {
+                result.getRelationships().add(new RelationshipPatch.Builder().
+                        operation(PatchOperation.DELETE).
+                        relationshipTO(originalRels.get(key)).build());
+            }
         }
 
         // 2. memberships
@@ -239,13 +232,16 @@ public final class AnyOperations {
 
         for (Map.Entry<Long, MembershipTO> entry : updatedMembs.entrySet()) {
             if (!originalMembs.containsKey(entry.getKey())) {
-                result.getMembershipsToAdd().add(entry.getKey());
+                result.getMemberships().add(new MembershipPatch.Builder().
+                        
operation(PatchOperation.ADD_REPLACE).membershipTO(entry.getValue()).build());
             }
         }
+
         if (!incremental) {
-            Set<Long> originalGroups = new HashSet<>(originalMembs.keySet());
-            originalGroups.removeAll(updatedMembs.keySet());
-            result.getMembershipsToRemove().addAll(originalGroups);
+            for (Long key : CollectionUtils.subtract(originalMembs.keySet(), 
updatedMembs.keySet())) {
+                result.getMemberships().add(new MembershipPatch.Builder().
+                        
operation(PatchOperation.DELETE).membershipTO(originalMembs.get(key)).build());
+            }
         }
 
         return result;
@@ -256,43 +252,24 @@ public final class AnyOperations {
      *
      * @param updated updated UserTO
      * @param original original UserTO
-     * @return UserMod containing differences
-     */
-    public static UserMod diff(final UserTO updated, final UserTO original) {
-        return diff(updated, original, false);
-    }
-
-    /**
-     * Calculate modifications needed by first in order to be equal to second.
-     *
-     * @param updated updated UserTO
-     * @param original original UserTO
      * @param incremental perform incremental diff (without removing existing 
info)
-     * @return UserMod containing differences
+     * @return UserPatch containing differences
      */
-    public static UserMod diff(final UserTO updated, final UserTO original, 
final boolean incremental) {
-        UserMod result = new UserMod();
+    public static UserPatch diff(final UserTO updated, final UserTO original, 
final boolean incremental) {
+        UserPatch result = new UserPatch();
 
         diff(updated, original, result, incremental);
 
-        // 0. realm
-        if (updated.getRealm() != null && (original.getRealm() == null
-                || !original.getRealm().equals(updated.getRealm()))) {
-
-            result.setRealm(updated.getRealm());
-        }
-
         // 1. password
-        if (updated.getPassword() != null && (original.getPassword() == null
-                || !original.getPassword().equals(updated.getPassword()))) {
+        if (updated.getPassword() != null
+                && (original.getPassword() == null || 
!original.getPassword().equals(updated.getPassword()))) {
 
-            result.setPassword(updated.getPassword());
+            result.setPassword(new 
PasswordPatch.Builder().value(updated.getPassword()).build());
         }
 
         // 2. username
-        if (original.getUsername() != null && 
!original.getUsername().equals(updated.getUsername())) {
-            result.setUsername(updated.getUsername());
-        }
+        result.setUsername(
+                replacePatchItem(updated.getUsername(), 
original.getUsername(), new StringReplacePatchItem()));
 
         // 3. security question / answer
         if (updated.getSecurityQuestion() == null) {
@@ -301,15 +278,27 @@ public final class AnyOperations {
         } else if 
(!updated.getSecurityQuestion().equals(original.getSecurityQuestion())
                 || StringUtils.isNotBlank(updated.getSecurityAnswer())) {
 
-            result.setSecurityQuestion(updated.getSecurityQuestion());
-            result.setSecurityAnswer(updated.getSecurityAnswer());
+            result.setSecurityQuestion(
+                    new 
LongReplacePatchItem.Builder().value(updated.getSecurityQuestion()).build());
+            result.setSecurityAnswer(
+                    new 
StringReplacePatchItem.Builder().value(updated.getSecurityAnswer()).build());
         }
 
-        result.setMustChangePassword(updated.isMustChangePassword());
+        result.setMustChangePassword(replacePatchItem(
+                updated.isMustChangePassword(), 
original.isMustChangePassword(), new BooleanReplacePatchItem()));
 
         // 4. roles
-        
result.getRolesToRemove().addAll(CollectionUtils.subtract(original.getRoles(), 
updated.getRoles()));
-        
result.getRolesToAdd().addAll(CollectionUtils.subtract(updated.getRoles(), 
original.getRoles()));
+        if (!incremental) {
+            for (Long toRemove : CollectionUtils.subtract(original.getRoles(), 
updated.getRoles())) {
+                result.getRoles().add(
+                        new 
LongPatchItem.Builder().operation(PatchOperation.DELETE).value(toRemove).build());
+            }
+        }
+
+        for (Long toAdd : CollectionUtils.subtract(updated.getRoles(), 
original.getRoles())) {
+            result.getRoles().add(
+                    new 
LongPatchItem.Builder().operation(PatchOperation.ADD_REPLACE).value(toAdd).build());
+        }
 
         // 5. relationships
         Map<Long, RelationshipTO> updatedRels = updated.getRelationshipMap();
@@ -317,13 +306,18 @@ public final class AnyOperations {
 
         for (Map.Entry<Long, RelationshipTO> entry : updatedRels.entrySet()) {
             if (!originalRels.containsKey(entry.getKey())) {
-                result.getRelationshipsToAdd().add(entry.getKey());
+                result.getRelationships().add(new RelationshipPatch.Builder().
+                        operation(PatchOperation.ADD_REPLACE).
+                        relationshipTO(entry.getValue()).build());
             }
         }
+
         if (!incremental) {
-            Set<Long> originalGroups = new HashSet<>(originalRels.keySet());
-            originalGroups.removeAll(updatedRels.keySet());
-            result.getRelationshipsToRemove().addAll(originalGroups);
+            for (Long key : CollectionUtils.subtract(originalRels.keySet(), 
updatedRels.keySet())) {
+                result.getRelationships().add(new RelationshipPatch.Builder().
+                        operation(PatchOperation.DELETE).
+                        relationshipTO(originalRels.get(key)).build());
+            }
         }
 
         // 6. memberships
@@ -332,13 +326,16 @@ public final class AnyOperations {
 
         for (Map.Entry<Long, MembershipTO> entry : updatedMembs.entrySet()) {
             if (!originalMembs.containsKey(entry.getKey())) {
-                result.getMembershipsToAdd().add(entry.getKey());
+                result.getMemberships().add(new MembershipPatch.Builder().
+                        
operation(PatchOperation.ADD_REPLACE).membershipTO(entry.getValue()).build());
             }
         }
+
         if (!incremental) {
-            Set<Long> originalGroups = new HashSet<>(originalMembs.keySet());
-            originalGroups.removeAll(updatedMembs.keySet());
-            result.getMembershipsToRemove().addAll(originalGroups);
+            for (Long key : CollectionUtils.subtract(originalMembs.keySet(), 
updatedMembs.keySet())) {
+                result.getMemberships().add(new MembershipPatch.Builder().
+                        
operation(PatchOperation.DELETE).membershipTO(originalMembs.get(key)).build());
+            }
         }
 
         return result;
@@ -349,119 +346,232 @@ public final class AnyOperations {
      *
      * @param updated updated GroupTO
      * @param original original GroupTO
-     * @return GroupMod containing differences
-     */
-    public static GroupMod diff(final GroupTO updated, final GroupTO original) 
{
-        return diff(updated, original, false);
-    }
-
-    /**
-     * Calculate modifications needed by first in order to be equal to second.
-     *
-     * @param updated updated GroupTO
-     * @param original original GroupTO
      * @param incremental perform incremental diff (without removing existing 
info)
-     * @return GroupMod containing differences
+     * @return GroupPatch containing differences
      */
-    public static GroupMod diff(final GroupTO updated, final GroupTO original, 
final boolean incremental) {
-        GroupMod result = new GroupMod();
+    public static GroupPatch diff(final GroupTO updated, final GroupTO 
original, final boolean incremental) {
+        GroupPatch result = new GroupPatch();
 
         diff(updated, original, result, incremental);
 
         // 1. name
-        if (!original.getName().equals(updated.getName())) {
-            result.setName(updated.getName());
-        }
+        result.setName(replacePatchItem(updated.getName(), original.getName(), 
new StringReplacePatchItem()));
 
-        // 2. owner
-        result.setUserOwner(new ReferenceMod(updated.getUserOwner()));
-        result.setGroupOwner(new ReferenceMod(updated.getGroupOwner()));
+        // 2. ownership
+        result.setUserOwner(replacePatchItem(
+                original.getUserOwner(), updated.getUserOwner(), new 
LongReplacePatchItem()));
+        result.setGroupOwner(replacePatchItem(
+                original.getGroupOwner(), updated.getGroupOwner(), new 
LongReplacePatchItem()));
 
         // 3. dynMembershipCond
-        result.setADynMembershipCond(updated.getADynMembershipCond());
-        result.setUDynMembershipCond(updated.getUDynMembershipCond());
+        result.setADynMembershipCond(replacePatchItem(
+                updated.getADynMembershipCond(), 
original.getADynMembershipCond(), new StringReplacePatchItem()));
+        result.setUDynMembershipCond(replacePatchItem(
+                updated.getUDynMembershipCond(), 
original.getUDynMembershipCond(), new StringReplacePatchItem()));
 
         return result;
     }
 
-    private static List<AttrTO> getUpdateValues(final Map<String, AttrTO> 
attrs,
-            final Set<String> attrsToBeRemoved, final Set<AttrMod> 
attrsToBeUpdated) {
+    @SuppressWarnings("unchecked")
+    public static <TO extends AnyTO, P extends AnyPatch> P diff(
+            final TO updated, final TO original, final boolean incremental) {
 
+        if (updated instanceof UserTO && original instanceof UserTO) {
+            return (P) diff((UserTO) updated, (UserTO) original, incremental);
+        } else if (updated instanceof GroupTO && original instanceof GroupTO) {
+            return (P) diff((GroupTO) updated, (GroupTO) original, 
incremental);
+        } else if (updated instanceof AnyObjectTO && original instanceof 
AnyObjectTO) {
+            return (P) diff((AnyObjectTO) updated, (AnyObjectTO) original, 
incremental);
+        }
+
+        throw new IllegalArgumentException("Unsupported: " + 
updated.getClass().getName());
+    }
+
+    private static Collection<AttrTO> patch(final Map<String, AttrTO> attrs, 
final Set<AttrPatch> attrPatches) {
         Map<String, AttrTO> rwattrs = new HashMap<>(attrs);
-        for (String attrName : attrsToBeRemoved) {
-            rwattrs.remove(attrName);
-        }
-        for (AttrMod attrMod : attrsToBeUpdated) {
-            if (rwattrs.containsKey(attrMod.getSchema())) {
-                AttrTO attrTO = rwattrs.get(attrMod.getSchema());
-                attrTO.getValues().removeAll(attrMod.getValuesToBeRemoved());
-                attrTO.getValues().addAll(attrMod.getValuesToBeAdded());
+        for (AttrPatch patch : attrPatches) {
+            if (patch.getAttrTO() == null) {
+                LOG.warn("Invalid {} specified: {}", 
AttrPatch.class.getName(), patch);
             } else {
-                AttrTO attrTO = new AttrTO();
-                attrTO.setSchema(attrMod.getSchema());
-                attrTO.getValues().addAll(attrMod.getValuesToBeAdded());
+                rwattrs.remove(patch.getAttrTO().getSchema());
+                if (patch.getOperation() == PatchOperation.ADD_REPLACE) {
+                    rwattrs.put(patch.getAttrTO().getSchema(), 
patch.getAttrTO());
+                }
+                switch (patch.getOperation()) {
+                    case ADD_REPLACE:
+                        if 
(rwattrs.containsKey(patch.getAttrTO().getSchema())) {
+                            rwattrs.remove(patch.getAttrTO().getSchema());
+                        }
+                        break;
 
-                rwattrs.put(attrMod.getSchema(), attrTO);
+                    case DELETE:
+                    default:
+                        rwattrs.remove(patch.getAttrTO().getSchema());
+                }
             }
         }
 
-        return new ArrayList<>(rwattrs.values());
+        return rwattrs.values();
     }
 
-    private static <T extends AnyTO, K extends AnyMod> void apply(final T to,
-            final K mod, final T result) {
-
-        // 1. attributes
-        result.getPlainAttrs().addAll(getUpdateValues(to.getPlainAttrMap(),
-                mod.getPlainAttrsToRemove(), mod.getPlainAttrsToUpdate()));
+    private static <T extends AnyTO, K extends AnyPatch> void patch(final T 
to, final K patch, final T result) {
+        // check same key
+        if (to.getKey() != patch.getKey()) {
+            throw new IllegalArgumentException(
+                    to.getClass().getSimpleName() + " and " + 
patch.getClass().getSimpleName()
+                    + " keys must be the same");
+        }
 
-        // 2. derived attributes
-        Map<String, AttrTO> attrs = to.getDerAttrMap();
-        for (String attrName : mod.getDerAttrsToRemove()) {
-            attrs.remove(attrName);
+        // 0. realm
+        if (patch.getRealm() != null) {
+            result.setRealm(patch.getRealm().getValue());
         }
-        for (String attrName : mod.getDerAttrsToAdd()) {
-            AttrTO attrTO = new AttrTO();
-            attrTO.setSchema(attrName);
 
-            attrs.put(attrName, attrTO);
+        // 1. auxiliary classes
+        for (StringPatchItem auxClassPatch : patch.getAuxClasses()) {
+            switch (auxClassPatch.getOperation()) {
+                case ADD_REPLACE:
+                    to.getAuxClasses().add(auxClassPatch.getValue());
+                    break;
+
+                case DELETE:
+                default:
+                    to.getAuxClasses().remove(auxClassPatch.getValue());
+            }
         }
-        result.getDerAttrs().addAll(attrs.values());
 
-        // 3. virtual attributes
-        result.getVirAttrs().addAll(getUpdateValues(to.getVirAttrMap(),
-                mod.getVirAttrsToRemove(), mod.getVirAttrsToUpdate()));
+        // 2. plain attributes
+        result.getPlainAttrs().clear();
+        
result.getPlainAttrs().addAll(AnyOperations.patch(to.getPlainAttrMap(), 
patch.getPlainAttrs()));
+
+        // 3. derived attributes
+        result.getDerAttrs().clear();
+        result.getDerAttrs().addAll(AnyOperations.patch(to.getDerAttrMap(), 
patch.getDerAttrs()));
 
-        // 4. resources
-        result.getResources().removeAll(mod.getResourcesToRemove());
-        result.getResources().addAll(mod.getResourcesToAdd());
+        // 4. virtual attributes
+        result.getVirAttrs().clear();
+        result.getVirAttrs().addAll(AnyOperations.patch(to.getVirAttrMap(), 
patch.getVirAttrs()));
+
+        // 5. resources
+        for (StringPatchItem resourcePatch : patch.getResources()) {
+            switch (resourcePatch.getOperation()) {
+                case ADD_REPLACE:
+                    result.getResources().add(resourcePatch.getValue());
+                    break;
+
+                case DELETE:
+                default:
+                    result.getResources().remove(resourcePatch.getValue());
+            }
+        }
     }
 
-    public static UserTO apply(final UserTO userTO, final UserMod userMod) {
-        // 1. check same id
-        if (userTO.getKey() != userMod.getKey()) {
-            throw new IllegalArgumentException("UserTO and UserMod ids must be 
the same");
+    public static GroupTO patch(final GroupTO groupTO, final GroupPatch 
groupPatch) {
+        GroupTO result = SerializationUtils.clone(groupTO);
+        AnyOperations.patch(groupTO, groupPatch, result);
+
+        if (groupPatch.getName() != null) {
+            result.setName(groupPatch.getName().getValue());
         }
 
-        UserTO result = SerializationUtils.clone(userTO);
-        apply(userTO, userMod, result);
+        if (groupPatch.getUserOwner() != null) {
+            result.setGroupOwner(groupPatch.getUserOwner().getValue());
+        }
+        if (groupPatch.getGroupOwner() != null) {
+            result.setGroupOwner(groupPatch.getGroupOwner().getValue());
+        }
 
-        // 0. realm
-        if (userMod.getRealm() != null) {
-            result.setRealm(userMod.getRealm());
+        if (groupPatch.getADynMembershipCond() != null) {
+            
result.setADynMembershipCond(groupPatch.getADynMembershipCond().getValue());
+        }
+        if (groupPatch.getUDynMembershipCond() != null) {
+            
result.setADynMembershipCond(groupPatch.getUDynMembershipCond().getValue());
         }
 
+        return result;
+    }
+
+    public static AnyObjectTO patch(final AnyObjectTO anyObjectTO, final 
AnyObjectPatch anyObjectPatch) {
+        AnyObjectTO result = SerializationUtils.clone(anyObjectTO);
+        AnyOperations.patch(anyObjectTO, anyObjectPatch, result);
+
+        // 1. relationships
+        for (final RelationshipPatch relPatch : 
anyObjectPatch.getRelationships()) {
+            if (relPatch.getRelationshipTO() == null) {
+                LOG.warn("Invalid {} specified: {}", 
RelationshipPatch.class.getName(), relPatch);
+            } else {
+                result.getRelationships().remove(relPatch.getRelationshipTO());
+                if (relPatch.getOperation() == PatchOperation.ADD_REPLACE) {
+                    
result.getRelationships().add(relPatch.getRelationshipTO());
+                }
+            }
+        }
+
+        // 2. memberships
+        for (final MembershipPatch membPatch : 
anyObjectPatch.getMemberships()) {
+            if (membPatch.getMembershipTO() == null) {
+                LOG.warn("Invalid {} specified: {}", 
MembershipPatch.class.getName(), membPatch);
+            } else {
+                result.getMemberships().remove(membPatch.getMembershipTO());
+                if (membPatch.getOperation() == PatchOperation.ADD_REPLACE) {
+                    result.getMemberships().add(membPatch.getMembershipTO());
+                }
+            }
+        }
+
+        return result;
+    }
+
+    public static UserTO patch(final UserTO userTO, final UserPatch userPatch) 
{
+        UserTO result = SerializationUtils.clone(userTO);
+        AnyOperations.patch(userTO, userPatch, result);
+
         // 1. password
-        result.setPassword(userMod.getPassword());
+        if (userPatch.getPassword() != null) {
+            result.setPassword(userPatch.getPassword().getValue());
+        }
 
         // 2. username
-        if (userMod.getUsername() != null) {
-            result.setUsername(userMod.getUsername());
+        if (userPatch.getUsername() != null) {
+            result.setUsername(userPatch.getUsername().getValue());
+        }
+
+        // 3. relationships
+        for (final RelationshipPatch relPatch : userPatch.getRelationships()) {
+            if (relPatch.getRelationshipTO() == null) {
+                LOG.warn("Invalid {} specified: {}", 
RelationshipPatch.class.getName(), relPatch);
+            } else {
+                result.getRelationships().remove(relPatch.getRelationshipTO());
+                if (relPatch.getOperation() == PatchOperation.ADD_REPLACE) {
+                    
result.getRelationships().add(relPatch.getRelationshipTO());
+                }
+            }
         }
 
-        // 3. roles
-        result.getRoles().removeAll(userMod.getRolesToRemove());
-        result.getRoles().addAll(userMod.getRolesToAdd());
+        // 4. memberships
+        for (final MembershipPatch membPatch : userPatch.getMemberships()) {
+            if (membPatch.getMembershipTO() == null) {
+                LOG.warn("Invalid {} specified: {}", 
MembershipPatch.class.getName(), membPatch);
+            } else {
+                result.getMemberships().remove(membPatch.getMembershipTO());
+                if (membPatch.getOperation() == PatchOperation.ADD_REPLACE) {
+                    result.getMemberships().add(membPatch.getMembershipTO());
+                }
+            }
+        }
+
+        // 5. roles
+        for (LongPatchItem rolePatch : userPatch.getRoles()) {
+            switch (rolePatch.getOperation()) {
+                case ADD_REPLACE:
+                    result.getRoles().add(rolePatch.getValue());
+                    break;
+
+                case DELETE:
+                default:
+                    result.getRoles().remove(rolePatch.getValue());
+            }
+        }
 
         return result;
     }

http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/common/lib/src/main/java/org/apache/syncope/common/lib/jaxb/GenericMapEntryType.java
----------------------------------------------------------------------
diff --git 
a/common/lib/src/main/java/org/apache/syncope/common/lib/jaxb/GenericMapEntryType.java
 
b/common/lib/src/main/java/org/apache/syncope/common/lib/jaxb/GenericMapEntryType.java
index 2d30612..a418837 100644
--- 
a/common/lib/src/main/java/org/apache/syncope/common/lib/jaxb/GenericMapEntryType.java
+++ 
b/common/lib/src/main/java/org/apache/syncope/common/lib/jaxb/GenericMapEntryType.java
@@ -14,9 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*
- * $Id: MapEntryType.java 399 2011-12-03 04:22:50Z jyeary $
- */
 package org.apache.syncope.common.lib.jaxb;
 
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/common/lib/src/main/java/org/apache/syncope/common/lib/jaxb/GenericMapType.java
----------------------------------------------------------------------
diff --git 
a/common/lib/src/main/java/org/apache/syncope/common/lib/jaxb/GenericMapType.java
 
b/common/lib/src/main/java/org/apache/syncope/common/lib/jaxb/GenericMapType.java
index 491a860..e57a401 100644
--- 
a/common/lib/src/main/java/org/apache/syncope/common/lib/jaxb/GenericMapType.java
+++ 
b/common/lib/src/main/java/org/apache/syncope/common/lib/jaxb/GenericMapType.java
@@ -14,9 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*
- * $Id: MapType.java 399 2011-12-03 04:22:50Z jyeary $
- */
 package org.apache.syncope.common.lib.jaxb;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/syncope/blob/9f73fa43/common/lib/src/main/java/org/apache/syncope/common/lib/jaxb/XmlGenericMapAdapter.java
----------------------------------------------------------------------
diff --git 
a/common/lib/src/main/java/org/apache/syncope/common/lib/jaxb/XmlGenericMapAdapter.java
 
b/common/lib/src/main/java/org/apache/syncope/common/lib/jaxb/XmlGenericMapAdapter.java
index 1b10d5f..1855164 100644
--- 
a/common/lib/src/main/java/org/apache/syncope/common/lib/jaxb/XmlGenericMapAdapter.java
+++ 
b/common/lib/src/main/java/org/apache/syncope/common/lib/jaxb/XmlGenericMapAdapter.java
@@ -14,9 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*
- * $Id: XmlGenericMapAdapter.java 399 2011-12-03 04:22:50Z jyeary $
- */
 package org.apache.syncope.common.lib.jaxb;
 
 import java.util.HashMap;

Reply via email to