You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2016/06/23 10:47:45 UTC
syncope git commit: [SYNCOPE-875] Auto-setting connectorName during
check as already done fore create
Repository: syncope
Updated Branches:
refs/heads/master ddc2f3a18 -> 9042203d7
[SYNCOPE-875] Auto-setting connectorName during check as already done fore create
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/9042203d
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/9042203d
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/9042203d
Branch: refs/heads/master
Commit: 9042203d7f2c976596d271c73cf9765f17a498a0
Parents: ddc2f3a
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Thu Jun 23 12:47:39 2016 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Thu Jun 23 12:47:39 2016 +0200
----------------------------------------------------------------------
.../wizards/resources/ConnectorDetailsPanel.java | 1 -
.../wizards/resources/ConnectorWizardBuilder.java | 15 +++++++++++----
2 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/9042203d/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ConnectorDetailsPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ConnectorDetailsPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ConnectorDetailsPanel.java
index a64705f..9ce3b0e 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ConnectorDetailsPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ConnectorDetailsPanel.java
@@ -42,7 +42,6 @@ public class ConnectorDetailsPanel extends WizardStep {
private static final long serialVersionUID = -2435937897614232137L;
public ConnectorDetailsPanel(final ConnInstanceTO connInstanceTO, final List<ConnBundleTO> bundles) {
-
super();
setOutputMarkupId(true);
http://git-wip-us.apache.org/repos/asf/syncope/blob/9042203d/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ConnectorWizardBuilder.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ConnectorWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ConnectorWizardBuilder.java
index 20f336f..20037d8 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ConnectorWizardBuilder.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ConnectorWizardBuilder.java
@@ -70,7 +70,14 @@ public class ConnectorWizardBuilder extends AbstractResourceWizardBuilder<ConnIn
@Override
protected Pair<Boolean, String> check(final AjaxRequestTarget target) {
- return connectorRestClient.check(modelObject);
+ ConnInstanceTO connInstanceTO = ConnInstanceTO.class.cast(modelObject);
+ ConnBundleTO bundleTO = ConnectorWizardBuilder.getBundle(connInstanceTO, bundles);
+
+ connInstanceTO.setConnectorName(bundleTO.getConnectorName());
+ connInstanceTO.setBundleName(bundleTO.getBundleName());
+ connInstanceTO.setVersion(bundleTO.getVersion());
+
+ return connectorRestClient.check(connInstanceTO);
}
@Override
@@ -86,8 +93,8 @@ public class ConnectorWizardBuilder extends AbstractResourceWizardBuilder<ConnIn
@Override
protected Serializable onApplyInternal(final Serializable modelObject) {
- final ConnInstanceTO connInstanceTO = ConnInstanceTO.class.cast(modelObject);
- final ConnBundleTO bundleTO = ConnectorWizardBuilder.getBundle(connInstanceTO, bundles);
+ ConnInstanceTO connInstanceTO = ConnInstanceTO.class.cast(modelObject);
+ ConnBundleTO bundleTO = ConnectorWizardBuilder.getBundle(connInstanceTO, bundles);
connInstanceTO.setConnectorName(bundleTO.getConnectorName());
connInstanceTO.setBundleName(bundleTO.getBundleName());
@@ -104,7 +111,7 @@ public class ConnectorWizardBuilder extends AbstractResourceWizardBuilder<ConnIn
connInstanceTO.setPoolConf(null);
}
- final ConnInstanceTO res;
+ ConnInstanceTO res;
if (mode == AjaxWizard.Mode.CREATE) {
res = connectorRestClient.create(connInstanceTO);
} else {