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:29 UTC
[syncope] branch 2_1_X updated (5dcbd3e -> 08caab2)
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a change to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git.
from 5dcbd3e [SYNCOPE-1509] Using .determinePreferredLanguage
new ce77b477 Fix import
new 08caab2 Upgrading Jackson
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../wicket/markup/html/list/ConnConfPropertyListView.java | 2 +-
.../client/console/wizards/any/AbstractAttrsWizardStep.java | 12 +++++-------
pom.xml | 2 +-
3 files changed, 7 insertions(+), 9 deletions(-)
[syncope] 01/02: Fix import
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit ce77b4779af52393d70bf4f1ac5aea2d10d5b73d
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Fri Nov 8 13:15:36 2019 +0100
Fix import
---
.../wicket/markup/html/list/ConnConfPropertyListView.java | 2 +-
.../client/console/wizards/any/AbstractAttrsWizardStep.java | 12 +++++-------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/list/ConnConfPropertyListView.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/list/ConnConfPropertyListView.java
index bc4ef01..8dfb7d0 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/list/ConnConfPropertyListView.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/list/ConnConfPropertyListView.java
@@ -91,7 +91,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/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrsWizardStep.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrsWizardStep.java
index 082d79a..5e894b5 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrsWizardStep.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrsWizardStep.java
@@ -29,7 +29,7 @@ import java.util.Optional;
import java.util.stream.Collectors;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.ListUtils;
-import org.apache.cxf.common.util.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.SchemaUtils;
import org.apache.syncope.client.console.rest.AnyTypeClassRestClient;
@@ -236,7 +236,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;
@@ -433,13 +433,12 @@ public abstract class AbstractAttrsWizardStep<S extends SchemaTO> extends Wizard
? Optional.empty()
: previousObject.getPlainAttr(attrTO.getSchema());
if (previousObject != null
- && ((!prevAttr.isPresent() && attrTO.getValues().stream().anyMatch(
- org.apache.commons.lang3.StringUtils::isNotBlank))
+ && ((!prevAttr.isPresent() && attrTO.getValues().stream().anyMatch(StringUtils::isNotBlank))
|| (prevAttr.isPresent() && !ListUtils.isEqualList(
prevAttr.get().getValues().stream().
- filter(org.apache.commons.lang3.StringUtils::isNotBlank).collect(Collectors.toList()),
+ filter(StringUtils::isNotBlank).collect(Collectors.toList()),
attrTO.getValues().stream().
- filter(org.apache.commons.lang3.StringUtils::isNotBlank).collect(Collectors.toList()))))) {
+ filter(StringUtils::isNotBlank).collect(Collectors.toList()))))) {
List<String> oldValues = prevAttr.isPresent()
? prevAttr.get().getValues()
@@ -448,5 +447,4 @@ public abstract class AbstractAttrsWizardStep<S extends SchemaTO> extends Wizard
}
}
}
-
}
[syncope] 02/02: Upgrading Jackson
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 08caab22292b0b125ae8bdcf06a4f1263e5a945b
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Mon Nov 11 08:08:26 2019 +0100
Upgrading Jackson
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index de8fdd4..d33471a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -401,7 +401,7 @@ under the License.
<cxf.version>3.2.11</cxf.version>
- <jackson.version>2.10.0</jackson.version>
+ <jackson.version>2.10.1</jackson.version>
<spring.version>5.1.11.RELEASE</spring.version>
<spring-security.version>5.1.7.RELEASE</spring-security.version>