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
The following commit(s) were added to refs/heads/master by this push:
new b33d9c6 Preferring Collectors#joining
b33d9c6 is described below
commit b33d9c6cd8e75acccfbc2e64cd1cd0865470a70a
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Tue Mar 8 12:35:32 2022 +0100
Preferring Collectors#joining
---
.../apache/syncope/client/console/PreferenceManager.java | 5 +++--
.../apache/syncope/client/enduser/PreferenceManager.java | 13 ++++++++-----
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/PreferenceManager.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/PreferenceManager.java
index 680f4ca..6d66bc5 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/PreferenceManager.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/PreferenceManager.java
@@ -28,6 +28,7 @@ import java.util.Base64;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import org.apache.wicket.util.cookies.CookieDefaults;
@@ -132,7 +133,7 @@ public final class PreferenceManager implements
Serializable {
}
// after retrieved previous setting in order to overwrite the key ...
- prefs.forEach((key, values) -> current.put(key,
StringUtils.join(values, ";")));
+ prefs.forEach((key, values) -> current.put(key,
values.stream().collect(Collectors.joining(";"))));
try {
COOKIE_UTILS.save(COOKIE_NAME,
Base64.getEncoder().encodeToString(setPrefs(current).getBytes()));
@@ -160,7 +161,7 @@ public final class PreferenceManager implements
Serializable {
}
public static void setList(final String key, final List<String> values) {
- set(key, StringUtils.join(values, ";"));
+ set(key, values.stream().collect(Collectors.joining(";")));
}
public static void setList(final Map<String, List<String>> prefs) {
diff --git
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/PreferenceManager.java
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/PreferenceManager.java
index 6a08abf..7bfbc28 100644
---
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/PreferenceManager.java
+++
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/PreferenceManager.java
@@ -29,6 +29,7 @@ import java.util.Base64;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import org.apache.wicket.util.cookies.CookieDefaults;
@@ -36,7 +37,7 @@ import org.apache.wicket.util.cookies.CookieUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class PreferenceManager implements Serializable {
+public final class PreferenceManager implements Serializable {
private static final long serialVersionUID = 3581434664555284193L;
@@ -133,9 +134,7 @@ public class PreferenceManager implements Serializable {
}
// after retrieved previous setting in order to overwrite the key ...
- prefs.forEach((key, values) -> {
- current.put(key, StringUtils.join(values, ";"));
- });
+ prefs.forEach((key, values) -> current.put(key,
values.stream().collect(Collectors.joining(";"))));
try {
COOKIE_UTILS.save(COOKIE_NAME,
Base64.getEncoder().encodeToString(setPrefs(current).getBytes()));
@@ -163,10 +162,14 @@ public class PreferenceManager implements Serializable {
}
public void setList(final String key, final List<String> values) {
- set(key, StringUtils.join(values, ";"));
+ set(key, values.stream().collect(Collectors.joining(";")));
}
public void setList(final Map<String, List<String>> prefs) {
set(prefs);
}
+
+ private PreferenceManager() {
+ // private constructor for static utility class
+ }
}