Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 3E118200D34 for ; Fri, 3 Nov 2017 11:18:47 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 3CA47160BFB; Fri, 3 Nov 2017 10:18:47 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 81D51160BE9 for ; Fri, 3 Nov 2017 11:18:46 +0100 (CET) Received: (qmail 72146 invoked by uid 500); 3 Nov 2017 10:18:45 -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 72137 invoked by uid 99); 3 Nov 2017 10:18:45 -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; Fri, 03 Nov 2017 10:18:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8E8CFDFB6F; Fri, 3 Nov 2017 10:18:45 +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: Fri, 03 Nov 2017 10:18:45 -0000 Message-Id: <9a89dad106c247fe9dda83c12ab042a1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] syncope git commit: Further changes to ensure querying for supported ConnId ObjectClasses work propertly archived-at: Fri, 03 Nov 2017 10:18:47 -0000 Repository: syncope Updated Branches: refs/heads/2_0_X edb004d8d -> 149b91000 refs/heads/master 81a030bd7 -> 3d4f233cc Further changes to ensure querying for supported ConnId ObjectClasses work propertly Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/149b9100 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/149b9100 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/149b9100 Branch: refs/heads/2_0_X Commit: 149b91000050cfd13ba8a9fa00464fa6ff566a86 Parents: edb004d Author: Francesco Chicchiriccò Authored: Fri Nov 3 11:18:30 2017 +0100 Committer: Francesco Chicchiriccò Committed: Fri Nov 3 11:18:30 2017 +0100 ---------------------------------------------------------------------- .../org/apache/syncope/core/logic/ConnectorLogic.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/149b9100/core/logic/src/main/java/org/apache/syncope/core/logic/ConnectorLogic.java ---------------------------------------------------------------------- diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/ConnectorLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/ConnectorLogic.java index f803eb6..e5cfc7b 100644 --- a/core/logic/src/main/java/org/apache/syncope/core/logic/ConnectorLogic.java +++ b/core/logic/src/main/java/org/apache/syncope/core/logic/ConnectorLogic.java @@ -21,7 +21,6 @@ package org.apache.syncope.core.logic; import java.lang.reflect.Method; import java.net.URI; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Locale; import java.util.Map; @@ -38,7 +37,6 @@ import org.apache.syncope.common.lib.to.ConnBundleTO; import org.apache.syncope.common.lib.to.ConnIdObjectClassTO; import org.apache.syncope.common.lib.to.ConnInstanceTO; import org.apache.syncope.common.lib.types.ClientExceptionType; -import org.apache.syncope.common.lib.types.ConnConfProperty; import org.apache.syncope.common.lib.types.StandardEntitlement; import org.apache.syncope.core.persistence.api.dao.ConnInstanceDAO; import org.apache.syncope.core.persistence.api.dao.ExternalResourceDAO; @@ -227,8 +225,14 @@ public class ConnectorLogic extends AbstractTransactionalLogic { public List buildObjectClassInfo( final ConnInstanceTO connInstanceTO, final boolean includeSpecial) { + ConnInstanceTO actual = connInstanceTO; + ConnInstance existing = connInstanceDAO.find(connInstanceTO.getKey()); + if (existing != null) { + actual = binder.getConnInstanceTO(existing); + } + Set objectClassInfo = connFactory.createConnector( - connFactory.buildConnInstanceOverride(connInstanceTO, Collections.emptySet(), null)). + connFactory.buildConnInstanceOverride(actual, connInstanceTO.getConf(), null)). getObjectClassInfo(); List result = new ArrayList<>(objectClassInfo.size());