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 2023/02/07 07:57:19 UTC
[syncope] branch 2_1_X updated (6ecefb2070 -> 86c95990d0)
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 6ecefb2070 Upgrading Elasticsearch
new 7f8af67d4d Upgrading docker-maven-plugin
new 7a6c19c8f5 Avoid to throw NPE after delegated admin access to Console
new 86c95990d0 Escaping XML entities when bootstraping from Content.xml
The 3 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:
.../java/org/apache/syncope/client/console/SyncopeConsoleSession.java | 3 ++-
.../syncope/core/persistence/jpa/content/ContentLoaderHandler.java | 2 ++
.../org/apache/syncope/core/persistence/jpa/entity/JPAApplication.java | 1 -
.../java/org/apache/syncope/core/provisioning/api/WorkflowResult.java | 2 +-
pom.xml | 2 +-
5 files changed, 6 insertions(+), 4 deletions(-)
[syncope] 01/03: Upgrading docker-maven-plugin
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 7f8af67d4dbe71c91784324d48b396499a1c3a65
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue Feb 7 08:52:28 2023 +0100
Upgrading docker-maven-plugin
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 9e513dd7a7..a6250c4e45 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2131,7 +2131,7 @@ under the License.
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.40.3</version>
+ <version>0.41.0</version>
</plugin>
<plugin>
[syncope] 03/03: Escaping XML entities when bootstraping from Content.xml
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 86c95990d0ea85502b880b8d8e1114af75a7e91d
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue Feb 7 08:53:42 2023 +0100
Escaping XML entities when bootstraping from Content.xml
---
.../syncope/core/persistence/jpa/content/ContentLoaderHandler.java | 2 ++
.../org/apache/syncope/core/persistence/jpa/entity/JPAApplication.java | 1 -
.../java/org/apache/syncope/core/provisioning/api/WorkflowResult.java | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/content/ContentLoaderHandler.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/content/ContentLoaderHandler.java
index 7b8332b8d7..af063ee026 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/content/ContentLoaderHandler.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/content/ContentLoaderHandler.java
@@ -25,6 +25,7 @@ import java.util.Map;
import javax.sql.DataSource;
import javax.xml.bind.DatatypeConverter;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.text.StringEscapeUtils;
import org.apache.commons.text.StringSubstitutor;
import org.apache.syncope.core.provisioning.api.utils.FormatUtils;
import org.slf4j.Logger;
@@ -91,6 +92,7 @@ public class ContentLoaderHandler extends DefaultHandler {
LOG.warn("Variable ${} could not be resolved", attrs.getValue(i));
value = attrs.getValue(i);
}
+ value = StringEscapeUtils.unescapeXml(value);
switch (colType) {
case Types.INTEGER:
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAApplication.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAApplication.java
index 756ce12ce6..1f65267a5c 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAApplication.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAApplication.java
@@ -69,5 +69,4 @@ public class JPAApplication extends AbstractProvidedKeyEntity implements Applica
public List<? extends Privilege> getPrivileges() {
return privileges;
}
-
}
diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/WorkflowResult.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/WorkflowResult.java
index 335b0fb2dd..37b84d0912 100644
--- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/WorkflowResult.java
+++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/WorkflowResult.java
@@ -28,7 +28,7 @@ public class WorkflowResult<T> {
private T result;
- private PropagationByResource<String> propByRes;
+ private final PropagationByResource<String> propByRes;
private final Set<String> performedTasks = new HashSet<>();
[syncope] 02/03: Avoid to throw NPE after delegated admin access to Console
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 7a6c19c8f5b6122df3a55e957311bdfceba57e53
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue Feb 7 08:53:08 2023 +0100
Avoid to throw NPE after delegated admin access to Console
---
.../java/org/apache/syncope/client/console/SyncopeConsoleSession.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java
index d81e6fc4ac..0b6878ef36 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java
@@ -64,6 +64,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.task.TaskRejectedException;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import org.springframework.util.CollectionUtils;
public class SyncopeConsoleSession extends AuthenticatedWebSession {
@@ -295,7 +296,7 @@ public class SyncopeConsoleSession extends AuthenticatedWebSession {
public List<String> getSearchableRealms() {
Set<String> roots = auth.get(StandardEntitlement.REALM_LIST);
- return roots.isEmpty()
+ return CollectionUtils.isEmpty(roots)
? Collections.emptyList()
: roots.stream().sorted().collect(Collectors.toList());
}