[SYNCOPE-673] Merge from master
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/c608b585 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/c608b585 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/c608b585 Branch: refs/heads/master Commit: c608b58540b1f6089e466096522042fd244b5368 Parents: 63108c8 8ea1e6a Author: Francesco Chicchiriccò <[email protected]> Authored: Wed May 27 12:20:38 2015 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Wed May 27 12:20:38 2015 +0200 ---------------------------------------------------------------------- .../java/sync/GroupSyncResultHandlerImpl.java | 5 +---- .../java/sync/UserSyncResultHandlerImpl.java | 11 ++++++----- pom.xml | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/c608b585/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/GroupSyncResultHandlerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/c608b585/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/UserSyncResultHandlerImpl.java ---------------------------------------------------------------------- diff --cc core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/UserSyncResultHandlerImpl.java index 8487fa8,d111ac6..d5c41db --- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/UserSyncResultHandlerImpl.java +++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/UserSyncResultHandlerImpl.java @@@ -55,12 -55,24 +55,13 @@@ public class UserSyncResultHandlerImpl } @Override - protected AbstractSubjectMod getSubjectMod(final AbstractSubjectTO subjectTO, final SyncDelta delta) { - return connObjectUtils.getAttributableMod(subjectTO.getKey(), - delta.getObject(), - subjectTO, - profile.getTask(), - getAttributableUtils()); - } - - @Override - protected AbstractSubjectTO doCreate( - final AbstractSubjectTO subjectTO, final SyncDelta delta, final ProvisioningResult result) { - - UserTO userTO = UserTO.class.cast(subjectTO); + protected AnyTO doCreate(final AnyTO anyTO, final SyncDelta delta, final ProvisioningResult result) { + UserTO userTO = UserTO.class.cast(anyTO); Boolean enabled = syncUtilities.readEnabled(delta.getObject(), profile.getTask()); - Map.Entry<Long, List<PropagationStatus>> created = userProvisioningManager.create(userTO, true, true, enabled, - Collections.singleton(profile.getTask().getResource().getKey())); + Map.Entry<Long, List<PropagationStatus>> created = + userProvisioningManager.create(userTO, true, true, enabled, + Collections.singleton(profile.getTask().getResource().getKey())); result.setKey(created.getKey()); @@@ -92,8 -104,8 +93,8 @@@ final SyncDelta delta, final ProvisioningResult result) { - final UserMod userMod = UserMod.class.cast(anyMod); - final Boolean enabled = syncUtilities.readEnabled(delta.getObject(), profile.getTask()); - UserMod userMod = UserMod.class.cast(subjectMod); ++ UserMod userMod = UserMod.class.cast(anyMod); + Boolean enabled = syncUtilities.readEnabled(delta.getObject(), profile.getTask()); Map.Entry<Long, List<PropagationStatus>> updated = userProvisioningManager.update(userMod, before.getKey(), result, enabled, Collections.singleton(profile.getTask().getResource().getKey())); http://git-wip-us.apache.org/repos/asf/syncope/blob/c608b585/pom.xml ----------------------------------------------------------------------
