Author: ilgrosso
Date: Thu Feb 7 10:59:12 2013
New Revision: 1443403
URL: http://svn.apache.org/viewvc?rev=1443403&view=rev
Log:
Backporting fix for connector check done for SYNCOPE-265 on trunk
Modified:
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceConnConfPanel.java
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/StatusPanel.java
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java
Modified:
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java?rev=1443403&r1=1443402&r2=1443403&view=diff
==============================================================================
---
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
(original)
+++
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
Thu Feb 7 10:59:12 2013
@@ -25,6 +25,20 @@ import java.util.EnumSet;
import java.util.HashSet;
import java.util.List;
import org.apache.commons.lang.StringUtils;
+import org.apache.syncope.client.to.ConnBundleTO;
+import org.apache.syncope.client.to.ConnInstanceTO;
+import
org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.console.rest.ConnectorRestClient;
+import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel;
+import
org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel;
+import org.apache.syncope.console.wicket.markup.html.form.AjaxNumberFieldPanel;
+import
org.apache.syncope.console.wicket.markup.html.form.AjaxPasswordFieldPanel;
+import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
+import org.apache.syncope.console.wicket.markup.html.form.FieldPanel;
+import
org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel;
+import org.apache.syncope.types.ConnConfPropSchema;
+import org.apache.syncope.types.ConnConfProperty;
+import org.apache.syncope.types.ConnectorCapability;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
@@ -51,20 +65,6 @@ import org.apache.wicket.model.PropertyM
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
import org.springframework.util.ClassUtils;
-import org.apache.syncope.client.to.ConnBundleTO;
-import org.apache.syncope.client.to.ConnInstanceTO;
-import
org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
-import org.apache.syncope.console.rest.ConnectorRestClient;
-import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel;
-import
org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel;
-import org.apache.syncope.console.wicket.markup.html.form.AjaxNumberFieldPanel;
-import
org.apache.syncope.console.wicket.markup.html.form.AjaxPasswordFieldPanel;
-import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
-import org.apache.syncope.console.wicket.markup.html.form.FieldPanel;
-import
org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel;
-import org.apache.syncope.types.ConnConfPropSchema;
-import org.apache.syncope.types.ConnConfProperty;
-import org.apache.syncope.types.ConnectorCapability;
/**
* Modal window with Connector form.
@@ -104,15 +104,16 @@ public class ConnectorModalPage extends
? EnumSet.noneOf(ConnectorCapability.class)
: connectorTO.getCapabilities());
- final IModel<List<ConnectorCapability>> capabilities = new
LoadableDetachableModel<List<ConnectorCapability>>() {
+ final IModel<List<ConnectorCapability>> capabilities =
+ new LoadableDetachableModel<List<ConnectorCapability>>() {
- private static final long serialVersionUID = 5275935387613157437L;
+ private static final long serialVersionUID =
5275935387613157437L;
- @Override
- protected List<ConnectorCapability> load() {
- return Arrays.asList(ConnectorCapability.values());
- }
- };
+ @Override
+ protected List<ConnectorCapability> load() {
+ return Arrays.asList(ConnectorCapability.values());
+ }
+ };
final IModel<List<ConnBundleTO>> bundles = new
LoadableDetachableModel<List<ConnBundleTO>>() {
@@ -322,7 +323,7 @@ public class ConnectorModalPage extends
connectorTO.setBundleName(bundleTO.getBundleName());
connectorTO.setVersion(bundleTO.getVersion());
- if (restClient.check(connectorTO).booleanValue()) {
+ if (restClient.check(connectorTO)) {
info(getString("success_connection"));
} else {
error(getString("error_connection"));
Modified:
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceConnConfPanel.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceConnConfPanel.java?rev=1443403&r1=1443402&r2=1443403&view=diff
==============================================================================
---
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceConnConfPanel.java
(original)
+++
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceConnConfPanel.java
Thu Feb 7 10:59:12 2013
@@ -22,6 +22,19 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import org.apache.syncope.client.to.ResourceTO;
+import org.apache.syncope.console.pages.BaseModalPage;
+import org.apache.syncope.console.pages.ResourceModalPage.ResourceEvent;
+import
org.apache.syncope.console.pages.panels.ResourceDetailsPanel.DetailsModEvent;
+import org.apache.syncope.console.rest.ConnectorRestClient;
+import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel;
+import org.apache.syncope.console.wicket.markup.html.form.AjaxNumberFieldPanel;
+import
org.apache.syncope.console.wicket.markup.html.form.AjaxPasswordFieldPanel;
+import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
+import org.apache.syncope.console.wicket.markup.html.form.FieldPanel;
+import
org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel;
+import
org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel.MultiValueSelectorEvent;
+import org.apache.syncope.types.ConnConfProperty;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -41,19 +54,6 @@ import org.apache.wicket.spring.injectio
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.ClassUtils;
-import org.apache.syncope.client.to.ResourceTO;
-import org.apache.syncope.console.pages.BaseModalPage;
-import org.apache.syncope.console.pages.ResourceModalPage.ResourceEvent;
-import
org.apache.syncope.console.pages.panels.ResourceDetailsPanel.DetailsModEvent;
-import org.apache.syncope.console.rest.ConnectorRestClient;
-import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel;
-import org.apache.syncope.console.wicket.markup.html.form.AjaxNumberFieldPanel;
-import
org.apache.syncope.console.wicket.markup.html.form.AjaxPasswordFieldPanel;
-import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
-import org.apache.syncope.console.wicket.markup.html.form.FieldPanel;
-import
org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel;
-import
org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel.MultiValueSelectorEvent;
-import org.apache.syncope.types.ConnConfProperty;
public class ResourceConnConfPanel extends Panel {
@@ -114,7 +114,7 @@ public class ResourceConnConfPanel exten
@Override
public void onClick(final AjaxRequestTarget target) {
- if (connRestClient.check(resourceTO).booleanValue()) {
+ if (connRestClient.check(resourceTO)) {
info(getString("success_connection"));
} else {
error(getString("error_connection"));
Modified:
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/StatusPanel.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/StatusPanel.java?rev=1443403&r1=1443402&r2=1443403&view=diff
==============================================================================
---
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/StatusPanel.java
(original)
+++
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/StatusPanel.java
Thu Feb 7 10:59:12 2013
@@ -68,9 +68,15 @@ public class StatusPanel extends Panel {
final StatusBean syncope = new StatusBean();
syncope.setAccountLink(userTO.getUsername());
syncope.setResourceName("Syncope");
- syncope.setStatus(userTO.getStatus() != null
- ? Status.valueOf(userTO.getStatus().toUpperCase())
- : Status.UNDEFINED);
+ Status syncopeStatus = Status.UNDEFINED;
+ if (userTO.getStatus() != null) {
+ try {
+ syncopeStatus =
Status.valueOf(userTO.getStatus().toUpperCase());
+ } catch (IllegalArgumentException e) {
+ LOG.warn("Unexpected status found: {}", userTO.getStatus());
+ }
+ }
+ syncope.setStatus(syncopeStatus);
statuses.add(syncope);
statuses.addAll(statusUtils.getRemoteStatuses(userTO));
Modified:
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java?rev=1443403&r1=1443402&r2=1443403&view=diff
==============================================================================
---
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java
(original)
+++
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java
Thu Feb 7 10:59:12 2013
@@ -24,14 +24,14 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Component;
import org.apache.syncope.client.to.ConnBundleTO;
import org.apache.syncope.client.to.ConnInstanceTO;
import org.apache.syncope.client.to.ResourceTO;
import
org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
import org.apache.syncope.console.SyncopeSession;
import org.apache.syncope.types.ConnConfProperty;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Component;
/**
* Console client for invoking Rest Connectors services.
@@ -150,20 +150,20 @@ public class ConnectorRestClient extends
* @param connectorTO connector.
* @return Connection status.
*/
- public Boolean check(final ConnInstanceTO connectorTO) {
-
- ConnInstanceTO connector = new ConnInstanceTO();
- BeanUtils.copyProperties(connectorTO, connector);
-
-
connector.setConfiguration(filterProperties(connector.getConfiguration()));
+ public boolean check(final ConnInstanceTO connectorTO) {
+ ConnInstanceTO toBeChecked = new ConnInstanceTO();
+ BeanUtils.copyProperties(connectorTO, toBeChecked, new
String[]{"configuration"});
+
toBeChecked.setConfiguration(filterProperties(connectorTO.getConfiguration()));
+ boolean check = false;
try {
- return SyncopeSession.get().getRestTemplate().postForObject(
- baseURL + "connector/check.json", connector,
Boolean.class);
+ check = SyncopeSession.get().getRestTemplate().postForObject(
+ baseURL + "connector/check.json", toBeChecked,
Boolean.class);
} catch (Exception e) {
- LOG.error("Connector not found {}", connector, e);
- return false;
+ LOG.error("While checking {}", toBeChecked, e);
}
+
+ return check;
}
/**
@@ -172,15 +172,16 @@ public class ConnectorRestClient extends
* @param connectorTO connector.
* @return Connection status.
*/
- public Boolean check(final ResourceTO resourceTO) {
-
+ public boolean check(final ResourceTO resourceTO) {
+ boolean check = false;
try {
- return SyncopeSession.get().getRestTemplate().postForObject(
+ check = SyncopeSession.get().getRestTemplate().postForObject(
baseURL + "resource/check.json", resourceTO,
Boolean.class);
} catch (Exception e) {
LOG.error("Connector not found {}", resourceTO.getConnectorId(),
e);
- return false;
}
+
+ return check;
}
public List<String> getSchemaNames(final ConnInstanceTO connectorTO) {
