This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 4_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/4_1_X by this push:
new ed10bdce2f Fixing after modernizer-maven-plugin
ed10bdce2f is described below
commit ed10bdce2fffb64d1cc05625c4b2aa6b86bb3205
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Thu Jul 23 10:36:08 2026 +0200
Fixing after modernizer-maven-plugin
---
.../console/panels/RemediationDirectoryPanel.java | 47 ++++++++++++----------
client/idrepo/common-ui/pom.xml | 16 ++++++++
.../ui/commons/markup/html/form/FieldPanel.java | 7 ++--
client/idrepo/console/pom.xml | 11 +++++
client/idrepo/enduser/pom.xml | 11 +++++
.../fit/core/wa/GoogleMfaAuthTokenITCase.java | 2 +-
.../starter/pac4j/saml/BaseWASAML2ClientTest.java | 4 +-
7 files changed, 71 insertions(+), 27 deletions(-)
diff --git
a/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/RemediationDirectoryPanel.java
b/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/RemediationDirectoryPanel.java
index f459a8aaa4..3d82ecfa5a 100644
---
a/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/RemediationDirectoryPanel.java
+++
b/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/RemediationDirectoryPanel.java
@@ -24,6 +24,8 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.DirectoryDataProvider;
@@ -157,13 +159,14 @@ public class RemediationDirectoryPanel
}, ActionLink.ActionType.VIEW_DETAILS,
IdMEntitlement.REMEDIATION_READ);
if (model.getObject().getOperation() == ResourceOperation.DELETE) {
- String entitlements = StringUtils.join(new String[] {
- IdMEntitlement.REMEDIATION_REMEDY,
- AnyTypeKind.USER.name().equals(model.getObject().getAnyType())
- ? IdRepoEntitlement.USER_DELETE
- :
AnyTypeKind.GROUP.name().equals(model.getObject().getAnyType())
- ? IdRepoEntitlement.GROUP_DELETE
- : AnyEntitlement.DELETE.getFor(model.getObject().getAnyType())
}, ",");
+ String entitlements = Stream.of(
+ IdMEntitlement.REMEDIATION_REMEDY,
+
AnyTypeKind.USER.name().equals(model.getObject().getAnyType())
+ ? IdRepoEntitlement.USER_DELETE
+ :
AnyTypeKind.GROUP.name().equals(model.getObject().getAnyType())
+ ? IdRepoEntitlement.GROUP_DELETE
+ :
AnyEntitlement.DELETE.getFor(model.getObject().getAnyType())).
+ collect(Collectors.joining(","));
panel.add(new ActionLink<>() {
@@ -185,20 +188,22 @@ public class RemediationDirectoryPanel
}, ActionLink.ActionType.CLOSE, entitlements, true);
} else {
String entitlements = model.getObject().getOperation() ==
ResourceOperation.CREATE
- ? StringUtils.join(new String[] {
- IdMEntitlement.REMEDIATION_REMEDY,
- AnyTypeKind.USER.name().equals(model.getObject().getAnyType())
- ? IdRepoEntitlement.USER_CREATE
- :
AnyTypeKind.GROUP.name().equals(model.getObject().getAnyType())
- ? IdRepoEntitlement.GROUP_CREATE
- : AnyEntitlement.CREATE.getFor(model.getObject().getAnyType())
}, ",")
- : StringUtils.join(new String[] {
- IdMEntitlement.REMEDIATION_REMEDY,
- AnyTypeKind.USER.name().equals(model.getObject().getAnyType())
- ? IdRepoEntitlement.USER_UPDATE
- :
AnyTypeKind.GROUP.name().equals(model.getObject().getAnyType())
- ? IdRepoEntitlement.GROUP_UPDATE
- : AnyEntitlement.UPDATE.getFor(model.getObject().getAnyType())
}, ",");
+ ? Stream.of(
+ IdMEntitlement.REMEDIATION_REMEDY,
+
AnyTypeKind.USER.name().equals(model.getObject().getAnyType())
+ ? IdRepoEntitlement.USER_CREATE
+ :
AnyTypeKind.GROUP.name().equals(model.getObject().getAnyType())
+ ? IdRepoEntitlement.GROUP_CREATE
+ :
AnyEntitlement.CREATE.getFor(model.getObject().getAnyType())).
+ collect(Collectors.joining(","))
+ : Stream.of(
+ IdMEntitlement.REMEDIATION_REMEDY,
+
AnyTypeKind.USER.name().equals(model.getObject().getAnyType())
+ ? IdRepoEntitlement.USER_UPDATE
+ :
AnyTypeKind.GROUP.name().equals(model.getObject().getAnyType())
+ ? IdRepoEntitlement.GROUP_UPDATE
+ :
AnyEntitlement.UPDATE.getFor(model.getObject().getAnyType())).
+ collect(Collectors.joining(","));
panel.add(new ActionLink<>() {
diff --git a/client/idrepo/common-ui/pom.xml b/client/idrepo/common-ui/pom.xml
index 23ab9bc7a3..7e59fbe1b7 100644
--- a/client/idrepo/common-ui/pom.xml
+++ b/client/idrepo/common-ui/pom.xml
@@ -155,6 +155,22 @@ under the License.
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.gaul</groupId>
+ <artifactId>modernizer-maven-plugin</artifactId>
+ <configuration>
+ <exclusions>
+ <exclusion>java/util/Optional.get:()Ljava/lang/Object;</exclusion>
+
<exclusion>org/apache/commons/lang3/time/FastDateFormat.getInstance:(Ljava/lang/String;)Lorg/apache/commons/lang3/time/FastDateFormat;</exclusion>
+ </exclusions>
+ </configuration>
+ </plugin>
</plugins>
<resources>
diff --git
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/FieldPanel.java
b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/FieldPanel.java
index ae30df19f9..d37da07d5d 100644
---
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/FieldPanel.java
+++
b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/FieldPanel.java
@@ -25,8 +25,9 @@ import java.io.Serializable;
import java.util.List;
import java.util.Optional;
import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
import org.apache.commons.lang3.SerializationUtils;
-import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.lib.Attr;
import org.apache.syncope.common.lib.to.AttributableTO;
import org.apache.wicket.AttributeModifier;
@@ -88,9 +89,9 @@ public abstract class FieldPanel<T extends Serializable>
extends AbstractFieldPa
public FieldPanel<T> setStyleSheet(final boolean replace, final String...
classes) {
if (replace) {
- field.add(AttributeModifier.replace("class",
StringUtils.join(classes, ' ')));
+ field.add(AttributeModifier.replace("class",
Stream.of(classes).collect(Collectors.joining(" "))));
} else {
- field.add(AttributeModifier.append("class",
StringUtils.join(classes, ' ')));
+ field.add(AttributeModifier.append("class",
Stream.of(classes).collect(Collectors.joining(" "))));
}
return this;
}
diff --git a/client/idrepo/console/pom.xml b/client/idrepo/console/pom.xml
index cad0f685f4..745988da61 100644
--- a/client/idrepo/console/pom.xml
+++ b/client/idrepo/console/pom.xml
@@ -207,6 +207,17 @@ under the License.
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.gaul</groupId>
+ <artifactId>modernizer-maven-plugin</artifactId>
+ <configuration>
+ <exclusions>
+ <exclusion>java/util/Optional.get:()Ljava/lang/Object;</exclusion>
+
<exclusion>org/apache/commons/lang3/time/FastDateFormat.getInstance:(Ljava/lang/String;)Lorg/apache/commons/lang3/time/FastDateFormat;</exclusion>
+ </exclusions>
+ </configuration>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
diff --git a/client/idrepo/enduser/pom.xml b/client/idrepo/enduser/pom.xml
index 647d976009..88084148fd 100644
--- a/client/idrepo/enduser/pom.xml
+++ b/client/idrepo/enduser/pom.xml
@@ -165,6 +165,17 @@ under the License.
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.gaul</groupId>
+ <artifactId>modernizer-maven-plugin</artifactId>
+ <configuration>
+ <exclusions>
+ <exclusion>java/util/Optional.get:()Ljava/lang/Object;</exclusion>
+
<exclusion>org/apache/commons/lang3/time/FastDateFormat.getInstance:(Ljava/lang/String;)Lorg/apache/commons/lang3/time/FastDateFormat;</exclusion>
+ </exclusions>
+ </configuration>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
diff --git
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/wa/GoogleMfaAuthTokenITCase.java
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/wa/GoogleMfaAuthTokenITCase.java
index 75679963e6..daa7c608fd 100644
---
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/wa/GoogleMfaAuthTokenITCase.java
+++
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/wa/GoogleMfaAuthTokenITCase.java
@@ -38,7 +38,7 @@ public class GoogleMfaAuthTokenITCase extends AbstractITCase {
private static final SecureRandom SECURE_RANDOM = new SecureRandom();
private static GoogleMfaAuthToken createGoogleMfaAuthToken() {
- int token = SECURE_RANDOM.ints(100_000,
999_999).findFirst().getAsInt();
+ int token = SECURE_RANDOM.ints(100_000,
999_999).findFirst().orElseThrow();
return new
GoogleMfaAuthToken.Builder().token(token).issueDate(LocalDateTime.now()).build();
}
diff --git
a/wa/starter/src/test/java/org/apache/syncope/wa/starter/pac4j/saml/BaseWASAML2ClientTest.java
b/wa/starter/src/test/java/org/apache/syncope/wa/starter/pac4j/saml/BaseWASAML2ClientTest.java
index 2bc69e7673..0a43bbe9ba 100644
---
a/wa/starter/src/test/java/org/apache/syncope/wa/starter/pac4j/saml/BaseWASAML2ClientTest.java
+++
b/wa/starter/src/test/java/org/apache/syncope/wa/starter/pac4j/saml/BaseWASAML2ClientTest.java
@@ -27,11 +27,11 @@ import static org.mockito.Mockito.when;
import jakarta.ws.rs.core.Response;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.math.BigInteger;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import java.security.KeyPair;
import java.security.KeyPairGenerator;
import java.security.KeyStore;
@@ -107,7 +107,7 @@ public abstract class BaseWASAML2ClientTest {
idpMetadataResolver.init();
cfg.setIdentityProviderMetadataResolver(idpMetadataResolver);
- cfg.setServiceProviderMetadataResource(new
FileSystemResource(File.createTempFile("sp-metadata", ".xml")));
+ cfg.setServiceProviderMetadataResource(new
FileSystemResource(Files.createTempFile("sp-metadata", ".xml")));
return cfg;
}
