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 2026/05/18 08:52:02 UTC
(syncope) branch 4_1_X updated (fc81642ee9 -> 20f12be87b)
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a change to branch 4_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
from fc81642ee9 Upgrading OpenSAML
new 60a7955c85 Upgrading modernizer-maven-plugin
new 20f12be87b Upgrading CAS
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:
.../clientapps/ClientAppDirectoryPanel.java | 4 ++--
.../console/panels/AttrRepoDirectoryPanel.java | 4 ++--
.../console/panels/AuthModuleDirectoryPanel.java | 4 ++--
.../panels/PasswordManagementDirectoryPanel.java | 4 ++--
.../console/commons/ConnectorDataProvider.java | 3 +--
...irectoryPanelAdditionalActionLinksProvider.java | 10 ++++-----
...AnyDirectoryPanelAdditionalActionsProvider.java | 4 ++--
.../commons/IdMImplementationInfoProvider.java | 4 ++--
.../console/panels/ConnectorDirectoryPanel.java | 13 +++++------
.../client/console/panels/ConnidLocations.java | 5 ++---
.../console/panels/LinkedAccountModalPanel.java | 4 ++--
.../console/panels/ResourceDirectoryPanel.java | 9 ++++----
.../policies/ProvisioningPolicyModalPanel.java | 4 ++--
.../client/console/rest/ConnectorRestClient.java | 3 +--
.../client/console/rest/ResourceRestClient.java | 3 +--
.../console/status/AnyStatusDirectoryPanel.java | 3 ++-
.../syncope/client/console/topology/Topology.java | 22 +++++++++---------
.../console/topology/TopologyTogglePanel.java | 8 +++----
.../topology/TopologyWebSocketBehavior.java | 26 +++++++++++-----------
.../markup/html/list/ConnConfPropertyListView.java | 2 +-
.../wizards/resources/ResourceMappingPanel.java | 4 ++--
.../syncope/client/ui/commons/MIMETypesLoader.java | 3 ++-
.../ui/commons/StyledNotificationBehavior.java | 2 +-
.../syncope/client/ui/commons/pages/BaseLogin.java | 3 +--
.../commons/IdRepoImplementationInfoProvider.java | 4 ++--
.../client/console/events/EventSelectionPanel.java | 4 ++--
.../client/console/events/SelectedEventsPanel.java | 4 ++--
.../notifications/NotificationWizardBuilder.java | 4 ++--
.../syncope/client/console/pages/BasePage.java | 2 +-
.../client/console/panels/AnyDirectoryPanel.java | 4 ++--
.../panels/AnyDisplayAttributesModalPanel.java | 6 ++---
.../console/panels/AnyObjectDirectoryPanel.java | 4 ++--
.../syncope/client/console/panels/AnysPanel.java | 2 +-
.../console/panels/DashboardControlPanel.java | 2 +-
.../console/panels/DelegationDirectoryPanel.java | 3 +--
.../client/console/panels/GroupDirectoryPanel.java | 10 ++++-----
.../client/console/panels/RealmDirectoryPanel.java | 2 +-
.../console/panels/RelationshipViewPanel.java | 8 +++----
.../syncope/client/console/panels/TogglePanel.java | 2 +-
.../client/console/panels/UserDirectoryPanel.java | 4 ++--
.../client/console/panels/search/SearchUtils.java | 2 +-
.../console/policies/PolicyDirectoryPanel.java | 4 ++--
.../console/reports/ReportDirectoryPanel.java | 4 +---
.../console/rest/NotificationRestClient.java | 5 +++--
.../client/console/rest/RoleRestClient.java | 4 ++--
.../console/tasks/SchedTaskDirectoryPanel.java | 2 +-
.../data/table/CollectionPropertyColumn.java | 4 ++--
.../client/console/widgets/AnyByRealmWidget.java | 4 ++--
.../syncope/client/console/widgets/JobWidget.java | 6 ++---
.../client/console/wizards/WizardMgtPanel.java | 6 ++---
.../client/console/wizards/any/AbstractAttrs.java | 2 +-
.../wizards/any/AbstractAttrsWizardStep.java | 2 +-
.../any/AnyObjectTemplateWizardBuilder.java | 2 +-
.../console/wizards/any/ConnObjectPanel.java | 4 ++--
.../wizards/any/GroupTemplateWizardBuilder.java | 2 +-
.../client/console/wizards/any/Management.java | 4 ++--
.../wizards/any/UserTemplateWizardBuilder.java | 2 +-
.../client/enduser/panels/ChangePasswordPanel.java | 6 ++---
.../client/lib/RestClientExceptionMapper.java | 4 ++--
.../syncope/common/lib/to/ProvisioningReport.java | 14 +++++-------
.../apache/syncope/common/lib/AnyOperations.java | 6 +----
.../common/lib/collections/CircularFifoQueue.java | 3 +--
.../AnyObjectFiqlSearchConditionBuilder.java | 3 +--
.../self/SelfKeymasterClientExceptionMapper.java | 4 ++--
.../core/persistence/api/search/FilterVisitor.java | 13 +++++------
.../search/SyncopeAbstractSearchCondVisitor.java | 12 +++++-----
.../provisioning/api/pushpull/PushActions.java | 3 +--
.../core/provisioning/api/job/JobNamerTest.java | 4 ++--
.../serialization/AttributeDeserializerTest.java | 5 +++--
.../provisioning/java/DefaultConnectorManager.java | 2 +-
.../provisioning/java/data/TaskDataBinderImpl.java | 4 ++--
.../pushpull/AbstractProvisioningJobDelegate.java | 18 +++++++--------
.../java/pushpull/AbstractPullResultHandler.java | 6 ++---
.../DefaultNotificationManagerTest.java | 7 +++---
.../spring/security/MSEntraJWTSSOProvider.java | 2 +-
.../jws/MSEntraAccessTokenJWSVerifier.java | 2 +-
.../jws/MSEntraJWSVerifierCacheLoader.java | 10 ++++-----
.../jws/MSEntraJWSVerifierCacheLoaderTest.java | 7 +++---
.../client/console/panels/NewBpmnProcess.java | 5 ++---
.../syncope/client/enduser/pages/Flowable.java | 3 +--
.../wizards/mapping/OIDCProviderMappingPanel.java | 4 ++--
.../wizards/mapping/SAML2IdPMappingPanel.java | 6 ++---
.../core/logic/saml2/SAML2SP4UIUserManager.java | 3 +--
.../panels/mapping/SCIMExtensionMappingPanel.java | 4 ++--
.../reference/flowable/PrintersValueProvider.java | 2 +-
.../org/apache/syncope/fit/core/AuditITCase.java | 6 ++---
.../apache/syncope/fit/core/MacroTaskITCase.java | 16 +++++++------
.../org/apache/syncope/fit/core/PolicyITCase.java | 9 ++++----
.../syncope/fit/core/PropagationTaskITCase.java | 2 +-
.../apache/syncope/fit/core/PullTaskITCase.java | 26 +++++++++++++---------
.../apache/syncope/fit/core/UserIssuesITCase.java | 5 +++--
.../syncope/fit/core/wa/WebAuthnAccountITCase.java | 2 +-
pom.xml | 5 +++--
.../starter/pac4j/saml/BaseWASAML2ClientTest.java | 7 +++---
94 files changed, 248 insertions(+), 267 deletions(-)
(syncope) 01/02: Upgrading modernizer-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 4_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 60a7955c85cade03c3ff67c78f23ece4bfdb1fd3
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Mon May 18 10:43:27 2026 +0200
Upgrading modernizer-maven-plugin
---
.../clientapps/ClientAppDirectoryPanel.java | 4 ++--
.../console/panels/AttrRepoDirectoryPanel.java | 4 ++--
.../console/panels/AuthModuleDirectoryPanel.java | 4 ++--
.../panels/PasswordManagementDirectoryPanel.java | 4 ++--
.../console/commons/ConnectorDataProvider.java | 3 +--
...irectoryPanelAdditionalActionLinksProvider.java | 10 ++++-----
...AnyDirectoryPanelAdditionalActionsProvider.java | 4 ++--
.../commons/IdMImplementationInfoProvider.java | 4 ++--
.../console/panels/ConnectorDirectoryPanel.java | 13 +++++------
.../client/console/panels/ConnidLocations.java | 5 ++---
.../console/panels/LinkedAccountModalPanel.java | 4 ++--
.../console/panels/ResourceDirectoryPanel.java | 9 ++++----
.../policies/ProvisioningPolicyModalPanel.java | 4 ++--
.../client/console/rest/ConnectorRestClient.java | 3 +--
.../client/console/rest/ResourceRestClient.java | 3 +--
.../console/status/AnyStatusDirectoryPanel.java | 3 ++-
.../syncope/client/console/topology/Topology.java | 22 +++++++++---------
.../console/topology/TopologyTogglePanel.java | 8 +++----
.../topology/TopologyWebSocketBehavior.java | 26 +++++++++++-----------
.../markup/html/list/ConnConfPropertyListView.java | 2 +-
.../wizards/resources/ResourceMappingPanel.java | 4 ++--
.../syncope/client/ui/commons/MIMETypesLoader.java | 3 ++-
.../ui/commons/StyledNotificationBehavior.java | 2 +-
.../syncope/client/ui/commons/pages/BaseLogin.java | 3 +--
.../commons/IdRepoImplementationInfoProvider.java | 4 ++--
.../client/console/events/EventSelectionPanel.java | 4 ++--
.../client/console/events/SelectedEventsPanel.java | 4 ++--
.../notifications/NotificationWizardBuilder.java | 4 ++--
.../syncope/client/console/pages/BasePage.java | 2 +-
.../client/console/panels/AnyDirectoryPanel.java | 4 ++--
.../panels/AnyDisplayAttributesModalPanel.java | 6 ++---
.../console/panels/AnyObjectDirectoryPanel.java | 4 ++--
.../syncope/client/console/panels/AnysPanel.java | 2 +-
.../console/panels/DashboardControlPanel.java | 2 +-
.../console/panels/DelegationDirectoryPanel.java | 3 +--
.../client/console/panels/GroupDirectoryPanel.java | 10 ++++-----
.../client/console/panels/RealmDirectoryPanel.java | 2 +-
.../console/panels/RelationshipViewPanel.java | 8 +++----
.../syncope/client/console/panels/TogglePanel.java | 2 +-
.../client/console/panels/UserDirectoryPanel.java | 4 ++--
.../client/console/panels/search/SearchUtils.java | 2 +-
.../console/policies/PolicyDirectoryPanel.java | 4 ++--
.../console/reports/ReportDirectoryPanel.java | 4 +---
.../console/rest/NotificationRestClient.java | 5 +++--
.../client/console/rest/RoleRestClient.java | 4 ++--
.../console/tasks/SchedTaskDirectoryPanel.java | 2 +-
.../data/table/CollectionPropertyColumn.java | 4 ++--
.../client/console/widgets/AnyByRealmWidget.java | 4 ++--
.../syncope/client/console/widgets/JobWidget.java | 6 ++---
.../client/console/wizards/WizardMgtPanel.java | 6 ++---
.../client/console/wizards/any/AbstractAttrs.java | 2 +-
.../wizards/any/AbstractAttrsWizardStep.java | 2 +-
.../any/AnyObjectTemplateWizardBuilder.java | 2 +-
.../console/wizards/any/ConnObjectPanel.java | 4 ++--
.../wizards/any/GroupTemplateWizardBuilder.java | 2 +-
.../client/console/wizards/any/Management.java | 4 ++--
.../wizards/any/UserTemplateWizardBuilder.java | 2 +-
.../client/enduser/panels/ChangePasswordPanel.java | 6 ++---
.../client/lib/RestClientExceptionMapper.java | 4 ++--
.../syncope/common/lib/to/ProvisioningReport.java | 14 +++++-------
.../apache/syncope/common/lib/AnyOperations.java | 6 +----
.../common/lib/collections/CircularFifoQueue.java | 3 +--
.../AnyObjectFiqlSearchConditionBuilder.java | 3 +--
.../self/SelfKeymasterClientExceptionMapper.java | 4 ++--
.../core/persistence/api/search/FilterVisitor.java | 13 +++++------
.../search/SyncopeAbstractSearchCondVisitor.java | 12 +++++-----
.../provisioning/api/pushpull/PushActions.java | 3 +--
.../core/provisioning/api/job/JobNamerTest.java | 4 ++--
.../serialization/AttributeDeserializerTest.java | 5 +++--
.../provisioning/java/DefaultConnectorManager.java | 2 +-
.../provisioning/java/data/TaskDataBinderImpl.java | 4 ++--
.../pushpull/AbstractProvisioningJobDelegate.java | 18 +++++++--------
.../java/pushpull/AbstractPullResultHandler.java | 6 ++---
.../DefaultNotificationManagerTest.java | 7 +++---
.../spring/security/MSEntraJWTSSOProvider.java | 2 +-
.../jws/MSEntraAccessTokenJWSVerifier.java | 2 +-
.../jws/MSEntraJWSVerifierCacheLoader.java | 10 ++++-----
.../jws/MSEntraJWSVerifierCacheLoaderTest.java | 7 +++---
.../client/console/panels/NewBpmnProcess.java | 5 ++---
.../syncope/client/enduser/pages/Flowable.java | 3 +--
.../wizards/mapping/OIDCProviderMappingPanel.java | 4 ++--
.../wizards/mapping/SAML2IdPMappingPanel.java | 6 ++---
.../core/logic/saml2/SAML2SP4UIUserManager.java | 3 +--
.../panels/mapping/SCIMExtensionMappingPanel.java | 4 ++--
.../reference/flowable/PrintersValueProvider.java | 2 +-
.../org/apache/syncope/fit/core/AuditITCase.java | 6 ++---
.../apache/syncope/fit/core/MacroTaskITCase.java | 16 +++++++------
.../org/apache/syncope/fit/core/PolicyITCase.java | 9 ++++----
.../syncope/fit/core/PropagationTaskITCase.java | 2 +-
.../apache/syncope/fit/core/PullTaskITCase.java | 26 +++++++++++++---------
.../apache/syncope/fit/core/UserIssuesITCase.java | 5 +++--
.../syncope/fit/core/wa/WebAuthnAccountITCase.java | 2 +-
pom.xml | 3 ++-
.../starter/pac4j/saml/BaseWASAML2ClientTest.java | 7 +++---
94 files changed, 247 insertions(+), 266 deletions(-)
diff --git a/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel.java b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel.java
index 18f02495ab..bf1ae60ed0 100644
--- a/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel.java
+++ b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel.java
@@ -232,8 +232,8 @@ public abstract class ClientAppDirectoryPanel<T extends ClientAppTO>
historyModal.show(true);
}
- }, ActionLink.ActionType.VIEW_AUDIT_HISTORY, String.format("%s,%s", AMEntitlement.CLIENTAPP_READ,
- IdRepoEntitlement.AUDIT_LIST));
+ }, ActionLink.ActionType.VIEW_AUDIT_HISTORY,
+ "%s,%s".formatted(AMEntitlement.CLIENTAPP_READ, IdRepoEntitlement.AUDIT_LIST));
panel.add(new ActionLink<>() {
diff --git a/client/am/console/src/main/java/org/apache/syncope/client/console/panels/AttrRepoDirectoryPanel.java b/client/am/console/src/main/java/org/apache/syncope/client/console/panels/AttrRepoDirectoryPanel.java
index 63bd50d47e..a251eb8383 100644
--- a/client/am/console/src/main/java/org/apache/syncope/client/console/panels/AttrRepoDirectoryPanel.java
+++ b/client/am/console/src/main/java/org/apache/syncope/client/console/panels/AttrRepoDirectoryPanel.java
@@ -183,8 +183,8 @@ public class AttrRepoDirectoryPanel
historyModal.show(true);
}
- }, ActionLink.ActionType.VIEW_AUDIT_HISTORY, String.format("%s,%s", AMEntitlement.ATTR_REPO_READ,
- IdRepoEntitlement.AUDIT_LIST));
+ }, ActionLink.ActionType.VIEW_AUDIT_HISTORY,
+ "%s,%s".formatted(AMEntitlement.ATTR_REPO_READ, IdRepoEntitlement.AUDIT_LIST));
panel.add(new ActionLink<>() {
diff --git a/client/am/console/src/main/java/org/apache/syncope/client/console/panels/AuthModuleDirectoryPanel.java b/client/am/console/src/main/java/org/apache/syncope/client/console/panels/AuthModuleDirectoryPanel.java
index 70d25d0b95..e693444887 100644
--- a/client/am/console/src/main/java/org/apache/syncope/client/console/panels/AuthModuleDirectoryPanel.java
+++ b/client/am/console/src/main/java/org/apache/syncope/client/console/panels/AuthModuleDirectoryPanel.java
@@ -187,8 +187,8 @@ public class AuthModuleDirectoryPanel
historyModal.show(true);
}
- }, ActionLink.ActionType.VIEW_AUDIT_HISTORY, String.format("%s,%s", AMEntitlement.AUTH_MODULE_READ,
- IdRepoEntitlement.AUDIT_LIST));
+ }, ActionLink.ActionType.VIEW_AUDIT_HISTORY,
+ "%s,%s".formatted(AMEntitlement.AUTH_MODULE_READ, IdRepoEntitlement.AUDIT_LIST));
panel.add(new ActionLink<>() {
diff --git a/client/am/console/src/main/java/org/apache/syncope/client/console/panels/PasswordManagementDirectoryPanel.java b/client/am/console/src/main/java/org/apache/syncope/client/console/panels/PasswordManagementDirectoryPanel.java
index 21bca4d97a..3e74713a70 100644
--- a/client/am/console/src/main/java/org/apache/syncope/client/console/panels/PasswordManagementDirectoryPanel.java
+++ b/client/am/console/src/main/java/org/apache/syncope/client/console/panels/PasswordManagementDirectoryPanel.java
@@ -213,8 +213,8 @@ public class PasswordManagementDirectoryPanel extends DirectoryPanel<
historyModal.show(true);
}
- }, ActionLink.ActionType.VIEW_AUDIT_HISTORY, String.format("%s,%s", AMEntitlement.PASSWORD_MANAGEMENT_READ,
- IdRepoEntitlement.AUDIT_LIST));
+ }, ActionLink.ActionType.VIEW_AUDIT_HISTORY,
+ "%s,%s".formatted(AMEntitlement.PASSWORD_MANAGEMENT_READ, IdRepoEntitlement.AUDIT_LIST));
panel.add(new ActionLink<>() {
diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/commons/ConnectorDataProvider.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/commons/ConnectorDataProvider.java
index 5a652d80ce..893f674b92 100644
--- a/client/idm/console/src/main/java/org/apache/syncope/client/console/commons/ConnectorDataProvider.java
+++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/commons/ConnectorDataProvider.java
@@ -19,7 +19,6 @@
package org.apache.syncope.client.console.commons;
import java.io.Serializable;
-import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
@@ -69,7 +68,7 @@ public class ConnectorDataProvider extends DirectoryDataProvider<Serializable> {
@Override
public Iterator<ConnInstanceTO> iterator(final long first, final long count) {
- List<ConnInstanceTO> result = Collections.emptyList();
+ List<ConnInstanceTO> result = List.of();
try {
currentPage = ((int) first / paginatorRows);
diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/commons/IdMAnyDirectoryPanelAdditionalActionLinksProvider.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/commons/IdMAnyDirectoryPanelAdditionalActionLinksProvider.java
index f2a4f95a07..d33861e959 100644
--- a/client/idm/console/src/main/java/org/apache/syncope/client/console/commons/IdMAnyDirectoryPanelAdditionalActionLinksProvider.java
+++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/commons/IdMAnyDirectoryPanelAdditionalActionLinksProvider.java
@@ -126,7 +126,7 @@ public class IdMAnyDirectoryPanelAdditionalActionLinksProvider
}
}, ActionLink.ActionType.MANAGE_RESOURCES);
manageResources.setEntitlements(
- String.format("%s,%s", IdRepoEntitlement.USER_READ, IdRepoEntitlement.USER_UPDATE));
+ "%s,%s".formatted(IdRepoEntitlement.USER_READ, IdRepoEntitlement.USER_UPDATE));
manageResources.setOnConfirm(false);
manageResources.setRealm(realm);
actions.add(manageResources);
@@ -146,7 +146,7 @@ public class IdMAnyDirectoryPanelAdditionalActionLinksProvider
modal.show(true);
}
}, ActionLink.ActionType.MANAGE_ACCOUNTS);
- manageAccounts.setEntitlements(String.format("%s,%s,%s",
+ manageAccounts.setEntitlements("%s,%s,%s".formatted(
IdRepoEntitlement.USER_READ, IdRepoEntitlement.USER_UPDATE, IdMEntitlement.RESOURCE_GET_CONNOBJECT));
manageAccounts.setOnConfirm(false);
manageAccounts.setRealm(realm);
@@ -167,7 +167,7 @@ public class IdMAnyDirectoryPanelAdditionalActionLinksProvider
modal.show(true);
}
}, ActionLink.ActionType.MERGE_ACCOUNTS);
- mergeAccounts.setEntitlements(String.format("%s,%s,%s,%s",
+ mergeAccounts.setEntitlements("%s,%s,%s,%s".formatted(
IdRepoEntitlement.USER_READ, IdRepoEntitlement.USER_UPDATE, IdRepoEntitlement.USER_DELETE,
IdMEntitlement.RESOURCE_GET_CONNOBJECT));
actions.add(mergeAccounts);
@@ -207,7 +207,7 @@ public class IdMAnyDirectoryPanelAdditionalActionLinksProvider
}
}, ActionLink.ActionType.MANAGE_RESOURCES);
manageResources.setEntitlements(
- String.format("%s,%s", IdRepoEntitlement.GROUP_READ, IdRepoEntitlement.GROUP_UPDATE));
+ "%s,%s".formatted(IdRepoEntitlement.GROUP_READ, IdRepoEntitlement.GROUP_UPDATE));
manageResources.setOnConfirm(false);
manageResources.setRealm(realm);
actions.add(manageResources);
@@ -249,7 +249,7 @@ public class IdMAnyDirectoryPanelAdditionalActionLinksProvider
}
}, ActionLink.ActionType.MANAGE_RESOURCES);
manageResources.setEntitlements(
- String.format("%s,%s", AnyEntitlement.READ.getFor(type), AnyEntitlement.UPDATE.getFor(type)));
+ "%s,%s".formatted(AnyEntitlement.READ.getFor(type), AnyEntitlement.UPDATE.getFor(type)));
manageResources.setRealm(realm);
actions.add(manageResources);
return actions;
diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/commons/IdMAnyDirectoryPanelAdditionalActionsProvider.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/commons/IdMAnyDirectoryPanelAdditionalActionsProvider.java
index 1d8d9b7323..a8cc861f99 100644
--- a/client/idm/console/src/main/java/org/apache/syncope/client/console/commons/IdMAnyDirectoryPanelAdditionalActionsProvider.java
+++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/commons/IdMAnyDirectoryPanelAdditionalActionsProvider.java
@@ -164,7 +164,7 @@ public class IdMAnyDirectoryPanelAdditionalActionsProvider implements AnyDirecto
};
csvPushLink.setOutputMarkupPlaceholderTag(true).setVisible(wizardInModal).setEnabled(wizardInModal);
MetaDataRoleAuthorizationStrategy.authorize(csvPushLink, Component.RENDER,
- String.format("%s,%s", IdRepoEntitlement.IMPLEMENTATION_LIST, IdRepoEntitlement.TASK_EXECUTE));
+ "%s,%s".formatted(IdRepoEntitlement.IMPLEMENTATION_LIST, IdRepoEntitlement.TASK_EXECUTE));
panel.addInnerObject(csvPushLink.setOutputMarkupId(true).setOutputMarkupPlaceholderTag(true));
csvPullLink = new AjaxLink<>("csvPull") {
@@ -185,7 +185,7 @@ public class IdMAnyDirectoryPanelAdditionalActionsProvider implements AnyDirecto
};
csvPullLink.setOutputMarkupPlaceholderTag(true).setVisible(wizardInModal).setEnabled(wizardInModal);
MetaDataRoleAuthorizationStrategy.authorize(csvPullLink, Component.RENDER,
- String.format("%s,%s", IdRepoEntitlement.IMPLEMENTATION_LIST, IdRepoEntitlement.TASK_EXECUTE));
+ "%s,%s".formatted(IdRepoEntitlement.IMPLEMENTATION_LIST, IdRepoEntitlement.TASK_EXECUTE));
panel.addInnerObject(csvPullLink.setOutputMarkupId(true).setOutputMarkupPlaceholderTag(true));
}
diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/commons/IdMImplementationInfoProvider.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/commons/IdMImplementationInfoProvider.java
index ed6b564466..fcb5ca29c2 100644
--- a/client/idm/console/src/main/java/org/apache/syncope/client/console/commons/IdMImplementationInfoProvider.java
+++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/commons/IdMImplementationInfoProvider.java
@@ -19,7 +19,7 @@
package org.apache.syncope.client.console.commons;
import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
import org.apache.syncope.client.console.init.ClassPathScanImplementationLookup;
@@ -67,7 +67,7 @@ public class IdMImplementationInfoProvider extends IdRepoImplementationInfoProvi
default:
}
- Collections.sort(classes);
+ classes.sort(Comparator.naturalOrder());
} else {
classes = super.getClasses(implementation, viewMode);
}
diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ConnectorDirectoryPanel.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ConnectorDirectoryPanel.java
index deff7f2057..777494f2d4 100644
--- a/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ConnectorDirectoryPanel.java
+++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ConnectorDirectoryPanel.java
@@ -23,7 +23,6 @@ import java.io.Serializable;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
@@ -127,7 +126,7 @@ public class ConnectorDirectoryPanel extends
@Override
protected Collection<ActionLink.ActionType> getBatches() {
- return Collections.singletonList(ActionLink.ActionType.DELETE);
+ return List.of(ActionLink.ActionType.DELETE);
}
@Override
@@ -158,7 +157,7 @@ public class ConnectorDirectoryPanel extends
target.add(modal);
}
- }, ActionLink.ActionType.CREATE_RESOURCE, String.format("%s", IdMEntitlement.RESOURCE_CREATE));
+ }, ActionLink.ActionType.CREATE_RESOURCE, "%s".formatted(IdMEntitlement.RESOURCE_CREATE));
panel.add(new ActionLink<>() {
@@ -183,8 +182,8 @@ public class ConnectorDirectoryPanel extends
modal.show(true);
}
- }, ActionLink.ActionType.EDIT, String.format("%s,%s", IdMEntitlement.CONNECTOR_READ,
- IdMEntitlement.CONNECTOR_UPDATE));
+ }, ActionLink.ActionType.EDIT,
+ "%s,%s".formatted(IdMEntitlement.CONNECTOR_READ, IdMEntitlement.CONNECTOR_UPDATE));
panel.add(new ActionLink<>() {
@@ -226,7 +225,7 @@ public class ConnectorDirectoryPanel extends
}
}, ActionLink.ActionType.VIEW_AUDIT_HISTORY,
- String.format("%s,%s", IdMEntitlement.CONNECTOR_READ, IdRepoEntitlement.AUDIT_LIST));
+ "%s,%s".formatted(IdMEntitlement.CONNECTOR_READ, IdRepoEntitlement.AUDIT_LIST));
panel.add(new ActionLink<>() {
@@ -236,7 +235,7 @@ public class ConnectorDirectoryPanel extends
public void onClick(final AjaxRequestTarget target, final Serializable ignore) {
try {
restClient.delete(((ConnInstanceTO) model.getObject()).getKey());
- target.appendJavaScript(String.format("jsPlumb.remove('%s');",
+ target.appendJavaScript("jsPlumb.remove('%s');".formatted(
((ConnInstanceTO) model.getObject()).getKey()));
SyncopeConsoleSession.get().success(getString(Constants.OPERATION_SUCCEEDED));
diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ConnidLocations.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ConnidLocations.java
index 591407f9b9..8c3f658f08 100644
--- a/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ConnidLocations.java
+++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ConnidLocations.java
@@ -23,7 +23,6 @@ import java.io.Serializable;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import org.apache.syncope.client.console.SyncopeConsoleSession;
@@ -124,14 +123,14 @@ public class ConnidLocations extends
modal.show(true);
}
- }, ActionLink.ActionType.CREATE, String.format("%s", IdMEntitlement.CONNECTOR_CREATE));
+ }, ActionLink.ActionType.CREATE, "%s".formatted(IdMEntitlement.CONNECTOR_CREATE));
return panel;
}
@Override
protected Collection<ActionLink.ActionType> getBatches() {
- return Collections.emptyList();
+ return List.of();
}
protected static class ConnidLocationsDataProvider extends DirectoryDataProvider<Serializable> {
diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/LinkedAccountModalPanel.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/LinkedAccountModalPanel.java
index 84b2990283..e2419cc0de 100644
--- a/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/LinkedAccountModalPanel.java
+++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/LinkedAccountModalPanel.java
@@ -298,7 +298,7 @@ public class LinkedAccountModalPanel extends Panel implements ModalPanel {
new ActionLinksTogglePanel.ActionLinkToggleCloseEventPayload(target));
}
}, ActionLink.ActionType.RECONCILIATION_PUSH,
- String.format("%s,%s", IdRepoEntitlement.USER_READ, IdRepoEntitlement.TASK_EXECUTE));
+ "%s,%s".formatted(IdRepoEntitlement.USER_READ, IdRepoEntitlement.TASK_EXECUTE));
builder.addAction(new ActionLink<>() {
@@ -324,7 +324,7 @@ public class LinkedAccountModalPanel extends Panel implements ModalPanel {
new ActionLinksTogglePanel.ActionLinkToggleCloseEventPayload(target));
}
}, ActionLink.ActionType.RECONCILIATION_PULL,
- String.format("%s,%s", IdRepoEntitlement.USER_READ, IdRepoEntitlement.TASK_EXECUTE));
+ "%s,%s".formatted(IdRepoEntitlement.USER_READ, IdRepoEntitlement.TASK_EXECUTE));
if (!reconciliationOnly) {
builder.addAction(new ActionLink<>() {
diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDirectoryPanel.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDirectoryPanel.java
index 081481d0ca..2b74a92493 100644
--- a/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDirectoryPanel.java
+++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDirectoryPanel.java
@@ -23,7 +23,6 @@ import java.io.Serializable;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
@@ -169,7 +168,7 @@ public class ResourceDirectoryPanel extends
@Override
protected Collection<ActionLink.ActionType> getBatches() {
- return Collections.singletonList(ActionLink.ActionType.DELETE);
+ return List.of(ActionLink.ActionType.DELETE);
}
@Override
@@ -201,7 +200,7 @@ public class ResourceDirectoryPanel extends
modal.show(true);
}
}, ActionLink.ActionType.EDIT,
- String.format("%s,%s", IdMEntitlement.RESOURCE_READ, IdMEntitlement.RESOURCE_UPDATE));
+ "%s,%s".formatted(IdMEntitlement.RESOURCE_READ, IdMEntitlement.RESOURCE_UPDATE));
panel.add(new ActionLink<>() {
@@ -231,7 +230,7 @@ public class ResourceDirectoryPanel extends
provisionModal.show(true);
}
}, ActionLink.ActionType.MAPPING,
- String.format("%s,%s", IdMEntitlement.RESOURCE_READ, IdMEntitlement.RESOURCE_UPDATE));
+ "%s,%s".formatted(IdMEntitlement.RESOURCE_READ, IdMEntitlement.RESOURCE_UPDATE));
panel.add(new ActionLink<>() {
@@ -347,7 +346,7 @@ public class ResourceDirectoryPanel extends
historyModal.show(true);
}
}, ActionLink.ActionType.VIEW_AUDIT_HISTORY,
- String.format("%s,%s", IdMEntitlement.RESOURCE_READ, IdRepoEntitlement.AUDIT_LIST));
+ "%s,%s".formatted(IdMEntitlement.RESOURCE_READ, IdRepoEntitlement.AUDIT_LIST));
panel.add(new ActionLink<>() {
diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/policies/ProvisioningPolicyModalPanel.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/policies/ProvisioningPolicyModalPanel.java
index 9b4915eebe..1d8b569325 100644
--- a/client/idm/console/src/main/java/org/apache/syncope/client/console/policies/ProvisioningPolicyModalPanel.java
+++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/policies/ProvisioningPolicyModalPanel.java
@@ -21,7 +21,7 @@ package org.apache.syncope.client.console.policies;
import com.fasterxml.jackson.databind.json.JsonMapper;
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -334,7 +334,7 @@ public class ProvisioningPolicyModalPanel extends AbstractModalPanel<Provisionin
choices.add(Constants.KEY_FIELD_NAME);
choices.add(rule.getAnyType().equals(AnyTypeKind.USER.name())
? Constants.USERNAME_FIELD_NAME : Constants.NAME_FIELD_NAME);
- Collections.sort(choices);
+ choices.sort(Comparator.naturalOrder());
return choices;
}
}
diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/rest/ConnectorRestClient.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/rest/ConnectorRestClient.java
index c419f93169..c09d7000e1 100644
--- a/client/idm/console/src/main/java/org/apache/syncope/client/console/rest/ConnectorRestClient.java
+++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/rest/ConnectorRestClient.java
@@ -27,7 +27,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
-import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.syncope.client.console.SyncopeConsoleSession;
@@ -158,7 +157,7 @@ public class ConnectorRestClient extends BaseRestClient {
Response response = client.path(key).get();
if (response.getStatus() == Response.Status.OK.getStatusCode()) {
response = client.back(false).path("check").
- post(IOUtils.toString((InputStream) response.getEntity(), StandardCharsets.UTF_8));
+ post(new String(((InputStream) response.getEntity()).readAllBytes(), StandardCharsets.UTF_8));
return response.getStatus() == Response.Status.NO_CONTENT.getStatusCode();
}
return false;
diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/rest/ResourceRestClient.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/rest/ResourceRestClient.java
index c53c02859d..4dcd5b0917 100644
--- a/client/idm/console/src/main/java/org/apache/syncope/client/console/rest/ResourceRestClient.java
+++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/rest/ResourceRestClient.java
@@ -26,7 +26,6 @@ import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
-import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.syncope.common.lib.to.ConnObject;
@@ -56,7 +55,7 @@ public class ResourceRestClient extends BaseRestClient {
Response response = client.path(key).get();
if (response.getStatus() == Response.Status.OK.getStatusCode()) {
response = client.back(false).path("check").
- post(IOUtils.toString((InputStream) response.getEntity(), StandardCharsets.UTF_8));
+ post(new String(((InputStream) response.getEntity()).readAllBytes(), StandardCharsets.UTF_8));
return response.getStatus() == Response.Status.NO_CONTENT.getStatusCode();
}
return false;
diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java
index 563c90358c..0bee880cad 100644
--- a/client/idm/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java
+++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java
@@ -276,7 +276,8 @@ public class AnyStatusDirectoryPanel
AnyStatusDirectoryPanel.this.getTogglePanel().close(target);
}
}, ActionLink.ActionType.MANAGE_ACCOUNTS,
- String.format("%s,%s,%s", IdRepoEntitlement.USER_READ, IdRepoEntitlement.USER_UPDATE,
+ "%s,%s,%s".formatted(
+ IdRepoEntitlement.USER_READ, IdRepoEntitlement.USER_UPDATE,
IdMEntitlement.RESOURCE_GET_CONNOBJECT));
}
}
diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/Topology.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/Topology.java
index 4aae9400c5..8416ec1272 100644
--- a/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/Topology.java
+++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/Topology.java
@@ -545,7 +545,7 @@ public class Topology extends BasePage {
List<String> list = new ArrayList<>();
targets.forEach((key, value) -> value.forEach((label, node) -> list.add(
- String.format("connect('%s','%s','%s');", key, label, node.getKind()))));
+ "connect('%s','%s','%s');".formatted(key, label, node.getKind()))));
return list;
}
@@ -563,8 +563,8 @@ public class Topology extends BasePage {
@Override
public void renderHead(final Component component, final IHeaderResponse response) {
- response.render(OnDomReadyHeaderItem.forScript(String.format("setPosition('%s', %d, %d)",
- node.getKey(), node.getX(), node.getY())));
+ response.render(OnDomReadyHeaderItem.forScript("setPosition('%s', %d, %d)".
+ formatted(node.getKey(), node.getX(), node.getY())));
}
});
@@ -580,10 +580,10 @@ public class Topology extends BasePage {
@Override
protected void onEvent(final AjaxRequestTarget target) {
togglePanel.toggleWithContent(target, node);
- target.appendJavaScript(String.format(
+ target.appendJavaScript(
"$('.window').removeClass(\"active-window\").addClass(\"inactive-window\"); "
+ "$(document.getElementById('%s'))."
- + "removeClass(\"inactive-window\").addClass(\"active-window\");", node.getKey()));
+ + "removeClass(\"inactive-window\").addClass(\"active-window\");".formatted(node.getKey()));
}
});
@@ -605,13 +605,13 @@ public class Topology extends BasePage {
newlyCreated.getModelObject().add(node);
payload.getTarget().add(newlyCreatedContainer);
- payload.getTarget().appendJavaScript(String.format(
+ payload.getTarget().appendJavaScript(
"window.Wicket.WebSocket.send('"
- + "{\"kind\":\"%s\",\"target\":\"%s\",\"source\":\"%s\",\"scope\":\"%s\"}');",
- SupportedOperation.ADD_ENDPOINT,
- payload.getKey(),
- payload.getParent(),
- payload.getKind()));
+ + "{\"kind\":\"%s\",\"target\":\"%s\",\"source\":\"%s\",\"scope\":\"%s\"}');".formatted(
+ SupportedOperation.ADD_ENDPOINT,
+ payload.getKey(),
+ payload.getParent(),
+ payload.getKind()));
}
}
}
diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java
index 1a775d6994..3cde0ec748 100644
--- a/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java
+++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java
@@ -240,7 +240,7 @@ public class TopologyTogglePanel extends TogglePanel<Serializable> {
public void onClick(final AjaxRequestTarget target) {
try {
connectorRestClient.delete(node.getKey());
- target.appendJavaScript(String.format("jsPlumb.remove('%s');", node.getKey()));
+ target.appendJavaScript("jsPlumb.remove('%s');".formatted(node.getKey()));
SyncopeConsoleSession.get().success(getString(Constants.OPERATION_SUCCEEDED));
toggle(target, false);
} catch (SyncopeClientException e) {
@@ -359,7 +359,7 @@ public class TopologyTogglePanel extends TogglePanel<Serializable> {
}
};
MetaDataRoleAuthorizationStrategy.authorize(history, RENDER,
- String.format("%s,%s", IdMEntitlement.CONNECTOR_READ, IdRepoEntitlement.AUDIT_LIST));
+ "%s,%s".formatted(IdMEntitlement.CONNECTOR_READ, IdRepoEntitlement.AUDIT_LIST));
fragment.add(history);
return fragment;
@@ -376,7 +376,7 @@ public class TopologyTogglePanel extends TogglePanel<Serializable> {
public void onClick(final AjaxRequestTarget target) {
try {
resourceRestClient.delete(node.getKey());
- target.appendJavaScript(String.format("jsPlumb.remove('%s');", node.getKey()));
+ target.appendJavaScript("jsPlumb.remove('%s');".formatted(node.getKey()));
SyncopeConsoleSession.get().success(getString(Constants.OPERATION_SUCCEEDED));
toggle(target, false);
} catch (SyncopeClientException e) {
@@ -622,7 +622,7 @@ public class TopologyTogglePanel extends TogglePanel<Serializable> {
}
};
MetaDataRoleAuthorizationStrategy.authorize(history, RENDER,
- String.format("%s,%s", IdMEntitlement.RESOURCE_READ, IdRepoEntitlement.AUDIT_LIST));
+ "%s,%s".formatted(IdMEntitlement.RESOURCE_READ, IdRepoEntitlement.AUDIT_LIST));
fragment.add(history);
AjaxLink<String> clone = new IndicatingAjaxLink<>("clone") {
diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/TopologyWebSocketBehavior.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/TopologyWebSocketBehavior.java
index 5004f4d4e3..3d69553533 100644
--- a/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/TopologyWebSocketBehavior.java
+++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/TopologyWebSocketBehavior.java
@@ -123,12 +123,12 @@ public class TopologyWebSocketBehavior extends BasePageWebSocketBehavior.OnMessa
}
} catch (InterruptedException | TimeoutException e) {
LOG.warn("Connection with {} timed out", checker.key);
- response = String.format("{ \"status\": \"%s\", \"target\": \"%s\"}",
- TopologyNode.Status.UNREACHABLE, checker.key);
+ response = "{ \"status\": \"%s\", \"target\": \"%s\"}".
+ formatted(TopologyNode.Status.UNREACHABLE, checker.key);
} catch (Exception e) {
LOG.error("Unexpected exception connecting to {}", checker.key, e);
- response = String.format("{ \"status\": \"%s\", \"target\": \"%s\"}",
- TopologyNode.Status.FAILURE, checker.key);
+ response = "{ \"status\": \"%s\", \"target\": \"%s\"}".
+ formatted(TopologyNode.Status.FAILURE, checker.key);
}
Optional.ofNullable(response).ifPresent(r -> responses.put(checker.key, r));
@@ -147,8 +147,8 @@ public class TopologyWebSocketBehavior extends BasePageWebSocketBehavior.OnMessa
if (connectors.containsKey(ckey)) {
handler.push(connectors.get(ckey));
} else {
- handler.push(String.format(
- "{ \"status\": \"%s\", \"target\": \"%s\"}", TopologyNode.Status.UNKNOWN, ckey));
+ handler.push("{ \"status\": \"%s\", \"target\": \"%s\"}".
+ formatted(TopologyNode.Status.UNKNOWN, ckey));
}
if (runningConnCheck.contains(ckey)) {
@@ -171,8 +171,8 @@ public class TopologyWebSocketBehavior extends BasePageWebSocketBehavior.OnMessa
if (resources.containsKey(rkey)) {
handler.push(resources.get(rkey));
} else {
- handler.push(String.format(
- "{ \"status\": \"%s\", \"target\": \"%s\"}", TopologyNode.Status.UNKNOWN, rkey));
+ handler.push("{ \"status\": \"%s\", \"target\": \"%s\"}".
+ formatted(TopologyNode.Status.UNKNOWN, rkey));
}
if (runningResCheck.contains(rkey)) {
@@ -190,7 +190,7 @@ public class TopologyWebSocketBehavior extends BasePageWebSocketBehavior.OnMessa
}
case ADD_ENDPOINT ->
- handler.appendJavaScript(String.format("addEndpoint('%s', '%s', '%s');",
+ handler.appendJavaScript("addEndpoint('%s', '%s', '%s');".formatted(
obj.get("source").asText(),
obj.get("target").asText(),
obj.get("scope").asText()));
@@ -229,12 +229,12 @@ public class TopologyWebSocketBehavior extends BasePageWebSocketBehavior.OnMessa
@Override
public String call() {
try {
- return String.format("{ \"status\": \"%s\", \"target\": \"%s\"}",
+ return "{ \"status\": \"%s\", \"target\": \"%s\"}".formatted(
connectorRestClient.check(coreAddress, domain, jwt, key)
? TopologyNode.Status.REACHABLE : TopologyNode.Status.UNREACHABLE, key);
} catch (Exception e) {
LOG.warn("Error checking connection for {}", key, e);
- return String.format("{ \"status\": \"%s\", \"target\": \"%s\"}", TopologyNode.Status.FAILURE, key);
+ return "{ \"status\": \"%s\", \"target\": \"%s\"}".formatted(TopologyNode.Status.FAILURE, key);
}
}
}
@@ -248,12 +248,12 @@ public class TopologyWebSocketBehavior extends BasePageWebSocketBehavior.OnMessa
@Override
public String call() {
try {
- return String.format("{ \"status\": \"%s\", \"target\": \"%s\"}",
+ return "{ \"status\": \"%s\", \"target\": \"%s\"}".formatted(
resourceRestClient.check(coreAddress, domain, jwt, key)
? TopologyNode.Status.REACHABLE : TopologyNode.Status.UNREACHABLE, key);
} catch (Exception e) {
LOG.warn("Error checking connection for {}", key, e);
- return String.format("{ \"status\": \"%s\", \"target\": \"%s\"}", TopologyNode.Status.FAILURE, key);
+ return "{ \"status\": \"%s\", \"target\": \"%s\"}".formatted(TopologyNode.Status.FAILURE, key);
}
}
}
diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/list/ConnConfPropertyListView.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/list/ConnConfPropertyListView.java
index a6381081ac..2bac130c1c 100644
--- a/client/idm/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/list/ConnConfPropertyListView.java
+++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/list/ConnConfPropertyListView.java
@@ -191,7 +191,7 @@ public class ConnConfPropertyListView extends ListView<ConnConfProperty> {
super.renderHead(response);
if (getModelObject().isEmpty()) {
response.render(OnDomReadyHeaderItem.forScript(
- String.format("$('#emptyPlaceholder').append(\"%s\")", getString("property.empty.list"))));
+ "$('#emptyPlaceholder').append(\"%s\")".formatted(getString("property.empty.list"))));
}
}
}
diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceMappingPanel.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceMappingPanel.java
index 6b4994e94d..b25c7b84f4 100644
--- a/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceMappingPanel.java
+++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceMappingPanel.java
@@ -19,7 +19,7 @@
package org.apache.syncope.client.console.wizards.resources;
import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -182,7 +182,7 @@ public class ResourceMappingPanel extends AbstractMappingPanel {
}
List<String> names = new ArrayList<>(choices);
- Collections.sort(names);
+ names.sort(Comparator.naturalOrder());
toBeUpdated.setChoices(names);
}
}
diff --git a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/MIMETypesLoader.java b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/MIMETypesLoader.java
index a41082b611..72d1288644 100644
--- a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/MIMETypesLoader.java
+++ b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/MIMETypesLoader.java
@@ -23,6 +23,7 @@ import com.fasterxml.jackson.databind.json.JsonMapper;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -58,7 +59,7 @@ public class MIMETypesLoader implements Serializable {
LOG.debug("MIME types loaded: {}", mimeTypesMap);
mimeTypes = new ArrayList<>(mimeTypesMap.keySet());
- Collections.sort(mimeTypes);
+ mimeTypes.sort(Comparator.naturalOrder());
mimeTypes = Collections.unmodifiableList(mimeTypes);
} catch (Exception e) {
LOG.error("Error reading file MIMETypes from resources", e);
diff --git a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/StyledNotificationBehavior.java b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/StyledNotificationBehavior.java
index 614acb86ce..a7abba5fbc 100644
--- a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/StyledNotificationBehavior.java
+++ b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/StyledNotificationBehavior.java
@@ -52,7 +52,7 @@ public class StyledNotificationBehavior extends NotificationBehavior {
? Notification.ERROR
: Notification.WARNING;
- return String.format("%s.options.autoHideAfter = %s; %s.show( { message: '%s' } , '%s');",
+ return "%s.options.autoHideAfter = %s; %s.show( { message: '%s' } , '%s');".formatted(
widget,
Notification.SUCCESS.equals(actual) || Notification.INFO.equals(actual)
? AUTOHIDEAFTER_GOOD : AUTOHIDEAFTER_BAD,
diff --git a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/pages/BaseLogin.java b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/pages/BaseLogin.java
index edbf9c1213..0097209911 100644
--- a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/pages/BaseLogin.java
+++ b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/pages/BaseLogin.java
@@ -249,8 +249,7 @@ public abstract class BaseLogin extends WebPage {
if (StringUtils.isNotBlank(notificationMessage)) {
response.render(OnLoadHeaderItem.forScript(StyledNotificationBehavior.jQueryShow(
StringEscapeUtils.escapeEcmaScript(notificationMessage),
- String.format("jQuery('#%s').data('kendoNotification')",
- notificationPanel.getNotificationMarkupId()),
+ "jQuery('#%s').data('kendoNotification')".formatted(notificationPanel.getNotificationMarkupId()),
notificationLevel)));
}
}
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/IdRepoImplementationInfoProvider.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/IdRepoImplementationInfoProvider.java
index f929a1a09e..a5a608deba 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/IdRepoImplementationInfoProvider.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/IdRepoImplementationInfoProvider.java
@@ -19,7 +19,7 @@
package org.apache.syncope.client.console.commons;
import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
import org.apache.syncope.client.console.SyncopeConsoleSession;
@@ -88,7 +88,7 @@ public class IdRepoImplementationInfoProvider implements ImplementationInfoProvi
}
}
if (!classes.isEmpty()) {
- Collections.sort(classes);
+ classes.sort(Comparator.naturalOrder());
}
return classes;
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/events/EventSelectionPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/events/EventSelectionPanel.java
index e1032047d0..6804aa8002 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/events/EventSelectionPanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/events/EventSelectionPanel.java
@@ -18,7 +18,7 @@
*/
package org.apache.syncope.client.console.events;
-import java.util.Collections;
+import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -199,7 +199,7 @@ public abstract class EventSelectionPanel extends Panel {
ops.add(eventCategoryTO.getCategory());
}
} else {
- Collections.sort(ops);
+ ops.sort(Comparator.naturalOrder());
}
return ops;
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/events/SelectedEventsPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/events/SelectedEventsPanel.java
index 84458a2cf0..8eaf0be103 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/events/SelectedEventsPanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/events/SelectedEventsPanel.java
@@ -18,7 +18,7 @@
*/
package org.apache.syncope.client.console.events;
-import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
import java.util.Set;
import org.apache.syncope.client.ui.commons.Constants;
@@ -110,7 +110,7 @@ public class SelectedEventsPanel extends Panel {
filter(toBeAdded -> !model.getObject().contains(toBeAdded.toString())).
forEach(toBeAdded -> model.getObject().add(toBeAdded.toString()));
- Collections.sort(model.getObject());
+ model.getObject().sort(Comparator.naturalOrder());
eventSelectionChanged.getTarget().add(selectionContainer);
}
}
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationWizardBuilder.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationWizardBuilder.java
index 8ea9290e2f..4bfa3d3577 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationWizardBuilder.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationWizardBuilder.java
@@ -20,7 +20,7 @@ package org.apache.syncope.client.console.notifications;
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
@@ -415,7 +415,7 @@ public class NotificationWizardBuilder extends BaseAjaxWizardBuilder<Notificatio
result.addAll(schemaRestClient.<DerSchemaTO>getSchemas(SchemaType.DERIVED, null, anyTypeClasses).
stream().map(DerSchemaTO::getKey).toList());
- Collections.sort(result);
+ result.sort(Comparator.naturalOrder());
return result;
}
}
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
index 1498751090..7a6f773d6b 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
@@ -179,7 +179,7 @@ public class BasePage extends BaseWebPage {
body.add(liContainer);
link = BookmarkablePageLinkBuilder.build("engagements", Engagements.class);
MetaDataRoleAuthorizationStrategy.authorize(link, WebPage.RENDER,
- String.format("%s,%s", IdRepoEntitlement.TASK_LIST, IdRepoEntitlement.IMPLEMENTATION_LIST));
+ "%s,%s".formatted(IdRepoEntitlement.TASK_LIST, IdRepoEntitlement.IMPLEMENTATION_LIST));
liContainer.add(link);
liContainer = new WebMarkupContainer(getLIContainerId("reports"));
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/AnyDirectoryPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/AnyDirectoryPanel.java
index ef90b31f0b..1ef99ffbe7 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/AnyDirectoryPanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/AnyDirectoryPanel.java
@@ -106,13 +106,13 @@ public abstract class AnyDirectoryPanel<A extends AnyTO, E extends AbstractAnyRe
protected AnyDirectoryPanel(final String id, final Builder<A, E> builder, final boolean wizardInModal) {
super(id, builder, wizardInModal);
- if (SyncopeConsoleSession.get().owns(String.format("%s_CREATE", builder.type), builder.realm)
+ if (SyncopeConsoleSession.get().owns("%s_CREATE".formatted(builder.type), builder.realm)
&& builder.realm.startsWith(SyncopeConstants.ROOT_REALM)) {
MetaDataRoleAuthorizationStrategy.authorizeAll(addAjaxLink, RENDER);
} else {
MetaDataRoleAuthorizationStrategy.unauthorizeAll(addAjaxLink, RENDER);
}
- setReadOnly(!SyncopeConsoleSession.get().owns(String.format("%s_UPDATE", builder.type), builder.realm));
+ setReadOnly(!SyncopeConsoleSession.get().owns("%s_UPDATE".formatted(builder.type), builder.realm));
realm = builder.realm;
type = builder.type;
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/AnyDisplayAttributesModalPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/AnyDisplayAttributesModalPanel.java
index 46100a2845..4e2c0481f4 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/AnyDisplayAttributesModalPanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/AnyDisplayAttributesModalPanel.java
@@ -61,15 +61,15 @@ public abstract class AnyDisplayAttributesModalPanel<T extends Serializable> ext
}
public static String getPrefDetailView(final String type) {
- return String.format(Constants.PREF_ANY_DETAILS_VIEW, type);
+ return Constants.PREF_ANY_DETAILS_VIEW.formatted(type);
}
public static String getPrefPlainAttributeView(final String type) {
- return String.format(Constants.PREF_ANY_PLAIN_ATTRS_VIEW, type);
+ return Constants.PREF_ANY_PLAIN_ATTRS_VIEW.formatted(type);
}
public static String getPrefDerivedAttributeView(final String type) {
- return String.format(Constants.PREF_ANY_DER_ATTRS_VIEW, type);
+ return Constants.PREF_ANY_DER_ATTRS_VIEW.formatted(type);
}
public static Class<? extends AnyTO> getTOClass(final String type) {
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectDirectoryPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectDirectoryPanel.java
index 848d9a48f5..93ddf6dc83 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectDirectoryPanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectDirectoryPanel.java
@@ -120,7 +120,7 @@ public class AnyObjectDirectoryPanel extends AnyDirectoryPanel<AnyObjectTO, AnyO
new AnyObjectWrapper(restClient.read(model.getObject().getKey())), target));
}
}, ActionType.EDIT,
- String.format("%s,%s", AnyEntitlement.READ.getFor(type), AnyEntitlement.UPDATE.getFor(type))).
+ "%s,%s".formatted(AnyEntitlement.READ.getFor(type), AnyEntitlement.UPDATE.getFor(type))).
setRealm(realm);
if (wizardInModal) {
@@ -202,7 +202,7 @@ public class AnyObjectDirectoryPanel extends AnyDirectoryPanel<AnyObjectTO, AnyO
altDefaultModal.show(true);
}
}, ActionType.VIEW_AUDIT_HISTORY,
- String.format("%s,%s", AnyEntitlement.READ.getFor(type), IdRepoEntitlement.AUDIT_LIST)).
+ "%s,%s".formatted(AnyEntitlement.READ.getFor(type), IdRepoEntitlement.AUDIT_LIST)).
setRealm(realm);
panel.add(new ActionLink<>() {
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/AnysPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/AnysPanel.java
index 5461c07c31..9a8a8bdbae 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/AnysPanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/AnysPanel.java
@@ -117,7 +117,7 @@ public abstract class AnysPanel extends WizardMgtPanel<RealmTO> {
anyTypes.forEach(anyType -> {
tabs.add(new ITabComponent(
new ResourceModel("anyType." + anyType.getKey(), anyType.getKey()),
- String.format("%s_SEARCH", anyType.getKey())) {
+ "%s_SEARCH".formatted(anyType.getKey())) {
private static final long serialVersionUID = 1169585538404171118L;
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/DashboardControlPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/DashboardControlPanel.java
index aeda4ae666..2262784bc2 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/DashboardControlPanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/DashboardControlPanel.java
@@ -34,7 +34,7 @@ public class DashboardControlPanel extends Panel {
JobWidget job = new JobWidget("job", pageRef);
MetaDataRoleAuthorizationStrategy.authorize(job, Component.RENDER,
- String.format("%s,%s,%s",
+ "%s,%s,%s".formatted(
IdRepoEntitlement.NOTIFICATION_LIST,
IdRepoEntitlement.TASK_LIST,
IdRepoEntitlement.REPORT_LIST));
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/DelegationDirectoryPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/DelegationDirectoryPanel.java
index cf430389ed..2d0887f310 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/DelegationDirectoryPanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/DelegationDirectoryPanel.java
@@ -21,7 +21,6 @@ package org.apache.syncope.client.console.panels;
import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
@@ -198,7 +197,7 @@ public class DelegationDirectoryPanel extends
@Override
public Iterator<DelegationTO> iterator(final long first, final long count) {
List<DelegationTO> result = restClient.list();
- Collections.sort(result, comparator);
+ result.sort(comparator);
return result.subList((int) first, (int) first + (int) count).iterator();
}
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/GroupDirectoryPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/GroupDirectoryPanel.java
index 76c47bfacd..57a35cda5f 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/GroupDirectoryPanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/GroupDirectoryPanel.java
@@ -249,7 +249,7 @@ public class GroupDirectoryPanel extends AnyDirectoryPanel<GroupTO, GroupRestCli
restClient.read(model.getObject().getKey())), target));
}
}, ActionType.EDIT,
- String.format("%s,%s", IdRepoEntitlement.GROUP_READ, IdRepoEntitlement.GROUP_UPDATE)).
+ "%s,%s".formatted(IdRepoEntitlement.GROUP_READ, IdRepoEntitlement.GROUP_UPDATE)).
setRealm(realm);
actions.add(new ActionLink<>() {
@@ -305,7 +305,7 @@ public class GroupDirectoryPanel extends AnyDirectoryPanel<GroupTO, GroupRestCli
return false;
}
}, ActionType.MEMBERS,
- String.format("%s,%s", IdRepoEntitlement.GROUP_READ, IdRepoEntitlement.GROUP_UPDATE)).
+ "%s,%s".formatted(IdRepoEntitlement.GROUP_READ, IdRepoEntitlement.GROUP_UPDATE)).
setRealm(realm);
ActionLink<GroupTO> provisionMembers = new ActionLink<GroupTO>() {
@@ -328,7 +328,7 @@ public class GroupDirectoryPanel extends AnyDirectoryPanel<GroupTO, GroupRestCli
actions.add(
provisionMembers,
ActionType.PROVISION_MEMBERS,
- String.format("%s,%s", IdRepoEntitlement.TASK_CREATE, IdRepoEntitlement.TASK_EXECUTE),
+ "%s,%s".formatted(IdRepoEntitlement.TASK_CREATE, IdRepoEntitlement.TASK_EXECUTE),
true).setRealm(realm);
ActionLink<GroupTO> deprovisionMembers = new ActionLink<GroupTO>() {
@@ -351,7 +351,7 @@ public class GroupDirectoryPanel extends AnyDirectoryPanel<GroupTO, GroupRestCli
actions.add(
deprovisionMembers,
ActionType.DEPROVISION_MEMBERS,
- String.format("%s,%s", IdRepoEntitlement.TASK_CREATE, IdRepoEntitlement.TASK_EXECUTE),
+ "%s,%s".formatted(IdRepoEntitlement.TASK_CREATE, IdRepoEntitlement.TASK_EXECUTE),
true).setRealm(realm);
SyncopeWebApplication.get().getAnyDirectoryPanelAdditionalActionLinksProvider().get(
@@ -430,7 +430,7 @@ public class GroupDirectoryPanel extends AnyDirectoryPanel<GroupTO, GroupRestCli
altDefaultModal.show(true);
}
}, ActionType.VIEW_AUDIT_HISTORY,
- String.format("%s,%s", IdRepoEntitlement.GROUP_READ, IdRepoEntitlement.AUDIT_LIST)).
+ "%s,%s".formatted(IdRepoEntitlement.GROUP_READ, IdRepoEntitlement.AUDIT_LIST)).
setRealm(realm);
actions.add(new ActionLink<>() {
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/RealmDirectoryPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/RealmDirectoryPanel.java
index 52e639c0bf..fe8f3c9e8c 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/RealmDirectoryPanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/RealmDirectoryPanel.java
@@ -362,7 +362,7 @@ public class RealmDirectoryPanel
altDefaultModal.show(true);
}
}, ActionLink.ActionType.VIEW_AUDIT_HISTORY,
- String.format("%s,%s", IdRepoEntitlement.REALM_UPDATE, IdRepoEntitlement.AUDIT_LIST)).
+ "%s,%s".formatted(IdRepoEntitlement.REALM_UPDATE, IdRepoEntitlement.AUDIT_LIST)).
setRealm(model.getObject().getFullPath());
panel.add(new ActionLink<>() {
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/RelationshipViewPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/RelationshipViewPanel.java
index 9272776b30..a2b7c78098 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/RelationshipViewPanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/RelationshipViewPanel.java
@@ -136,12 +136,12 @@ public final class RelationshipViewPanel extends WizardMgtPanel<RelationshipTO>
row.add(new Label("relationship", relationshipTO.getType()));
Label leftEnd = new Label("left_end", isLeftRelation
- ? String.format("%s %s", anyTO.getType(), anyName)
- : String.format("%s %s", relationshipTO.getOtherEndType(), relationshipTO.getOtherEndName()));
+ ? "%s %s".formatted(anyTO.getType(), anyName)
+ : "%s %s".formatted(relationshipTO.getOtherEndType(), relationshipTO.getOtherEndName()));
Label rightEnd = new Label("right_end", isLeftRelation
- ? String.format("%s %s", relationshipTO.getOtherEndType(), relationshipTO.getOtherEndName())
- : String.format("%s %s", anyTO.getType(), anyName));
+ ? "%s %s".formatted(relationshipTO.getOtherEndType(), relationshipTO.getOtherEndName())
+ : "%s %s".formatted(anyTO.getType(), anyName));
if (anyTO.getKey() != null && anyTO.getKey().equals(relationshipTO.getOtherEndKey())) {
setBold(leftEnd, rightEnd);
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/TogglePanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/TogglePanel.java
index e69bf99c18..0a235f9858 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/TogglePanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/TogglePanel.java
@@ -213,7 +213,7 @@ public abstract class TogglePanel<T extends Serializable> extends WizardMgtPanel
* @param toggle toggle action.
*/
public void toggle(final AjaxRequestTarget target, final boolean toggle) {
- String selector = String.format("$(\"div#%s\")", activeId);
+ String selector = "$(\"div#%s\")".formatted(activeId);
if (toggle) {
if (status == Status.INACTIVE) {
target.add(TogglePanel.this.container);
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
index b9e1bdcfa4..3fa73757b2 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
@@ -149,7 +149,7 @@ public class UserDirectoryPanel extends AnyDirectoryPanel<UserTO, UserRestClient
new UserWrapper(restClient.read(model.getObject().getKey())), target));
}
}, ActionType.EDIT,
- String.format("%s,%s", IdRepoEntitlement.USER_READ, IdRepoEntitlement.USER_UPDATE)).
+ "%s,%s".formatted(IdRepoEntitlement.USER_READ, IdRepoEntitlement.USER_UPDATE)).
setRealm(realm);
panel.add(new ActionLink<>() {
@@ -339,7 +339,7 @@ public class UserDirectoryPanel extends AnyDirectoryPanel<UserTO, UserRestClient
altDefaultModal.show(true);
}
}, ActionType.VIEW_AUDIT_HISTORY,
- String.format("%s,%s", IdRepoEntitlement.USER_READ, IdRepoEntitlement.AUDIT_LIST)).
+ "%s,%s".formatted(IdRepoEntitlement.USER_READ, IdRepoEntitlement.AUDIT_LIST)).
setRealm(realm);
}
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchUtils.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchUtils.java
index c45c38b550..b00d9ee664 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchUtils.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchUtils.java
@@ -66,7 +66,7 @@ public final class SearchUtils implements Serializable {
};
public static Pattern getTypeConditionPattern(final String type) {
- return Pattern.compile(String.format(";\\$type==%s|\\$type==%s;", type, type));
+ return Pattern.compile(";\\$type==%s|\\$type==%s;".formatted(type, type));
}
public static Map<String, List<SearchClause>> getSearchClauses(final Map<String, String> fiql) {
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java
index 4924685f17..b340441c27 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java
@@ -211,8 +211,8 @@ public abstract class PolicyDirectoryPanel<T extends PolicyTO>
historyModal.show(true);
}
- }, ActionLink.ActionType.VIEW_AUDIT_HISTORY, String.format("%s,%s", IdRepoEntitlement.POLICY_READ,
- IdRepoEntitlement.AUDIT_LIST));
+ }, ActionLink.ActionType.VIEW_AUDIT_HISTORY,
+ "%s,%s".formatted(IdRepoEntitlement.POLICY_READ, IdRepoEntitlement.AUDIT_LIST));
panel.add(new ActionLink<>() {
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java
index ab6a8afa86..4392e4ae4e 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java
@@ -161,9 +161,7 @@ public abstract class ReportDirectoryPanel
JobTO jobTO = restClient.getJob(rowModel.getObject().getKey());
panel = new JobActionPanel(componentId, jobTO, false, ReportDirectoryPanel.this);
MetaDataRoleAuthorizationStrategy.authorize(panel, WebPage.ENABLE,
- String.format("%s,%s",
- IdRepoEntitlement.REPORT_EXECUTE,
- IdRepoEntitlement.REPORT_UPDATE));
+ "%s,%s".formatted(IdRepoEntitlement.REPORT_EXECUTE, IdRepoEntitlement.REPORT_UPDATE));
} catch (Exception e) {
LOG.error("Could not get job for report {}", rowModel.getObject().getKey(), e);
panel = new Label(componentId, Model.of());
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/NotificationRestClient.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/NotificationRestClient.java
index f02e46a2ef..ebc1cb2b7b 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/NotificationRestClient.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/NotificationRestClient.java
@@ -81,8 +81,9 @@ public class NotificationRestClient extends BaseRestClient {
public String readTemplateFormat(final String key, final MailTemplateFormat format) {
try {
- return IOUtils.toString(InputStream.class.cast(
- getService(MailTemplateService.class).getFormat(key, format).getEntity()), StandardCharsets.UTF_8);
+ return new String(InputStream.class.cast(
+ getService(MailTemplateService.class).getFormat(key, format).getEntity()).readAllBytes(),
+ StandardCharsets.UTF_8);
} catch (Exception e) {
LOG.error("Error retrieving mail template {} as {}", key, format, e);
return StringUtils.EMPTY;
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/RoleRestClient.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/RoleRestClient.java
index 064aebe350..cb7ed3880b 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/RoleRestClient.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/RoleRestClient.java
@@ -58,8 +58,8 @@ public class RoleRestClient extends BaseRestClient {
public String readAnyLayout(final String role) {
try {
- return IOUtils.toString(InputStream.class.cast(
- getService(RoleService.class).getAnyLayout(role).getEntity()),
+ return new String(InputStream.class.cast(
+ getService(RoleService.class).getAnyLayout(role).getEntity()).readAllBytes(),
StandardCharsets.UTF_8);
} catch (SyncopeClientException e) {
if (e.getType() == ClientExceptionType.NotFound) {
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java
index d67afcecd6..94a6dda78e 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java
@@ -197,7 +197,7 @@ public abstract class SchedTaskDirectoryPanel<T extends SchedTaskTO>
panel = new JobActionPanel(componentId, jobTO, false, SchedTaskDirectoryPanel.this);
MetaDataRoleAuthorizationStrategy.authorize(
panel, WebPage.ENABLE,
- String.format("%s,%s", IdRepoEntitlement.TASK_EXECUTE, IdRepoEntitlement.TASK_UPDATE));
+ "%s,%s".formatted(IdRepoEntitlement.TASK_EXECUTE, IdRepoEntitlement.TASK_UPDATE));
} catch (Exception e) {
LOG.error("Could not get job for task {}", rowModel.getObject().getKey(), e);
panel = new Label(componentId, Model.of());
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/extensions/markup/html/repeater/data/table/CollectionPropertyColumn.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/extensions/markup/html/repeater/data/table/CollectionPropertyColumn.java
index 1539008df2..4b28a0a1f6 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/extensions/markup/html/repeater/data/table/CollectionPropertyColumn.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/extensions/markup/html/repeater/data/table/CollectionPropertyColumn.java
@@ -20,7 +20,7 @@ package org.apache.syncope.client.console.wicket.extensions.markup.html.repeater
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
@@ -44,7 +44,7 @@ public class CollectionPropertyColumn<T> extends PropertyColumn<T, String> {
if (value instanceof final Collection collection) {
List values = new ArrayList(collection);
- Collections.sort(values);
+ values.sort(Comparator.naturalOrder());
cellItem.add(new CollectionPanel(componentId, values));
}
}
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/AnyByRealmWidget.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/AnyByRealmWidget.java
index 3f3e95d61a..82f176d921 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/AnyByRealmWidget.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/AnyByRealmWidget.java
@@ -19,7 +19,7 @@
package org.apache.syncope.client.console.widgets;
import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -99,7 +99,7 @@ public class AnyByRealmWidget extends BaseWidget {
realmSet.addAll(any2ByRealm.keySet());
}
List<String> realms = new ArrayList<>(realmSet);
- Collections.sort(realms);
+ realms.sort(Comparator.naturalOrder());
Bar bar = new Bar();
bar.getOptions().setBarShowStroke(true);
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/JobWidget.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/JobWidget.java
index 7e666fac7f..9deb5e0a61 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/JobWidget.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/JobWidget.java
@@ -350,17 +350,17 @@ public class JobWidget extends BaseWidget {
String roles;
switch (jobTO.getType()) {
case TASK:
- roles = String.format("%s,%s",
+ roles = "%s,%s".formatted(
IdRepoEntitlement.TASK_EXECUTE, IdRepoEntitlement.TASK_UPDATE);
break;
case REPORT:
- roles = String.format("%s,%s",
+ roles = "%s,%s".formatted(
IdRepoEntitlement.REPORT_EXECUTE, IdRepoEntitlement.REPORT_UPDATE);
break;
case NOTIFICATION:
- roles = String.format("%s,%s",
+ roles = "%s,%s".formatted(
IdRepoEntitlement.NOTIFICATION_EXECUTE, IdRepoEntitlement.NOTIFICATION_UPDATE);
break;
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
index ee8a096d39..9696001ff4 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
@@ -200,8 +200,8 @@ public abstract class WizardMgtPanel<T extends Serializable> extends AbstractWiz
target.ifPresent(t -> t.add(modal.setContent(modalPanel)));
modal.header(Optional.ofNullable(newItemEvent.getTitleModel()).
- orElseGet(() -> new StringResourceModel(
- String.format("any.%s", newItemEvent.getEventDescription()),
+ orElseGet(() -> new StringResourceModel(
+ "any.%s".formatted(newItemEvent.getEventDescription()),
this,
Model.of(modalPanel.getItem()))));
modal.show(true);
@@ -211,7 +211,7 @@ public abstract class WizardMgtPanel<T extends Serializable> extends AbstractWiz
fragment.add(new Label(
"title",
Optional.ofNullable(newItemEvent.getTitleModel()).
- orElseGet(() -> Model.of(StringUtils.EMPTY))));
+ orElseGet(() -> Model.of(StringUtils.EMPTY))));
fragment.add(Component.class.cast(modalPanel));
container.addOrReplace(fragment);
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
index ce63c083c6..c622075ebb 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
@@ -186,7 +186,7 @@ public abstract class AbstractAttrs<S extends SchemaTO> extends AbstractAttrsWiz
&& CollectionUtils.isEmpty(relationships.getObject())) {
response.render(OnDomReadyHeaderItem.forScript(
- String.format("$('#emptyPlaceholder').append(\"%s\"); $('#attributes').hide();",
+ "$('#emptyPlaceholder').append(\"%s\"); $('#attributes').hide();".formatted(
getString("attribute.empty.list"))));
}
}
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrsWizardStep.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrsWizardStep.java
index d67689df00..b663fa0b3a 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrsWizardStep.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrsWizardStep.java
@@ -162,7 +162,7 @@ public abstract class AbstractAttrsWizardStep<S extends SchemaTO> extends Wizard
super.renderHead(response);
if (CollectionUtils.isEmpty(attrs.getObject())) {
response.render(OnDomReadyHeaderItem.forScript(
- String.format("$('#emptyPlaceholder').append(\"%s\"); $('#attributes').hide();",
+ "$('#emptyPlaceholder').append(\"%s\"); $('#attributes').hide();".formatted(
getString("attribute.empty.list"))));
}
}
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyObjectTemplateWizardBuilder.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyObjectTemplateWizardBuilder.java
index 9fb5370199..efdbd32d6b 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyObjectTemplateWizardBuilder.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyObjectTemplateWizardBuilder.java
@@ -55,7 +55,7 @@ public class AnyObjectTemplateWizardBuilder extends AnyObjectWizardBuilder
AnyObjectTO anyObjectTO = new AnyObjectTO();
anyObjectTO.setType(anyType);
if (templatable instanceof final RealmTO realmTO) {
- anyObjectTO.setRealm(String.format("'%s'", RealmsUtils.getFullPath(realmTO.getFullPath())));
+ anyObjectTO.setRealm("'%s'".formatted(RealmsUtils.getFullPath(realmTO.getFullPath())));
}
setItem(new AnyObjectWrapper(anyObjectTO));
}
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/ConnObjectPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/ConnObjectPanel.java
index 0447943e1d..265cb93154 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/ConnObjectPanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/ConnObjectPanel.java
@@ -19,7 +19,7 @@
package org.apache.syncope.client.console.wizards.any;
import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -73,7 +73,7 @@ public class ConnObjectPanel extends Panel {
List<String> schemas = ListUtils.sum(right.stream().map(Attr::getSchema).collect(Collectors.toList()),
left.stream().map(Attr::getSchema).collect(Collectors.toList()));
- Collections.sort(schemas);
+ schemas.sort(Comparator.naturalOrder());
return schemas;
}
};
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/GroupTemplateWizardBuilder.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/GroupTemplateWizardBuilder.java
index 12036a94c9..3fd447abff 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/GroupTemplateWizardBuilder.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/GroupTemplateWizardBuilder.java
@@ -53,7 +53,7 @@ public class GroupTemplateWizardBuilder extends GroupWizardBuilder implements Te
} else {
GroupTO groupTO = new GroupTO();
if (templatable instanceof final RealmTO realmTO) {
- groupTO.setRealm(String.format("'%s'", RealmsUtils.getFullPath(realmTO.getFullPath())));
+ groupTO.setRealm("'%s'".formatted(RealmsUtils.getFullPath(realmTO.getFullPath())));
}
setItem(new GroupWrapper(groupTO));
}
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/Management.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/Management.java
index 325177f573..a481486d64 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/Management.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/Management.java
@@ -222,7 +222,7 @@ public class Management extends WizardStep implements ICondition {
return StringUtils.EMPTY;
}
- return String.format("[%s] %s", userTO.getKey(), userTO.getUsername());
+ return "[%s] %s".formatted(userTO.getKey(), userTO.getUsername());
}
@Override
@@ -269,7 +269,7 @@ public class Management extends WizardStep implements ICondition {
if (groupTO == null) {
return StringUtils.EMPTY;
} else {
- return String.format("[%s] %s", groupTO.getKey(), groupTO.getName());
+ return "[%s] %s".formatted(groupTO.getKey(), groupTO.getName());
}
}
}
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserTemplateWizardBuilder.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserTemplateWizardBuilder.java
index 271a370e23..ecdc471b69 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserTemplateWizardBuilder.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserTemplateWizardBuilder.java
@@ -67,7 +67,7 @@ public class UserTemplateWizardBuilder extends UserWizardBuilder implements Temp
} else {
UserTO userTO = new UserTO();
if (templatable instanceof final RealmTO realmTO) {
- userTO.setRealm(String.format("'%s'", RealmsUtils.getFullPath(realmTO.getFullPath())));
+ userTO.setRealm("'%s'".formatted(RealmsUtils.getFullPath(realmTO.getFullPath())));
}
setItem(new UserWrapper(userTO));
}
diff --git a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/panels/ChangePasswordPanel.java b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/panels/ChangePasswordPanel.java
index 686f223673..ffdc5099dd 100644
--- a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/panels/ChangePasswordPanel.java
+++ b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/panels/ChangePasswordPanel.java
@@ -75,10 +75,8 @@ public abstract class ChangePasswordPanel extends Panel {
String cssClass = getString(CssUtils.key(Form.class, "hidden-fields"));
// div that is not visible (but not display:none either)
- buffer.append(String.format(
- "<div style=\"width:0px;height:0px;position:absolute;"
- + "left:-100px;top:-100px;overflow:hidden\" class=\"%s\">",
- cssClass));
+ buffer.append("<div style=\"width:0px;height:0px;position:absolute;"
+ + "left:-100px;top:-100px;overflow:hidden\" class=\"%s\">".formatted(cssClass));
// add an empty textfield (otherwise IE doesn't work)
buffer.append("<input title=\"text_hidden\" "
diff --git a/client/idrepo/lib/src/main/java/org/apache/syncope/client/lib/RestClientExceptionMapper.java b/client/idrepo/lib/src/main/java/org/apache/syncope/client/lib/RestClientExceptionMapper.java
index 40dbcb692f..bcf14925ac 100644
--- a/client/idrepo/lib/src/main/java/org/apache/syncope/client/lib/RestClientExceptionMapper.java
+++ b/client/idrepo/lib/src/main/java/org/apache/syncope/client/lib/RestClientExceptionMapper.java
@@ -75,8 +75,8 @@ public class RestClientExceptionMapper implements ResponseExceptionMapper<Except
: new BadRequestException(message, response);
} else {
// 5. All other codes are mapped to runtime exception with HTTP code information
- ex = new WebApplicationException(String.format("Remote exception with status code: %s",
- Response.Status.fromStatusCode(statusCode).name()),
+ ex = new WebApplicationException("Remote exception with status code: %s".
+ formatted(Response.Status.fromStatusCode(statusCode).name()),
response);
}
diff --git a/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/ProvisioningReport.java b/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/ProvisioningReport.java
index 7ca1a573f8..7baf058bf1 100644
--- a/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/ProvisioningReport.java
+++ b/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/ProvisioningReport.java
@@ -117,16 +117,14 @@ public class ProvisioningReport implements BaseBean {
if (level == TraceLevel.SUMMARY) {
// No per entry log in this case.
return null;
- } else if (level == TraceLevel.FAILURES && status == Status.FAILURE) {
+ }
+ if (level == TraceLevel.FAILURES && status == Status.FAILURE) {
// only report failures
- return String.format("Failed %s (key/name): %s/%s with message: %s", operation, key, name, message);
- } else {
- // All
- return String.format("%s %s (key/name): %s/%s %s", operation, status, key, name,
- StringUtils.isBlank(message)
- ? ""
- : "with message: " + message);
+ return "Failed %s (key/name): %s/%s with message: %s".formatted(operation, key, name, message);
}
+ // ALL
+ return "%s %s (key/name): %s/%s %s".formatted(
+ operation, status, key, name, StringUtils.isBlank(message) ? "" : "with message: " + message);
}
/**
diff --git a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/AnyOperations.java b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/AnyOperations.java
index 567fcb1faf..7b086202fb 100644
--- a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/AnyOperations.java
+++ b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/AnyOperations.java
@@ -19,9 +19,7 @@
package org.apache.syncope.common.lib;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
@@ -60,8 +58,6 @@ public final class AnyOperations {
private static final Logger LOG = LoggerFactory.getLogger(AnyOperations.class);
- private static final List<String> NULL_SINGLETON_LIST = Collections.singletonList(null);
-
private AnyOperations() {
// empty constructor for static utility classes
}
@@ -597,6 +593,6 @@ public final class AnyOperations {
}
private static boolean isEmpty(final Attr attr) {
- return attr.getValues().isEmpty() || NULL_SINGLETON_LIST.equals(attr.getValues());
+ return attr.getValues().isEmpty() || attr.getValues().stream().allMatch(e -> e == null);
}
}
diff --git a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/collections/CircularFifoQueue.java b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/collections/CircularFifoQueue.java
index affa39c01a..1e2c128b63 100644
--- a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/collections/CircularFifoQueue.java
+++ b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/collections/CircularFifoQueue.java
@@ -259,8 +259,7 @@ public class CircularFifoQueue<E> extends AbstractCollection<E> implements Queue
final int sz = size();
if (index < 0 || index >= sz) {
throw new NoSuchElementException(
- String.format("The specified index (%1$d) is outside the available range [0, %2$d)",
- index, Integer.valueOf(sz)));
+ "The specified index (%1$d) is outside the available range [0, %2$d)".formatted(index, sz));
}
final int idx = (start + index) % maxElements;
diff --git a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/search/AnyObjectFiqlSearchConditionBuilder.java b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/search/AnyObjectFiqlSearchConditionBuilder.java
index cdbbd079cd..d32562e49b 100644
--- a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/search/AnyObjectFiqlSearchConditionBuilder.java
+++ b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/search/AnyObjectFiqlSearchConditionBuilder.java
@@ -18,7 +18,6 @@
*/
package org.apache.syncope.common.lib.search;
-import java.util.Collections;
import java.util.Map;
import org.apache.cxf.jaxrs.ext.search.client.FiqlSearchConditionBuilder;
import org.apache.cxf.jaxrs.ext.search.fiql.FiqlParser;
@@ -46,7 +45,7 @@ public class AnyObjectFiqlSearchConditionBuilder extends AbstractFiqlSearchCondi
@Override
public String query() {
- return new FiqlSearchConditionBuilder.Builder(Collections.emptyMap()).
+ return new FiqlSearchConditionBuilder.Builder(Map.of()).
is(SpecialAttr.TYPE.toString()).equalTo(type).query();
}
diff --git a/common/keymaster/self/client-self/src/main/java/org/apache/syncope/common/keymaster/client/self/SelfKeymasterClientExceptionMapper.java b/common/keymaster/self/client-self/src/main/java/org/apache/syncope/common/keymaster/client/self/SelfKeymasterClientExceptionMapper.java
index 2d4104b569..1d8e7738f3 100644
--- a/common/keymaster/self/client-self/src/main/java/org/apache/syncope/common/keymaster/client/self/SelfKeymasterClientExceptionMapper.java
+++ b/common/keymaster/self/client-self/src/main/java/org/apache/syncope/common/keymaster/client/self/SelfKeymasterClientExceptionMapper.java
@@ -66,8 +66,8 @@ public class SelfKeymasterClientExceptionMapper implements ResponseExceptionMapp
: new BadRequestException(message);
} else {
// 5. All other codes are mapped to runtime exception with HTTP code information
- ex = new WebServiceException(String.format("Remote exception with status code: %s",
- Response.Status.fromStatusCode(statusCode).name()));
+ ex = new WebServiceException("Remote exception with status code: %s".
+ formatted(Response.Status.fromStatusCode(statusCode).name()));
}
LOG.error("Exception thrown", ex);
return ex;
diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/FilterVisitor.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/FilterVisitor.java
index 4bfb6369f4..54cca9bb37 100644
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/FilterVisitor.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/FilterVisitor.java
@@ -60,7 +60,7 @@ public class FilterVisitor extends AbstractSearchConditionVisitor<SearchBean, Fi
ConditionType ct = sc.getConditionType();
if (sc instanceof final SyncopeFiqlSearchCondition<SearchBean> sfsc
- && sc.getConditionType() == ConditionType.CUSTOM) {
+ && sc.getConditionType() == ConditionType.CUSTOM) {
switch (sfsc.getOperator()) {
case SyncopeFiqlParser.IEQ:
ct = ConditionType.EQUALS;
@@ -72,7 +72,7 @@ public class FilterVisitor extends AbstractSearchConditionVisitor<SearchBean, Fi
default:
throw new IllegalArgumentException(
- String.format("Condition type %s is not supported", sfsc.getOperator()));
+ "Condition type %s is not supported".formatted(sfsc.getOperator()));
}
}
@@ -104,8 +104,7 @@ public class FilterVisitor extends AbstractSearchConditionVisitor<SearchBean, Fi
leaf = FilterBuilder.startsWith(
AttributeBuilder.build(name, value.substring(0, value.length() - 1)));
} else {
- throw new IllegalArgumentException(
- String.format("Unsupported search value %s", value));
+ throw new IllegalArgumentException("Unsupported search value %s".formatted(value));
}
if (ct == ConditionType.NOT_EQUALS) {
@@ -114,7 +113,7 @@ public class FilterVisitor extends AbstractSearchConditionVisitor<SearchBean, Fi
}
} else {
throw new IllegalArgumentException(
- String.format("Special attr name %s is not supported", specialAttrName));
+ "Special attr name %s is not supported".formatted(specialAttrName));
}
break;
@@ -135,7 +134,7 @@ public class FilterVisitor extends AbstractSearchConditionVisitor<SearchBean, Fi
break;
default:
- throw new IllegalArgumentException(String.format("Condition type %s is not supported", ct.name()));
+ throw new IllegalArgumentException("Condition type %s is not supported".formatted(ct.name()));
}
return leaf;
@@ -161,7 +160,7 @@ public class FilterVisitor extends AbstractSearchConditionVisitor<SearchBean, Fi
default:
throw new IllegalArgumentException(
- String.format("Condition type %s is not supported", sc.getConditionType().name()));
+ "Condition type %s is not supported".formatted(sc.getConditionType().name()));
}
return compound;
diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SyncopeAbstractSearchCondVisitor.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SyncopeAbstractSearchCondVisitor.java
index dd27c91d03..82449226b9 100644
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SyncopeAbstractSearchCondVisitor.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SyncopeAbstractSearchCondVisitor.java
@@ -61,8 +61,8 @@ public abstract class SyncopeAbstractSearchCondVisitor
}
protected static String getValue(final SearchCondition<SearchBean> sc) {
- String value = SearchUtils.toSqlWildcardString(URLDecoder.decode(sc.getStatement().getValue().toString()
- .replace("+", "%2B"), StandardCharsets.UTF_8), false);
+ String value = SearchUtils.toSqlWildcardString(URLDecoder.decode(sc.getStatement().getValue().
+ toString().replace("+", "%2B"), StandardCharsets.UTF_8), false);
if (value.indexOf('%') == -1) {
value = value.replaceAll("\\\\_", "_");
}
@@ -86,7 +86,7 @@ public abstract class SyncopeAbstractSearchCondVisitor
default:
throw new IllegalArgumentException(
- String.format("Condition type %s is not supported", sfsc.getOperator()));
+ "Condition type %s is not supported".formatted(sfsc.getOperator()));
}
}
@@ -183,7 +183,7 @@ public abstract class SyncopeAbstractSearchCondVisitor
default:
throw new IllegalArgumentException(
- String.format("Special attr name %s is not supported", specialAttrName));
+ "Special attr name %s is not supported".formatted(specialAttrName));
}
}
if (ct == ConditionType.NOT_EQUALS) {
@@ -217,7 +217,7 @@ public abstract class SyncopeAbstractSearchCondVisitor
break;
default:
- throw new IllegalArgumentException(String.format("Condition type %s is not supported", ct.name()));
+ throw new IllegalArgumentException("Condition type %s is not supported".formatted(ct.name()));
}
// SYNCOPE-1293: explicitly re-process to allow 'token==$null' or 'token!=$null'
@@ -256,7 +256,7 @@ public abstract class SyncopeAbstractSearchCondVisitor
default:
throw new IllegalArgumentException(
- String.format("Condition type %s is not supported", sc.getConditionType().name()));
+ "Condition type %s is not supported".formatted(sc.getConditionType().name()));
}
return compound;
diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/pushpull/PushActions.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/pushpull/PushActions.java
index bbeae66a4f..ad9cde856c 100644
--- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/pushpull/PushActions.java
+++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/pushpull/PushActions.java
@@ -18,7 +18,6 @@
*/
package org.apache.syncope.core.provisioning.api.pushpull;
-import java.util.Collections;
import java.util.Set;
import org.apache.syncope.common.lib.to.ProvisioningReport;
import org.apache.syncope.core.persistence.api.entity.Entity;
@@ -37,7 +36,7 @@ public interface PushActions extends ProvisioningActions {
* @return additional attributes to include in the result from the underlying connector
*/
default Set<String> moreAttrsToGet(ProvisioningProfile<?, ?> profile, Entity entity) {
- return Collections.emptySet();
+ return Set.of();
}
/**
diff --git a/core/provisioning-api/src/test/java/org/apache/syncope/core/provisioning/api/job/JobNamerTest.java b/core/provisioning-api/src/test/java/org/apache/syncope/core/provisioning/api/job/JobNamerTest.java
index 1195ed9463..75adbd9d0c 100644
--- a/core/provisioning-api/src/test/java/org/apache/syncope/core/provisioning/api/job/JobNamerTest.java
+++ b/core/provisioning-api/src/test/java/org/apache/syncope/core/provisioning/api/job/JobNamerTest.java
@@ -39,7 +39,7 @@ public class JobNamerTest extends AbstractTest {
assertTrue(JobNamer.getTaskKeyFromJobName(name).isEmpty());
String uuid = UUID.randomUUID().toString();
- name = String.format("taskJob%s", uuid);
+ name = "taskJob%s".formatted(uuid);
assertEquals(uuid, JobNamer.getTaskKeyFromJobName(name).orElseThrow());
}
@@ -49,7 +49,7 @@ public class JobNamerTest extends AbstractTest {
assertTrue(JobNamer.getTaskKeyFromJobName(name).isEmpty());
String uuid = UUID.randomUUID().toString();
- name = String.format("reportJob%s", uuid);
+ name = "reportJob%s".formatted(uuid);
assertEquals(uuid, JobNamer.getReportKeyFromJobName(name).orElseThrow());
}
diff --git a/core/provisioning-api/src/test/java/org/apache/syncope/core/provisioning/api/serialization/AttributeDeserializerTest.java b/core/provisioning-api/src/test/java/org/apache/syncope/core/provisioning/api/serialization/AttributeDeserializerTest.java
index 8f1f7030b3..a7a87984ee 100644
--- a/core/provisioning-api/src/test/java/org/apache/syncope/core/provisioning/api/serialization/AttributeDeserializerTest.java
+++ b/core/provisioning-api/src/test/java/org/apache/syncope/core/provisioning/api/serialization/AttributeDeserializerTest.java
@@ -19,6 +19,7 @@
package org.apache.syncope.core.provisioning.api.serialization;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.Mockito.when;
import com.fasterxml.jackson.core.JsonParser;
@@ -26,7 +27,6 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import java.io.IOException;
-import java.util.Collections;
import java.util.List;
import org.apache.syncope.core.provisioning.api.AbstractTest;
import org.identityconnectors.framework.common.objects.Attribute;
@@ -71,7 +71,8 @@ public class AttributeDeserializerTest extends AbstractTest {
when(node.isNull()).thenReturn(Boolean.TRUE);
Attribute attr = deserializer.deserialize(jp, ct);
assertEquals(name, attr.getName());
- assertEquals(Collections.singletonList(null), attr.getValue());
+ assertEquals(1, attr.getValue().size());
+ assertNull(attr.getValue().getFirst());
}
@Test
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultConnectorManager.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultConnectorManager.java
index ea15d07dcc..63b0a04051 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultConnectorManager.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultConnectorManager.java
@@ -54,7 +54,7 @@ public class DefaultConnectorManager implements ConnectorManager {
protected static final Logger LOG = LoggerFactory.getLogger(ConnectorManager.class);
protected static String getBeanName(final ExternalResource resource) {
- return String.format("%s-ConnInstance-%s-%s",
+ return "%s-ConnInstance-%s-%s".formatted(
AuthContextUtils.getDomain(), resource.getConnector().getKey(), resource.getKey());
}
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/TaskDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/TaskDataBinderImpl.java
index 48036dbf3c..b015989cfe 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/TaskDataBinderImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/TaskDataBinderImpl.java
@@ -362,7 +362,7 @@ public class TaskDataBinderImpl extends AbstractExecutableDatabinder implements
public SchedTask createSchedTask(final SchedTaskTO taskTO, final TaskUtils taskUtils) {
Class<? extends TaskTO> taskTOClass = taskUtils.getType().getToClass();
if (!taskTOClass.equals(taskTO.getClass())) {
- throw new IllegalArgumentException(String.format("Expected %s, found %s", taskTOClass, taskTO.getClass()));
+ throw new IllegalArgumentException("Expected %s, found %s".formatted(taskTOClass, taskTO.getClass()));
}
SchedTask task = taskUtils.newTask();
@@ -413,7 +413,7 @@ public class TaskDataBinderImpl extends AbstractExecutableDatabinder implements
public void updateSchedTask(final SchedTask task, final SchedTaskTO taskTO, final TaskUtils taskUtils) {
Class<? extends TaskTO> taskTOClass = taskUtils.getType().getToClass();
if (!taskTOClass.equals(taskTO.getClass())) {
- throw new IllegalArgumentException(String.format("Expected %s, found %s", taskTOClass, taskTO.getClass()));
+ throw new IllegalArgumentException("Expected %s, found %s".formatted(taskTOClass, taskTO.getClass()));
}
if (StringUtils.isBlank(taskTO.getName())) {
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractProvisioningJobDelegate.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractProvisioningJobDelegate.java
index 5e5f7d65f2..1328b35122 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractProvisioningJobDelegate.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractProvisioningJobDelegate.java
@@ -145,18 +145,18 @@ public abstract class AbstractProvisioningJobDelegate<T extends ProvisioningTask
if (level == TraceLevel.SUMMARY) {
// No per entry log in this case.
return null;
- } else if (level == TraceLevel.FAILURES && result.getStatus() == ProvisioningReport.Status.FAILURE) {
+ }
+ if (level == TraceLevel.FAILURES && result.getStatus() == ProvisioningReport.Status.FAILURE) {
// only report failures
- return String.format("Failed %s (key/name): %s/%s with message: %s",
+ return "Failed %s (key/name): %s/%s with message: %s".formatted(
result.getOperation(), result.getKey(), result.getName(), result.getMessage());
- } else {
- // All
- return String.format("%s %s (key/name): %s/%s %s",
- result.getOperation(), result.getStatus(), result.getKey(), result.getName(),
- StringUtils.isBlank(result.getMessage())
- ? StringUtils.EMPTY
- : "with message: " + result.getMessage());
}
+ // ALL
+ return "%s %s (key/name): %s/%s %s".formatted(
+ result.getOperation(), result.getStatus(), result.getKey(), result.getName(),
+ StringUtils.isBlank(result.getMessage())
+ ? StringUtils.EMPTY
+ : "with message: " + result.getMessage());
}).filter(Objects::nonNull).forEach(report -> sb.append(report).append('\n'));
return sb.toString();
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java
index 10b81ec9bf..47fb8d6fa3 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java
@@ -317,7 +317,7 @@ public abstract class AbstractPullResultHandler
AnyTO before = getAnyTO(match.getAny());
if (before == null) {
result.setStatus(ProvisioningReport.Status.FAILURE);
- result.setMessage(String.format("Any '%s(%s)' not found", provision.getAnyType(), match));
+ result.setMessage("Any '%s(%s)' not found".formatted(provision.getAnyType(), match));
} else {
result.setName(getName(before));
}
@@ -443,7 +443,7 @@ public abstract class AbstractPullResultHandler
if (before == null) {
result.setStatus(ProvisioningReport.Status.FAILURE);
- result.setMessage(String.format("Any '%s(%s)' not found", provision.getAnyType(), match));
+ result.setMessage("Any '%s(%s)' not found".formatted(provision.getAnyType(), match));
}
OpEvent.Outcome resultStatus = OpEvent.Outcome.SUCCESS;
@@ -557,7 +557,7 @@ public abstract class AbstractPullResultHandler
if (before == null) {
result.setStatus(ProvisioningReport.Status.FAILURE);
- result.setMessage(String.format("Any '%s(%s)' not found", provision.getAnyType(), match));
+ result.setMessage("Any '%s(%s)' not found".formatted(provision.getAnyType(), match));
}
OpEvent.Outcome resultStatus = OpEvent.Outcome.SUCCESS;
diff --git a/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/notification/DefaultNotificationManagerTest.java b/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/notification/DefaultNotificationManagerTest.java
index 8efdedc5eb..954650764d 100644
--- a/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/notification/DefaultNotificationManagerTest.java
+++ b/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/notification/DefaultNotificationManagerTest.java
@@ -28,7 +28,6 @@ import static org.mockito.Mockito.mockStatic;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -196,7 +195,7 @@ public class DefaultNotificationManagerTest {
when(userDAO.findById(beforeDelete.getKey())).thenReturn(Optional.empty());
Notification notification = mock(Notification.class);
- doReturn(Collections.singletonList(notification)).when(notificationDAO).findAll();
+ doReturn(List.of(notification)).when(notificationDAO).findAll();
when(notification.isActive()).thenReturn(true);
when(notification.getEvents()).thenReturn(List.of(DELETE_SUCCESS));
when(notification.getRecipientsFIQL()).thenReturn(null);
@@ -244,7 +243,7 @@ public class DefaultNotificationManagerTest {
@Test
void nullBeforeWithMissingEntityDoesNotThrow() {
Notification notification = mock(Notification.class);
- doReturn(Collections.singletonList(notification)).when(notificationDAO).findAll();
+ doReturn(List.of(notification)).when(notificationDAO).findAll();
when(notification.isActive()).thenReturn(true);
when(notification.getEvents()).thenReturn(List.of(DELETE_SUCCESS));
when(notification.getRecipientsFIQL()).thenReturn(null);
@@ -276,7 +275,7 @@ public class DefaultNotificationManagerTest {
null,
"delete",
OpEvent.Outcome.SUCCESS,
- null, // before is null
+ null, // before is null
null);
}
diff --git a/core/spring/src/main/java/org/apache/syncope/core/spring/security/MSEntraJWTSSOProvider.java b/core/spring/src/main/java/org/apache/syncope/core/spring/security/MSEntraJWTSSOProvider.java
index f07faa2703..5594affa7c 100644
--- a/core/spring/src/main/java/org/apache/syncope/core/spring/security/MSEntraJWTSSOProvider.java
+++ b/core/spring/src/main/java/org/apache/syncope/core/spring/security/MSEntraJWTSSOProvider.java
@@ -76,7 +76,7 @@ public class MSEntraJWTSSOProvider implements JWTSSOProvider {
@Override
public String getIssuer() {
- return String.format("https://sts.windows.net/%s/", tenantId);
+ return "https://sts.windows.net/%s/".formatted(tenantId);
}
@Override
diff --git a/core/spring/src/main/java/org/apache/syncope/core/spring/security/jws/MSEntraAccessTokenJWSVerifier.java b/core/spring/src/main/java/org/apache/syncope/core/spring/security/jws/MSEntraAccessTokenJWSVerifier.java
index b67c1d4700..c174ae4291 100644
--- a/core/spring/src/main/java/org/apache/syncope/core/spring/security/jws/MSEntraAccessTokenJWSVerifier.java
+++ b/core/spring/src/main/java/org/apache/syncope/core/spring/security/jws/MSEntraAccessTokenJWSVerifier.java
@@ -104,7 +104,7 @@ public class MSEntraAccessTokenJWSVerifier implements JWSVerifier {
String keyId = header.getKeyID();
JWSVerifier delegate = Optional.ofNullable(verifiersCache.get(keyId)).
orElseThrow(() -> new JOSEException(
- String.format("JSON Web Key Set cache could not retrieve a public key for given key id '%s'", keyId)));
+ "JSON Web Key Set cache could not retrieve a public key for given key id '%s'".formatted(keyId)));
return delegate.verify(header, signingInput, signature);
}
diff --git a/core/spring/src/main/java/org/apache/syncope/core/spring/security/jws/MSEntraJWSVerifierCacheLoader.java b/core/spring/src/main/java/org/apache/syncope/core/spring/security/jws/MSEntraJWSVerifierCacheLoader.java
index 71107c8940..a57fba3dab 100644
--- a/core/spring/src/main/java/org/apache/syncope/core/spring/security/jws/MSEntraJWSVerifierCacheLoader.java
+++ b/core/spring/src/main/java/org/apache/syncope/core/spring/security/jws/MSEntraJWSVerifierCacheLoader.java
@@ -61,10 +61,9 @@ public class MSEntraJWSVerifierCacheLoader implements CacheLoader<String, JWSVer
}
protected String getOpenIDMetadataDocumentUrl() {
- return String.format(
- "https://login.microsoftonline.com/%s/.well-known/openid-configuration%s",
+ return "https://login.microsoftonline.com/%s/.well-known/openid-configuration%s".formatted(
Optional.ofNullable(tenantId).orElse("common"),
- Optional.ofNullable(appId).map(i -> String.format("?appid=%s", i)).orElse(""));
+ Optional.ofNullable(appId).map(i -> "?appid=%s".formatted(i)).orElse(""));
}
protected String extractJwksUri(final String openIdMetadataDocument) {
@@ -83,13 +82,12 @@ public class MSEntraJWSVerifierCacheLoader implements CacheLoader<String, JWSVer
HttpRequest.newBuilder().uri(URI.create(url)).build(),
HttpResponse.BodyHandlers.ofString());
if (response.statusCode() >= 400) {
- throw new IllegalStateException(
- String.format("Received HTTP status code %d", response.statusCode()));
+ throw new IllegalStateException("Received HTTP status code %d".formatted(response.statusCode()));
}
return response.body();
} catch (IOException | InterruptedException | IllegalStateException e) {
throw new IllegalStateException(
- String.format("Fetching JSON document for Microsoft Entra from '%s' failed:", url), e);
+ "Fetching JSON document for Microsoft Entra from '%s' failed:".formatted(url), e);
}
}
diff --git a/core/spring/src/test/java/org/apache/syncope/core/spring/security/jws/MSEntraJWSVerifierCacheLoaderTest.java b/core/spring/src/test/java/org/apache/syncope/core/spring/security/jws/MSEntraJWSVerifierCacheLoaderTest.java
index 16bc837f23..0dd6816d6a 100644
--- a/core/spring/src/test/java/org/apache/syncope/core/spring/security/jws/MSEntraJWSVerifierCacheLoaderTest.java
+++ b/core/spring/src/test/java/org/apache/syncope/core/spring/security/jws/MSEntraJWSVerifierCacheLoaderTest.java
@@ -37,14 +37,13 @@ public class MSEntraJWSVerifierCacheLoaderTest extends AbstractTest {
void getOpenIDMetadataDocumentUrl() {
// Tenant id and app id
MSEntraJWSVerifierCacheLoader v1 = new MSEntraJWSVerifierCacheLoader(TENANT_ID, APP_ID);
- assertEquals(String.format(
- "https://login.microsoftonline.com/%s/.well-known/openid-configuration?appid=%s", TENANT_ID, APP_ID),
+ assertEquals("https://login.microsoftonline.com/%s/.well-known/openid-configuration?appid=%s".
+ formatted(TENANT_ID, APP_ID),
v1.getOpenIDMetadataDocumentUrl());
// Tenant id, no app id
MSEntraJWSVerifierCacheLoader v2 = new MSEntraJWSVerifierCacheLoader(TENANT_ID, null);
- assertEquals(
- String.format("https://login.microsoftonline.com/%s/.well-known/openid-configuration", TENANT_ID),
+ assertEquals("https://login.microsoftonline.com/%s/.well-known/openid-configuration".formatted(TENANT_ID),
v2.getOpenIDMetadataDocumentUrl());
// No tenant id, no app id
diff --git a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/NewBpmnProcess.java b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/NewBpmnProcess.java
index 5f95d87db8..a27fdd7d93 100644
--- a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/NewBpmnProcess.java
+++ b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/NewBpmnProcess.java
@@ -21,7 +21,6 @@ package org.apache.syncope.client.console.panels;
import jakarta.ws.rs.core.MediaType;
import java.io.Serializable;
import java.nio.charset.StandardCharsets;
-import org.apache.commons.io.IOUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.rest.BpmnProcessRestClient;
import org.apache.syncope.client.ui.commons.Constants;
@@ -60,8 +59,8 @@ public class NewBpmnProcess extends TogglePanel<Serializable> {
protected void onSubmit(final AjaxRequestTarget target) {
try {
bpmnProcessRestClient.setDefinition(MediaType.APPLICATION_XML_TYPE, key.getModelObject(),
- IOUtils.toString(
- NewBpmnProcess.class.getResourceAsStream("empty.bpmn20.xml"),
+ new String(
+ NewBpmnProcess.class.getResourceAsStream("empty.bpmn20.xml").readAllBytes(),
StandardCharsets.UTF_8).replaceAll("%KEY%", key.getModelObject()));
key.getModel().setObject(null);
diff --git a/ext/flowable/client-enduser/src/main/java/org/apache/syncope/client/enduser/pages/Flowable.java b/ext/flowable/client-enduser/src/main/java/org/apache/syncope/client/enduser/pages/Flowable.java
index 1e3743fc99..984a3eeb8f 100644
--- a/ext/flowable/client-enduser/src/main/java/org/apache/syncope/client/enduser/pages/Flowable.java
+++ b/ext/flowable/client-enduser/src/main/java/org/apache/syncope/client/enduser/pages/Flowable.java
@@ -81,8 +81,7 @@ public class Flowable extends BaseExtPage {
userRequestRestClient.startRequest(bpmnProcessModel.getObject());
} catch (Exception e) {
LOG.error("Unable to start bpmnProcess [{}]", bpmnProcessModel.getObject(), e);
- SyncopeEnduserSession.get()
- .error(String.format("Unable to start bpmnProcess [%s]", e.getMessage()));
+ SyncopeEnduserSession.get().error("Unable to start bpmnProcess [%s]".formatted(e.getMessage()));
getNotificationPanel().refresh(target);
}
target.add(container);
diff --git a/ext/oidcc4ui/client-console/src/main/java/org/apache/syncope/client/console/wizards/mapping/OIDCProviderMappingPanel.java b/ext/oidcc4ui/client-console/src/main/java/org/apache/syncope/client/console/wizards/mapping/OIDCProviderMappingPanel.java
index b2b8bd9289..fe5b359907 100644
--- a/ext/oidcc4ui/client-console/src/main/java/org/apache/syncope/client/console/wizards/mapping/OIDCProviderMappingPanel.java
+++ b/ext/oidcc4ui/client-console/src/main/java/org/apache/syncope/client/console/wizards/mapping/OIDCProviderMappingPanel.java
@@ -19,7 +19,7 @@
package org.apache.syncope.client.console.wizards.mapping;
import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
import org.apache.syncope.client.console.init.ClassPathScanImplementationLookup;
import org.apache.syncope.client.console.rest.AnyTypeClassRestClient;
@@ -105,7 +105,7 @@ public class OIDCProviderMappingPanel extends AbstractMappingPanel {
choices.addAll(anyTypeClassTO.getDerSchemas());
});
- Collections.sort(choices);
+ choices.sort(Comparator.naturalOrder());
toBeUpdated.setChoices(choices);
}
}
diff --git a/ext/saml2sp4ui/client-console/src/main/java/org/apache/syncope/client/console/wizards/mapping/SAML2IdPMappingPanel.java b/ext/saml2sp4ui/client-console/src/main/java/org/apache/syncope/client/console/wizards/mapping/SAML2IdPMappingPanel.java
index 70f82bc35f..2031966ac1 100644
--- a/ext/saml2sp4ui/client-console/src/main/java/org/apache/syncope/client/console/wizards/mapping/SAML2IdPMappingPanel.java
+++ b/ext/saml2sp4ui/client-console/src/main/java/org/apache/syncope/client/console/wizards/mapping/SAML2IdPMappingPanel.java
@@ -19,7 +19,7 @@
package org.apache.syncope.client.console.wizards.mapping;
import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
import org.apache.syncope.client.console.init.ClassPathScanImplementationLookup;
import org.apache.syncope.client.console.rest.AnyTypeClassRestClient;
@@ -72,7 +72,7 @@ public class SAML2IdPMappingPanel extends AbstractMappingPanel {
@Override
protected IModel<List<String>> getExtAttrNames() {
- return Model.ofList(Collections.singletonList("NameID"));
+ return Model.ofList(List.of("NameID"));
}
@Override
@@ -88,7 +88,7 @@ public class SAML2IdPMappingPanel extends AbstractMappingPanel {
choices.addAll(anyTypeClassTO.getDerSchemas());
});
- Collections.sort(choices);
+ choices.sort(Comparator.naturalOrder());
toBeUpdated.setChoices(choices);
}
}
diff --git a/ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2SP4UIUserManager.java b/ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2SP4UIUserManager.java
index 581670dbf9..8aa5d1a492 100644
--- a/ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2SP4UIUserManager.java
+++ b/ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2SP4UIUserManager.java
@@ -20,7 +20,6 @@ package org.apache.syncope.core.logic.saml2;
import java.text.ParseException;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -112,7 +111,7 @@ public class SAML2SP4UIUserManager {
}
if (idp.getConnObjectKeyItem().isEmpty()) {
LOG.warn("Unable to determine conn object key item for IdP: {}", idpKey);
- return Collections.emptyList();
+ return List.of();
}
return inboundMatcher.matchByConnObjectKeyValue(
idp.getConnObjectKeyItem().get(), connObjectKeyValue, AnyTypeKind.USER, null, false).stream().
diff --git a/ext/scimv2/client-console/src/main/java/org/apache/syncope/client/console/panels/mapping/SCIMExtensionMappingPanel.java b/ext/scimv2/client-console/src/main/java/org/apache/syncope/client/console/panels/mapping/SCIMExtensionMappingPanel.java
index e5e9d932d5..a847ed93ec 100644
--- a/ext/scimv2/client-console/src/main/java/org/apache/syncope/client/console/panels/mapping/SCIMExtensionMappingPanel.java
+++ b/ext/scimv2/client-console/src/main/java/org/apache/syncope/client/console/panels/mapping/SCIMExtensionMappingPanel.java
@@ -20,7 +20,7 @@ package org.apache.syncope.client.console.panels.mapping;
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.init.ClassPathScanImplementationLookup;
@@ -284,7 +284,7 @@ public class SCIMExtensionMappingPanel extends Panel {
choices.addAll(anyTypeClassTO.getDerSchemas());
});
- Collections.sort(choices);
+ choices.sort(Comparator.naturalOrder());
return Model.ofList(choices);
}
}
diff --git a/fit/core-reference/src/main/java-all/org/apache/syncope/fit/core/reference/flowable/PrintersValueProvider.java b/fit/core-reference/src/main/java-all/org/apache/syncope/fit/core/reference/flowable/PrintersValueProvider.java
index d61ad75b04..ef0ecb7484 100644
--- a/fit/core-reference/src/main/java-all/org/apache/syncope/fit/core/reference/flowable/PrintersValueProvider.java
+++ b/fit/core-reference/src/main/java-all/org/apache/syncope/fit/core/reference/flowable/PrintersValueProvider.java
@@ -60,7 +60,7 @@ public class PrintersValueProvider implements DropdownValueProvider {
AnyObject::getKey,
AnyObject::getName,
(u, v) -> {
- throw new IllegalStateException(String.format("Duplicate key %s", u));
+ throw new IllegalStateException("Duplicate key %s".formatted(u));
},
LinkedHashMap::new));
}
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AuditITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AuditITCase.java
index 36598d367c..1e3dff3cd4 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AuditITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AuditITCase.java
@@ -42,7 +42,6 @@ import java.util.Properties;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
-import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.SerializationUtils;
import org.apache.syncope.client.lib.SyncopeClient;
import org.apache.syncope.common.lib.Attr;
@@ -645,8 +644,9 @@ public class AuditITCase extends AbstractITCase {
logicActions.setKey("CustomAuditLogicActions");
logicActions.setEngine(ImplementationEngine.GROOVY);
logicActions.setType(IdRepoImplementationType.LOGIC_ACTIONS);
- logicActions.setBody(IOUtils.toString(
- getClass().getResourceAsStream("/CustomAuditLogicActions.groovy"), StandardCharsets.UTF_8));
+ logicActions.setBody(new String(
+ getClass().getResourceAsStream("/CustomAuditLogicActions.groovy").readAllBytes(),
+ StandardCharsets.UTF_8));
Response response = IMPLEMENTATION_SERVICE.create(logicActions);
logicActions = IMPLEMENTATION_SERVICE.read(
logicActions.getType(), response.getHeaderString(RESTHeaders.RESOURCE_KEY));
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MacroTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MacroTaskITCase.java
index f7b551e3a9..db4a65b154 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MacroTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MacroTaskITCase.java
@@ -31,7 +31,6 @@ import java.nio.charset.StandardCharsets;
import java.util.Locale;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
-import org.apache.commons.io.IOUtils;
import org.apache.syncope.common.lib.SyncopeClientException;
import org.apache.syncope.common.lib.command.CommandTO;
import org.apache.syncope.common.lib.form.FormProperty;
@@ -110,8 +109,9 @@ public class MacroTaskITCase extends AbstractITCase {
command.setKey("GroovyCommand");
command.setEngine(ImplementationEngine.GROOVY);
command.setType(IdRepoImplementationType.COMMAND);
- command.setBody(IOUtils.toString(
- MacroTaskITCase.class.getResourceAsStream("/GroovyCommand.groovy"), StandardCharsets.UTF_8));
+ command.setBody(new String(
+ MacroTaskITCase.class.getResourceAsStream("/GroovyCommand.groovy").readAllBytes(),
+ StandardCharsets.UTF_8));
Response response = IMPLEMENTATION_SERVICE.create(command);
command = IMPLEMENTATION_SERVICE.read(
command.getType(), response.getHeaderString(RESTHeaders.RESOURCE_KEY));
@@ -278,8 +278,9 @@ public class MacroTaskITCase extends AbstractITCase {
createMacroActionsIfNeeded(
"ProcessBuilderMacroActions",
ImplementationEngine.GROOVY,
- IOUtils.toString(
- getClass().getResourceAsStream("/ProcessBuilderMacroActions.groovy"), StandardCharsets.UTF_8));
+ new String(
+ getClass().getResourceAsStream("/ProcessBuilderMacroActions.groovy").readAllBytes(),
+ StandardCharsets.UTF_8));
MacroTaskTO task = new MacroTaskTO();
task.setName("groovySecuritySandbox" + UUID.randomUUID().toString());
@@ -305,8 +306,9 @@ public class MacroTaskITCase extends AbstractITCase {
createMacroActionsIfNeeded(
"BashMacroActions",
ImplementationEngine.GROOVY,
- IOUtils.toString(
- getClass().getResourceAsStream("/BashMacroActions.groovy"), StandardCharsets.UTF_8));
+ new String(
+ getClass().getResourceAsStream("/BashMacroActions.groovy").readAllBytes(),
+ StandardCharsets.UTF_8));
task = new MacroTaskTO();
task.setName("groovySecuritySandbox" + UUID.randomUUID().toString());
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PolicyITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PolicyITCase.java
index e21027cf68..5bcfcef9c0 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PolicyITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PolicyITCase.java
@@ -30,7 +30,6 @@ import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Set;
-import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.SerializationUtils;
import org.apache.syncope.common.lib.SyncopeClientException;
import org.apache.syncope.common.lib.policy.AccessPolicyTO;
@@ -75,8 +74,8 @@ public class PolicyITCase extends AbstractITCase {
corrRule.setKey("TestPullRule");
corrRule.setEngine(ImplementationEngine.GROOVY);
corrRule.setType(IdMImplementationType.INBOUND_CORRELATION_RULE);
- corrRule.setBody(IOUtils.toString(
- getClass().getResourceAsStream("/TestPullRule.groovy"), StandardCharsets.UTF_8));
+ corrRule.setBody(new String(
+ getClass().getResourceAsStream("/TestPullRule.groovy").readAllBytes(), StandardCharsets.UTF_8));
Response response = IMPLEMENTATION_SERVICE.create(corrRule);
corrRule = IMPLEMENTATION_SERVICE.read(
corrRule.getType(), response.getHeaderString(RESTHeaders.RESOURCE_KEY));
@@ -102,8 +101,8 @@ public class PolicyITCase extends AbstractITCase {
corrRule.setKey("TestPushRule");
corrRule.setEngine(ImplementationEngine.GROOVY);
corrRule.setType(IdMImplementationType.PUSH_CORRELATION_RULE);
- corrRule.setBody(IOUtils.toString(
- getClass().getResourceAsStream("/TestPushRule.groovy"), StandardCharsets.UTF_8));
+ corrRule.setBody(new String(
+ getClass().getResourceAsStream("/TestPushRule.groovy").readAllBytes(), StandardCharsets.UTF_8));
Response response = IMPLEMENTATION_SERVICE.create(corrRule);
corrRule = IMPLEMENTATION_SERVICE.read(
corrRule.getType(), response.getHeaderString(RESTHeaders.RESOURCE_KEY));
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PropagationTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PropagationTaskITCase.java
index 7939707bfd..65386f704b 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PropagationTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PropagationTaskITCase.java
@@ -609,7 +609,7 @@ public class PropagationTaskITCase extends AbstractTaskITCase {
page(1).
size(10).
build());
- Collections.sort(unorderedTasks.getResult(), (t1, t2) -> t1.getStart().compareTo(t2.getStart()));
+ unorderedTasks.getResult().sort((t1, t2) -> t1.getStart().compareTo(t2.getStart()));
assertNotNull(unorderedTasks);
assertFalse(unorderedTasks.getResult().isEmpty());
assertEquals(10, unorderedTasks.getResult().size());
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
index 8fe5ef14e7..a0122e812d 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
@@ -37,9 +37,9 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.time.OffsetDateTime;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -49,7 +49,6 @@ import java.util.Set;
import java.util.UUID;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
-import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.SerializationUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Strings;
@@ -483,7 +482,9 @@ public class PullTaskITCase extends AbstractTaskITCase {
assertNotNull(userConnObject);
assertEquals("odd", userConnObject.getAttr("title").orElseThrow().getValues().getFirst());
Attr userDn = userConnObject.getAttr(Name.NAME).orElseThrow();
- updateLdapRemoteObject(userDn.getValues().getFirst(), Collections.singletonMap("title", null));
+ Map<String, String> attributes = new HashMap<>();
+ attributes.put("title", null);
+ updateLdapRemoteObject(userDn.getValues().getFirst(), attributes);
// SYNCOPE-317
execSchedTask(TASK_SERVICE, TaskType.PULL, LDAP_PULL_TASK, MAX_WAIT_SECONDS, false);
@@ -551,8 +552,9 @@ public class PullTaskITCase extends AbstractTaskITCase {
transformer.setKey("PrefixItemTransformer");
transformer.setEngine(ImplementationEngine.GROOVY);
transformer.setType(IdRepoImplementationType.ITEM_TRANSFORMER);
- transformer.setBody(IOUtils.toString(
- getClass().getResourceAsStream("/PrefixItemTransformer.groovy"), StandardCharsets.UTF_8));
+ transformer.setBody(new String(
+ getClass().getResourceAsStream("/PrefixItemTransformer.groovy").readAllBytes(),
+ StandardCharsets.UTF_8));
Response response = IMPLEMENTATION_SERVICE.create(transformer);
transformer = IMPLEMENTATION_SERVICE.read(
transformer.getType(), response.getHeaderString(RESTHeaders.RESOURCE_KEY));
@@ -672,8 +674,9 @@ public class PullTaskITCase extends AbstractTaskITCase {
reconFilterBuilder.setKey("TestReconFilterBuilder");
reconFilterBuilder.setEngine(ImplementationEngine.GROOVY);
reconFilterBuilder.setType(IdMImplementationType.RECON_FILTER_BUILDER);
- reconFilterBuilder.setBody(IOUtils.toString(
- getClass().getResourceAsStream("/TestReconFilterBuilder.groovy"), StandardCharsets.UTF_8));
+ reconFilterBuilder.setBody(new String(
+ getClass().getResourceAsStream("/TestReconFilterBuilder.groovy").readAllBytes(),
+ StandardCharsets.UTF_8));
Response response = IMPLEMENTATION_SERVICE.create(reconFilterBuilder);
reconFilterBuilder = IMPLEMENTATION_SERVICE.read(
reconFilterBuilder.getType(), response.getHeaderString(RESTHeaders.RESOURCE_KEY));
@@ -1138,8 +1141,8 @@ public class PullTaskITCase extends AbstractTaskITCase {
corrRule.setKey("TestPullRule");
corrRule.setEngine(ImplementationEngine.GROOVY);
corrRule.setType(IdMImplementationType.INBOUND_CORRELATION_RULE);
- corrRule.setBody(IOUtils.toString(
- getClass().getResourceAsStream("/TestPullRule.groovy"), StandardCharsets.UTF_8));
+ corrRule.setBody(new String(
+ getClass().getResourceAsStream("/TestPullRule.groovy").readAllBytes(), StandardCharsets.UTF_8));
Response response = IMPLEMENTATION_SERVICE.create(corrRule);
corrRule = IMPLEMENTATION_SERVICE.read(
corrRule.getType(), response.getHeaderString(RESTHeaders.RESOURCE_KEY));
@@ -1585,8 +1588,9 @@ public class PullTaskITCase extends AbstractTaskITCase {
pullActions.setKey("AddResourcePullActions");
pullActions.setEngine(ImplementationEngine.GROOVY);
pullActions.setType(IdMImplementationType.INBOUND_ACTIONS);
- pullActions.setBody(IOUtils.toString(
- getClass().getResourceAsStream("/AddResourcePullActions.groovy"), StandardCharsets.UTF_8));
+ pullActions.setBody(new String(
+ getClass().getResourceAsStream("/AddResourcePullActions.groovy").readAllBytes(),
+ StandardCharsets.UTF_8));
Response response = IMPLEMENTATION_SERVICE.create(pullActions);
pullActions = IMPLEMENTATION_SERVICE.read(
pullActions.getType(), response.getHeaderString(RESTHeaders.RESOURCE_KEY));
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java
index 9da21a897c..4ee88229e6 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java
@@ -808,8 +808,9 @@ public class UserIssuesITCase extends AbstractITCase {
logicActions.setKey("DoubleValueLogicActions");
logicActions.setEngine(ImplementationEngine.GROOVY);
logicActions.setType(IdRepoImplementationType.LOGIC_ACTIONS);
- logicActions.setBody(org.apache.commons.io.IOUtils.toString(
- getClass().getResourceAsStream("/DoubleValueLogicActions.groovy"), StandardCharsets.UTF_8));
+ logicActions.setBody(new String(
+ getClass().getResourceAsStream("/DoubleValueLogicActions.groovy").readAllBytes(),
+ StandardCharsets.UTF_8));
Response response = IMPLEMENTATION_SERVICE.create(logicActions);
logicActions = IMPLEMENTATION_SERVICE.read(
logicActions.getType(), response.getHeaderString(RESTHeaders.RESOURCE_KEY));
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/wa/WebAuthnAccountITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/wa/WebAuthnAccountITCase.java
index e4ecb6887d..b114ca7305 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/wa/WebAuthnAccountITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/wa/WebAuthnAccountITCase.java
@@ -45,7 +45,7 @@ public class WebAuthnAccountITCase extends AbstractITCase {
+ " \"username\" : \"%s\""
+ " } ]";
WebAuthnDeviceCredential credential = new WebAuthnDeviceCredential.Builder().
- json(String.format(record, id, id, id)).
+ json(record.formatted(id, id, id)).
identifier("fFGyV3K5x1").
build();
return new WebAuthnAccount.Builder().credential(credential).build();
diff --git a/pom.xml b/pom.xml
index 4678aa6808..8f5a091aa5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2008,11 +2008,12 @@ under the License.
<plugin>
<groupId>org.gaul</groupId>
<artifactId>modernizer-maven-plugin</artifactId>
- <version>3.3.0</version>
+ <version>3.4.0</version>
<configuration>
<javaVersion>${targetJdk}</javaVersion>
<ignorePackages>
<ignorePackage>org.apache.syncope.core.persistence.jpa.entity</ignorePackage>
+ <ignorePackage>org.apache.syncope.ext.openfga.client</ignorePackage>
</ignorePackages>
<exclusions>
<exclusion>java/util/Optional.get:()Ljava/lang/Object;</exclusion>
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 255ece95b6..2bc69e7673 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
@@ -40,7 +40,6 @@ import java.security.cert.Certificate;
import java.security.cert.CertificateFactory;
import java.util.Base64;
import java.util.Date;
-import org.apache.commons.io.IOUtils;
import org.apache.syncope.common.rest.api.service.wa.WASAML2SPService;
import org.apache.syncope.wa.bootstrap.WARestClient;
import org.bouncycastle.asn1.ASN1EncodableVector;
@@ -135,9 +134,9 @@ public abstract class BaseWASAML2ClientTest {
}
protected static String getSPMetadata() throws IOException {
- return Base64.getEncoder().encodeToString(
- IOUtils.toString(new ClassPathResource("sp-metadata.xml").getInputStream(), StandardCharsets.UTF_8).
- getBytes(StandardCharsets.UTF_8));
+ return Base64.getEncoder().encodeToString(new String(
+ new ClassPathResource("sp-metadata.xml").getInputStream().readAllBytes(), StandardCharsets.UTF_8).
+ getBytes(StandardCharsets.UTF_8));
}
protected static WARestClient getWARestClient() throws Exception {
(syncope) 02/02: Upgrading CAS
Posted by il...@apache.org.
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
commit 20f12be87b4e76b2c6d480614fde92631dec1a0e
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Mon May 18 10:48:49 2026 +0200
Upgrading CAS
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 8f5a091aa5..34f5f8ea4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -467,7 +467,7 @@ under the License.
<pac4j.version>6.3.3</pac4j.version>
<opensaml.version>5.2.2</opensaml.version>
- <cas.version>7.3.7-SNAPSHOT</cas.version>
+ <cas.version>7.3.7</cas.version>
<cas-client.version>4.0.4</cas-client.version>
<swagger-core.version>2.2.50</swagger-core.version>