Repository: syncope Updated Branches: refs/heads/2_0_X 781ae9367 -> f9aed7b8d refs/heads/master 68ab1fbed -> 3a9d872f1
Ensure the Admin Console correctly provides details to fetch ConnId object classes info Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f9aed7b8 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f9aed7b8 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f9aed7b8 Branch: refs/heads/2_0_X Commit: f9aed7b8d2e044041e2c82a8471988d33b302aaf Parents: 781ae93 Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Thu Nov 2 14:03:43 2017 +0100 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Thu Nov 2 14:03:43 2017 +0100 ---------------------------------------------------------------------- .../syncope/client/console/rest/ConnectorRestClient.java | 6 +++++- .../console/wizards/resources/ProvisionWizardBuilder.java | 8 ++++++-- .../console/wizards/resources/ResourceMappingPanel.java | 2 ++ .../console/wizards/resources/ResourceProvisionPanel.java | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/f9aed7b8/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 5f1d41b..fb84ef3 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 @@ -85,9 +85,13 @@ public class ConnectorRestClient extends BaseRestClient { } public List<String> getExtAttrNames( - final String objectClass, final String connectorKey, final Collection<ConnConfProperty> conf) { + final String adminRealm, + final String objectClass, + final String connectorKey, + final Collection<ConnConfProperty> conf) { ConnInstanceTO connInstanceTO = new ConnInstanceTO(); + connInstanceTO.setAdminRealm(adminRealm); connInstanceTO.setKey(connectorKey); connInstanceTO.getConf().addAll(conf); http://git-wip-us.apache.org/repos/asf/syncope/blob/f9aed7b8/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ProvisionWizardBuilder.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ProvisionWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ProvisionWizardBuilder.java index 2ade6cf..5b297e6 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ProvisionWizardBuilder.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ProvisionWizardBuilder.java @@ -53,6 +53,8 @@ public class ProvisionWizardBuilder extends AjaxWizardBuilder<ResourceProvision> private final ResourceTO resourceTO; + private final String adminRealm; + protected AjaxTextFieldPanel clazz; /** @@ -183,11 +185,13 @@ public class ProvisionWizardBuilder extends AjaxWizardBuilder<ResourceProvision> * Construct. * * @param resourceTO external resource to be updated. + * @param adminRealm admin realm * @param pageRef Caller page reference. */ - public ProvisionWizardBuilder(final ResourceTO resourceTO, final PageReference pageRef) { + public ProvisionWizardBuilder(final ResourceTO resourceTO, final String adminRealm, final PageReference pageRef) { super(new ResourceProvision(), pageRef); this.resourceTO = resourceTO; + this.adminRealm = adminRealm; } @Override @@ -206,7 +210,7 @@ public class ProvisionWizardBuilder extends AjaxWizardBuilder<ResourceProvision> modelObject.getProvisionTO().setMapping(new MappingTO()); } mapping.add(new ResourceMappingPanel( - "mapping", resourceTO, modelObject, itemTransformers, jexlTransformers)); + "mapping", resourceTO, adminRealm, modelObject, itemTransformers, jexlTransformers)); wizardModel.add(mapping); http://git-wip-us.apache.org/repos/asf/syncope/blob/f9aed7b8/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceMappingPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceMappingPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceMappingPanel.java index 02ae10f..94f011a 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceMappingPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceMappingPanel.java @@ -67,6 +67,7 @@ public class ResourceMappingPanel extends AbstractMappingPanel { public ResourceMappingPanel( final String id, final ResourceTO resourceTO, + final String adminRealm, final ResourceProvision provision, final ItemTransformersTogglePanel itemTransformers, final JEXLTransformersTogglePanel jexlTransformers) { @@ -90,6 +91,7 @@ public class ResourceMappingPanel extends AbstractMappingPanel { @Override protected List<String> load() { return new ConnectorRestClient().getExtAttrNames( + adminRealm, provision.getObjectClass(), resourceTO.getConnector(), resourceTO.getConfOverride()); http://git-wip-us.apache.org/repos/asf/syncope/blob/f9aed7b8/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.java index 69d321e..7837584 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.java @@ -90,7 +90,7 @@ public class ResourceProvisionPanel extends AbstractModalPanel<Serializable> { actionTogglePanel = new ActionLinksTogglePanel<>("toggle", pageRef); add(actionTogglePanel); - wizard = new ProvisionWizardBuilder(resourceTO, pageRef); + wizard = new ProvisionWizardBuilder(resourceTO, adminRealm, pageRef); final ListViewPanel.Builder<ResourceProvision> builder = new ListViewPanel.Builder<ResourceProvision>( ResourceProvision.class, pageRef) {