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 0ad6535b050f91be0903fcf807a35190b3a2fb07 Author: Francesco Chicchiriccò <[email protected]> AuthorDate: Tue May 12 13:25:42 2026 +0200 Upgrading Swagger Core --- .../ui/commons/resources/saml2sp4ui/AbstractSAML2SP4UIResource.java | 6 ++++-- pom.xml | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ext/saml2sp4ui/client-common-ui/src/main/java/org/apache/syncope/client/ui/commons/resources/saml2sp4ui/AbstractSAML2SP4UIResource.java b/ext/saml2sp4ui/client-common-ui/src/main/java/org/apache/syncope/client/ui/commons/resources/saml2sp4ui/AbstractSAML2SP4UIResource.java index ebc63db5cb..18502eaa96 100644 --- a/ext/saml2sp4ui/client-common-ui/src/main/java/org/apache/syncope/client/ui/commons/resources/saml2sp4ui/AbstractSAML2SP4UIResource.java +++ b/ext/saml2sp4ui/client-common-ui/src/main/java/org/apache/syncope/client/ui/commons/resources/saml2sp4ui/AbstractSAML2SP4UIResource.java @@ -23,6 +23,7 @@ import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import java.util.Base64; +import java.util.Optional; import java.util.stream.Stream; import org.apache.commons.lang3.StringUtils; import org.apache.syncope.client.ui.commons.SAML2SP4UIConstants; @@ -84,9 +85,10 @@ public abstract class AbstractSAML2SP4UIResource extends AbstractResource { response.setIdpEntityID(attributes.getRequest().getQueryParameters(). getParameterValue(SAML2SP4UIConstants.SAML2SP4UI_IDP_ENTITY_ID).toOptionalString()); if (StringUtils.isBlank(response.getIdpEntityID())) { - Stream.of(((HttpServletRequest) attributes.getRequest().getContainerRequest()).getCookies()). + Optional.ofNullable(((HttpServletRequest) attributes.getRequest().getContainerRequest()).getCookies()). + ifPresent(cookies -> Stream.of(cookies). filter(cookie -> SAML2SP4UIConstants.SAML2SP4UI_IDP_ENTITY_ID.equals(cookie.getName())). - findFirst().ifPresent(cookie -> response.setIdpEntityID(cookie.getValue())); + findFirst().ifPresent(cookie -> response.setIdpEntityID(cookie.getValue()))); } } diff --git a/pom.xml b/pom.xml index 830bb95041..85de570515 100644 --- a/pom.xml +++ b/pom.xml @@ -469,7 +469,7 @@ under the License. <cas.version>7.3.6</cas.version> <cas-client.version>4.0.4</cas-client.version> - <swagger-core.version>2.2.49</swagger-core.version> + <swagger-core.version>2.2.50</swagger-core.version> <swagger-ui.version>5.32.5</swagger-ui.version> <jquery-slimscroll.version>1.3.8</jquery-slimscroll.version> @@ -2221,7 +2221,7 @@ under the License. <link>https://docs.spring.io/spring-framework/docs/6.2.x/javadoc-api/</link> <link>https://docs.spring.io/spring-security/site/docs/6.5.x/api/</link> <link>https://developer-docs.flowable.com/javadocs/flowable-oss-javadoc/2025.1/</link> - <link>https://docs.swagger.io/swagger-core/v2.2.49/apidocs/</link> + <link>https://docs.swagger.io/swagger-core/v2.2.50/apidocs/</link> </links> <additionalOptions> <additionalOption>--legal-notices</additionalOption>
