This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 3_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/3_0_X by this push:
new 660c4e34e3 Upgrading woodstox-core
660c4e34e3 is described below
commit 660c4e34e344a2696ef6319b5dfd5af3cb3d7ddd
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Thu Mar 28 11:29:05 2024 +0100
Upgrading woodstox-core
---
.../syncope/client/console/rest/LoggerConfRestClient.java | 14 +++++++-------
.../org/apache/syncope/client/lib/WebClientBuilder.java | 14 ++++++++------
...faTrustStorageTCase.java => MfaTrustStorageITCase.java} | 2 +-
pom.xml | 2 +-
.../syncope/wa/starter/mapping/DefaultAuthMapper.java | 5 ++---
5 files changed, 19 insertions(+), 18 deletions(-)
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/LoggerConfRestClient.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/LoggerConfRestClient.java
index 4aea4c3197..e006ea9148 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/LoggerConfRestClient.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/LoggerConfRestClient.java
@@ -113,12 +113,12 @@ public class LoggerConfRestClient implements RestClient,
LoggerConfOp {
@Override
public void setLevel(final String key, final LogLevel level) {
instances.forEach(i -> WebClientBuilder.build(getActuatorEndpoint(i),
- SyncopeWebApplication.get().getAnonymousUser(),
- SyncopeWebApplication.get().getAnonymousKey(),
- List.of())
- .accept(MediaType.APPLICATION_JSON_TYPE)
- .type(MediaType.APPLICATION_JSON_TYPE)
- .path(key)
- .post("{\"configuredLevel\": \"" + level.name() + "\"}"));
+ SyncopeWebApplication.get().getAnonymousUser(),
+ SyncopeWebApplication.get().getAnonymousKey(),
+ List.of()).
+ accept(MediaType.APPLICATION_JSON_TYPE).
+ type(MediaType.APPLICATION_JSON_TYPE).
+ path(key).
+ post("{\"configuredLevel\": \"" + level.name() + "\"}"));
}
}
diff --git
a/client/idrepo/lib/src/main/java/org/apache/syncope/client/lib/WebClientBuilder.java
b/client/idrepo/lib/src/main/java/org/apache/syncope/client/lib/WebClientBuilder.java
index 003a467134..5bb251d69e 100644
---
a/client/idrepo/lib/src/main/java/org/apache/syncope/client/lib/WebClientBuilder.java
+++
b/client/idrepo/lib/src/main/java/org/apache/syncope/client/lib/WebClientBuilder.java
@@ -26,13 +26,18 @@ import
org.apache.cxf.transport.http.asyncclient.AsyncHTTPConduit;
public final class WebClientBuilder {
- private WebClientBuilder() {
+ protected static WebClient setAsync(final WebClient webClient) {
+ ClientConfiguration config = WebClient.getConfig(webClient);
+ config.getRequestContext().put(AsyncHTTPConduit.USE_ASYNC,
Boolean.TRUE);
+
+ return webClient;
}
public static WebClient build(final String address,
final String username,
final String password,
final List<?> providers) {
+
return setAsync(WebClient.create(address, providers, username,
password, null));
}
@@ -44,10 +49,7 @@ public final class WebClientBuilder {
return setAsync(WebClient.create(uri));
}
- protected static WebClient setAsync(final WebClient webClient) {
- ClientConfiguration config = WebClient.getConfig(webClient);
- config.getRequestContext().put(AsyncHTTPConduit.USE_ASYNC,
Boolean.TRUE);
-
- return webClient;
+ private WebClientBuilder() {
+ // private constructor for static utility class
}
}
diff --git
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/wa/MfaTrustStorageTCase.java
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/wa/MfaTrustStorageITCase.java
similarity index 98%
rename from
fit/core-reference/src/test/java/org/apache/syncope/fit/core/wa/MfaTrustStorageTCase.java
rename to
fit/core-reference/src/test/java/org/apache/syncope/fit/core/wa/MfaTrustStorageITCase.java
index 1a1e488ce9..24d672a08b 100644
---
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/wa/MfaTrustStorageTCase.java
+++
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/wa/MfaTrustStorageITCase.java
@@ -32,7 +32,7 @@ import org.apache.syncope.fit.AbstractITCase;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-public class MfaTrustStorageTCase extends AbstractITCase {
+public class MfaTrustStorageITCase extends AbstractITCase {
private static MfaTrustedDevice createDeviceRegistration() {
MfaTrustedDevice device = new MfaTrustedDevice();
diff --git a/pom.xml b/pom.xml
index 36843aaf4c..025e0050c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -703,7 +703,7 @@ under the License.
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
- <version>6.6.1</version>
+ <version>6.6.2</version>
</dependency>
<dependency>
diff --git
a/wa/starter/src/main/java/org/apache/syncope/wa/starter/mapping/DefaultAuthMapper.java
b/wa/starter/src/main/java/org/apache/syncope/wa/starter/mapping/DefaultAuthMapper.java
index 0fc3326b5c..43a9155360 100644
---
a/wa/starter/src/main/java/org/apache/syncope/wa/starter/mapping/DefaultAuthMapper.java
+++
b/wa/starter/src/main/java/org/apache/syncope/wa/starter/mapping/DefaultAuthMapper.java
@@ -79,9 +79,8 @@ public class DefaultAuthMapper implements AuthMapper {
delegatedAuthHandlers.addAll(authModules.stream().
filter(m -> m.getConf() instanceof Pac4jAuthModuleConf).
map(m -> Pair.of(
- m.getKey(),
- Optional.ofNullable(((Pac4jAuthModuleConf)
m.getConf()).getClientName())
- .orElse(m.getKey()))).
+ m.getKey(),
+ Optional.ofNullable(((Pac4jAuthModuleConf)
m.getConf()).getClientName()).orElse(m.getKey()))).
collect(Collectors.toSet()));
if (!delegatedAuthHandlers.isEmpty()) {
authHandlers.removeAll(delegatedAuthHandlers.stream().map(Pair::getLeft).collect(Collectors.toSet()));
