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 2019/11/11 07:28:26 UTC
[syncope] 01/03: Fix import
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 7a4e1c0d57104f1c4272319a1da91a547b42a6b7
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Fri Nov 8 13:15:36 2019 +0100
Fix import
---
.../console/wicket/markup/html/list/ConnConfPropertyListView.java | 2 +-
.../syncope/client/console/wizards/any/AbstractAttrsWizardStep.java | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/list/ConnConfPropertyListView.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/list/ConnConfPropertyListView.java
index bafd73d..023bb8c 100644
--- a/client/idm/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/list/ConnConfPropertyListView.java
+++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/list/ConnConfPropertyListView.java
@@ -92,7 +92,7 @@ public class ConnConfPropertyListView extends ListView<ConnConfProperty> {
try {
propertySchemaClass = ClassUtils.getClass(property.getSchema().getType());
if (ClassUtils.isPrimitiveOrWrapper(propertySchemaClass)) {
- propertySchemaClass = org.apache.commons.lang3.ClassUtils.primitiveToWrapper(propertySchemaClass);
+ propertySchemaClass = ClassUtils.primitiveToWrapper(propertySchemaClass);
}
} catch (ClassNotFoundException e) {
LOG.error("Error parsing attribute type", e);
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrsWizardStep.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrsWizardStep.java
index f64f18e..e5eedc9 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrsWizardStep.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrsWizardStep.java
@@ -235,7 +235,7 @@ public abstract class AbstractAttrsWizardStep<S extends SchemaTO> extends Wizard
schemaTO.getLabel(SyncopeConsoleSession.get().getLocale()), new Model<>(), true);
((AjaxDropDownChoicePanel<String>) panel).setChoices(SchemaUtils.getEnumeratedValues(schemaTO));
- if (org.apache.commons.lang3.StringUtils.isNotBlank(schemaTO.getEnumerationKeys())) {
+ if (StringUtils.isNotBlank(schemaTO.getEnumerationKeys())) {
((AjaxDropDownChoicePanel) panel).setChoiceRenderer(new IChoiceRenderer<String>() {
private static final long serialVersionUID = -3724971416312135885L;
@@ -432,7 +432,7 @@ public abstract class AbstractAttrsWizardStep<S extends SchemaTO> extends Wizard
? Optional.empty()
: previousObject.getPlainAttr(attr.getSchema());
if (previousObject != null
- && ((prevAttr.isEmpty() && attr.getValues().stream().anyMatch(StringUtils::isNotBlank))
+ && ((!prevAttr.isPresent() && attr.getValues().stream().anyMatch(StringUtils::isNotBlank))
|| (prevAttr.isPresent() && !ListUtils.isEqualList(
prevAttr.get().getValues().stream().
filter(StringUtils::isNotBlank).collect(Collectors.toList()),
@@ -446,5 +446,4 @@ public abstract class AbstractAttrsWizardStep<S extends SchemaTO> extends Wizard
}
}
}
-
}