Return-Path: X-Original-To: apmail-syncope-commits-archive@www.apache.org Delivered-To: apmail-syncope-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 41CF117D42 for ; Thu, 11 Jun 2015 14:16:53 +0000 (UTC) Received: (qmail 98553 invoked by uid 500); 11 Jun 2015 14:16:53 -0000 Delivered-To: apmail-syncope-commits-archive@syncope.apache.org Received: (qmail 98502 invoked by uid 500); 11 Jun 2015 14:16:53 -0000 Mailing-List: contact commits-help@syncope.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@syncope.apache.org Delivered-To: mailing list commits@syncope.apache.org Received: (qmail 98246 invoked by uid 99); 11 Jun 2015 14:16:53 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Jun 2015 14:16:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C1E30DFFD5; Thu, 11 Jun 2015 14:16:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: ilgrosso@apache.org To: commits@syncope.apache.org Date: Thu, 11 Jun 2015 14:17:27 -0000 Message-Id: In-Reply-To: <03fff1eebfc74363bad37a139938245d@git.apache.org> References: <03fff1eebfc74363bad37a139938245d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [37/70] syncope git commit: [SYNCOPE-673] Merge from master [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ò Authored: Wed May 27 12:20:38 2015 +0200 Committer: Francesco Chicchiriccò 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> created = userProvisioningManager.create(userTO, true, true, enabled, - Collections.singleton(profile.getTask().getResource().getKey())); + Map.Entry> 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> 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 ----------------------------------------------------------------------