From 52f20b5281314df4d04c4aa6e85d2bbb76bd986a Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 29 Jul 2020 18:18:05 -0700 Subject: [PATCH] Use parenthesis with single-arg lambdas Use regular expression search/replace to ensure all single-arg lambdas have parenthesis. This aligns with the style used in Spring Boot and ensure that single-arg and multi-arg lambdas are consistent. Issue gh-8945 --- .../acls/jdbc/BasicLookupStrategy.java | 4 +- .../src/main/java/lock/GlobalLockPlugin.java | 2 +- buildSrc/src/main/java/trang/TrangPlugin.java | 2 +- .../cas/web/CasAuthenticationFilterTests.java | 4 +- .../config/annotation/rsocket/JwtITests.java | 2 +- ...RSocketMessageHandlerConnectionITests.java | 2 +- .../rsocket/RSocketMessageHandlerITests.java | 6 +- .../rsocket/SimpleAuthenticationITests.java | 2 +- ...LdapProviderBeanDefinitionParserTests.java | 8 +- .../security/config/Customizer.java | 2 +- .../annotation/rsocket/RSocketSecurity.java | 4 +- ...ocketAcceptorInterceptorConfiguration.java | 4 +- .../annotation/web/builders/HttpSecurity.java | 120 +++++++++--------- .../OAuth2ClientConfiguration.java | 5 +- .../SecurityReactorContextConfiguration.java | 2 +- .../web/configurers/CsrfConfigurer.java | 2 +- .../DefaultLoginPageConfigurer.java | 2 +- .../oauth2/client/OAuth2LoginConfigurer.java | 2 +- .../OAuth2ResourceServerConfigurer.java | 2 +- .../saml2/Saml2LoginConfigurer.java | 2 +- .../RsaKeyConversionServicePostProcessor.java | 8 +- .../http/OAuth2LoginBeanDefinitionParser.java | 2 +- ...ientRegistrationsBeanDefinitionParser.java | 18 +-- .../config/web/server/ServerHttpSecurity.java | 58 ++++----- .../AuthenticationManagerBuilderTests.java | 2 +- .../NamespaceAuthenticationManagerTests.java | 10 +- .../AuthenticationConfigurationTests.java | 2 +- .../EnableReactiveMethodSecurityTests.java | 6 +- ...lobalMethodSecurityConfigurationTests.java | 2 +- .../NamespaceGlobalMethodSecurityTests.java | 2 +- ...curityConfigurerAdapterPowermockTests.java | 2 +- .../HttpSecurityConfigurationTests.java | 6 +- ...ntextConfigurationResourceServerTests.java | 2 +- ...urityReactorContextConfigurationTests.java | 8 +- .../WebSecurityConfigurationTests.java | 16 +-- .../configurers/AnonymousConfigurerTests.java | 6 +- .../configurers/AuthorizeRequestsTests.java | 8 +- .../ChannelSecurityConfigurerTests.java | 2 +- .../web/configurers/CorsConfigurerTests.java | 6 +- ...onfigurerIgnoringRequestMatchersTests.java | 12 +- .../web/configurers/CsrfConfigurerTests.java | 4 +- .../web/configurers/DefaultFiltersTests.java | 4 +- .../DefaultLoginPageConfigurerTests.java | 2 +- ...ingConfigurerAccessDeniedHandlerTests.java | 4 +- ...essionUrlAuthorizationConfigurerTests.java | 4 +- .../configurers/FormLoginConfigurerTests.java | 12 +- .../configurers/HeadersConfigurerTests.java | 34 ++--- .../configurers/HttpBasicConfigurerTests.java | 2 +- .../HttpSecurityRequestMatchersTests.java | 8 +- .../web/configurers/JeeConfigurerTests.java | 20 +-- .../configurers/LogoutConfigurerTests.java | 8 +- .../NamespaceHttpAnonymousTests.java | 2 +- .../configurers/NamespaceHttpBasicTests.java | 12 +- .../NamespaceHttpHeadersTests.java | 2 +- .../configurers/NamespaceHttpJeeTests.java | 2 +- .../configurers/NamespaceHttpLogoutTests.java | 14 +- .../NamespaceHttpOpenIDLoginTests.java | 6 +- ...aceHttpServerAccessDeniedHandlerTests.java | 8 +- .../configurers/NamespaceHttpX509Tests.java | 4 +- .../configurers/NamespaceRememberMeTests.java | 2 +- .../NamespaceSessionManagementTests.java | 6 +- .../PortMapperConfigurerTests.java | 8 +- .../RememberMeConfigurerTests.java | 10 +- .../RequestCacheConfigurerTests.java | 8 +- .../RequestMatcherConfigurerTests.java | 6 +- .../SecurityContextConfigurerTests.java | 2 +- .../ServletApiConfigurerTests.java | 2 +- .../SessionManagementConfigurerTests.java | 10 +- .../web/configurers/X509ConfigurerTests.java | 2 +- .../client/OAuth2ClientConfigurerTests.java | 4 +- .../client/OAuth2LoginConfigurerTests.java | 34 ++--- .../OAuth2ResourceServerConfigurerTests.java | 30 ++--- .../openid/OpenIDLoginConfigurerTests.java | 24 ++-- .../saml2/Saml2LoginConfigurerTests.java | 26 ++-- .../reactive/EnableWebFluxSecurityTests.java | 26 ++-- ...eyConversionServicePostProcessorTests.java | 4 +- .../security/config/doc/Element.java | 10 +- .../config/doc/SpringSecurityXsdParser.java | 16 +-- .../security/config/doc/XmlNode.java | 8 +- .../config/doc/XsdDocumentedTests.java | 36 +++--- .../security/config/http/CsrfConfigTests.java | 8 +- .../config/http/HttpCorsConfigTests.java | 2 +- .../config/http/HttpHeadersConfigTests.java | 4 +- .../config/http/InterceptUrlConfigTests.java | 2 +- .../config/http/MiscHttpConfigTests.java | 10 +- .../OAuth2LoginBeanDefinitionParserTests.java | 4 +- ...sourceServerBeanDefinitionParserTests.java | 2 +- .../config/http/OpenIDConfigTests.java | 4 +- .../http/SessionManagementConfigTests.java | 2 +- .../server/AuthorizeExchangeSpecTests.java | 6 +- .../config/web/server/CorsSpecTests.java | 4 +- .../server/ExceptionHandlingSpecTests.java | 20 +-- .../config/web/server/FormLoginTests.java | 8 +- .../config/web/server/HeaderSpecTests.java | 39 +++--- .../web/server/HttpsRedirectSpecTests.java | 4 +- .../config/web/server/LogoutSpecTests.java | 4 +- .../web/server/OAuth2ClientSpecTests.java | 10 +- .../config/web/server/OAuth2LoginTests.java | 18 +-- .../server/OAuth2ResourceServerSpecTests.java | 64 +++++----- .../config/web/server/RequestCacheTests.java | 5 +- .../web/server/ServerHttpSecurityTests.java | 59 ++++----- .../server/HtmlUnitWebTestClient.java | 22 ++-- .../server/MockWebResponseBuilder.java | 2 +- ...efaultMethodSecurityExpressionHandler.java | 2 +- .../MapBasedMethodSecurityMetadataSource.java | 2 +- ...rePostAdviceReactiveMethodInterceptor.java | 16 +-- ...rDetailsReactiveAuthenticationManager.java | 10 +- ...legatingReactiveAuthenticationManager.java | 2 +- .../ReactiveAuthenticationManagerAdapter.java | 4 +- ...enticatedReactiveAuthorizationManager.java | 2 +- ...AuthorityReactiveAuthorizationManager.java | 6 +- .../ReactiveAuthorizationManager.java | 4 +- .../security/converter/RsaKeyConverters.java | 4 +- .../ReactiveSecurityContextHolder.java | 6 +- .../AnnotationParameterNameDiscoverer.java | 6 +- .../MapReactiveUserDetailsService.java | 2 +- .../security/core/userdetails/User.java | 2 +- .../provisioning/JdbcUserDetailsManager.java | 16 +-- .../SecurityExpressionRootTests.java | 2 +- ...oryReactiveAuthenticationManagerTests.java | 2 +- .../jaas/JaasAuthenticationProviderTests.java | 2 +- ...elegatingSecurityContextRunnableTests.java | 2 +- .../ReactiveSecurityContextHolderTests.java | 6 +- .../core/userdetails/PasswordEncodedUser.java | 2 +- .../UserDetailsByNameServiceWrapperTests.java | 2 +- .../security/core/userdetails/UserTests.java | 9 +- .../ConcurrentSessionManagementTests.java | 2 +- .../SpringSecurityLdapTemplateITests.java | 2 +- .../DefaultLdapAuthoritiesPopulatorTests.java | 2 +- .../ldap/SpringSecurityLdapTemplate.java | 8 +- .../DefaultLdapAuthoritiesPopulator.java | 2 +- .../userdetails/LdapUserDetailsManager.java | 12 +- ...thenticationPrincipalArgumentResolver.java | 2 +- ...urrentSecurityContextArgumentResolver.java | 2 +- .../SimpDestinationMessageMatcher.java | 2 +- .../handler/invocation/ResolvableMethod.java | 26 ++-- ...tServiceOAuth2AuthorizedClientManager.java | 13 +- ...ReactiveOAuth2AuthorizedClientManager.java | 14 +- ...eactiveOAuth2AuthorizedClientProvider.java | 5 +- ...eactiveOAuth2AuthorizedClientProvider.java | 2 +- ...ReactiveOAuth2AuthorizedClientService.java | 6 +- ...OAuth2AuthorizedClientProviderBuilder.java | 18 +-- ...eactiveOAuth2AuthorizedClientProvider.java | 5 +- ...OAuth2AuthorizedClientProviderBuilder.java | 18 +-- ...eactiveOAuth2AuthorizedClientProvider.java | 5 +- ...tionCodeReactiveAuthenticationManager.java | 2 +- .../OAuth2LoginAuthenticationProvider.java | 2 +- ...th2LoginReactiveAuthenticationManager.java | 6 +- ...activeOAuth2AccessTokenResponseClient.java | 6 +- ...thorizationCodeAuthenticationProvider.java | 2 +- ...tionCodeReactiveAuthenticationManager.java | 16 +-- .../OidcIdTokenDecoderFactory.java | 11 +- .../ReactiveOidcIdTokenDecoderFactory.java | 11 +- .../OidcReactiveOAuth2UserService.java | 14 +- .../client/oidc/userinfo/OidcUserService.java | 6 +- ...ntInitiatedServerLogoutSuccessHandler.java | 6 +- .../registration/ClientRegistration.java | 2 +- .../DefaultReactiveOAuth2UserService.java | 15 ++- .../userinfo/DelegatingOAuth2UserService.java | 4 +- ...ultOAuth2AuthorizationRequestResolver.java | 2 +- .../DefaultOAuth2AuthorizedClientManager.java | 13 +- ...ReactiveOAuth2AuthorizedClientManager.java | 45 +++---- ...th2AuthorizationRequestRedirectFilter.java | 2 +- ...Auth2AuthorizedClientArgumentResolver.java | 2 +- ...uthorizedClientExchangeFilterFunction.java | 78 ++++++------ ...uthorizedClientExchangeFilterFunction.java | 66 +++++----- ...Auth2AuthorizedClientArgumentResolver.java | 9 +- ...verOAuth2AuthorizationRequestResolver.java | 10 +- ...OAuth2AuthorizationCodeGrantWebFilter.java | 22 ++-- ...AuthorizationRequestRedirectWebFilter.java | 4 +- ...ationCodeAuthenticationTokenConverter.java | 6 +- ...2ServerAuthorizationRequestRepository.java | 12 +- ...erverOAuth2AuthorizedClientRepository.java | 6 +- .../OAuth2AuthorizationContextTests.java | 2 +- .../client/OAuth2AuthorizeRequestTests.java | 4 +- ...2AuthorizedClientProviderBuilderTests.java | 16 ++- ...Auth2LoginAuthenticationProviderTests.java | 8 +- ...ginReactiveAuthenticationManagerTests.java | 2 +- ...orizationCodeTokenResponseClientTests.java | 2 +- ...ntCredentialsTokenResponseClientTests.java | 2 +- ...ctivePasswordTokenResponseClientTests.java | 6 +- ...eRefreshTokenTokenResponseClientTests.java | 4 +- .../OAuth2AuthenticationTokenMixinTests.java | 2 +- .../OAuth2AuthorizationRequestMixinTests.java | 6 +- .../OAuth2AuthorizedClientMixinTests.java | 2 +- ...zationCodeAuthenticationProviderTests.java | 14 +- ...odeReactiveAuthenticationManagerTests.java | 28 ++-- .../OidcIdTokenDecoderFactoryTests.java | 6 +- .../OidcIdTokenValidatorTests.java | 38 +++--- ...eactiveOidcIdTokenDecoderFactoryTests.java | 6 +- ...DefaultReactiveOAuth2UserServiceTests.java | 4 +- ...uth2AuthorizationRequestResolverTests.java | 15 ++- ...ultOAuth2AuthorizedClientManagerTests.java | 22 ++-- ...iveOAuth2AuthorizedClientManagerTests.java | 8 +- ...uth2AuthorizationCodeGrantFilterTests.java | 4 +- ...AuthorizedClientArgumentResolverTests.java | 2 +- ...zedClientExchangeFilterFunctionITests.java | 4 +- ...izedClientExchangeFilterFunctionTests.java | 28 ++-- ...zedClientExchangeFilterFunctionITests.java | 2 +- ...izedClientExchangeFilterFunctionTests.java | 29 +++-- ...uth2AuthorizationRequestResolverTests.java | 15 ++- ...2AuthorizationCodeGrantWebFilterTests.java | 18 +-- ...rizationRequestRedirectWebFilterTests.java | 6 +- ...erAuthorizationRequestRepositoryTests.java | 8 +- ...uth2LoginAuthenticationWebFilterTests.java | 2 +- .../endpoint/OAuth2AuthorizationRequest.java | 4 +- ...cessTokenResponseHttpMessageConverter.java | 2 +- .../OAuth2ErrorHttpMessageConverter.java | 2 +- ...Auth2AccessTokenResponseBodyExtractor.java | 2 +- .../converter/ClaimTypeConverterTests.java | 3 +- .../OAuth2AuthorizationRequestTests.java | 2 +- .../core/oidc/OidcIdTokenBuilderTests.java | 4 +- .../core/oidc/OidcUserInfoBuilderTests.java | 4 +- .../jwt/MappedJwtClaimSetConverter.java | 2 +- .../security/oauth2/jwt/NimbusJwtDecoder.java | 2 +- .../oauth2/jwt/NimbusReactiveJwtDecoder.java | 27 ++-- .../oauth2/jwt/ReactiveRemoteJWKSource.java | 6 +- .../security/oauth2/jwt/JwtBuilderTests.java | 8 +- .../oauth2/jwt/JwtClaimValidatorTests.java | 2 +- .../jwt/JwtTimestampValidatorTests.java | 4 +- .../jwt/NimbusJwtDecoderJwkSupportTests.java | 2 +- .../oauth2/jwt/NimbusJwtDecoderTests.java | 6 +- .../jwt/NimbusReactiveJwtDecoderTests.java | 17 ++- .../server/resource/BearerTokenError.java | 8 +- ...wtIssuerAuthenticationManagerResolver.java | 2 +- ...ReactiveAuthenticationManagerResolver.java | 8 +- .../JwtReactiveAuthenticationManager.java | 2 +- ...queTokenReactiveAuthenticationManager.java | 2 +- .../ReactiveJwtAuthenticationConverter.java | 2 +- .../NimbusOpaqueTokenIntrospector.java | 2 +- ...NimbusReactiveOpaqueTokenIntrospector.java | 8 +- .../web/BearerTokenAuthenticationFilter.java | 2 +- .../BearerTokenServerAccessDeniedHandler.java | 4 +- .../ServerBearerExchangeFilterFunction.java | 6 +- .../ServletBearerExchangeFilterFunction.java | 6 +- ...verBearerTokenAuthenticationConverter.java | 2 +- .../TestOAuth2AuthenticatedPrincipals.java | 2 +- .../JwtAuthenticationConverterTests.java | 2 +- .../JwtAuthenticationProviderTests.java | 4 +- ...uerAuthenticationManagerResolverTests.java | 2 +- ...iveAuthenticationManagerResolverTests.java | 4 +- ...paqueTokenAuthenticationProviderTests.java | 2 +- ...kenReactiveAuthenticationManagerTests.java | 2 +- ...activeJwtAuthenticationConverterTests.java | 2 +- ...antedAuthoritiesConverterAdapterTests.java | 2 +- .../NimbusOpaqueTokenIntrospectorTests.java | 4 +- ...sReactiveOpaqueTokenIntrospectorTests.java | 4 +- .../OpenIDAuthenticationFilterTests.java | 2 +- .../AnonymousPayloadInterceptor.java | 2 +- ...uthenticationPayloadExchangeConverter.java | 2 +- .../AuthenticationPayloadInterceptor.java | 4 +- ...uthenticationPayloadExchangeConverter.java | 4 +- .../AuthorizationPayloadInterceptor.java | 4 +- ...geMatcherReactiveAuthorizationManager.java | 6 +- .../core/ContextPayloadInterceptorChain.java | 2 +- .../core/PayloadInterceptorRSocket.java | 18 +-- .../rsocket/core/PayloadSocketAcceptor.java | 4 +- .../metadata/BasicAuthenticationDecoder.java | 4 +- .../metadata/BasicAuthenticationEncoder.java | 2 +- .../BearerTokenAuthenticationEncoder.java | 2 +- .../metadata/SimpleAuthenticationEncoder.java | 2 +- .../matcher/RoutePayloadExchangeMatcher.java | 4 +- ...AuthenticationPayloadInterceptorChain.java | 2 +- ...cherReactiveAuthorizationManagerTests.java | 6 +- .../CaptureSecurityContextSocketAcceptor.java | 2 +- .../core/PayloadInterceptorRSocketTests.java | 24 ++-- .../core/OpenSamlInitializationService.java | 4 +- .../OpenSamlAuthenticationProvider.java | 20 +-- .../OpenSamlAuthenticationRequestFactory.java | 9 +- .../Saml2AuthenticationRequest.java | 4 +- .../Saml2AuthenticationToken.java | 5 +- ...gistrationBuilderHttpMessageConverter.java | 11 +- .../RelyingPartyRegistration.java | 32 ++--- ...faultRelyingPartyRegistrationResolver.java | 2 +- .../OpenSamlInitializationServiceTests.java | 2 +- .../OpenSamlAuthenticationProviderTests.java | 4 +- ...SamlAuthenticationRequestFactoryTests.java | 14 +- ...aml2AuthenticationRequestFactoryTests.java | 10 +- .../OpenSamlMetadataResolverTests.java | 4 +- .../RelyingPartyRegistrationTests.java | 10 +- .../TestRelyingPartyRegistrations.java | 16 +-- ...ebSsoAuthenticationRequestFilterTests.java | 18 +-- ...enticationRequestContextResolverTests.java | 8 +- .../service/web/Saml2MetadataFilterTests.java | 6 +- .../sample/HelloRSocketApplicationITests.java | 2 +- .../HelloWebfluxMethodApplicationITests.java | 4 +- .../src/main/java/sample/SecurityConfig.java | 2 +- .../HelloWebfluxMethodApplicationTests.java | 4 +- .../sample/HelloWebfluxApplicationITests.java | 4 +- .../sample/HelloWebfluxApplicationTests.java | 4 +- .../HelloWebfluxFnApplicationITests.java | 4 +- .../main/java/sample/HelloUserController.java | 2 +- .../HelloWebfluxFnApplicationTests.java | 4 +- .../samples/config/SecurityConfig.java | 4 +- .../AuthorizationServerConfiguration.java | 2 +- .../sample/OAuth2LoginApplicationTests.java | 2 +- .../sample/OAuth2LoginControllerTests.java | 4 +- .../sample/OAuth2LoginApplicationTests.java | 10 +- .../web/OAuth2LoginControllerTests.java | 2 +- ...h2ResourceServerSecurityConfiguration.java | 4 +- .../boot/env/MockWebServerPropertySource.java | 12 +- ...h2ResourceServerSecurityConfiguration.java | 4 +- .../boot/env/MockWebServerPropertySource.java | 12 +- ...h2ResourceServerSecurityConfiguration.java | 6 +- .../OAuth2ResourceServerControllerTests.java | 4 +- ...h2ResourceServerSecurityConfiguration.java | 6 +- ...OAuth2ResourceServerApplicationITests.java | 4 +- .../src/main/java/sample/SecurityConfig.java | 4 +- .../OAuth2ResourceServerControllerTests.java | 10 +- ...h2ResourceServerSecurityConfiguration.java | 2 +- .../OAuth2ResourceServerControllerTests.java | 8 +- .../java/sample/config/SecurityConfig.java | 2 +- .../java/sample/config/SecurityConfig.java | 2 +- .../Saml2LoginIntegrationTests.java | 2 +- .../sample/WebfluxFormSecurityConfig.java | 4 +- .../src/main/java/sample/MeController.java | 2 +- .../java/sample/WebfluxX509Application.java | 2 +- .../sample/WebfluxX509ApplicationTest.java | 4 +- .../samples/config/SecurityConfig.java | 6 +- .../samples/config/SecurityConfig.java | 6 +- .../samples/config/SecurityConfig.java | 24 ++-- .../samples/config/SecurityConfig.java | 4 +- .../samples/config/SecurityConfig.java | 4 +- .../samples/config/SecurityConfig.java | 6 +- .../samples/config/SecurityConfigTests.java | 2 +- .../samples/config/SecurityConfig.java | 2 +- .../samples/cas/CasSampleProxyTests.java | 6 +- .../security/samples/pages/ContactsPage.java | 8 +- .../java/sample/contact/ContactDaoSpring.java | 6 +- .../sample/contact/DataSourcePopulator.java | 4 +- .../server/SecurityMockServerConfigurers.java | 22 ++-- .../SecurityMockMvcRequestPostProcessors.java | 10 +- ...ctorContextTestExecutionListenerTests.java | 6 +- ...yMockServerConfigurerOpaqueTokenTests.java | 11 +- ...kServerConfigurersClassAnnotatedTests.java | 6 +- ...SecurityMockServerConfigurersJwtTests.java | 12 +- ...ockServerConfigurersOAuth2ClientTests.java | 4 +- ...MockServerConfigurersOAuth2LoginTests.java | 11 +- ...tyMockServerConfigurersOidcLoginTests.java | 23 ++-- .../SecurityMockServerConfigurersTests.java | 2 +- ...yMockMvcRequestBuildersFormLoginTests.java | 2 +- ...MockMvcRequestBuildersFormLogoutTests.java | 2 +- ...ckMvcRequestPostProcessorsDigestTests.java | 2 +- ...yMockMvcRequestPostProcessorsJwtTests.java | 10 +- ...equestPostProcessorsOAuth2ClientTests.java | 4 +- ...RequestPostProcessorsOAuth2LoginTests.java | 12 +- ...vcRequestPostProcessorsOidcLoginTests.java | 8 +- ...RequestPostProcessorsOpaqueTokenTests.java | 13 +- .../SecurityMockMvcResultMatchersTests.java | 6 +- .../access/ExceptionTranslationFilter.java | 2 +- .../authentication/AuthenticationFilter.java | 2 +- .../logout/CookieClearingLogoutHandler.java | 2 +- .../ui/DefaultLoginPageGeneratingFilter.java | 2 +- .../ui/DefaultLogoutPageGeneratingFilter.java | 2 +- .../web/firewall/StrictHttpFirewall.java | 8 +- .../header/writers/CompositeHeaderWriter.java | 2 +- .../security/web/http/SecurityHeaders.java | 2 +- ...thenticationPrincipalArgumentResolver.java | 2 +- ...urrentSecurityContextArgumentResolver.java | 2 +- .../web/savedrequest/DefaultSavedRequest.java | 2 +- ...egatingServerAuthenticationEntryPoint.java | 10 +- .../server/MatcherSecurityWebFilterChain.java | 2 +- ...erverFormLoginAuthenticationConverter.java | 2 +- .../web/server/WebFilterChainProxy.java | 10 +- .../AnonymousAuthenticationWebFilter.java | 2 +- ...tionConverterServerWebExchangeMatcher.java | 4 +- .../AuthenticationWebFilter.java | 16 +-- ...ingServerAuthenticationSuccessHandler.java | 2 +- ...PreAuthenticatedAuthenticationManager.java | 2 +- ...ectServerAuthenticationSuccessHandler.java | 2 +- .../authentication/SwitchUserWebFilter.java | 16 +-- .../logout/DelegatingServerLogoutHandler.java | 2 +- .../logout/LogoutWebFilter.java | 6 +- .../authorization/AuthorizationWebFilter.java | 7 +- ...elegatingReactiveAuthorizationManager.java | 4 +- .../ExceptionTranslationWebFilter.java | 4 +- .../HttpStatusServerAccessDeniedHandler.java | 4 +- ...geDelegatingServerAccessDeniedHandler.java | 4 +- .../context/ReactorContextWebFilter.java | 2 +- .../SecurityContextServerWebExchange.java | 2 +- ...essionServerSecurityContextRepository.java | 6 +- .../web/server/csrf/CsrfWebFilter.java | 22 ++-- .../WebSessionServerCsrfTokenRepository.java | 8 +- .../CompositeServerHttpHeadersWriter.java | 2 +- .../CookieServerRequestCache.java | 8 +- .../ServerRequestCacheWebFilter.java | 4 +- .../WebSessionServerRequestCache.java | 8 +- .../transport/HttpsRedirectWebFilter.java | 6 +- .../ui/LoginPageGeneratingWebFilter.java | 4 +- .../ui/LogoutPageGeneratingWebFilter.java | 6 +- .../matcher/AndServerWebExchangeMatcher.java | 10 +- .../NegatedServerWebExchangeMatcher.java | 4 +- .../matcher/OrServerWebExchangeMatcher.java | 6 +- ...PatternParserServerWebExchangeMatcher.java | 4 +- .../web/session/ConcurrentSessionFilter.java | 2 +- .../security/web/util/ThrowableAnalyzer.java | 4 +- .../security/web/FilterChainProxyTests.java | 10 +- .../expression/WebExpressionVoterTests.java | 2 +- ...namePasswordAuthenticationFilterTests.java | 2 +- ...PreAuthenticatedProcessingFilterTests.java | 2 +- ...henticatedAuthenticationProviderTests.java | 2 +- ...estAttributeAuthenticationFilterTests.java | 2 +- ...equestHeaderAuthenticationFilterTests.java | 2 +- ...PreAuthenticatedProcessingFilterTests.java | 2 +- ...efaultLogoutPageGeneratingFilterTests.java | 2 +- .../www/DigestAuthenticationFilterTests.java | 2 +- .../web/firewall/StrictHttpFirewallTests.java | 12 +- .../JaasApiIntegrationFilterTests.java | 2 +- .../security/web/method/ResolvableMethod.java | 24 ++-- .../savedrequest/CookieRequestCacheTests.java | 2 +- .../HttpSessionRequestCacheTests.java | 2 +- .../web/server/WebFilterChainProxyTests.java | 2 +- .../AuthenticationWebFilterTests.java | 26 ++-- ...rverAuthenticationSuccessHandlerTests.java | 2 +- ...rverAuthenticationFailureHandlerTests.java | 2 +- .../SwitchUserWebFilterTests.java | 12 +- .../DelegatingServerLogoutHandlerTests.java | 2 +- .../logout/LogoutWebFilterTests.java | 2 +- .../AuthorizationWebFilterTests.java | 4 +- .../context/ReactorContextWebFilterTests.java | 4 +- ...ontextServerWebExchangeWebFilterTests.java | 20 +-- ...SessionServerCsrfTokenRepositoryTests.java | 2 +- ...CompositeServerHttpHeadersWriterTests.java | 6 +- .../CookieServerRequestCacheTests.java | 2 +- .../WebSessionServerRequestCacheTests.java | 2 +- .../ui/LoginPageGeneratingWebFilterTests.java | 4 +- 426 files changed, 1668 insertions(+), 1617 deletions(-) diff --git a/acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java b/acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java index 0b69010fd2..6258b27495 100644 --- a/acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java +++ b/acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java @@ -231,7 +231,7 @@ public class BasicLookupStrategy implements LookupStrategy { String sql = computeRepeatingSql(this.lookupPrimaryKeysWhereClause, findNow.size()); - Set parentsToLookup = this.jdbcTemplate.query(sql, ps -> { + Set parentsToLookup = this.jdbcTemplate.query(sql, (ps) -> { int i = 0; for (Long toFind : findNow) { @@ -358,7 +358,7 @@ public class BasicLookupStrategy implements LookupStrategy { // (including markers to each parent in the hierarchy) String sql = computeRepeatingSql(this.lookupObjectIdentitiesWhereClause, objectIdentities.size()); - Set parentsToLookup = this.jdbcTemplate.query(sql, ps -> { + Set parentsToLookup = this.jdbcTemplate.query(sql, (ps) -> { int i = 0; for (ObjectIdentity oid : objectIdentities) { // Determine prepared statement values for this iteration diff --git a/buildSrc/src/main/java/lock/GlobalLockPlugin.java b/buildSrc/src/main/java/lock/GlobalLockPlugin.java index 955e73e681..ee458eb0d4 100644 --- a/buildSrc/src/main/java/lock/GlobalLockPlugin.java +++ b/buildSrc/src/main/java/lock/GlobalLockPlugin.java @@ -9,7 +9,7 @@ import org.gradle.api.Project; public class GlobalLockPlugin implements Plugin { @Override public void apply(Project project) { - project.getTasks().register("writeLocks", GlobalLockTask.class, writeAll -> { + project.getTasks().register("writeLocks", GlobalLockTask.class, (writeAll) -> { writeAll.setDescription("Writes the locks for all projects"); }); } diff --git a/buildSrc/src/main/java/trang/TrangPlugin.java b/buildSrc/src/main/java/trang/TrangPlugin.java index d447b64bb4..02ca3746ad 100644 --- a/buildSrc/src/main/java/trang/TrangPlugin.java +++ b/buildSrc/src/main/java/trang/TrangPlugin.java @@ -10,7 +10,7 @@ import org.gradle.api.Project; public class TrangPlugin implements Plugin { @Override public void apply(Project project) { - project.getTasks().register("rncToXsd", RncToXsd.class, rncToXsd -> { + project.getTasks().register("rncToXsd", RncToXsd.class, (rncToXsd) -> { rncToXsd.setDescription("Converts .rnc to .xsd"); rncToXsd.setGroup("Build"); }); diff --git a/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationFilterTests.java b/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationFilterTests.java index f8c141f7b4..e37c07619f 100644 --- a/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationFilterTests.java +++ b/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationFilterTests.java @@ -71,7 +71,7 @@ public class CasAuthenticationFilterTests { request.addParameter("ticket", "ST-0-ER94xMJmn6pha35CQRoZ"); CasAuthenticationFilter filter = new CasAuthenticationFilter(); - filter.setAuthenticationManager(a -> a); + filter.setAuthenticationManager((a) -> a); assertThat(filter.requiresAuthentication(request, new MockHttpServletResponse())).isTrue(); @@ -82,7 +82,7 @@ public class CasAuthenticationFilterTests { @Test(expected = AuthenticationException.class) public void testNullServiceTicketHandledGracefully() throws Exception { CasAuthenticationFilter filter = new CasAuthenticationFilter(); - filter.setAuthenticationManager(a -> { + filter.setAuthenticationManager((a) -> { throw new BadCredentialsException("Rejected"); }); diff --git a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/JwtITests.java b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/JwtITests.java index b5d412b8a0..4ef09c80d9 100644 --- a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/JwtITests.java +++ b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/JwtITests.java @@ -155,7 +155,7 @@ public class JwtITests { @Bean PayloadSocketAcceptorInterceptor rsocketInterceptor(RSocketSecurity rsocket) { - rsocket.authorizePayload(authorize -> authorize.anyRequest().authenticated().anyExchange().permitAll()) + rsocket.authorizePayload((authorize) -> authorize.anyRequest().authenticated().anyExchange().permitAll()) .jwt(Customizer.withDefaults()); return rsocket.build(); } diff --git a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java index 9f6ed43885..01c3095b9f 100644 --- a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java +++ b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java @@ -244,7 +244,7 @@ public class RSocketMessageHandlerConnectionITests { @Bean PayloadSocketAcceptorInterceptor rsocketInterceptor(RSocketSecurity rsocket) { - rsocket.authorizePayload(authorize -> authorize.setup().hasRole("SETUP").route("secure.admin.*") + rsocket.authorizePayload((authorize) -> authorize.setup().hasRole("SETUP").route("secure.admin.*") .hasRole("ADMIN").route("secure.**").hasRole("USER").route("secure.authority.*") .hasAuthority("ROLE_USER").route("management.*").hasAnyAuthority("ROLE_ADMIN").route("prohibit") .denyAll().anyRequest().permitAll()).basicAuthentication(Customizer.withDefaults()); diff --git a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java index 4997af8aed..ebe6c0f996 100644 --- a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java +++ b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java @@ -81,7 +81,7 @@ public class RSocketMessageHandlerITests { .transport(TcpServerTransport.create("localhost", 0)).start().block(); this.requester = RSocketRequester.builder() - // .rsocketFactory(factory -> + // .rsocketFactory((factory) -> // factory.addRequesterPlugin(payloadInterceptor)) .rsocketStrategies(this.handler.getRSocketStrategies()) .connectTcp("localhost", this.server.address().getPort()).block(); @@ -221,7 +221,7 @@ public class RSocketMessageHandlerITests { @Bean PayloadSocketAcceptorInterceptor rsocketInterceptor(RSocketSecurity rsocket) { - rsocket.authorizePayload(authorize -> { + rsocket.authorizePayload((authorize) -> { authorize.route("secure.*").authenticated().anyExchange().permitAll(); }).basicAuthentication(Customizer.withDefaults()); return rsocket.build(); @@ -242,7 +242,7 @@ public class RSocketMessageHandlerITests { @MessageMapping({ "secure.retrieve-flux", "retrieve-flux" }) Flux retrieveFlux(Flux payload) { - return payload.doOnNext(this::add).map(p -> "hello " + p); + return payload.doOnNext(this::add).map((p) -> "hello " + p); } @MessageMapping({ "secure.send", "send" }) diff --git a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/SimpleAuthenticationITests.java b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/SimpleAuthenticationITests.java index 6dc34ec2dd..2598c152cb 100644 --- a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/SimpleAuthenticationITests.java +++ b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/SimpleAuthenticationITests.java @@ -139,7 +139,7 @@ public class SimpleAuthenticationITests { @Bean PayloadSocketAcceptorInterceptor rsocketInterceptor(RSocketSecurity rsocket) { - rsocket.authorizePayload(authorize -> authorize.anyRequest().authenticated().anyExchange().permitAll()) + rsocket.authorizePayload((authorize) -> authorize.anyRequest().authenticated().anyExchange().permitAll()) .simpleAuthentication(Customizer.withDefaults()); return rsocket.build(); } diff --git a/config/src/integration-test/java/org/springframework/security/config/ldap/LdapProviderBeanDefinitionParserTests.java b/config/src/integration-test/java/org/springframework/security/config/ldap/LdapProviderBeanDefinitionParserTests.java index 250197b140..01edcd9f47 100644 --- a/config/src/integration-test/java/org/springframework/security/config/ldap/LdapProviderBeanDefinitionParserTests.java +++ b/config/src/integration-test/java/org/springframework/security/config/ldap/LdapProviderBeanDefinitionParserTests.java @@ -135,8 +135,8 @@ public class LdapProviderBeanDefinitionParserTests { ProviderManager providerManager = this.appCtx.getBean(BeanIds.AUTHENTICATION_MANAGER, ProviderManager.class); assertThat(providerManager.getProviders()).hasSize(1); - assertThat(providerManager.getProviders()).extracting("userDetailsContextMapper") - .allSatisfy(contextMapper -> assertThat(contextMapper).isInstanceOf(InetOrgPersonContextMapper.class)); + assertThat(providerManager.getProviders()).extracting("userDetailsContextMapper").allSatisfy( + (contextMapper) -> assertThat(contextMapper).isInstanceOf(InetOrgPersonContextMapper.class)); } @Test @@ -153,10 +153,10 @@ public class LdapProviderBeanDefinitionParserTests { AuthenticationProvider authenticationProvider = providerManager.getProviders().get(0); assertThat(authenticationProvider).extracting("authenticator.userDnFormat") - .satisfies(messageFormats -> assertThat(messageFormats) + .satisfies((messageFormats) -> assertThat(messageFormats) .isEqualTo(new MessageFormat[] { new MessageFormat("uid={0},ou=people") })); assertThat(authenticationProvider).extracting("authoritiesPopulator.groupSearchFilter") - .satisfies(searchFilter -> assertThat(searchFilter).isEqualTo("member={0}")); + .satisfies((searchFilter) -> assertThat(searchFilter).isEqualTo("member={0}")); } } diff --git a/config/src/main/java/org/springframework/security/config/Customizer.java b/config/src/main/java/org/springframework/security/config/Customizer.java index 8433a3c7de..fc68b127e0 100644 --- a/config/src/main/java/org/springframework/security/config/Customizer.java +++ b/config/src/main/java/org/springframework/security/config/Customizer.java @@ -37,7 +37,7 @@ public interface Customizer { * @return a {@link Customizer} that does not alter the input argument. */ static Customizer withDefaults() { - return t -> { + return (t) -> { }; } diff --git a/config/src/main/java/org/springframework/security/config/annotation/rsocket/RSocketSecurity.java b/config/src/main/java/org/springframework/security/config/annotation/rsocket/RSocketSecurity.java index ab47073dab..85bde9ee27 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/rsocket/RSocketSecurity.java +++ b/config/src/main/java/org/springframework/security/config/annotation/rsocket/RSocketSecurity.java @@ -60,7 +60,7 @@ import org.springframework.security.rsocket.util.matcher.RoutePayloadExchangeMat * @Bean * PayloadSocketAcceptorInterceptor rsocketInterceptor(RSocketSecurity rsocket) { * rsocket - * .authorizePayload(authorize -> + * .authorizePayload((authorize) -> * authorize * .anyRequest().authenticated() * ); @@ -87,7 +87,7 @@ import org.springframework.security.rsocket.util.matcher.RoutePayloadExchangeMat * @Bean * PayloadSocketAcceptorInterceptor rsocketInterceptor(RSocketSecurity rsocket) { * rsocket - * .authorizePayload(authorize -> + * .authorizePayload((authorize) -> * authorize * // must have ROLE_SETUP to make connection * .setup().hasRole("SETUP") diff --git a/config/src/main/java/org/springframework/security/config/annotation/rsocket/SecuritySocketAcceptorInterceptorConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/rsocket/SecuritySocketAcceptorInterceptorConfiguration.java index 57804f171f..7e36fbfcde 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/rsocket/SecuritySocketAcceptorInterceptorConfiguration.java +++ b/config/src/main/java/org/springframework/security/config/annotation/rsocket/SecuritySocketAcceptorInterceptorConfiguration.java @@ -47,8 +47,8 @@ class SecuritySocketAcceptorInterceptorConfiguration { throw new NoSuchBeanDefinitionException("No RSocketSecurity defined"); } rsocket.basicAuthentication(Customizer.withDefaults()).simpleAuthentication(Customizer.withDefaults()) - .authorizePayload(authz -> authz.setup().authenticated().anyRequest().authenticated() - .matcher(e -> MatchResult.match()).permitAll()); + .authorizePayload((authz) -> authz.setup().authenticated().anyRequest().authenticated() + .matcher((e) -> MatchResult.match()).permitAll()); return rsocket.build(); } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java b/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java index cfeedfd26d..002676eef2 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java @@ -260,11 +260,11 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder + * .authorizeRequests((authorizeRequests) -> * authorizeRequests * .antMatchers("/**").hasRole("USER") * ) - * .openidLogin(openidLogin -> + * .openidLogin((openidLogin) -> * openidLogin * .permitAll() * ); @@ -293,48 +293,48 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder + * http.authorizeRequests((authorizeRequests) -> * authorizeRequests * .antMatchers("/**").hasRole("USER") * ) - * .openidLogin(openidLogin -> + * .openidLogin((openidLogin) -> * openidLogin * .loginPage("/login") * .permitAll() * .authenticationUserDetailsService( * new AutoProvisioningUserDetailsService()) - * .attributeExchange(googleExchange -> + * .attributeExchange((googleExchange) -> * googleExchange * .identifierPattern("https://www.google.com/.*") - * .attribute(emailAttribute -> + * .attribute((emailAttribute) -> * emailAttribute * .name("email") * .type("https://axschema.org/contact/email") * .required(true) * ) - * .attribute(firstnameAttribute -> + * .attribute((firstnameAttribute) -> * firstnameAttribute * .name("firstname") * .type("https://axschema.org/namePerson/first") * .required(true) * ) - * .attribute(lastnameAttribute -> + * .attribute((lastnameAttribute) -> * lastnameAttribute * .name("lastname") * .type("https://axschema.org/namePerson/last") * .required(true) * ) * ) - * .attributeExchange(yahooExchange -> + * .attributeExchange((yahooExchange) -> * yahooExchange * .identifierPattern(".*yahoo.com.*") - * .attribute(emailAttribute -> + * .attribute((emailAttribute) -> * emailAttribute * .name("email") * .type("https://schema.openid.net/contact/email") * .required(true) * ) - * .attribute(fullnameAttribute -> + * .attribute((fullnameAttribute) -> * fullnameAttribute * .name("fullname") * .type("https://axschema.org/namePerson") @@ -488,7 +488,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder + * .headers((headers) -> * headers * .contentTypeOptions(withDefaults()) * .xssProtection(withDefaults()) @@ -510,7 +510,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder headers.disable()); + * .headers((headers) -> headers.disable()); * } * } * @@ -529,7 +529,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder + * .headers((headers) -> * headers * .defaultsDisabled() * .cacheControl(withDefaults()) @@ -551,9 +551,9 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder + * .headers((headers) -> * headers - * .frameOptions(frameOptions -> frameOptions.disable()) + * .frameOptions((frameOptions) -> frameOptions.disable()) * ); * } * @@ -677,17 +677,17 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder + * .authorizeRequests((authorizeRequests) -> * authorizeRequests * .anyRequest().hasRole("USER") * ) - * .formLogin(formLogin -> + * .formLogin((formLogin) -> * formLogin * .permitAll() * ) - * .sessionManagement(sessionManagement -> + * .sessionManagement((sessionManagement) -> * sessionManagement - * .sessionConcurrency(sessionConcurrency -> + * .sessionConcurrency((sessionConcurrency) -> * sessionConcurrency * .maximumSessions(1) * .expiredUrl("/login?expired") @@ -788,11 +788,11 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder + * .requiresChannel((requiresChannel) -> * requiresChannel * .anyRequest().requiresSecure() * ) - * .portMapper(portMapper -> + * .portMapper((portMapper) -> * portMapper * .http(9090).mapsTo(9443) * .http(80).mapsTo(443) @@ -901,11 +901,11 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder + * .authorizeRequests((authorizeRequests) -> * authorizeRequests * .antMatchers("/**").hasRole("USER") * ) - * .jee(jee -> + * .jee((jee) -> * jee * .mappableRoles("USER", "ADMIN") * ); @@ -1009,7 +1009,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder + * .authorizeRequests((authorizeRequests) -> * authorizeRequests * .antMatchers("/**").hasRole("USER") * ) @@ -1081,7 +1081,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder + * .authorizeRequests((authorizeRequests) -> * authorizeRequests * .antMatchers("/**").hasRole("USER") * ) @@ -1188,7 +1188,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder + * .authorizeRequests((authorizeRequests) -> * authorizeRequests * .antMatchers("/**").hasRole("USER") * ) @@ -1209,7 +1209,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder + * .authorizeRequests((authorizeRequests) -> * authorizeRequests * .antMatchers("/admin/**").hasRole("ADMIN") * .antMatchers("/**").hasRole("USER") @@ -1231,7 +1231,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder + * .authorizeRequests((authorizeRequests) -> * authorizeRequests * .antMatchers("/**").hasRole("USER") * .antMatchers("/admin/**").hasRole("ADMIN") @@ -1286,11 +1286,11 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder + * .authorizeRequests((authorizeRequests) -> * authorizeRequests * .antMatchers("/**").hasRole("USER") * ) - * .requestCache(requestCache -> + * .requestCache((requestCache) -> * requestCache.disable() * ); * } @@ -1334,12 +1334,12 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder + * .authorizeRequests((authorizeRequests) -> * authorizeRequests * .antMatchers("/**").hasRole("USER") * ) * // sample exception handling customization - * .exceptionHandling(exceptionHandling -> + * .exceptionHandling((exceptionHandling) -> * exceptionHandling * .accessDeniedPage("/errors/access-denied") * ); @@ -1383,7 +1383,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder + * .securityContext((securityContext) -> * securityContext * .securityContextRepository(SCR) * ); @@ -1425,7 +1425,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder + * .servletApi((servletApi) -> * servletApi.disable() * ); * } @@ -1481,7 +1481,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder csrf.disable()); + * .csrf((csrf) -> csrf.disable()); * } * } * @@ -1557,13 +1557,13 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder + * .authorizeRequests((authorizeRequests) -> * authorizeRequests * .antMatchers("/**").hasRole("USER") * ) * .formLogin(withDefaults()) * // sample logout customization - * .logout(logout -> + * .logout((logout) -> * logout.deleteCookies("remove") * .invalidateHttpSession(false) * .logoutUrl("/custom-logout") @@ -1672,13 +1672,13 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder + * .authorizeRequests((authorizeRequests) -> * authorizeRequests * .antMatchers("/**").hasRole("USER") * ) * .formLogin(withDefaults()) * // sample anonymous customization - * .anonymous(anonymous -> + * .anonymous((anonymous) -> * anonymous * .authorities("ROLE_ANON") * ) @@ -1698,13 +1698,13 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder + * .authorizeRequests((authorizeRequests) -> * authorizeRequests * .antMatchers("/**").hasRole("USER") * ) * .formLogin(withDefaults()) * // sample anonymous customization - * .anonymous(anonymous -> + * .anonymous((anonymous) -> * anonymous.disable() * ); * } @@ -1807,7 +1807,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder + * .authorizeRequests((authorizeRequests) -> * authorizeRequests * .antMatchers("/**").hasRole("USER") * ) @@ -1826,11 +1826,11 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder + * .authorizeRequests((authorizeRequests) -> * authorizeRequests * .antMatchers("/**").hasRole("USER") * ) - * .formLogin(formLogin -> + * .formLogin((formLogin) -> * formLogin * .usernameParameter("username") * .passwordParameter("password") @@ -2184,7 +2184,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder + * .authorizeRequests((authorizeRequests) -> * authorizeRequests * .anyRequest().authenticated() * ) @@ -2268,7 +2268,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder + * .authorizeRequests((authorizeRequests) -> * authorizeRequests * .anyRequest().authenticated() * ) @@ -2325,13 +2325,13 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder + * .authorizeRequests((authorizeRequests) -> * authorizeRequests * .anyRequest().authenticated() * ) - * .oauth2ResourceServer(oauth2ResourceServer -> + * .oauth2ResourceServer((oauth2ResourceServer) -> * oauth2ResourceServer - * .jwt(jwt -> + * .jwt((jwt) -> * jwt * .decoder(jwtDecoder()) * ) @@ -2418,12 +2418,12 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder + * .authorizeRequests((authorizeRequests) -> * authorizeRequests * .antMatchers("/**").hasRole("USER") * ) * .formLogin(withDefaults()) - * .requiresChannel(requiresChannel -> + * .requiresChannel((requiresChannel) -> * requiresChannel * .anyRequest().requiresSecure() * ); @@ -2492,7 +2492,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder + * .authorizeRequests((authorizeRequests) -> * authorizeRequests * .antMatchers("/**").hasRole("USER") * ) @@ -2727,11 +2727,11 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder + * .requestMatchers((requestMatchers) -> * requestMatchers * .antMatchers("/api/**", "/oauth/**") * ) - * .authorizeRequests(authorizeRequests -> + * .authorizeRequests((authorizeRequests) -> * authorizeRequests * .antMatchers("/**").hasRole("USER") * ) @@ -2750,12 +2750,12 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder + * .requestMatchers((requestMatchers) -> * requestMatchers * .antMatchers("/api/**") * .antMatchers("/oauth/**") * ) - * .authorizeRequests(authorizeRequests -> + * .authorizeRequests((authorizeRequests) -> * authorizeRequests * .antMatchers("/**").hasRole("USER") * ) @@ -2774,15 +2774,15 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder + * .requestMatchers((requestMatchers) -> * requestMatchers * .antMatchers("/api/**") * ) - * .requestMatchers(requestMatchers -> + * .requestMatchers((requestMatchers) -> * requestMatchers * .antMatchers("/oauth/**") * ) - * .authorizeRequests(authorizeRequests -> + * .authorizeRequests((authorizeRequests) -> * authorizeRequests * .antMatchers("/**").hasRole("USER") * ) diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/OAuth2ClientConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/OAuth2ClientConfiguration.java index 98c7fcc37a..9b6e11ec87 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/OAuth2ClientConfiguration.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/OAuth2ClientConfiguration.java @@ -119,9 +119,8 @@ final class OAuth2ClientConfiguration { if (this.clientRegistrationRepository != null && this.authorizedClientRepository != null) { if (this.accessTokenResponseClient != null) { OAuth2AuthorizedClientProvider authorizedClientProvider = OAuth2AuthorizedClientProviderBuilder - .builder().authorizationCode().refreshToken() - .clientCredentials( - configurer -> configurer.accessTokenResponseClient(this.accessTokenResponseClient)) + .builder().authorizationCode().refreshToken().clientCredentials((configurer) -> configurer + .accessTokenResponseClient(this.accessTokenResponseClient)) .password().build(); DefaultOAuth2AuthorizedClientManager defaultAuthorizedClientManager = new DefaultOAuth2AuthorizedClientManager( this.clientRegistrationRepository, this.authorizedClientRepository); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/SecurityReactorContextConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/SecurityReactorContextConfiguration.java index 72c6d92801..2e59665ff4 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/SecurityReactorContextConfiguration.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/SecurityReactorContextConfiguration.java @@ -72,7 +72,7 @@ class SecurityReactorContextConfiguration { Function, ? extends Publisher> lifter = Operators .liftPublisher((pub, sub) -> createSubscriberIfNecessary(sub)); - Hooks.onLastOperator(SECURITY_REACTOR_CONTEXT_OPERATOR_KEY, pub -> { + Hooks.onLastOperator(SECURITY_REACTOR_CONTEXT_OPERATOR_KEY, (pub) -> { if (!contextAttributesAvailable()) { // No need to decorate so return original Publisher return pub; diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java index 596cdb39e4..44f7dd85b7 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java @@ -170,7 +170,7 @@ public final class CsrfConfigurer> * 
 	 * http
 	 *     .csrf()
-	 *         .ignoringRequestMatchers(request -> "XMLHttpRequest".equals(request.getHeader("X-Requested-With")))
+	 *         .ignoringRequestMatchers((request) -> "XMLHttpRequest".equals(request.getHeader("X-Requested-With")))
 	 *         .and()
 	 *     ...
 	 *
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/DefaultLoginPageConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/DefaultLoginPageConfigurer.java index 6d9482bed7..315e27a806 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/DefaultLoginPageConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/DefaultLoginPageConfigurer.java @@ -76,7 +76,7 @@ public final class DefaultLoginPageConfigurer> @Override public void init(H http) { - Function> hiddenInputs = request -> { + Function> hiddenInputs = (request) -> { CsrfToken token = (CsrfToken) request.getAttribute(CsrfToken.class.getName()); if (token == null) { return Collections.emptyMap(); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurer.java index 4c5a7d1472..1d111b866a 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurer.java @@ -504,7 +504,7 @@ public final class OAuth2LoginConfigurer> ? this.authorizationEndpointConfig.authorizationRequestBaseUri : OAuth2AuthorizationRequestRedirectFilter.DEFAULT_AUTHORIZATION_REQUEST_BASE_URI; Map loginUrlToClientName = new HashMap<>(); - clientRegistrations.forEach(registration -> loginUrlToClientName.put( + clientRegistrations.forEach((registration) -> loginUrlToClientName.put( authorizationRequestBaseUri + "/" + registration.getRegistrationId(), registration.getClientName())); return loginUrlToClientName; diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurer.java index 2ae3b43bce..53db1292f7 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurer.java @@ -242,7 +242,7 @@ public final class OAuth2ResourceServerConfigurer authenticationManager; + resolver = (request) -> authenticationManager; } BearerTokenAuthenticationFilter filter = new BearerTokenAuthenticationFilter(resolver); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java index 7811cb40e4..e73183dc28 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java @@ -303,7 +303,7 @@ public final class Saml2LoginConfigurer> Map idps = new LinkedHashMap<>(); if (idpRepo instanceof Iterable) { Iterable repo = (Iterable) idpRepo; - repo.forEach(p -> idps.put(authRequestPrefixUrl.replace("{registrationId}", p.getRegistrationId()), + repo.forEach((p) -> idps.put(authRequestPrefixUrl.replace("{registrationId}", p.getRegistrationId()), p.getRegistrationId())); } return idps; diff --git a/config/src/main/java/org/springframework/security/config/crypto/RsaKeyConversionServicePostProcessor.java b/config/src/main/java/org/springframework/security/config/crypto/RsaKeyConversionServicePostProcessor.java index 1d7892a626..6fbde50351 100644 --- a/config/src/main/java/org/springframework/security/config/crypto/RsaKeyConversionServicePostProcessor.java +++ b/config/src/main/java/org/springframework/security/config/crypto/RsaKeyConversionServicePostProcessor.java @@ -76,7 +76,7 @@ public class RsaKeyConversionServicePostProcessor implements BeanFactoryPostProc registry.addConverter(String.class, RSAPublicKey.class, x509); } else { - beanFactory.addPropertyEditorRegistrar(registry -> { + beanFactory.addPropertyEditorRegistrar((registry) -> { registry.registerCustomEditor(RSAPublicKey.class, new ConverterPropertyEditorAdapter<>(x509)); registry.registerCustomEditor(RSAPrivateKey.class, new ConverterPropertyEditorAdapter<>(pkcs8)); }); @@ -101,7 +101,7 @@ public class RsaKeyConversionServicePostProcessor implements BeanFactoryPostProc } private Converter pemInputStreamConverter() { - return source -> source.startsWith("-----") ? toInputStream(source) + return (source) -> source.startsWith("-----") ? toInputStream(source) : toInputStream(this.resourceLoader.getResource(source)); } @@ -119,7 +119,7 @@ public class RsaKeyConversionServicePostProcessor implements BeanFactoryPostProc } private Converter autoclose(Converter inputStreamKeyConverter) { - return inputStream -> { + return (inputStream) -> { try (InputStream is = inputStream) { return inputStreamKeyConverter.convert(is); } @@ -130,7 +130,7 @@ public class RsaKeyConversionServicePostProcessor implements BeanFactoryPostProc } private Converter pair(Converter one, Converter two) { - return source -> { + return (source) -> { I intermediary = one.convert(source); return two.convert(intermediary); }; diff --git a/config/src/main/java/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParser.java index b8cbeafe75..40bad1103b 100644 --- a/config/src/main/java/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParser.java @@ -469,7 +469,7 @@ final class OAuth2LoginBeanDefinitionParser implements BeanDefinitionParser { String authorizationRequestBaseUri = DEFAULT_AUTHORIZATION_REQUEST_BASE_URI; Map loginUrlToClientName = new HashMap<>(); - clientRegistrations.forEach(registration -> loginUrlToClientName.put( + clientRegistrations.forEach((registration) -> loginUrlToClientName.put( authorizationRequestBaseUri + "/" + registration.getRegistrationId(), registration.getClientName())); diff --git a/config/src/main/java/org/springframework/security/config/oauth2/client/ClientRegistrationsBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/oauth2/client/ClientRegistrationsBeanDefinitionParser.java index fe29565b98..a8c3ff9473 100644 --- a/config/src/main/java/org/springframework/security/config/oauth2/client/ClientRegistrationsBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/oauth2/client/ClientRegistrationsBeanDefinitionParser.java @@ -147,19 +147,19 @@ public final class ClientRegistrationsBeanDefinitionParser implements BeanDefini String providerId = providerElt.getAttribute(ATT_PROVIDER_ID); provider.put(ATT_PROVIDER_ID, providerId); getOptionalIfNotEmpty(providerElt.getAttribute(ATT_AUTHORIZATION_URI)) - .ifPresent(value -> provider.put(ATT_AUTHORIZATION_URI, value)); + .ifPresent((value) -> provider.put(ATT_AUTHORIZATION_URI, value)); getOptionalIfNotEmpty(providerElt.getAttribute(ATT_TOKEN_URI)) - .ifPresent(value -> provider.put(ATT_TOKEN_URI, value)); + .ifPresent((value) -> provider.put(ATT_TOKEN_URI, value)); getOptionalIfNotEmpty(providerElt.getAttribute(ATT_USER_INFO_URI)) - .ifPresent(value -> provider.put(ATT_USER_INFO_URI, value)); + .ifPresent((value) -> provider.put(ATT_USER_INFO_URI, value)); getOptionalIfNotEmpty(providerElt.getAttribute(ATT_USER_INFO_AUTHENTICATION_METHOD)) - .ifPresent(value -> provider.put(ATT_USER_INFO_AUTHENTICATION_METHOD, value)); + .ifPresent((value) -> provider.put(ATT_USER_INFO_AUTHENTICATION_METHOD, value)); getOptionalIfNotEmpty(providerElt.getAttribute(ATT_USER_INFO_USER_NAME_ATTRIBUTE)) - .ifPresent(value -> provider.put(ATT_USER_INFO_USER_NAME_ATTRIBUTE, value)); + .ifPresent((value) -> provider.put(ATT_USER_INFO_USER_NAME_ATTRIBUTE, value)); getOptionalIfNotEmpty(providerElt.getAttribute(ATT_JWK_SET_URI)) - .ifPresent(value -> provider.put(ATT_JWK_SET_URI, value)); + .ifPresent((value) -> provider.put(ATT_JWK_SET_URI, value)); getOptionalIfNotEmpty(providerElt.getAttribute(ATT_ISSUER_URI)) - .ifPresent(value -> provider.put(ATT_ISSUER_URI, value)); + .ifPresent((value) -> provider.put(ATT_ISSUER_URI, value)); providers.put(providerId, provider); } @@ -210,7 +210,7 @@ public final class ClientRegistrationsBeanDefinitionParser implements BeanDefini } private static Optional getOptionalIfNotEmpty(String str) { - return Optional.ofNullable(str).filter(s -> !s.isEmpty()); + return Optional.ofNullable(str).filter((s) -> !s.isEmpty()); } private static CommonOAuth2Provider getCommonProvider(String providerId) { @@ -246,7 +246,7 @@ public final class ClientRegistrationsBeanDefinitionParser implements BeanDefini private static String getCanonicalName(String name) { StringBuilder canonicalName = new StringBuilder(name.length()); name.chars().filter(Character::isLetterOrDigit).map(Character::toLowerCase) - .forEach(c -> canonicalName.append((char) c)); + .forEach((c) -> canonicalName.append((char) c)); return canonicalName.toString(); } diff --git a/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java b/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java index 8d55920d15..f9247744c6 100644 --- a/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java +++ b/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java @@ -396,7 +396,7 @@ public class ServerHttpSecurity { * http * // ... * .redirectToHttps() - * .httpsRedirectWhen(serverWebExchange -> + * .httpsRedirectWhen((serverWebExchange) -> * serverWebExchange.getRequest().getHeaders().containsKey("X-Requires-Https")) * return http.build(); * } @@ -431,9 +431,9 @@ public class ServerHttpSecurity { * public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { * http * // ... - * .redirectToHttps(redirectToHttps -> + * .redirectToHttps((redirectToHttps) -> * redirectToHttps - * .httpsRedirectWhen(serverWebExchange -> + * .httpsRedirectWhen((serverWebExchange) -> * serverWebExchange.getRequest().getHeaders().containsKey("X-Requires-Https")) * ); * return http.build(); @@ -501,7 +501,7 @@ public class ServerHttpSecurity { * public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { * http * // ... - * .csrf(csrf -> + * .csrf((csrf) -> * csrf.disabled() * ); * return http.build(); @@ -516,7 +516,7 @@ public class ServerHttpSecurity { * public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { * http * // ... - * .csrf(csrf -> + * .csrf((csrf) -> * csrf * // Handle CSRF failures * .accessDeniedHandler(accessDeniedHandler) @@ -607,7 +607,7 @@ public class ServerHttpSecurity { * public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { * http * // ... - * .anonymous(anonymous -> + * .anonymous((anonymous) -> * anonymous * .key("key") * .authorities("ROLE_ANONYMOUS") @@ -660,7 +660,7 @@ public class ServerHttpSecurity { * public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { * http * // ... - * .httpBasic(httpBasic -> + * .httpBasic((httpBasic) -> * httpBasic * // used for authenticating the credentials * .authenticationManager(authenticationManager) @@ -719,7 +719,7 @@ public class ServerHttpSecurity { * public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { * http * // ... - * .formLogin(formLogin -> + * .formLogin((formLogin) -> * formLogin * // used for authenticating the credentials * .authenticationManager(authenticationManager) @@ -781,7 +781,7 @@ public class ServerHttpSecurity { * @Bean * public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { * http - * .x509(x509 -> + * .x509((x509) -> * x509 * .authenticationManager(authenticationManager) * .principalExtractor(principalExtractor) @@ -839,7 +839,7 @@ public class ServerHttpSecurity { * public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { * http * // ... - * .oauth2Login(oauth2Login -> + * .oauth2Login((oauth2Login) -> * oauth2Login * .authenticationConverter(authenticationConverter) * .authenticationManager(manager) @@ -890,7 +890,7 @@ public class ServerHttpSecurity { * public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { * http * // ... - * .oauth2Client(oauth2Client -> + * .oauth2Client((oauth2Client) -> * oauth2Client * .clientRegistrationRepository(clientRegistrationRepository) * .authorizedClientRepository(authorizedClientRepository) @@ -941,9 +941,9 @@ public class ServerHttpSecurity { * public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { * http * // ... - * .oauth2ResourceServer(oauth2ResourceServer -> + * .oauth2ResourceServer((oauth2ResourceServer) -> * oauth2ResourceServer - * .jwt(jwt -> + * .jwt((jwt) -> * jwt * .publicKey(publicKey()) * ) @@ -1027,15 +1027,15 @@ public class ServerHttpSecurity { * public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { * http * // ... - * .headers(headers -> + * .headers((headers) -> * headers * // customize frame options to be same origin - * .frameOptions(frameOptions -> + * .frameOptions((frameOptions) -> * frameOptions * .mode(XFrameOptionsServerHttpHeadersWriter.Mode.SAMEORIGIN) * ) * // disable cache control - * .cache(cache -> + * .cache((cache) -> * cache * .disable() * ) @@ -1088,7 +1088,7 @@ public class ServerHttpSecurity { * public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { * http * // ... - * .exceptionHandling(exceptionHandling -> + * .exceptionHandling((exceptionHandling) -> * exceptionHandling * // customize how to request for authentication * .authenticationEntryPoint(entryPoint) @@ -1126,7 +1126,7 @@ public class ServerHttpSecurity { * .pathMatchers("/users/{username}").access((authentication, context) -> * authentication * .map(Authentication::getName) - * .map(username -> username.equals(context.getVariables().get("username"))) + * .map((username) -> username.equals(context.getVariables().get("username"))) * .map(AuthorizationDecision::new) * ) * // allows providing a custom matching strategy that requires the role "ROLE_CUSTOM" @@ -1153,7 +1153,7 @@ public class ServerHttpSecurity { * public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { * http * // ... - * .authorizeExchange(exchanges -> + * .authorizeExchange((exchanges) -> * exchanges * // any URL that starts with /admin/ requires the role "ROLE_ADMIN" * .pathMatchers("/admin/**").hasRole("ADMIN") @@ -1164,7 +1164,7 @@ public class ServerHttpSecurity { * .pathMatchers("/users/{username}").access((authentication, context) -> * authentication * .map(Authentication::getName) - * .map(username -> username.equals(context.getVariables().get("username"))) + * .map((username) -> username.equals(context.getVariables().get("username"))) * .map(AuthorizationDecision::new) * ) * // allows providing a custom matching strategy that requires the role "ROLE_CUSTOM" @@ -1222,7 +1222,7 @@ public class ServerHttpSecurity { * public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { * http * // ... - * .logout(logout -> + * .logout((logout) -> * logout * // configures how log out is done * .logoutHandler(logoutHandler) @@ -1278,7 +1278,7 @@ public class ServerHttpSecurity { * public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { * http * // ... - * .requestCache(requestCache -> + * .requestCache((requestCache) -> * requestCache * // configures how the request is cached * .requestCache(customRequestCache) @@ -1405,7 +1405,7 @@ public class ServerHttpSecurity { } AnnotationAwareOrderComparator.sort(this.webFilters); List sortedWebFilters = new ArrayList<>(); - this.webFilters.forEach(f -> { + this.webFilters.forEach((f) -> { if (f instanceof OrderedWebFilter) { f = ((OrderedWebFilter) f).webFilter; } @@ -1675,7 +1675,7 @@ public class ServerHttpSecurity { * @return the {@link HttpsRedirectSpec} for additional configuration */ public HttpsRedirectSpec httpsRedirectWhen(Function when) { - ServerWebExchangeMatcher matcher = e -> when.apply(e) ? ServerWebExchangeMatcher.MatchResult.match() + ServerWebExchangeMatcher matcher = (e) -> when.apply(e) ? ServerWebExchangeMatcher.MatchResult.match() : ServerWebExchangeMatcher.MatchResult.notMatch(); return httpsRedirectWhen(matcher); } @@ -3128,9 +3128,9 @@ public class ServerHttpSecurity { ServerOAuth2AuthorizationCodeAuthenticationTokenConverter delegate = new ServerOAuth2AuthorizationCodeAuthenticationTokenConverter( clientRegistrationRepository); delegate.setAuthorizationRequestRepository(getAuthorizationRequestRepository()); - ServerAuthenticationConverter authenticationConverter = exchange -> delegate.convert(exchange) + ServerAuthenticationConverter authenticationConverter = (exchange) -> delegate.convert(exchange) .onErrorMap(OAuth2AuthorizationException.class, - e -> new OAuth2AuthenticationException(e.getError(), e.getError().toString())); + (e) -> new OAuth2AuthenticationException(e.getError(), e.getError().toString())); this.authenticationConverter = authenticationConverter; return authenticationConverter; } @@ -3248,7 +3248,7 @@ public class ServerHttpSecurity { MediaType.TEXT_PLAIN); htmlMatcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL)); - ServerWebExchangeMatcher xhrMatcher = exchange -> { + ServerWebExchangeMatcher xhrMatcher = (exchange) -> { if (exchange.getRequest().getHeaders().getOrEmpty("X-Requested-With").contains("XMLHttpRequest")) { return ServerWebExchangeMatcher.MatchResult.match(); } @@ -3330,7 +3330,7 @@ public class ServerHttpSecurity { } Map result = new HashMap<>(); registrations.iterator().forEachRemaining( - r -> result.put("/oauth2/authorization/" + r.getRegistrationId(), r.getClientName())); + (r) -> result.put("/oauth2/authorization/" + r.getRegistrationId(), r.getClientName())); return result; } @@ -3784,7 +3784,7 @@ public class ServerHttpSecurity { public Mono filter(ServerWebExchange exchange, WebFilterChain chain) { WebFilterExchange webFilterExchange = new WebFilterExchange(exchange, chain); return super.filter(exchange, chain).onErrorResume(AuthenticationException.class, - e -> this.authenticationFailureHandler.onAuthenticationFailure(webFilterExchange, e)); + (e) -> this.authenticationFailureHandler.onAuthenticationFailure(webFilterExchange, e)); } @Override diff --git a/config/src/test/java/org/springframework/security/config/annotation/authentication/AuthenticationManagerBuilderTests.java b/config/src/test/java/org/springframework/security/config/annotation/authentication/AuthenticationManagerBuilderTests.java index fa57b57997..ff15268852 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/authentication/AuthenticationManagerBuilderTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/authentication/AuthenticationManagerBuilderTests.java @@ -89,7 +89,7 @@ public class AuthenticationManagerBuilderTests { public void customAuthenticationEventPublisherWithWeb() throws Exception { ObjectPostProcessor opp = mock(ObjectPostProcessor.class); AuthenticationEventPublisher aep = mock(AuthenticationEventPublisher.class); - given(opp.postProcess(any())).willAnswer(a -> a.getArgument(0)); + given(opp.postProcess(any())).willAnswer((a) -> a.getArgument(0)); AuthenticationManager am = new AuthenticationManagerBuilder(opp).authenticationEventPublisher(aep) .inMemoryAuthentication().and().build(); diff --git a/config/src/test/java/org/springframework/security/config/annotation/authentication/NamespaceAuthenticationManagerTests.java b/config/src/test/java/org/springframework/security/config/annotation/authentication/NamespaceAuthenticationManagerTests.java index e5d0e25c07..3ec92265b7 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/authentication/NamespaceAuthenticationManagerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/authentication/NamespaceAuthenticationManagerTests.java @@ -49,10 +49,10 @@ public class NamespaceAuthenticationManagerTests { this.spring.register(EraseCredentialsTrueDefaultConfig.class).autowire(); this.mockMvc.perform(formLogin()) - .andExpect(authenticated().withAuthentication(a -> assertThat(a.getCredentials()).isNull())); + .andExpect(authenticated().withAuthentication((a) -> assertThat(a.getCredentials()).isNull())); this.mockMvc.perform(formLogin()) - .andExpect(authenticated().withAuthentication(a -> assertThat(a.getCredentials()).isNull())); + .andExpect(authenticated().withAuthentication((a) -> assertThat(a.getCredentials()).isNull())); // no exception due to username being cleared out } @@ -61,10 +61,10 @@ public class NamespaceAuthenticationManagerTests { this.spring.register(EraseCredentialsFalseConfig.class).autowire(); this.mockMvc.perform(formLogin()) - .andExpect(authenticated().withAuthentication(a -> assertThat(a.getCredentials()).isNotNull())); + .andExpect(authenticated().withAuthentication((a) -> assertThat(a.getCredentials()).isNotNull())); this.mockMvc.perform(formLogin()) - .andExpect(authenticated().withAuthentication(a -> assertThat(a.getCredentials()).isNotNull())); + .andExpect(authenticated().withAuthentication((a) -> assertThat(a.getCredentials()).isNotNull())); // no exception due to username being cleared out } @@ -74,7 +74,7 @@ public class NamespaceAuthenticationManagerTests { this.spring.register(GlobalEraseCredentialsFalseConfig.class).autowire(); this.mockMvc.perform(SecurityMockMvcRequestBuilders.formLogin()).andExpect(SecurityMockMvcResultMatchers - .authenticated().withAuthentication(a -> assertThat(a.getCredentials()).isNotNull())); + .authenticated().withAuthentication((a) -> assertThat(a.getCredentials()).isNotNull())); } @EnableWebSecurity diff --git a/config/src/test/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfigurationTests.java b/config/src/test/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfigurationTests.java index 7cba39f447..a9e3c0ae0e 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfigurationTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfigurationTests.java @@ -197,7 +197,7 @@ public class AuthenticationConfigurationTests { public void getAuthenticationManagerWhenPostProcessThenUsesBeanClassLoaderOnProxyFactoryBean() throws Exception { this.spring.register(Sec2531Config.class).autowire(); ObjectPostProcessor opp = this.spring.getContext().getBean(ObjectPostProcessor.class); - given(opp.postProcess(any())).willAnswer(a -> a.getArgument(0)); + given(opp.postProcess(any())).willAnswer((a) -> a.getArgument(0)); AuthenticationConfiguration config = this.spring.getContext().getBean(AuthenticationConfiguration.class); config.getAuthenticationManager(); diff --git a/config/src/test/java/org/springframework/security/config/annotation/method/configuration/EnableReactiveMethodSecurityTests.java b/config/src/test/java/org/springframework/security/config/annotation/method/configuration/EnableReactiveMethodSecurityTests.java index 474713b393..3b5b47c9fb 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/method/configuration/EnableReactiveMethodSecurityTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/method/configuration/EnableReactiveMethodSecurityTests.java @@ -224,7 +224,7 @@ public class EnableReactiveMethodSecurityTests { Flux findById = this.messageService.fluxPreAuthorizeHasRoleFindById(1L) .subscriberContext(this.withAdmin); - StepVerifier.create(findById).consumeNextWith(s -> AssertionsForClassTypes.assertThat(s).isEqualTo("result")) + StepVerifier.create(findById).consumeNextWith((s) -> AssertionsForClassTypes.assertThat(s).isEqualTo("result")) .verifyComplete(); } @@ -349,7 +349,7 @@ public class EnableReactiveMethodSecurityTests { Publisher findById = Flux.from(this.messageService.publisherPreAuthorizeHasRoleFindById(1L)) .subscriberContext(this.withAdmin); - StepVerifier.create(findById).consumeNextWith(s -> AssertionsForClassTypes.assertThat(s).isEqualTo("result")) + StepVerifier.create(findById).consumeNextWith((s) -> AssertionsForClassTypes.assertThat(s).isEqualTo("result")) .verifyComplete(); } @@ -457,7 +457,7 @@ public class EnableReactiveMethodSecurityTests { } static Publisher publisher(Flux flux) { - return subscriber -> flux.subscribe(subscriber); + return (subscriber) -> flux.subscribe(subscriber); } static Publisher publisherJust(T... data) { diff --git a/config/src/test/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfigurationTests.java b/config/src/test/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfigurationTests.java index ac9fe3381c..cadb3c8982 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfigurationTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfigurationTests.java @@ -221,7 +221,7 @@ public class GlobalMethodSecurityConfigurationTests { public void globalSecurityProxiesSecurity() { this.spring.register(Sec3005Config.class).autowire(); - assertThat(this.service.getClass()).matches(c -> !Proxy.isProxyClass(c), "is not proxy class"); + assertThat(this.service.getClass()).matches((c) -> !Proxy.isProxyClass(c), "is not proxy class"); } // // // gh-3797 diff --git a/config/src/test/java/org/springframework/security/config/annotation/method/configuration/NamespaceGlobalMethodSecurityTests.java b/config/src/test/java/org/springframework/security/config/annotation/method/configuration/NamespaceGlobalMethodSecurityTests.java index 0efe382210..5266e15d28 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/method/configuration/NamespaceGlobalMethodSecurityTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/method/configuration/NamespaceGlobalMethodSecurityTests.java @@ -241,7 +241,7 @@ public class NamespaceGlobalMethodSecurityTests { this.spring.register(CustomRunAsManagerConfig.class, MethodSecurityServiceConfig.class).autowire(); assertThat(this.service.runAs().getAuthorities()) - .anyMatch(authority -> "ROLE_RUN_AS_SUPER".equals(authority.getAuthority())); + .anyMatch((authority) -> "ROLE_RUN_AS_SUPER".equals(authority.getAuthority())); } @Test diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/WebSecurityConfigurerAdapterPowermockTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/WebSecurityConfigurerAdapterPowermockTests.java index 00e8731731..7a46bdddcb 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/WebSecurityConfigurerAdapterPowermockTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/WebSecurityConfigurerAdapterPowermockTests.java @@ -106,7 +106,7 @@ public class WebSecurityConfigurerAdapterPowermockTests { CallableProcessingInterceptor callableProcessingInterceptor = callableProcessingInterceptorArgCaptor .getAllValues().stream() - .filter(e -> SecurityContextCallableProcessingInterceptor.class.isAssignableFrom(e.getClass())) + .filter((e) -> SecurityContextCallableProcessingInterceptor.class.isAssignableFrom(e.getClass())) .findFirst().orElse(null); assertThat(callableProcessingInterceptor).isNotNull(); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/HttpSecurityConfigurationTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/HttpSecurityConfigurationTests.java index 6e2eb6804c..83bb042a5b 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/HttpSecurityConfigurationTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/HttpSecurityConfigurationTests.java @@ -189,7 +189,7 @@ public class HttpSecurityConfigurationTests { @Bean public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { - return http.authorizeRequests(authorize -> authorize.anyRequest().permitAll()).build(); + return http.authorizeRequests((authorize) -> authorize.anyRequest().permitAll()).build(); } } @@ -199,8 +199,8 @@ public class HttpSecurityConfigurationTests { @Bean public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { - return http.authorizeRequests(authorize -> authorize.anyRequest().authenticated()).formLogin(withDefaults()) - .build(); + return http.authorizeRequests((authorize) -> authorize.anyRequest().authenticated()) + .formLogin(withDefaults()).build(); } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/SecurityReactorContextConfigurationResourceServerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/SecurityReactorContextConfigurationResourceServerTests.java index 3f5bc05eda..1dbe5abdce 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/SecurityReactorContextConfigurationResourceServerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/SecurityReactorContextConfigurationResourceServerTests.java @@ -123,7 +123,7 @@ public class SecurityReactorContextConfigurationResourceServerTests { @GetMapping("/token") public String token() { return this.rest.get().uri(this.uri).retrieve().bodyToMono(String.class) - .flatMap(result -> this.rest.get().uri(this.uri).retrieve().bodyToMono(String.class)).block(); + .flatMap((result) -> this.rest.get().uri(this.uri).retrieve().bodyToMono(String.class)).block(); } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/SecurityReactorContextConfigurationTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/SecurityReactorContextConfigurationTests.java index 855a00c311..f4e09b2fe6 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/SecurityReactorContextConfigurationTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/SecurityReactorContextConfigurationTests.java @@ -209,9 +209,9 @@ public class SecurityReactorContextConfigurationTests { ClientResponse clientResponseOk = ClientResponse.create(HttpStatus.OK).build(); ExchangeFilterFunction filter = (req, next) -> Mono.subscriberContext() - .filter(ctx -> ctx.hasKey(SecurityReactorContextSubscriber.SECURITY_CONTEXT_ATTRIBUTES)) - .map(ctx -> ctx.get(SecurityReactorContextSubscriber.SECURITY_CONTEXT_ATTRIBUTES)).cast(Map.class) - .map(attributes -> { + .filter((ctx) -> ctx.hasKey(SecurityReactorContextSubscriber.SECURITY_CONTEXT_ATTRIBUTES)) + .map((ctx) -> ctx.get(SecurityReactorContextSubscriber.SECURITY_CONTEXT_ATTRIBUTES)).cast(Map.class) + .map((attributes) -> { if (attributes.containsKey(HttpServletRequest.class) && attributes.containsKey(HttpServletResponse.class) && attributes.containsKey(Authentication.class)) { @@ -231,7 +231,7 @@ public class SecurityReactorContextConfigurationTests { expectedContextAttributes.put(Authentication.class, this.authentication); Mono clientResponseMono = filter.filter(clientRequest, exchange) - .flatMap(response -> filter.filter(clientRequest, exchange)); + .flatMap((response) -> filter.filter(clientRequest, exchange)); StepVerifier.create(clientResponseMono).expectAccessibleContext() .contains(SecurityReactorContextSubscriber.SECURITY_CONTEXT_ATTRIBUTES, expectedContextAttributes) diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurationTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurationTests.java index 4b4e8567c4..384db38440 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurationTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurationTests.java @@ -368,27 +368,27 @@ public class WebSecurityConfigurationTests { @Order(1) @Bean SecurityFilterChain filterChain1(HttpSecurity http) throws Exception { - return http.antMatcher("/role1/**").authorizeRequests(authorize -> authorize.anyRequest().hasRole("1")) + return http.antMatcher("/role1/**").authorizeRequests((authorize) -> authorize.anyRequest().hasRole("1")) .build(); } @Order(2) @Bean SecurityFilterChain filterChain2(HttpSecurity http) throws Exception { - return http.antMatcher("/role2/**").authorizeRequests(authorize -> authorize.anyRequest().hasRole("2")) + return http.antMatcher("/role2/**").authorizeRequests((authorize) -> authorize.anyRequest().hasRole("2")) .build(); } @Order(3) @Bean SecurityFilterChain filterChain3(HttpSecurity http) throws Exception { - return http.antMatcher("/role3/**").authorizeRequests(authorize -> authorize.anyRequest().hasRole("3")) + return http.antMatcher("/role3/**").authorizeRequests((authorize) -> authorize.anyRequest().hasRole("3")) .build(); } @Bean SecurityFilterChain filterChain4(HttpSecurity http) throws Exception { - return http.authorizeRequests(authorize -> authorize.anyRequest().hasRole("4")).build(); + return http.authorizeRequests((authorize) -> authorize.anyRequest().hasRole("4")).build(); } } @@ -541,7 +541,7 @@ public class WebSecurityConfigurationTests { @Bean public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { - return http.authorizeRequests(authorize -> authorize.anyRequest().authenticated()).build(); + return http.authorizeRequests((authorize) -> authorize.anyRequest().authenticated()).build(); } } @@ -655,8 +655,8 @@ public class WebSecurityConfigurationTests { @Order(2) @Bean SecurityFilterChain filterChain(HttpSecurity http) throws Exception { - return http.antMatcher("/filter/**").authorizeRequests(authorize -> authorize.anyRequest().authenticated()) - .build(); + return http.antMatcher("/filter/**") + .authorizeRequests((authorize) -> authorize.anyRequest().authenticated()).build(); } @Order(1) @@ -665,7 +665,7 @@ public class WebSecurityConfigurationTests { @Override protected void configure(HttpSecurity http) throws Exception { - http.antMatcher("/config/**").authorizeRequests(authorize -> authorize.anyRequest().permitAll()); + http.antMatcher("/config/**").authorizeRequests((authorize) -> authorize.anyRequest().permitAll()); } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AnonymousConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AnonymousConfigurerTests.java index 40eafaf04d..71e4af4647 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AnonymousConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AnonymousConfigurerTests.java @@ -103,7 +103,7 @@ public class AnonymousConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .anonymous(anonymous -> + .anonymous((anonymous) -> anonymous .principal("principal") ); @@ -119,7 +119,7 @@ public class AnonymousConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().permitAll() ) @@ -145,7 +145,7 @@ public class AnonymousConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().permitAll() ) diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AuthorizeRequestsTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AuthorizeRequestsTests.java index 42884f2f09..1ff7e6d757 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AuthorizeRequestsTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AuthorizeRequestsTests.java @@ -393,7 +393,7 @@ public class AuthorizeRequestsTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .antMatchers(HttpMethod.POST).denyAll() ); @@ -533,7 +533,7 @@ public class AuthorizeRequestsTests { // @formatter:off http .httpBasic(withDefaults()) - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .mvcMatchers("/path").denyAll() ); @@ -605,7 +605,7 @@ public class AuthorizeRequestsTests { // @formatter:off http .httpBasic(withDefaults()) - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .mvcMatchers("/path").servletPath("/spring").denyAll() ); @@ -677,7 +677,7 @@ public class AuthorizeRequestsTests { // @formatter:off http .httpBasic(withDefaults()) - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .mvcMatchers("/user/{userName}").access("#userName == 'user'") ); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurerTests.java index c385a6aacb..11f93dafb3 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurerTests.java @@ -151,7 +151,7 @@ public class ChannelSecurityConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .requiresChannel(requiresChannel -> + .requiresChannel((requiresChannel) -> requiresChannel .anyRequest().requiresSecure() ); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CorsConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CorsConfigurerTests.java index c883479ace..a238e07b2c 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CorsConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CorsConfigurerTests.java @@ -244,7 +244,7 @@ public class CorsConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().authenticated() ) @@ -298,7 +298,7 @@ public class CorsConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().authenticated() ) @@ -351,7 +351,7 @@ public class CorsConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().authenticated() ) diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurerIgnoringRequestMatchersTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurerIgnoringRequestMatchersTests.java index bba69c31a7..14c59ab078 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurerIgnoringRequestMatchersTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurerIgnoringRequestMatchersTests.java @@ -93,7 +93,7 @@ public class CsrfConfigurerIgnoringRequestMatchersTests { @EnableWebSecurity static class IgnoringRequestMatchers extends WebSecurityConfigurerAdapter { - RequestMatcher requestMatcher = request -> HttpMethod.POST.name().equals(request.getMethod()); + RequestMatcher requestMatcher = (request) -> HttpMethod.POST.name().equals(request.getMethod()); @Override protected void configure(HttpSecurity http) throws Exception { @@ -110,13 +110,13 @@ public class CsrfConfigurerIgnoringRequestMatchersTests { @EnableWebSecurity static class IgnoringRequestInLambdaMatchers extends WebSecurityConfigurerAdapter { - RequestMatcher requestMatcher = request -> HttpMethod.POST.name().equals(request.getMethod()); + RequestMatcher requestMatcher = (request) -> HttpMethod.POST.name().equals(request.getMethod()); @Override protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .csrf(csrf -> + .csrf((csrf) -> csrf .requireCsrfProtectionMatcher(new AntPathRequestMatcher("/path")) .ignoringRequestMatchers(this.requestMatcher) @@ -129,7 +129,7 @@ public class CsrfConfigurerIgnoringRequestMatchersTests { @EnableWebSecurity static class IgnoringPathsAndMatchers extends WebSecurityConfigurerAdapter { - RequestMatcher requestMatcher = request -> HttpMethod.POST.name().equals(request.getMethod()); + RequestMatcher requestMatcher = (request) -> HttpMethod.POST.name().equals(request.getMethod()); @Override protected void configure(HttpSecurity http) throws Exception { @@ -146,13 +146,13 @@ public class CsrfConfigurerIgnoringRequestMatchersTests { @EnableWebSecurity static class IgnoringPathsAndMatchersInLambdaConfig extends WebSecurityConfigurerAdapter { - RequestMatcher requestMatcher = request -> HttpMethod.POST.name().equals(request.getMethod()); + RequestMatcher requestMatcher = (request) -> HttpMethod.POST.name().equals(request.getMethod()); @Override protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .csrf(csrf -> + .csrf((csrf) -> csrf .ignoringAntMatchers("/no-csrf") .ignoringRequestMatchers(this.requestMatcher) diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurerTests.java index eace9809e5..1c147877e2 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurerTests.java @@ -558,7 +558,7 @@ public class CsrfConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .csrf(csrf -> csrf.requireCsrfProtectionMatcher(MATCHER)); + .csrf((csrf) -> csrf.requireCsrfProtectionMatcher(MATCHER)); // @formatter:on } @@ -601,7 +601,7 @@ public class CsrfConfigurerTests { // @formatter:off http .formLogin(withDefaults()) - .csrf(csrf -> csrf.csrfTokenRepository(REPO)); + .csrf((csrf) -> csrf.csrfTokenRepository(REPO)); // @formatter:on } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/DefaultFiltersTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/DefaultFiltersTests.java index 1bce91535a..558a0cb400 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/DefaultFiltersTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/DefaultFiltersTests.java @@ -87,8 +87,8 @@ public class DefaultFiltersTests { DefaultSecurityFilterChain filterChain = (DefaultSecurityFilterChain) filterChains.get(0); assertThat(filterChain.getRequestMatcher()).isInstanceOf(AnyRequestMatcher.class); assertThat(filterChain.getFilters().size()).isEqualTo(1); - long filter = filterChain.getFilters().stream().filter(it -> it instanceof UsernamePasswordAuthenticationFilter) - .count(); + long filter = filterChain.getFilters().stream() + .filter((it) -> it instanceof UsernamePasswordAuthenticationFilter).count(); assertThat(filter).isEqualTo(1); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/DefaultLoginPageConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/DefaultLoginPageConfigurerTests.java index d2110741cf..3b398acaac 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/DefaultLoginPageConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/DefaultLoginPageConfigurerTests.java @@ -325,7 +325,7 @@ public class DefaultLoginPageConfigurerTests { FilterChainProxy filterChain = this.spring.getContext().getBean(FilterChainProxy.class); assertThat(filterChain.getFilterChains().get(0).getFilters().stream() - .filter(filter -> filter.getClass().isAssignableFrom(DefaultLoginPageGeneratingFilter.class)).count()) + .filter((filter) -> filter.getClass().isAssignableFrom(DefaultLoginPageGeneratingFilter.class)).count()) .isZero(); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ExceptionHandlingConfigurerAccessDeniedHandlerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ExceptionHandlingConfigurerAccessDeniedHandlerTests.java index be40eb0eb6..139b2ab63b 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ExceptionHandlingConfigurerAccessDeniedHandlerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ExceptionHandlingConfigurerAccessDeniedHandlerTests.java @@ -116,11 +116,11 @@ public class ExceptionHandlingConfigurerAccessDeniedHandlerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().denyAll() ) - .exceptionHandling(exceptionHandling -> + .exceptionHandling((exceptionHandling) -> exceptionHandling .defaultAccessDeniedHandlerFor( this.teapotDeniedHandler, diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurerTests.java index dcb870439c..b2cbe23e82 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurerTests.java @@ -229,7 +229,7 @@ public class ExpressionUrlAuthorizationConfigurerTests { public void getWhenHasIpAddressConfiguredAndIpAddressMatchesThenRespondsWithOk() throws Exception { this.spring.register(HasIpAddressConfig.class, BasicController.class).autowire(); - this.mvc.perform(get("/").with(request -> { + this.mvc.perform(get("/").with((request) -> { request.setRemoteAddr("192.168.1.0"); return request; })).andExpect(status().isOk()); @@ -239,7 +239,7 @@ public class ExpressionUrlAuthorizationConfigurerTests { public void getWhenHasIpAddressConfiguredAndIpAddressDoesNotMatchThenRespondsWithUnauthorized() throws Exception { this.spring.register(HasIpAddressConfig.class, BasicController.class).autowire(); - this.mvc.perform(get("/").with(request -> { + this.mvc.perform(get("/").with((request) -> { request.setRemoteAddr("192.168.1.1"); return request; })).andExpect(status().isUnauthorized()); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/FormLoginConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/FormLoginConfigurerTests.java index 0ed4745f88..505d5313a4 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/FormLoginConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/FormLoginConfigurerTests.java @@ -392,7 +392,7 @@ public class FormLoginConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().hasRole("USER") ) @@ -456,11 +456,11 @@ public class FormLoginConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().hasRole("USER") ) - .formLogin(formLogin -> + .formLogin((formLogin) -> formLogin .loginPage("/authenticate") .permitAll() @@ -514,18 +514,18 @@ public class FormLoginConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().authenticated() ) - .formLogin(formLogin -> + .formLogin((formLogin) -> formLogin .loginProcessingUrl("/loginCheck") .loginPage("/login") .defaultSuccessUrl("/", true) .permitAll() ) - .logout(logout -> + .logout((logout) -> logout .logoutSuccessUrl("/login") .logoutUrl("/logout") diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurerTests.java index 275f89c498..81a541d42d 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurerTests.java @@ -486,7 +486,7 @@ public class HeadersConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .headers(headers -> + .headers((headers) -> headers .defaultsDisabled() .contentTypeOptions(withDefaults()) @@ -548,7 +548,7 @@ public class HeadersConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .headers(headers -> + .headers((headers) -> headers .defaultsDisabled() .cacheControl(withDefaults()) @@ -580,7 +580,7 @@ public class HeadersConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .headers(headers -> + .headers((headers) -> headers .defaultsDisabled() .xssProtection(withDefaults()) @@ -611,9 +611,9 @@ public class HeadersConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .headers(headers -> + .headers((headers) -> headers - .frameOptions(frameOptionsConfig -> frameOptionsConfig.sameOrigin()) + .frameOptions((frameOptionsConfig) -> frameOptionsConfig.sameOrigin()) ); // @formatter:on } @@ -763,10 +763,10 @@ public class HeadersConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .headers(headers -> + .headers((headers) -> headers .defaultsDisabled() - .httpPublicKeyPinning(hpkp -> + .httpPublicKeyPinning((hpkp) -> hpkp .addSha256Pins("d6qzRu9zOECb90Uez27xWltNsj0e1Md7GkYYkVoZWmM=") .reportUri("https://example.net/pkp-report") @@ -815,10 +815,10 @@ public class HeadersConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .headers(headers -> + .headers((headers) -> headers .defaultsDisabled() - .contentSecurityPolicy(csp -> + .contentSecurityPolicy((csp) -> csp .policyDirectives("default-src 'self'; script-src trustedscripts.example.com") .reportOnly() @@ -851,10 +851,10 @@ public class HeadersConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .headers(headers -> + .headers((headers) -> headers .defaultsDisabled() - .contentSecurityPolicy(csp -> + .contentSecurityPolicy((csp) -> csp.policyDirectives("") ) ); @@ -870,7 +870,7 @@ public class HeadersConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .headers(headers -> + .headers((headers) -> headers .defaultsDisabled() .contentSecurityPolicy(withDefaults()) @@ -902,7 +902,7 @@ public class HeadersConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .headers(headers -> + .headers((headers) -> headers .defaultsDisabled() .referrerPolicy() @@ -934,10 +934,10 @@ public class HeadersConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .headers(headers -> + .headers((headers) -> headers .defaultsDisabled() - .referrerPolicy(referrerPolicy -> + .referrerPolicy((referrerPolicy) -> referrerPolicy.policy(ReferrerPolicy.SAME_ORIGIN) ) ); @@ -999,10 +999,10 @@ public class HeadersConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .headers(headers -> + .headers((headers) -> headers .defaultsDisabled() - .httpStrictTransportSecurity(hstsConfig -> hstsConfig.preload(true)) + .httpStrictTransportSecurity((hstsConfig) -> hstsConfig.preload(true)) ); // @formatter:on } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpBasicConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpBasicConfigurerTests.java index 6353743976..493a85479d 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpBasicConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpBasicConfigurerTests.java @@ -153,7 +153,7 @@ public class HttpBasicConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().authenticated() ) diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityRequestMatchersTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityRequestMatchersTests.java index cfeea9e85a..8ec6163509 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityRequestMatchersTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityRequestMatchersTests.java @@ -302,12 +302,12 @@ public class HttpSecurityRequestMatchersTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .requestMatchers(requestMatchers -> + .requestMatchers((requestMatchers) -> requestMatchers .mvcMatchers("/path") ) .httpBasic(withDefaults()) - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().denyAll() ); @@ -374,13 +374,13 @@ public class HttpSecurityRequestMatchersTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .requestMatchers(requestMatchers -> + .requestMatchers((requestMatchers) -> requestMatchers .mvcMatchers("/path").servletPath("/spring") .mvcMatchers("/never-match") ) .httpBasic(withDefaults()) - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().denyAll() ); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurerTests.java index 3ce299689d..485689185d 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurerTests.java @@ -81,7 +81,7 @@ public class JeeConfigurerTests { Principal user = mock(Principal.class); given(user.getName()).willReturn("user"); - this.mvc.perform(get("/").principal(user).with(request -> { + this.mvc.perform(get("/").principal(user).with((request) -> { request.addUserRole("ROLE_ADMIN"); request.addUserRole("ROLE_USER"); return request; @@ -94,7 +94,7 @@ public class JeeConfigurerTests { Principal user = mock(Principal.class); given(user.getName()).willReturn("user"); - this.mvc.perform(get("/").principal(user).with(request -> { + this.mvc.perform(get("/").principal(user).with((request) -> { request.addUserRole("ROLE_ADMIN"); request.addUserRole("ROLE_USER"); return request; @@ -107,7 +107,7 @@ public class JeeConfigurerTests { Principal user = mock(Principal.class); given(user.getName()).willReturn("user"); - this.mvc.perform(get("/").principal(user).with(request -> { + this.mvc.perform(get("/").principal(user).with((request) -> { request.addUserRole("ROLE_ADMIN"); request.addUserRole("ROLE_USER"); return request; @@ -125,7 +125,7 @@ public class JeeConfigurerTests { given(JeeCustomAuthenticatedUserDetailsServiceConfig.authenticationUserDetailsService.loadUserDetails(any())) .willReturn(userDetails); - this.mvc.perform(get("/").principal(user).with(request -> { + this.mvc.perform(get("/").principal(user).with((request) -> { request.addUserRole("ROLE_ADMIN"); request.addUserRole("ROLE_USER"); return request; @@ -184,11 +184,11 @@ public class JeeConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().hasRole("USER") ) - .jee(jee -> + .jee((jee) -> jee .mappableRoles("USER") ); @@ -204,11 +204,11 @@ public class JeeConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().hasRole("USER") ) - .jee(jee -> + .jee((jee) -> jee .mappableAuthorities("ROLE_USER") ); @@ -227,11 +227,11 @@ public class JeeConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().hasRole("USER") ) - .jee(jee -> + .jee((jee) -> jee .authenticatedUserDetailsService(authenticationUserDetailsService) ); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurerTests.java index 4d3905976b..c6a722e127 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurerTests.java @@ -267,7 +267,7 @@ public class LogoutConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .logout(logout -> + .logout((logout) -> logout.defaultLogoutSuccessHandlerFor(null, mock(RequestMatcher.class)) ); // @formatter:on @@ -296,7 +296,7 @@ public class LogoutConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .logout(logout -> + .logout((logout) -> logout.defaultLogoutSuccessHandlerFor(mock(LogoutSuccessHandler.class), null) ); // @formatter:on @@ -397,7 +397,7 @@ public class LogoutConfigurerTests { http .csrf() .disable() - .logout(logout -> logout.logoutUrl("/custom/logout")); + .logout((logout) -> logout.logoutUrl("/custom/logout")); // @formatter:on } @@ -424,7 +424,7 @@ public class LogoutConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .logout(logout -> logout.addLogoutHandler(null)); + .logout((logout) -> logout.addLogoutHandler(null)); // @formatter:on } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpAnonymousTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpAnonymousTests.java index 077e69b5b5..6ebf4a23dd 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpAnonymousTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpAnonymousTests.java @@ -198,7 +198,7 @@ public class NamespaceHttpAnonymousTests { Optional anonymousToken() { return Optional.of(SecurityContextHolder.getContext()).map(SecurityContext::getAuthentication) - .filter(a -> a instanceof AnonymousAuthenticationToken) + .filter((a) -> a instanceof AnonymousAuthenticationToken) .map(AnonymousAuthenticationToken.class::cast); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpBasicTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpBasicTests.java index a4f1de385b..8eed33342d 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpBasicTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpBasicTests.java @@ -199,7 +199,7 @@ public class NamespaceHttpBasicTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().hasRole("USER") ) @@ -232,11 +232,11 @@ public class NamespaceHttpBasicTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().hasRole("USER") ) - .httpBasic(httpBasicConfig -> httpBasicConfig.realmName("Custom Realm")); + .httpBasic((httpBasicConfig) -> httpBasicConfig.realmName("Custom Realm")); // @formatter:on } @@ -274,7 +274,7 @@ public class NamespaceHttpBasicTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .httpBasic(httpBasicConfig -> + .httpBasic((httpBasicConfig) -> httpBasicConfig.authenticationDetailsSource(this.authenticationDetailsSource)); // @formatter:on } @@ -314,11 +314,11 @@ public class NamespaceHttpBasicTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().hasRole("USER") ) - .httpBasic(httpBasicConfig -> + .httpBasic((httpBasicConfig) -> httpBasicConfig.authenticationEntryPoint(this.authenticationEntryPoint)); // @formatter:on } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpHeadersTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpHeadersTests.java index d8a4f437d5..eef4ba934a 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpHeadersTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpHeadersTests.java @@ -153,7 +153,7 @@ public class NamespaceHttpHeadersTests { } private static ResultMatcher includes(Map headers, String... headerNames) { - return result -> { + return (result) -> { assertThat(result.getResponse().getHeaderNames()).hasSameSizeAs(headerNames); for (String headerName : headerNames) { header().string(headerName, headers.get(headerName)).match(result); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpJeeTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpJeeTests.java index e243d28cc8..47cd62b4c3 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpJeeTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpJeeTests.java @@ -66,7 +66,7 @@ public class NamespaceHttpJeeTests { Principal user = mock(Principal.class); given(user.getName()).willReturn("joe"); - this.mvc.perform(get("/roles").principal(user).with(request -> { + this.mvc.perform(get("/roles").principal(user).with((request) -> { request.addUserRole("ROLE_admin"); request.addUserRole("ROLE_user"); request.addUserRole("ROLE_unmapped"); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpLogoutTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpLogoutTests.java index 996f91a685..3f69893ed9 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpLogoutTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpLogoutTests.java @@ -95,7 +95,7 @@ public class NamespaceHttpLogoutTests { this.mvc.perform(post("/custom-logout").with(csrf())).andExpect(authenticated(false)) .andExpect(redirectedUrl("/logout-success")) - .andExpect(result -> assertThat(result.getResponse().getCookies()).hasSize(1)) + .andExpect((result) -> assertThat(result.getResponse().getCookies()).hasSize(1)) .andExpect(cookie().maxAge("remove", 0)).andExpect(session(Objects::nonNull)); } @@ -106,7 +106,7 @@ public class NamespaceHttpLogoutTests { this.mvc.perform(post("/custom-logout").with(csrf())).andExpect(authenticated(false)) .andExpect(redirectedUrl("/logout-success")) - .andExpect(result -> assertThat(result.getResponse().getCookies()).hasSize(1)) + .andExpect((result) -> assertThat(result.getResponse().getCookies()).hasSize(1)) .andExpect(cookie().maxAge("remove", 0)).andExpect(session(Objects::nonNull)); } @@ -134,16 +134,16 @@ public class NamespaceHttpLogoutTests { } ResultMatcher authenticated(boolean authenticated) { - return result -> assertThat(Optional.ofNullable(SecurityContextHolder.getContext().getAuthentication()) + return (result) -> assertThat(Optional.ofNullable(SecurityContextHolder.getContext().getAuthentication()) .map(Authentication::isAuthenticated).orElse(false)).isEqualTo(authenticated); } ResultMatcher noCookies() { - return result -> assertThat(result.getResponse().getCookies()).isEmpty(); + return (result) -> assertThat(result.getResponse().getCookies()).isEmpty(); } ResultMatcher session(Predicate sessionPredicate) { - return result -> assertThat(result.getRequest().getSession(false)) + return (result) -> assertThat(result.getRequest().getSession(false)) .is(new Condition<>(sessionPredicate, "sessionPredicate failed")); } @@ -190,7 +190,7 @@ public class NamespaceHttpLogoutTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .logout(logout -> + .logout((logout) -> logout.deleteCookies("remove") .invalidateHttpSession(false) .logoutUrl("/custom-logout") @@ -227,7 +227,7 @@ public class NamespaceHttpLogoutTests { // @formatter:off http - .logout(logout -> logout.logoutSuccessHandler(logoutSuccessHandler)); + .logout((logout) -> logout.logoutSuccessHandler(logoutSuccessHandler)); // @formatter:on } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpOpenIDLoginTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpOpenIDLoginTests.java index 9064b565f8..8200697010 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpOpenIDLoginTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpOpenIDLoginTests.java @@ -120,13 +120,13 @@ public class NamespaceHttpOpenIDLoginTests { .getAttribute("SPRING_SECURITY_OPEN_ID_ATTRIBUTES_FETCH_LIST"); assertThat(attributeObject).isInstanceOf(List.class); List attributeList = (List) attributeObject; - assertThat(attributeList.stream().anyMatch(attribute -> "firstname".equals(attribute.getName()) + assertThat(attributeList.stream().anyMatch((attribute) -> "firstname".equals(attribute.getName()) && "https://axschema.org/namePerson/first".equals(attribute.getType()) && attribute.isRequired())) .isTrue(); - assertThat(attributeList.stream().anyMatch(attribute -> "lastname".equals(attribute.getName()) + assertThat(attributeList.stream().anyMatch((attribute) -> "lastname".equals(attribute.getName()) && "https://axschema.org/namePerson/last".equals(attribute.getType()) && attribute.isRequired())) .isTrue(); - assertThat(attributeList.stream().anyMatch(attribute -> "email".equals(attribute.getName()) + assertThat(attributeList.stream().anyMatch((attribute) -> "email".equals(attribute.getName()) && "https://axschema.org/contact/email".equals(attribute.getType()) && attribute.isRequired())) .isTrue(); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpServerAccessDeniedHandlerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpServerAccessDeniedHandlerTests.java index 757e52a740..f431f397be 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpServerAccessDeniedHandlerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpServerAccessDeniedHandlerTests.java @@ -124,11 +124,11 @@ public class NamespaceHttpServerAccessDeniedHandlerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().denyAll() ) - .exceptionHandling(exceptionHandling -> + .exceptionHandling((exceptionHandling) -> exceptionHandling.accessDeniedPage("/AccessDeniedPageConfig") ); // @formatter:on @@ -167,11 +167,11 @@ public class NamespaceHttpServerAccessDeniedHandlerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().denyAll() ) - .exceptionHandling(exceptionHandling -> + .exceptionHandling((exceptionHandling) -> exceptionHandling.accessDeniedHandler(accessDeniedHandler()) ); // @formatter:on diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpX509Tests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpX509Tests.java index 8b9e0e6209..e6d6576183 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpX509Tests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpX509Tests.java @@ -273,7 +273,7 @@ public class NamespaceHttpX509Tests { .anyRequest().hasRole("USER") .and() .x509() - .userDetailsService(username -> USER); + .userDetailsService((username) -> USER); // @formatter:on } @@ -296,7 +296,7 @@ public class NamespaceHttpX509Tests { .anyRequest().hasRole("USER") .and() .x509() - .authenticationUserDetailsService(authentication -> USER); + .authenticationUserDetailsService((authentication) -> USER); // @formatter:on } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceRememberMeTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceRememberMeTests.java index 595b38b8e0..949fea0e42 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceRememberMeTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceRememberMeTests.java @@ -244,7 +244,7 @@ public class NamespaceRememberMeTests { } static RequestPostProcessor rememberMeLogin(String parameterName, boolean parameterValue) { - return request -> { + return (request) -> { csrf().postProcessRequest(request); request.setParameter("username", "user"); request.setParameter("password", "password"); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceSessionManagementTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceSessionManagementTests.java index 4d8440efa6..8fccfcd006 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceSessionManagementTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceSessionManagementTests.java @@ -96,7 +96,7 @@ public class NamespaceSessionManagementTests { public void authenticateWhenUsingInvalidSessionUrlThenMatchesNamespace() throws Exception { this.spring.register(CustomSessionManagementConfig.class).autowire(); - this.mvc.perform(get("/auth").with(request -> { + this.mvc.perform(get("/auth").with((request) -> { request.setRequestedSessionIdValid(false); request.setRequestedSessionId("id"); return request; @@ -137,7 +137,7 @@ public class NamespaceSessionManagementTests { given(mock.changeSessionId()).willThrow(SessionAuthenticationException.class); mock.setMethod("GET"); - this.mvc.perform(get("/auth").with(request -> mock).with(httpBasic("user", "password"))) + this.mvc.perform(get("/auth").with((request) -> mock).with(httpBasic("user", "password"))) .andExpect(redirectedUrl("/session-auth-error")); } @@ -158,7 +158,7 @@ public class NamespaceSessionManagementTests { public void authenticateWhenUsingCustomInvalidSessionStrategyThenMatchesNamespace() throws Exception { this.spring.register(InvalidSessionStrategyConfig.class).autowire(); - this.mvc.perform(get("/auth").with(request -> { + this.mvc.perform(get("/auth").with((request) -> { request.setRequestedSessionIdValid(false); request.setRequestedSessionId("id"); return request; diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/PortMapperConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/PortMapperConfigurerTests.java index 75436e2a40..6c7f1d59ea 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/PortMapperConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/PortMapperConfigurerTests.java @@ -91,11 +91,11 @@ public class PortMapperConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .requiresChannel(requiresChannel -> + .requiresChannel((requiresChannel) -> requiresChannel .anyRequest().requiresSecure() ) - .portMapper(portMapper -> + .portMapper((portMapper) -> portMapper .http(543).mapsTo(123) ); @@ -113,11 +113,11 @@ public class PortMapperConfigurerTests { customPortMapper.setPortMappings(Collections.singletonMap("543", "123")); // @formatter:off http - .requiresChannel(requiresChannel -> + .requiresChannel((requiresChannel) -> requiresChannel .anyRequest().requiresSecure() ) - .portMapper(portMapper -> + .portMapper((portMapper) -> portMapper .portMapper(customPortMapper) ); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurerTests.java index a0030c867e..8c10fa0d5a 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurerTests.java @@ -121,7 +121,7 @@ public class RememberMeConfigurerTests { Cookie rememberMeCookie = mvcResult.getResponse().getCookie("remember-me"); this.mvc.perform(get("/abc").cookie(rememberMeCookie)).andExpect(authenticated() - .withAuthentication(auth -> assertThat(auth).isInstanceOf(RememberMeAuthenticationToken.class))); + .withAuthentication((auth) -> assertThat(auth).isInstanceOf(RememberMeAuthenticationToken.class))); } @Test @@ -196,7 +196,7 @@ public class RememberMeConfigurerTests { Cookie rememberMeCookie = mvcResult.getResponse().getCookie("remember-me"); this.mvc.perform(get("/abc").cookie(rememberMeCookie)).andExpect(authenticated() - .withAuthentication(auth -> assertThat(auth).isInstanceOf(RememberMeAuthenticationToken.class))); + .withAuthentication((auth) -> assertThat(auth).isInstanceOf(RememberMeAuthenticationToken.class))); } @EnableWebSecurity @@ -334,7 +334,7 @@ public class RememberMeConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().hasRole("USER") ) @@ -389,12 +389,12 @@ public class RememberMeConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().hasRole("USER") ) .formLogin(withDefaults()) - .rememberMe(rememberMe -> + .rememberMe((rememberMe) -> rememberMe .rememberMeCookieDomain("spring.io") ); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RequestCacheConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RequestCacheConfigurerTests.java index a82959e24f..a385089f9a 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RequestCacheConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RequestCacheConfigurerTests.java @@ -333,7 +333,7 @@ public class RequestCacheConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().authenticated() ) @@ -351,7 +351,7 @@ public class RequestCacheConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().authenticated() ) @@ -369,12 +369,12 @@ public class RequestCacheConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().authenticated() ) .formLogin(withDefaults()) - .requestCache(requestCache -> + .requestCache((requestCache) -> requestCache .requestCache(new NullRequestCache()) ); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RequestMatcherConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RequestMatcherConfigurerTests.java index 9abd316d03..e820678b2f 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RequestMatcherConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RequestMatcherConfigurerTests.java @@ -87,15 +87,15 @@ public class RequestMatcherConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .requestMatchers(requestMatchers -> + .requestMatchers((requestMatchers) -> requestMatchers .antMatchers("/api/**") ) - .requestMatchers(requestMatchers -> + .requestMatchers((requestMatchers) -> requestMatchers .antMatchers("/oauth/**") ) - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().denyAll() ); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SecurityContextConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SecurityContextConfigurerTests.java index 4d232ac77f..e3bb13407c 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SecurityContextConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SecurityContextConfigurerTests.java @@ -252,7 +252,7 @@ public class SecurityContextConfigurerTests { // @formatter:off http .formLogin(withDefaults()) - .securityContext(securityContext -> + .securityContext((securityContext) -> securityContext .securityContextRepository(new NullSecurityContextRepository()) ); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ServletApiConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ServletApiConfigurerTests.java index ae3318db30..05236e3742 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ServletApiConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ServletApiConfigurerTests.java @@ -343,7 +343,7 @@ public class ServletApiConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .servletApi(servletApi -> + .servletApi((servletApi) -> servletApi .rolePrefix("PERMISSION_") ); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerTests.java index 4022a9d2d0..36c2b9aeba 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerTests.java @@ -362,9 +362,9 @@ public class SessionManagementConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .sessionManagement(sessionManagement -> + .sessionManagement((sessionManagement) -> sessionManagement - .sessionFixation(sessionFixation -> + .sessionFixation((sessionFixation) -> sessionFixation.newSession() ) ) @@ -417,9 +417,9 @@ public class SessionManagementConfigurerTests { // @formatter:off http .formLogin(withDefaults()) - .sessionManagement(sessionManagement -> + .sessionManagement((sessionManagement) -> sessionManagement - .sessionConcurrency(sessionConcurrency -> + .sessionConcurrency((sessionConcurrency) -> sessionConcurrency .maximumSessions(1) .maxSessionsPreventsLogin(true) @@ -446,7 +446,7 @@ public class SessionManagementConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .sessionManagement(sessionManagement -> + .sessionManagement((sessionManagement) -> sessionManagement .sessionCreationPolicy(SessionCreationPolicy.STATELESS) ); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/X509ConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/X509ConfigurerTests.java index 0de22b0bb0..64ca605e85 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/X509ConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/X509ConfigurerTests.java @@ -182,7 +182,7 @@ public class X509ConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .x509(x509 -> + .x509((x509) -> x509 .subjectPrincipalRegex("CN=(.*?)@example.com(?:,|$)") ); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2ClientConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2ClientConfigurerTests.java index 8598189995..2fd0b699a8 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2ClientConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2ClientConfigurerTests.java @@ -233,7 +233,7 @@ public class OAuth2ClientConfigurerTests { OAuth2AuthorizationRequestResolver defaultAuthorizationRequestResolver = authorizationRequestResolver; authorizationRequestResolver = mock(OAuth2AuthorizationRequestResolver.class); given(authorizationRequestResolver.resolve(any())) - .willAnswer(invocation -> defaultAuthorizationRequestResolver.resolve(invocation.getArgument(0))); + .willAnswer((invocation) -> defaultAuthorizationRequestResolver.resolve(invocation.getArgument(0))); this.spring.register(OAuth2ClientConfig.class).autowire(); @@ -295,7 +295,7 @@ public class OAuth2ClientConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().authenticated() ) diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurerTests.java index 382e80edb9..206b1157c2 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurerTests.java @@ -586,7 +586,7 @@ public class OAuth2LoginConfigurerTests { } private static OAuth2AccessTokenResponseClient createOauth2AccessTokenResponseClient() { - return request -> { + return (request) -> { Map additionalParameters = new HashMap<>(); if (request.getAuthorizationExchange().getAuthorizationRequest().getScopes().contains("openid")) { additionalParameters.put(OidcParameterNames.ID_TOKEN, "token123"); @@ -598,17 +598,17 @@ public class OAuth2LoginConfigurerTests { private static OAuth2UserService createOauth2UserService() { Map userAttributes = Collections.singletonMap("name", "spring"); - return request -> new DefaultOAuth2User(Collections.singleton(new OAuth2UserAuthority(userAttributes)), + return (request) -> new DefaultOAuth2User(Collections.singleton(new OAuth2UserAuthority(userAttributes)), userAttributes, "name"); } private static OAuth2UserService createOidcUserService() { OidcIdToken idToken = TestOidcIdTokens.idToken().build(); - return request -> new DefaultOidcUser(Collections.singleton(new OidcUserAuthority(idToken)), idToken); + return (request) -> new DefaultOidcUser(Collections.singleton(new OidcUserAuthority(idToken)), idToken); } private static GrantedAuthoritiesMapper createGrantedAuthoritiesMapper() { - return authorities -> { + return (authorities) -> { boolean isOidc = OidcUserAuthority.class.isInstance(authorities.iterator().next()); List mappedAuthorities = new ArrayList<>(authorities); mappedAuthorities.add(new SimpleGrantedAuthority(isOidc ? "ROLE_OIDC_USER" : "ROLE_OAUTH2_USER")); @@ -650,7 +650,7 @@ public class OAuth2LoginConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .oauth2Login(oauth2Login -> + .oauth2Login((oauth2Login) -> oauth2Login .clientRegistrationRepository( new InMemoryClientRegistrationRepository(GOOGLE_CLIENT_REGISTRATION)) @@ -811,10 +811,10 @@ public class OAuth2LoginConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .oauth2Login(oauth2Login -> + .oauth2Login((oauth2Login) -> oauth2Login .clientRegistrationRepository(this.clientRegistrationRepository) - .authorizationEndpoint(authorizationEndpoint -> + .authorizationEndpoint((authorizationEndpoint) -> authorizationEndpoint .authorizationRequestResolver(this.resolver) ) @@ -866,7 +866,7 @@ public class OAuth2LoginConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .oauth2Login(oauth2Login -> + .oauth2Login((oauth2Login) -> oauth2Login .clientRegistrationRepository( new InMemoryClientRegistrationRepository(GOOGLE_CLIENT_REGISTRATION)) @@ -945,21 +945,21 @@ public class OAuth2LoginConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().authenticated() ) - .securityContext(securityContext -> + .securityContext((securityContext) -> securityContext .securityContextRepository(securityContextRepository()) ) - .oauth2Login(oauth2Login -> + .oauth2Login((oauth2Login) -> oauth2Login - .tokenEndpoint(tokenEndpoint -> + .tokenEndpoint((tokenEndpoint) -> tokenEndpoint .accessTokenResponseClient(createOauth2AccessTokenResponseClient()) ) - .userInfoEndpoint(userInfoEndpoint -> + .userInfoEndpoint((userInfoEndpoint) -> userInfoEndpoint .userService(createOauth2UserService()) .oidcUserService(createOidcUserService()) @@ -985,7 +985,7 @@ public class OAuth2LoginConfigurerTests { @Bean JwtDecoderFactory jwtDecoderFactory() { - return clientRegistration -> getJwtDecoder(); + return (clientRegistration) -> getJwtDecoder(); } private static JwtDecoder getJwtDecoder() { @@ -994,7 +994,7 @@ public class OAuth2LoginConfigurerTests { claims.put(IdTokenClaimNames.ISS, "http://localhost/iss"); claims.put(IdTokenClaimNames.AUD, Arrays.asList("clientId", "a", "u", "d")); claims.put(IdTokenClaimNames.AZP, "clientId"); - Jwt jwt = TestJwts.jwt().claims(c -> c.putAll(claims)).build(); + Jwt jwt = TestJwts.jwt().claims((c) -> c.putAll(claims)).build(); JwtDecoder jwtDecoder = mock(JwtDecoder.class); given(jwtDecoder.decode(any())).willReturn(jwt); return jwtDecoder; @@ -1007,12 +1007,12 @@ public class OAuth2LoginConfigurerTests { @Bean JwtDecoderFactory jwtDecoderFactory1() { - return clientRegistration -> JwtDecoderFactoryConfig.getJwtDecoder(); + return (clientRegistration) -> JwtDecoderFactoryConfig.getJwtDecoder(); } @Bean JwtDecoderFactory jwtDecoderFactory2() { - return clientRegistration -> JwtDecoderFactoryConfig.getJwtDecoder(); + return (clientRegistration) -> JwtDecoderFactoryConfig.getJwtDecoder(); } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java index 93342403c6..82fbe70deb 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java @@ -1404,12 +1404,12 @@ public class OAuth2ResourceServerConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .antMatchers("/requires-read-scope").access("hasAuthority('SCOPE_message:read')") .anyRequest().authenticated() ) - .oauth2ResourceServer(oauth2ResourceServer -> + .oauth2ResourceServer((oauth2ResourceServer) -> oauth2ResourceServer .jwt(withDefaults()) ); @@ -1450,14 +1450,14 @@ public class OAuth2ResourceServerConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .antMatchers("/requires-read-scope").access("hasAuthority('SCOPE_message:read')") .anyRequest().authenticated() ) - .oauth2ResourceServer(oauth2ResourceServer -> + .oauth2ResourceServer((oauth2ResourceServer) -> oauth2ResourceServer - .jwt(jwt -> + .jwt((jwt) -> jwt .jwkSetUri(this.jwkSetUri) ) @@ -1601,7 +1601,7 @@ public class OAuth2ResourceServerConfigurerTests { .anyRequest().denyAll() .and() .exceptionHandling() - .defaultAccessDeniedHandlerFor(new AccessDeniedHandlerImpl(), request -> false) + .defaultAccessDeniedHandlerFor(new AccessDeniedHandlerImpl(), (request) -> false) .and() .httpBasic() .and() @@ -1668,7 +1668,7 @@ public class OAuth2ResourceServerConfigurerTests { Converter getJwtAuthenticationConverter() { JwtAuthenticationConverter converter = new JwtAuthenticationConverter(); converter.setJwtGrantedAuthoritiesConverter( - jwt -> Collections.singletonList(new SimpleGrantedAuthority("message:read"))); + (jwt) -> Collections.singletonList(new SimpleGrantedAuthority("message:read"))); return converter; } @@ -1871,13 +1871,13 @@ public class OAuth2ResourceServerConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().authenticated() ) - .oauth2ResourceServer(oauth2ResourceServer -> + .oauth2ResourceServer((oauth2ResourceServer) -> oauth2ResourceServer - .jwt(jwt -> + .jwt((jwt) -> jwt .decoder(decoder()) ) @@ -2091,12 +2091,12 @@ public class OAuth2ResourceServerConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .antMatchers("/requires-read-scope").hasAuthority("SCOPE_message:read") .anyRequest().authenticated() ) - .oauth2ResourceServer(oauth2ResourceServer -> + .oauth2ResourceServer((oauth2ResourceServer) -> oauth2ResourceServer .opaqueToken(withDefaults()) ); @@ -2135,13 +2135,13 @@ public class OAuth2ResourceServerConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().authenticated() ) - .oauth2ResourceServer(oauth2ResourceServer -> + .oauth2ResourceServer((oauth2ResourceServer) -> oauth2ResourceServer - .opaqueToken(opaqueToken -> + .opaqueToken((opaqueToken) -> opaqueToken .authenticationManager(authenticationProvider()::authenticate) ) diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/openid/OpenIDLoginConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/openid/OpenIDLoginConfigurerTests.java index e5cb902773..66d8cf2701 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/openid/OpenIDLoginConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/openid/OpenIDLoginConfigurerTests.java @@ -127,11 +127,11 @@ public class OpenIDLoginConfigurerTests { List attributeList = (List) attributeObject; assertThat( attributeList.stream() - .anyMatch(attribute -> "nickname".equals(attribute.getName()) + .anyMatch((attribute) -> "nickname".equals(attribute.getName()) && "https://schema.openid.net/namePerson/friendly".equals(attribute.getType()))) .isTrue(); assertThat(attributeList.stream() - .anyMatch(attribute -> "email".equals(attribute.getName()) + .anyMatch((attribute) -> "email".equals(attribute.getName()) && "https://schema.openid.net/contact/email".equals(attribute.getType()) && attribute.isRequired() && attribute.getCount() == 2)).isTrue(); } @@ -231,11 +231,11 @@ public class OpenIDLoginConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().authenticated() ) - .openidLogin(openIdLogin -> + .openidLogin((openIdLogin) -> openIdLogin .loginPage("/login/custom") ); @@ -253,22 +253,22 @@ public class OpenIDLoginConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().permitAll() ) - .openidLogin(openIdLogin -> + .openidLogin((openIdLogin) -> openIdLogin .consumerManager(CONSUMER_MANAGER) - .attributeExchange(attributeExchange -> + .attributeExchange((attributeExchange) -> attributeExchange .identifierPattern(".*") - .attribute(nicknameAttribute -> + .attribute((nicknameAttribute) -> nicknameAttribute .name("nickname") .type("https://schema.openid.net/namePerson/friendly") ) - .attribute(emailAttribute -> + .attribute((emailAttribute) -> emailAttribute .name("email") .type("https://schema.openid.net/contact/email") @@ -291,14 +291,14 @@ public class OpenIDLoginConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().permitAll() ) - .openidLogin(openIdLogin -> + .openidLogin((openIdLogin) -> openIdLogin .consumerManager(CONSUMER_MANAGER) - .attributeExchange(attributeExchange -> + .attributeExchange((attributeExchange) -> attributeExchange .identifierPattern(".*") .attribute(withDefaults()) diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurerTests.java index 0205de29b3..a8c47766f6 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurerTests.java @@ -102,10 +102,10 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. */ public class Saml2LoginConfigurerTests { - private static final Converter> AUTHORITIES_EXTRACTOR = a -> Arrays - .asList(new SimpleGrantedAuthority("TEST")); + private static final Converter> AUTHORITIES_EXTRACTOR = ( + a) -> Arrays.asList(new SimpleGrantedAuthority("TEST")); - private static final GrantedAuthoritiesMapper AUTHORITIES_MAPPER = authorities -> Arrays + private static final GrantedAuthoritiesMapper AUTHORITIES_MAPPER = (authorities) -> Arrays .asList(new SimpleGrantedAuthority("TEST CONVERTED")); private static final Duration RESPONSE_TIME_VALIDATION_SKEW = Duration.ZERO; @@ -194,8 +194,8 @@ public class Saml2LoginConfigurerTests { public void authenticateWhenCustomAuthenticationConverterThenUses() throws Exception { this.spring.register(CustomAuthenticationConverter.class).autowire(); RelyingPartyRegistration relyingPartyRegistration = TestRelyingPartyRegistrations.noCredentials() - .assertingPartyDetails(party -> party.verificationX509Credentials( - c -> c.add(TestSaml2X509Credentials.relyingPartyVerifyingCredential()))) + .assertingPartyDetails((party) -> party.verificationX509Credentials( + (c) -> c.add(TestSaml2X509Credentials.relyingPartyVerifyingCredential()))) .build(); String response = new String(samlDecode(SIGNED_RESPONSE)); given(CustomAuthenticationConverter.authenticationConverter.convert(any(HttpServletRequest.class))) @@ -212,7 +212,7 @@ public class Saml2LoginConfigurerTests { "authenticationManager"); ProviderManager pm = (ProviderManager) manager; AuthenticationProvider provider = pm.getProviders().stream() - .filter(p -> p instanceof OpenSamlAuthenticationProvider).findFirst().get(); + .filter((p) -> p instanceof OpenSamlAuthenticationProvider).findFirst().get(); Assert.assertSame(AUTHORITIES_EXTRACTOR, ReflectionTestUtils.getField(provider, "authoritiesExtractor")); Assert.assertSame(AUTHORITIES_MAPPER, ReflectionTestUtils.getField(provider, "authoritiesMapper")); Assert.assertSame(RESPONSE_TIME_VALIDATION_SKEW, @@ -221,7 +221,7 @@ public class Saml2LoginConfigurerTests { private Saml2WebSsoAuthenticationFilter getSaml2SsoFilter(FilterChainProxy chain) { return (Saml2WebSsoAuthenticationFilter) chain.getFilters("/login/saml2/sso/test").stream() - .filter(f -> f instanceof Saml2WebSsoAuthenticationFilter).findFirst().get(); + .filter((f) -> f instanceof Saml2WebSsoAuthenticationFilter).findFirst().get(); } private void performSaml2Login(String expected) throws IOException, ServletException { @@ -324,7 +324,7 @@ public class Saml2LoginConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authz -> authz + .authorizeRequests((authz) -> authz .anyRequest().authenticated() ) .saml2Login(withDefaults()); @@ -346,10 +346,10 @@ public class Saml2LoginConfigurerTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authz -> authz + .authorizeRequests((authz) -> authz .anyRequest().authenticated() ) - .saml2Login(saml2 -> {}); + .saml2Login((saml2) -> {}); // @formatter:on } @@ -357,7 +357,7 @@ public class Saml2LoginConfigurerTests { Saml2AuthenticationRequestFactory authenticationRequestFactory() { OpenSamlAuthenticationRequestFactory authenticationRequestFactory = new OpenSamlAuthenticationRequestFactory(); authenticationRequestFactory - .setAuthnRequestConsumerResolver(context -> authnRequest -> authnRequest.setForceAuthn(true)); + .setAuthnRequestConsumerResolver((context) -> (authnRequest) -> authnRequest.setForceAuthn(true)); return authenticationRequestFactory; } @@ -371,8 +371,8 @@ public class Saml2LoginConfigurerTests { @Override protected void configure(HttpSecurity http) throws Exception { - http.authorizeRequests(authz -> authz.anyRequest().authenticated()) - .saml2Login(saml2 -> saml2.authenticationConverter(authenticationConverter)); + http.authorizeRequests((authz) -> authz.anyRequest().authenticated()) + .saml2Login((saml2) -> saml2.authenticationConverter(authenticationConverter)); } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/reactive/EnableWebFluxSecurityTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/reactive/EnableWebFluxSecurityTests.java index 036618be7b..9ef91dc752 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/reactive/EnableWebFluxSecurityTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/reactive/EnableWebFluxSecurityTests.java @@ -112,7 +112,7 @@ public class EnableWebFluxSecurityTests { WebTestClient client = WebTestClientBuilder.bindToWebFilters(this.springSecurityFilterChain).build(); - FluxExchangeResult result = client.get().headers(headers -> headers.setBasicAuth("user", "password")) + FluxExchangeResult result = client.get().headers((headers) -> headers.setBasicAuth("user", "password")) .exchange().expectStatus().isOk().returnResult(String.class); result.assertWithDiagnostics(() -> assertThat(result.getResponseCookies().isEmpty())); } @@ -126,16 +126,16 @@ public class EnableWebFluxSecurityTests { WebTestClient client = WebTestClientBuilder .bindToWebFilters( (exchange, chain) -> contextRepository.save(exchange, context) - .switchIfEmpty(chain.filter(exchange)).flatMap(e -> chain.filter(exchange)), + .switchIfEmpty(chain.filter(exchange)).flatMap((e) -> chain.filter(exchange)), this.springSecurityFilterChain, (exchange, chain) -> ReactiveSecurityContextHolder.getContext() - .map(SecurityContext::getAuthentication).flatMap(principal -> exchange + .map(SecurityContext::getAuthentication).flatMap((principal) -> exchange .getResponse().writeWith(Mono.just(toDataBuffer(principal.getName()))))) .build(); client.get().uri("/").exchange().expectStatus().isOk().expectBody(String.class) - .consumeWith(result -> assertThat(result.getResponseBody()).isEqualTo(currentPrincipal.getName())); + .consumeWith((result) -> assertThat(result.getResponseBody()).isEqualTo(currentPrincipal.getName())); } @Test @@ -145,13 +145,13 @@ public class EnableWebFluxSecurityTests { .bindToWebFilters(this.springSecurityFilterChain, (exchange, chain) -> ReactiveSecurityContextHolder.getContext() - .map(SecurityContext::getAuthentication).flatMap(principal -> exchange + .map(SecurityContext::getAuthentication).flatMap((principal) -> exchange .getResponse().writeWith(Mono.just(toDataBuffer(principal.getName()))))) .build(); - client.get().uri("/").headers(headers -> headers.setBasicAuth("user", "password")).exchange().expectStatus() + client.get().uri("/").headers((headers) -> headers.setBasicAuth("user", "password")).exchange().expectStatus() .isOk().expectBody(String.class) - .consumeWith(result -> assertThat(result.getResponseBody()).isEqualTo("user")); + .consumeWith((result) -> assertThat(result.getResponseBody()).isEqualTo("user")); } @Test @@ -171,13 +171,13 @@ public class EnableWebFluxSecurityTests { .bindToWebFilters(this.springSecurityFilterChain, (exchange, chain) -> ReactiveSecurityContextHolder.getContext() - .map(SecurityContext::getAuthentication).flatMap(principal -> exchange + .map(SecurityContext::getAuthentication).flatMap((principal) -> exchange .getResponse().writeWith(Mono.just(toDataBuffer(principal.getName()))))) .build(); - client.get().uri("/").headers(headers -> headers.setBasicAuth("user", "password")).exchange().expectStatus() + client.get().uri("/").headers((headers) -> headers.setBasicAuth("user", "password")).exchange().expectStatus() .isOk().expectBody(String.class) - .consumeWith(result -> assertThat(result.getResponseBody()).isEqualTo("user")); + .consumeWith((result) -> assertThat(result.getResponseBody()).isEqualTo("user")); } @Test @@ -185,7 +185,7 @@ public class EnableWebFluxSecurityTests { this.spring.register(MapReactiveUserDetailsServiceConfig.class).autowire(); WebTestClient client = WebTestClientBuilder.bindToWebFilters(this.springSecurityFilterChain).build(); - client.get().uri("/").headers(h -> h.setBasicAuth("user", "password")).exchange().expectStatus().isOk(); + client.get().uri("/").headers((h) -> h.setBasicAuth("user", "password")).exchange().expectStatus().isOk(); ReactiveUserDetailsService users = this.spring.getContext().getBean(ReactiveUserDetailsService.class); assertThat(users.findByUsername("user").block().getPassword()).startsWith("{bcrypt}"); @@ -195,8 +195,8 @@ public class EnableWebFluxSecurityTests { public void formLoginWorks() { this.spring.register(Config.class).autowire(); WebTestClient client = WebTestClientBuilder.bindToWebFilters(this.springSecurityFilterChain, (exchange, - chain) -> Mono.subscriberContext().flatMap(c -> c.>get(Authentication.class)).flatMap( - principal -> exchange.getResponse().writeWith(Mono.just(toDataBuffer(principal.getName()))))) + chain) -> Mono.subscriberContext().flatMap((c) -> c.>get(Authentication.class)).flatMap( + (principal) -> exchange.getResponse().writeWith(Mono.just(toDataBuffer(principal.getName()))))) .build(); MultiValueMap data = new LinkedMultiValueMap<>(); diff --git a/config/src/test/java/org/springframework/security/config/crypto/RsaKeyConversionServicePostProcessorTests.java b/config/src/test/java/org/springframework/security/config/crypto/RsaKeyConversionServicePostProcessorTests.java index 180983d8f6..dfa8399e66 100644 --- a/config/src/test/java/org/springframework/security/config/crypto/RsaKeyConversionServicePostProcessorTests.java +++ b/config/src/test/java/org/springframework/security/config/crypto/RsaKeyConversionServicePostProcessorTests.java @@ -146,7 +146,7 @@ public class RsaKeyConversionServicePostProcessorTests { @Bean BeanFactoryPostProcessor conversionServiceCustomizer() { - return beanFactory -> beanFactory.getBean(RsaKeyConversionServicePostProcessor.class) + return (beanFactory) -> beanFactory.getBean(RsaKeyConversionServicePostProcessor.class) .setResourceLoader(new CustomResourceLoader()); } @@ -158,7 +158,7 @@ public class RsaKeyConversionServicePostProcessorTests { @Bean ConversionService conversionService() { GenericConversionService service = new GenericConversionService(); - service.addConverter(String.class, RSAPublicKey.class, source -> { + service.addConverter(String.class, RSAPublicKey.class, (source) -> { throw new IllegalArgumentException("unsupported"); }); return service; diff --git a/config/src/test/java/org/springframework/security/config/doc/Element.java b/config/src/test/java/org/springframework/security/config/doc/Element.java index 2e8369880f..6a6bd75181 100644 --- a/config/src/test/java/org/springframework/security/config/doc/Element.java +++ b/config/src/test/java/org/springframework/security/config/doc/Element.java @@ -130,9 +130,9 @@ public class Element { Collection ids = new ArrayList<>(); ids.add(getId()); - this.childElmts.values().forEach(elmt -> ids.add(elmt.getId())); + this.childElmts.values().forEach((elmt) -> ids.add(elmt.getId())); - this.attrs.forEach(attr -> ids.add(attr.getId())); + this.attrs.forEach((attr) -> ids.add(attr.getId())); if (!this.childElmts.isEmpty()) { ids.add(getId() + "-children"); @@ -152,7 +152,8 @@ public class Element { public Map getAllChildElmts() { Map result = new HashMap<>(); - this.childElmts.values().forEach(elmt -> elmt.subGrps.forEach(subElmt -> result.put(subElmt.name, subElmt))); + this.childElmts.values() + .forEach((elmt) -> elmt.subGrps.forEach((subElmt) -> result.put(subElmt.name, subElmt))); result.putAll(this.childElmts); @@ -162,7 +163,8 @@ public class Element { public Map getAllParentElmts() { Map result = new HashMap<>(); - this.parentElmts.values().forEach(elmt -> elmt.subGrps.forEach(subElmt -> result.put(subElmt.name, subElmt))); + this.parentElmts.values() + .forEach((elmt) -> elmt.subGrps.forEach((subElmt) -> result.put(subElmt.name, subElmt))); result.putAll(this.parentElmts); diff --git a/config/src/test/java/org/springframework/security/config/doc/SpringSecurityXsdParser.java b/config/src/test/java/org/springframework/security/config/doc/SpringSecurityXsdParser.java index 00bb96ee0c..1181230cf0 100644 --- a/config/src/test/java/org/springframework/security/config/doc/SpringSecurityXsdParser.java +++ b/config/src/test/java/org/springframework/security/config/doc/SpringSecurityXsdParser.java @@ -61,7 +61,7 @@ public class SpringSecurityXsdParser { private Map elements(XmlNode node) { Map elementNameToElement = new HashMap<>(); - node.children().forEach(child -> { + node.children().forEach((child) -> { if ("element".equals(child.simpleName())) { Element e = elmt(child); elementNameToElement.put(e.getName(), e); @@ -81,7 +81,7 @@ public class SpringSecurityXsdParser { */ private Collection attrs(XmlNode element) { Collection attrs = new ArrayList<>(); - element.children().forEach(c -> { + element.children().forEach((c) -> { String name = c.simpleName(); if ("attribute".equals(name)) { attrs.add(attr(c)); @@ -103,7 +103,7 @@ public class SpringSecurityXsdParser { private Collection attrgrps(XmlNode element) { Collection attrgrp = new ArrayList<>(); - element.children().forEach(c -> { + element.children().forEach((c) -> { if (!"element".equals(c.simpleName())) { if ("attributeGroup".equals(c.simpleName())) { if (c.attribute("name") != null) { @@ -130,7 +130,7 @@ public class SpringSecurityXsdParser { root = root.parent().get(); } - return expand(root).filter(node -> name.equals(node.attribute("name"))).findFirst() + return expand(root).filter((node) -> name.equals(node.attribute("name"))).findFirst() .orElseThrow(IllegalArgumentException::new); } @@ -157,8 +157,8 @@ public class SpringSecurityXsdParser { * @return */ private String desc(XmlNode element) { - return element.child("annotation").flatMap(annotation -> annotation.child("documentation")) - .map(documentation -> documentation.text()).orElse(null); + return element.child("annotation").flatMap((annotation) -> annotation.child("documentation")) + .map((documentation) -> documentation.text()).orElse(null); } /** @@ -197,8 +197,8 @@ public class SpringSecurityXsdParser { e.setChildElmts(elements(n)); e.setAttrs(attrs(n)); e.getAttrs().addAll(attrgrps(n)); - e.getAttrs().forEach(attr -> attr.setElmt(e)); - e.getChildElmts().values().forEach(element -> element.getParentElmts().put(e.getName(), e)); + e.getAttrs().forEach((attr) -> attr.setElmt(e)); + e.getChildElmts().values().forEach((element) -> element.getParentElmts().put(e.getName(), e)); String subGrpName = n.attribute("substitutionGroup"); if (!StringUtils.isEmpty(subGrpName)) { diff --git a/config/src/test/java/org/springframework/security/config/doc/XmlNode.java b/config/src/test/java/org/springframework/security/config/doc/XmlNode.java index 639ed25322..173efac460 100644 --- a/config/src/test/java/org/springframework/security/config/doc/XmlNode.java +++ b/config/src/test/java/org/springframework/security/config/doc/XmlNode.java @@ -50,16 +50,16 @@ public class XmlNode { } public Optional child(String name) { - return this.children().filter(child -> name.equals(child.simpleName())).findFirst(); + return this.children().filter((child) -> name.equals(child.simpleName())).findFirst(); } public Optional parent() { - return Optional.ofNullable(this.node.getParentNode()).map(parent -> new XmlNode(parent)); + return Optional.ofNullable(this.node.getParentNode()).map((parent) -> new XmlNode(parent)); } public String attribute(String name) { - return Optional.ofNullable(this.node.getAttributes()).map(attrs -> attrs.getNamedItem(name)) - .map(attr -> attr.getTextContent()).orElse(null); + return Optional.ofNullable(this.node.getAttributes()).map((attrs) -> attrs.getNamedItem(name)) + .map((attr) -> attr.getTextContent()).orElse(null); } public Node node() { diff --git a/config/src/test/java/org/springframework/security/config/doc/XsdDocumentedTests.java b/config/src/test/java/org/springframework/security/config/doc/XsdDocumentedTests.java index 519851f3be..d07647fda1 100644 --- a/config/src/test/java/org/springframework/security/config/doc/XsdDocumentedTests.java +++ b/config/src/test/java/org/springframework/security/config/doc/XsdDocumentedTests.java @@ -70,9 +70,9 @@ public class XsdDocumentedTests { XmlNode root = this.xml.parse(this.schemaDocumentLocation); List nodes = root.child("schema").map(XmlNode::children).orElse(Stream.empty()) - .filter(node -> "simpleType".equals(node.simpleName()) + .filter((node) -> "simpleType".equals(node.simpleName()) && "named-security-filter".equals(node.attribute("name"))) - .flatMap(XmlNode::children).flatMap(XmlNode::children).map(node -> node.attribute("value")) + .flatMap(XmlNode::children).flatMap(XmlNode::children).map((node) -> node.attribute("value")) .filter(StringUtils::isNotEmpty).collect(Collectors.toList()); SecurityFiltersAssertions.assertEquals(nodes); @@ -91,9 +91,9 @@ public class XsdDocumentedTests { XmlNode root = this.xml.parse(this.schema31xDocumentLocation); List nodes = root.child("schema").map(XmlNode::children).orElse(Stream.empty()) - .filter(node -> "simpleType".equals(node.simpleName()) + .filter((node) -> "simpleType".equals(node.simpleName()) && "named-security-filter".equals(node.attribute("name"))) - .flatMap(XmlNode::children).flatMap(XmlNode::children).map(node -> node.attribute("value")) + .flatMap(XmlNode::children).flatMap(XmlNode::children).map((node) -> node.attribute("value")) .filter(StringUtils::isNotEmpty).collect(Collectors.toList()); assertThat(nodes).isEqualTo(expected); @@ -129,11 +129,11 @@ public class XsdDocumentedTests { Map elementsByElementName = this.xml.elementsByElementName(this.schemaDocumentLocation); List documentIds = Files.lines(Paths.get(this.referenceLocation)) - .filter(line -> line.matches("\\[\\[(nsa-.*)\\]\\]")).map(line -> line.substring(2, line.length() - 2)) - .collect(Collectors.toList()); + .filter((line) -> line.matches("\\[\\[(nsa-.*)\\]\\]")) + .map((line) -> line.substring(2, line.length() - 2)).collect(Collectors.toList()); - Set expectedIds = elementsByElementName.values().stream().flatMap(element -> element.getIds().stream()) - .collect(Collectors.toSet()); + Set expectedIds = elementsByElementName.values().stream() + .flatMap((element) -> element.getIds().stream()).collect(Collectors.toSet()); documentIds.removeAll(this.ignoredIds); expectedIds.removeAll(this.ignoredIds); @@ -179,7 +179,7 @@ public class XsdDocumentedTests { String expression = "^\\* <<(nsa-.*),.*>>$"; if (line.matches(expression)) { String elmtId = line.replaceAll(expression, "$1"); - currentDocAttrNameToElmt.computeIfAbsent(docAttrName, key -> new ArrayList<>()).add(elmtId); + currentDocAttrNameToElmt.computeIfAbsent(docAttrName, (key) -> new ArrayList<>()).add(elmtId); } } } @@ -189,21 +189,21 @@ public class XsdDocumentedTests { Map> schemaAttrNameToChildren = new HashMap<>(); Map> schemaAttrNameToParents = new HashMap<>(); - elementNameToElement.entrySet().stream().forEach(entry -> { + elementNameToElement.entrySet().stream().forEach((entry) -> { String key = "nsa-" + entry.getKey(); if (this.ignoredIds.contains(key)) { return; } List parentIds = entry.getValue().getAllParentElmts().values().stream() - .filter(element -> !this.ignoredIds.contains(element.getId())).map(element -> element.getId()) + .filter((element) -> !this.ignoredIds.contains(element.getId())).map((element) -> element.getId()) .sorted().collect(Collectors.toList()); if (!parentIds.isEmpty()) { schemaAttrNameToParents.put(key, parentIds); } List childIds = entry.getValue().getAllChildElmts().values().stream() - .filter(element -> !this.ignoredIds.contains(element.getId())).map(element -> element.getId()) + .filter((element) -> !this.ignoredIds.contains(element.getId())).map((element) -> element.getId()) .sorted().collect(Collectors.toList()); if (!childIds.isEmpty()) { schemaAttrNameToChildren.put(key, childIds); @@ -224,12 +224,14 @@ public class XsdDocumentedTests { Map elementNameToElement = this.xml.elementsByElementName(this.schemaDocumentLocation); String notDocElmtIds = elementNameToElement.values().stream() - .filter(element -> StringUtils.isEmpty(element.getDesc()) && !this.ignoredIds.contains(element.getId())) - .map(element -> element.getId()).sorted().collect(Collectors.joining("\n")); + .filter((element) -> StringUtils.isEmpty(element.getDesc()) + && !this.ignoredIds.contains(element.getId())) + .map((element) -> element.getId()).sorted().collect(Collectors.joining("\n")); - String notDocAttrIds = elementNameToElement.values().stream().flatMap(element -> element.getAttrs().stream()) - .filter(element -> StringUtils.isEmpty(element.getDesc()) && !this.ignoredIds.contains(element.getId())) - .map(element -> element.getId()).sorted().collect(Collectors.joining("\n")); + String notDocAttrIds = elementNameToElement.values().stream().flatMap((element) -> element.getAttrs().stream()) + .filter((element) -> StringUtils.isEmpty(element.getDesc()) + && !this.ignoredIds.contains(element.getId())) + .map((element) -> element.getId()).sorted().collect(Collectors.joining("\n")); assertThat(notDocElmtIds).isEmpty(); assertThat(notDocAttrIds).isEmpty(); diff --git a/config/src/test/java/org/springframework/security/config/http/CsrfConfigTests.java b/config/src/test/java/org/springframework/security/config/http/CsrfConfigTests.java index ac82eb3c93..0f3bc46d77 100644 --- a/config/src/test/java/org/springframework/security/config/http/CsrfConfigTests.java +++ b/config/src/test/java/org/springframework/security/config/http/CsrfConfigTests.java @@ -142,7 +142,7 @@ public class CsrfConfigTests { this.spring.configLocations(this.xml("shared-controllers"), this.xml("AutoConfig")).autowire(); MockMvc traceEnabled = MockMvcBuilders.webAppContextSetup(this.spring.getContext()).apply(springSecurity()) - .addDispatcherServletCustomizer(dispatcherServlet -> dispatcherServlet.setDispatchTraceRequest(true)) + .addDispatcherServletCustomizer((dispatcherServlet) -> dispatcherServlet.setDispatchTraceRequest(true)) .build(); traceEnabled.perform(request(HttpMethod.TRACE, "/csrf-in-header")).andExpect(csrfInHeader()); @@ -219,7 +219,7 @@ public class CsrfConfigTests { this.spring.configLocations(this.xml("shared-controllers"), this.xml("CsrfEnabled")).autowire(); MockMvc traceEnabled = MockMvcBuilders.webAppContextSetup(this.spring.getContext()).apply(springSecurity()) - .addDispatcherServletCustomizer(dispatcherServlet -> dispatcherServlet.setDispatchTraceRequest(true)) + .addDispatcherServletCustomizer((dispatcherServlet) -> dispatcherServlet.setDispatchTraceRequest(true)) .build(); traceEnabled.perform(request(HttpMethod.TRACE, "/csrf-in-header")).andExpect(csrfInHeader()); @@ -425,11 +425,11 @@ public class CsrfConfigTests { } ResultMatcher csrfInHeader() { - return new CsrfReturnedResultMatcher(result -> result.getResponse().getHeader("X-CSRF-TOKEN")); + return new CsrfReturnedResultMatcher((result) -> result.getResponse().getHeader("X-CSRF-TOKEN")); } ResultMatcher csrfInBody() { - return new CsrfReturnedResultMatcher(result -> result.getResponse().getContentAsString()); + return new CsrfReturnedResultMatcher((result) -> result.getResponse().getContentAsString()); } @Controller diff --git a/config/src/test/java/org/springframework/security/config/http/HttpCorsConfigTests.java b/config/src/test/java/org/springframework/security/config/http/HttpCorsConfigTests.java index 862cdd0613..3809b4f5a1 100644 --- a/config/src/test/java/org/springframework/security/config/http/HttpCorsConfigTests.java +++ b/config/src/test/java/org/springframework/security/config/http/HttpCorsConfigTests.java @@ -126,7 +126,7 @@ public class HttpCorsConfigTests { } private ResultMatcher corsResponseHeaders() { - return result -> { + return (result) -> { header().exists("Access-Control-Allow-Origin").match(result); header().exists("X-Content-Type-Options").match(result); }; diff --git a/config/src/test/java/org/springframework/security/config/http/HttpHeadersConfigTests.java b/config/src/test/java/org/springframework/security/config/http/HttpHeadersConfigTests.java index ecc0c86719..ef52dec747 100644 --- a/config/src/test/java/org/springframework/security/config/http/HttpHeadersConfigTests.java +++ b/config/src/test/java/org/springframework/security/config/http/HttpHeadersConfigTests.java @@ -659,7 +659,7 @@ public class HttpHeadersConfigTests { } private static ResultMatcher includes(Map headers) { - return result -> { + return (result) -> { for (Map.Entry header : headers.entrySet()) { header().string(header.getKey(), header.getValue()).match(result); } @@ -671,7 +671,7 @@ public class HttpHeadersConfigTests { } private static ResultMatcher excludes(Collection headers) { - return result -> { + return (result) -> { for (String name : headers) { header().doesNotExist(name).match(result); } diff --git a/config/src/test/java/org/springframework/security/config/http/InterceptUrlConfigTests.java b/config/src/test/java/org/springframework/security/config/http/InterceptUrlConfigTests.java index bc12def2ef..5a3860ddae 100644 --- a/config/src/test/java/org/springframework/security/config/http/InterceptUrlConfigTests.java +++ b/config/src/test/java/org/springframework/security/config/http/InterceptUrlConfigTests.java @@ -214,7 +214,7 @@ public class InterceptUrlConfigTests { MockServletContext servletContext = spy(new MockServletContext()); final ServletRegistration registration = mock(ServletRegistration.class); given(registration.getMappings()).willReturn(Collections.singleton(servletPath)); - Answer> answer = invocation -> Collections.singletonMap("spring", + Answer> answer = (invocation) -> Collections.singletonMap("spring", registration); given(servletContext.getServletRegistrations()).willAnswer(answer); return servletContext; diff --git a/config/src/test/java/org/springframework/security/config/http/MiscHttpConfigTests.java b/config/src/test/java/org/springframework/security/config/http/MiscHttpConfigTests.java index a1f99f4d41..d77ce6517e 100644 --- a/config/src/test/java/org/springframework/security/config/http/MiscHttpConfigTests.java +++ b/config/src/test/java/org/springframework/security/config/http/MiscHttpConfigTests.java @@ -340,7 +340,7 @@ public class MiscHttpConfigTests { Class userFilterClass = this.spring.getContext().getBean("userFilter").getClass(); - assertThat(filters).extracting((Extractor>) filter -> filter.getClass()).containsSubsequence( + assertThat(filters).extracting((Extractor>) (filter) -> filter.getClass()).containsSubsequence( userFilterClass, userFilterClass, SecurityContextPersistenceFilter.class, LogoutFilter.class, userFilterClass); } @@ -355,7 +355,7 @@ public class MiscHttpConfigTests { public void configureWhenUsingX509ThenAddsX509FilterCorrectly() { this.spring.configLocations(xml("X509")).autowire(); - assertThat(getFilters("/")).extracting((Extractor>) filter -> filter.getClass()) + assertThat(getFilters("/")).extracting((Extractor>) (filter) -> filter.getClass()) .containsSubsequence(CsrfFilter.class, X509AuthenticationFilter.class, ExceptionTranslationFilter.class); } @@ -384,7 +384,7 @@ public class MiscHttpConfigTests { List values = result.getResponse().getHeaders("Set-Cookie"); assertThat(values.size()).isEqualTo(2); - assertThat(values).extracting(value -> value.split("=")[0]).contains("JSESSIONID", "mycookie"); + assertThat(values).extracting((value) -> value.split("=")[0]).contains("JSESSIONID", "mycookie"); } @Test @@ -587,7 +587,7 @@ public class MiscHttpConfigTests { Principal user = mock(Principal.class); given(user.getName()).willReturn("joe"); - this.mvc.perform(get("/roles").principal(user).with(request -> { + this.mvc.perform(get("/roles").principal(user).with((request) -> { request.addUserRole("admin"); request.addUserRole("user"); request.addUserRole("unmapped"); @@ -703,7 +703,7 @@ public class MiscHttpConfigTests { } private Answer writeTo(OutputStream os) { - return invocation -> { + return (invocation) -> { os.write(invocation.getArgument(0).toString().getBytes()); return null; }; diff --git a/config/src/test/java/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParserTests.java index 295f0af89b..343c4d6469 100644 --- a/config/src/test/java/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParserTests.java +++ b/config/src/test/java/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParserTests.java @@ -274,7 +274,7 @@ public class OAuth2LoginBeanDefinitionParserTests { given(this.accessTokenResponseClient.getTokenResponse(any())).willReturn(accessTokenResponse); Jwt jwt = TestJwts.user(); - given(this.jwtDecoderFactory.createDecoder(any())).willReturn(token -> jwt); + given(this.jwtDecoderFactory.createDecoder(any())).willReturn((token) -> jwt); MultiValueMap params = new LinkedMultiValueMap<>(); params.add("code", "code123"); @@ -331,7 +331,7 @@ public class OAuth2LoginBeanDefinitionParserTests { given(this.accessTokenResponseClient.getTokenResponse(any())).willReturn(accessTokenResponse); Jwt jwt = TestJwts.user(); - given(this.jwtDecoderFactory.createDecoder(any())).willReturn(token -> jwt); + given(this.jwtDecoderFactory.createDecoder(any())).willReturn((token) -> jwt); given(this.userAuthoritiesMapper.mapAuthorities(any())) .willReturn((Collection) AuthorityUtils.createAuthorityList("ROLE_OIDC_USER")); diff --git a/config/src/test/java/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests.java index 6e88114297..aa233653b1 100644 --- a/config/src/test/java/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests.java +++ b/config/src/test/java/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests.java @@ -678,7 +678,7 @@ public class OAuth2ResourceServerBeanDefinitionParserTests { AuthenticationManagerResolver authenticationManagerResolver = this.spring.getContext() .getBean(AuthenticationManagerResolver.class); given(authenticationManagerResolver.resolve(any(HttpServletRequest.class))).willReturn( - authentication -> new JwtAuthenticationToken(TestJwts.jwt().build(), Collections.emptyList())); + (authentication) -> new JwtAuthenticationToken(TestJwts.jwt().build(), Collections.emptyList())); this.mvc.perform(get("/").header("Authorization", "Bearer token")).andExpect(status().isNotFound()); diff --git a/config/src/test/java/org/springframework/security/config/http/OpenIDConfigTests.java b/config/src/test/java/org/springframework/security/config/http/OpenIDConfigTests.java index 93b754c02c..3de4472b57 100644 --- a/config/src/test/java/org/springframework/security/config/http/OpenIDConfigTests.java +++ b/config/src/test/java/org/springframework/security/config/http/OpenIDConfigTests.java @@ -118,7 +118,7 @@ public class OpenIDConfigTests { OpenIDConsumer consumer = mock(OpenIDConsumer.class); given(consumer.beginConsumption(any(HttpServletRequest.class), anyString(), anyString(), anyString())) - .will(invocation -> openIdEndpointUrl + invocation.getArgument(2)); + .will((invocation) -> openIdEndpointUrl + invocation.getArgument(2)); openIDFilter.setConsumer(consumer); String expectedReturnTo = new StringBuilder("http://localhost/login/openid").append("?") @@ -155,7 +155,7 @@ public class OpenIDConfigTests { this.mvc.perform( get("/login/openid").param(OpenIDAuthenticationFilter.DEFAULT_CLAIMED_IDENTITY_FIELD, endpoint)) .andExpect(status().isFound()) - .andExpect(result -> result.getResponse().getRedirectedUrl().endsWith( + .andExpect((result) -> result.getResponse().getRedirectedUrl().endsWith( "openid.ext1.type.nickname=http%3A%2F%2Fschema.openid.net%2FnamePerson%2Ffriendly&" + "openid.ext1.if_available=nickname&" + "openid.ext1.type.email=http%3A%2F%2Fschema.openid.net%2Fcontact%2Femail&" diff --git a/config/src/test/java/org/springframework/security/config/http/SessionManagementConfigTests.java b/config/src/test/java/org/springframework/security/config/http/SessionManagementConfigTests.java index 6a81001b45..19f7b33547 100644 --- a/config/src/test/java/org/springframework/security/config/http/SessionManagementConfigTests.java +++ b/config/src/test/java/org/springframework/security/config/http/SessionManagementConfigTests.java @@ -378,7 +378,7 @@ public class SessionManagementConfigTests { this.spring.configLocations(this.xml("SessionFixationProtectionNoneWithInvalidSessionUrl")).autowire(); - this.mvc.perform(get("/auth").with(request -> { + this.mvc.perform(get("/auth").with((request) -> { request.setRequestedSessionId("1"); request.setRequestedSessionIdValid(false); return request; diff --git a/config/src/test/java/org/springframework/security/config/web/server/AuthorizeExchangeSpecTests.java b/config/src/test/java/org/springframework/security/config/web/server/AuthorizeExchangeSpecTests.java index c1bb20ae3d..1fec30b4fc 100644 --- a/config/src/test/java/org/springframework/security/config/web/server/AuthorizeExchangeSpecTests.java +++ b/config/src/test/java/org/springframework/security/config/web/server/AuthorizeExchangeSpecTests.java @@ -64,8 +64,8 @@ public class AuthorizeExchangeSpecTests { @Test public void antMatchersWhenPatternsInLambdaThenAnyMethod() { - this.http.csrf(ServerHttpSecurity.CsrfSpec::disable) - .authorizeExchange(exchanges -> exchanges.pathMatchers("/a", "/b").denyAll().anyExchange().permitAll()); + this.http.csrf(ServerHttpSecurity.CsrfSpec::disable).authorizeExchange( + (exchanges) -> exchanges.pathMatchers("/a", "/b").denyAll().anyExchange().permitAll()); WebTestClient client = buildClient(); @@ -97,7 +97,7 @@ public class AuthorizeExchangeSpecTests { @Test(expected = IllegalStateException.class) public void buildWhenMatcherDefinedWithNoAccessInLambdaThenThrowsException() { - this.http.authorizeExchange(exchanges -> exchanges.pathMatchers("/incomplete")); + this.http.authorizeExchange((exchanges) -> exchanges.pathMatchers("/incomplete")); this.http.build(); } diff --git a/config/src/test/java/org/springframework/security/config/web/server/CorsSpecTests.java b/config/src/test/java/org/springframework/security/config/web/server/CorsSpecTests.java index 9bec73e8bd..33e1d2e9c0 100644 --- a/config/src/test/java/org/springframework/security/config/web/server/CorsSpecTests.java +++ b/config/src/test/java/org/springframework/security/config/web/server/CorsSpecTests.java @@ -78,7 +78,7 @@ public class CorsSpecTests { @Test public void corsWhenEnabledInLambdaThenAccessControlAllowOriginAndSecurityHeaders() { - this.http.cors(cors -> cors.configurationSource(this.source)); + this.http.cors((cors) -> cors.configurationSource(this.source)); this.expectedHeaders.set("Access-Control-Allow-Origin", "*"); this.expectedHeaders.set("X-Frame-Options", "DENY"); assertHeaders(); @@ -104,7 +104,7 @@ public class CorsSpecTests { private void assertHeaders() { WebTestClient client = buildClient(); FluxExchangeResult response = client.get().uri("https://example.com/") - .headers(h -> h.setOrigin("https://origin.example.com")).exchange().returnResult(String.class); + .headers((h) -> h.setOrigin("https://origin.example.com")).exchange().returnResult(String.class); Map> responseHeaders = response.getResponseHeaders(); diff --git a/config/src/test/java/org/springframework/security/config/web/server/ExceptionHandlingSpecTests.java b/config/src/test/java/org/springframework/security/config/web/server/ExceptionHandlingSpecTests.java index edad325b3c..470536e558 100644 --- a/config/src/test/java/org/springframework/security/config/web/server/ExceptionHandlingSpecTests.java +++ b/config/src/test/java/org/springframework/security/config/web/server/ExceptionHandlingSpecTests.java @@ -52,7 +52,7 @@ public class ExceptionHandlingSpecTests { @Test public void requestWhenExceptionHandlingWithDefaultsInLambdaThenDefaultAuthenticationEntryPointUsed() { SecurityWebFilterChain securityWebFilter = this.http - .authorizeExchange(exchanges -> exchanges.anyExchange().authenticated()) + .authorizeExchange((exchanges) -> exchanges.anyExchange().authenticated()) .exceptionHandling(withDefaults()).build(); WebTestClient client = WebTestClientBuilder.bindToWebFilters(securityWebFilter).build(); @@ -75,8 +75,8 @@ public class ExceptionHandlingSpecTests { @Test public void requestWhenCustomAuthenticationEntryPointInLambdaThenCustomAuthenticationEntryPointUsed() { SecurityWebFilterChain securityWebFilter = this.http - .authorizeExchange(exchanges -> exchanges.anyExchange().authenticated()) - .exceptionHandling(exceptionHandling -> exceptionHandling + .authorizeExchange((exchanges) -> exchanges.anyExchange().authenticated()) + .exceptionHandling((exceptionHandling) -> exceptionHandling .authenticationEntryPoint(redirectServerAuthenticationEntryPoint("/auth"))) .build(); @@ -92,19 +92,19 @@ public class ExceptionHandlingSpecTests { WebTestClient client = WebTestClientBuilder.bindToWebFilters(securityWebFilter).build(); - client.get().uri("/admin").headers(headers -> headers.setBasicAuth("user", "password")).exchange() + client.get().uri("/admin").headers((headers) -> headers.setBasicAuth("user", "password")).exchange() .expectStatus().isForbidden(); } @Test public void requestWhenExceptionHandlingWithDefaultsInLambdaThenDefaultAccessDeniedHandlerUsed() { SecurityWebFilterChain securityWebFilter = this.http.httpBasic(withDefaults()) - .authorizeExchange(exchanges -> exchanges.anyExchange().hasRole("ADMIN")) + .authorizeExchange((exchanges) -> exchanges.anyExchange().hasRole("ADMIN")) .exceptionHandling(withDefaults()).build(); WebTestClient client = WebTestClientBuilder.bindToWebFilters(securityWebFilter).build(); - client.get().uri("/admin").headers(headers -> headers.setBasicAuth("user", "password")).exchange() + client.get().uri("/admin").headers((headers) -> headers.setBasicAuth("user", "password")).exchange() .expectStatus().isForbidden(); } @@ -116,21 +116,21 @@ public class ExceptionHandlingSpecTests { WebTestClient client = WebTestClientBuilder.bindToWebFilters(securityWebFilter).build(); - client.get().uri("/admin").headers(headers -> headers.setBasicAuth("user", "password")).exchange() + client.get().uri("/admin").headers((headers) -> headers.setBasicAuth("user", "password")).exchange() .expectStatus().isBadRequest(); } @Test public void requestWhenCustomAccessDeniedHandlerInLambdaThenCustomAccessDeniedHandlerUsed() { SecurityWebFilterChain securityWebFilter = this.http.httpBasic(withDefaults()) - .authorizeExchange(exchanges -> exchanges.anyExchange().hasRole("ADMIN")) - .exceptionHandling(exceptionHandling -> exceptionHandling + .authorizeExchange((exchanges) -> exchanges.anyExchange().hasRole("ADMIN")) + .exceptionHandling((exceptionHandling) -> exceptionHandling .accessDeniedHandler(httpStatusServerAccessDeniedHandler(HttpStatus.BAD_REQUEST))) .build(); WebTestClient client = WebTestClientBuilder.bindToWebFilters(securityWebFilter).build(); - client.get().uri("/admin").headers(headers -> headers.setBasicAuth("user", "password")).exchange() + client.get().uri("/admin").headers((headers) -> headers.setBasicAuth("user", "password")).exchange() .expectStatus().isBadRequest(); } diff --git a/config/src/test/java/org/springframework/security/config/web/server/FormLoginTests.java b/config/src/test/java/org/springframework/security/config/web/server/FormLoginTests.java index cdda790028..791d064c70 100644 --- a/config/src/test/java/org/springframework/security/config/web/server/FormLoginTests.java +++ b/config/src/test/java/org/springframework/security/config/web/server/FormLoginTests.java @@ -92,7 +92,7 @@ public class FormLoginTests { @Test public void formLoginWhenDefaultsInLambdaThenCreatesDefaultLoginPage() { SecurityWebFilterChain securityWebFilter = this.http - .authorizeExchange(exchanges -> exchanges.anyExchange().authenticated()).formLogin(withDefaults()) + .authorizeExchange((exchanges) -> exchanges.anyExchange().authenticated()).formLogin(withDefaults()) .build(); WebTestClient webTestClient = WebTestClientBuilder.bindToWebFilters(securityWebFilter).build(); @@ -135,8 +135,8 @@ public class FormLoginTests { public void formLoginWhenCustomLoginPageInLambdaThenUsed() { SecurityWebFilterChain securityWebFilter = this.http .authorizeExchange( - exchanges -> exchanges.pathMatchers("/login").permitAll().anyExchange().authenticated()) - .formLogin(formLogin -> formLogin.loginPage("/login")).build(); + (exchanges) -> exchanges.pathMatchers("/login").permitAll().anyExchange().authenticated()) + .formLogin((formLogin) -> formLogin.loginPage("/login")).build(); WebTestClient webTestClient = WebTestClient .bindToController(new CustomLoginPageController(), new WebTestClientBuilder.Http200RestController()) @@ -479,7 +479,7 @@ public class FormLoginTests { @GetMapping("/login") public Mono login(ServerWebExchange exchange) { Mono token = exchange.getAttributeOrDefault(CsrfToken.class.getName(), Mono.empty()); - return token.map(t -> "\n" + "\n" + " \n" + return token.map((t) -> "\n" + "\n" + " \n" + " \n" + " \n" + " \n" + " \n" diff --git a/config/src/test/java/org/springframework/security/config/web/server/HeaderSpecTests.java b/config/src/test/java/org/springframework/security/config/web/server/HeaderSpecTests.java index 5608941875..746da35e23 100644 --- a/config/src/test/java/org/springframework/security/config/web/server/HeaderSpecTests.java +++ b/config/src/test/java/org/springframework/security/config/web/server/HeaderSpecTests.java @@ -87,7 +87,7 @@ public class HeaderSpecTests { public void headersWhenDisableInLambdaThenNoSecurityHeaders() { new HashSet<>(this.expectedHeaders.keySet()).forEach(this::expectHeaderNamesNotPresent); - this.http.headers(headers -> headers.disable()); + this.http.headers((headers) -> headers.disable()); assertHeaders(); } @@ -124,7 +124,7 @@ public class HeaderSpecTests { @Test public void headersWhenCacheDisableInLambdaThenCacheNotWritten() { expectHeaderNamesNotPresent(HttpHeaders.CACHE_CONTROL, HttpHeaders.PRAGMA, HttpHeaders.EXPIRES); - this.http.headers(headers -> headers.cache(cache -> cache.disable())); + this.http.headers((headers) -> headers.cache((cache) -> cache.disable())); assertHeaders(); } @@ -140,7 +140,8 @@ public class HeaderSpecTests { @Test public void headersWhenContentOptionsDisableInLambdaThenContentTypeOptionsNotWritten() { expectHeaderNamesNotPresent(ContentTypeOptionsServerHttpHeadersWriter.X_CONTENT_OPTIONS); - this.http.headers(headers -> headers.contentTypeOptions(contentTypeOptions -> contentTypeOptions.disable())); + this.http + .headers((headers) -> headers.contentTypeOptions((contentTypeOptions) -> contentTypeOptions.disable())); assertHeaders(); } @@ -156,7 +157,7 @@ public class HeaderSpecTests { @Test public void headersWhenHstsDisableInLambdaThenHstsNotWritten() { expectHeaderNamesNotPresent(StrictTransportSecurityServerHttpHeadersWriter.STRICT_TRANSPORT_SECURITY); - this.http.headers(headers -> headers.hsts(hsts -> hsts.disable())); + this.http.headers((headers) -> headers.hsts((hsts) -> hsts.disable())); assertHeaders(); } @@ -176,8 +177,8 @@ public class HeaderSpecTests { this.expectedHeaders.remove(StrictTransportSecurityServerHttpHeadersWriter.STRICT_TRANSPORT_SECURITY); this.expectedHeaders.add(StrictTransportSecurityServerHttpHeadersWriter.STRICT_TRANSPORT_SECURITY, "max-age=60"); - this.http - .headers(headers -> headers.hsts(hsts -> hsts.maxAge(Duration.ofSeconds(60)).includeSubdomains(false))); + this.http.headers( + (headers) -> headers.hsts((hsts) -> hsts.maxAge(Duration.ofSeconds(60)).includeSubdomains(false))); assertHeaders(); } @@ -197,7 +198,7 @@ public class HeaderSpecTests { this.expectedHeaders.remove(StrictTransportSecurityServerHttpHeadersWriter.STRICT_TRANSPORT_SECURITY); this.expectedHeaders.add(StrictTransportSecurityServerHttpHeadersWriter.STRICT_TRANSPORT_SECURITY, "max-age=60 ; includeSubDomains ; preload"); - this.http.headers(headers -> headers.hsts(hsts -> hsts.maxAge(Duration.ofSeconds(60)).preload(true))); + this.http.headers((headers) -> headers.hsts((hsts) -> hsts.maxAge(Duration.ofSeconds(60)).preload(true))); assertHeaders(); } @@ -213,7 +214,7 @@ public class HeaderSpecTests { @Test public void headersWhenFrameOptionsDisableInLambdaThenFrameOptionsNotWritten() { expectHeaderNamesNotPresent(XFrameOptionsServerHttpHeadersWriter.X_FRAME_OPTIONS); - this.http.headers(headers -> headers.frameOptions(frameOptions -> frameOptions.disable())); + this.http.headers((headers) -> headers.frameOptions((frameOptions) -> frameOptions.disable())); assertHeaders(); } @@ -229,8 +230,8 @@ public class HeaderSpecTests { @Test public void headersWhenFrameOptionsModeInLambdaThenFrameOptionsCustomMode() { this.expectedHeaders.set(XFrameOptionsServerHttpHeadersWriter.X_FRAME_OPTIONS, "SAMEORIGIN"); - this.http.headers(headers -> headers - .frameOptions(frameOptions -> frameOptions.mode(XFrameOptionsServerHttpHeadersWriter.Mode.SAMEORIGIN))); + this.http.headers((headers) -> headers.frameOptions( + (frameOptions) -> frameOptions.mode(XFrameOptionsServerHttpHeadersWriter.Mode.SAMEORIGIN))); assertHeaders(); } @@ -246,7 +247,7 @@ public class HeaderSpecTests { @Test public void headersWhenXssProtectionDisableInLambdaThenXssProtectionNotWritten() { expectHeaderNamesNotPresent("X-Xss-Protection"); - this.http.headers(headers -> headers.xssProtection(xssProtection -> xssProtection.disable())); + this.http.headers((headers) -> headers.xssProtection((xssProtection) -> xssProtection.disable())); assertHeaders(); } @@ -278,7 +279,7 @@ public class HeaderSpecTests { this.expectedHeaders.add(ContentSecurityPolicyServerHttpHeadersWriter.CONTENT_SECURITY_POLICY, expectedPolicyDirectives); - this.http.headers(headers -> headers.contentSecurityPolicy(withDefaults())); + this.http.headers((headers) -> headers.contentSecurityPolicy(withDefaults())); assertHeaders(); } @@ -289,8 +290,8 @@ public class HeaderSpecTests { this.expectedHeaders.add(ContentSecurityPolicyServerHttpHeadersWriter.CONTENT_SECURITY_POLICY, policyDirectives); - this.http.headers(headers -> headers.contentSecurityPolicy( - contentSecurityPolicy -> contentSecurityPolicy.policyDirectives(policyDirectives))); + this.http.headers((headers) -> headers.contentSecurityPolicy( + (contentSecurityPolicy) -> contentSecurityPolicy.policyDirectives(policyDirectives))); assertHeaders(); } @@ -308,7 +309,7 @@ public class HeaderSpecTests { public void headersWhenReferrerPolicyEnabledInLambdaThenReferrerPolicyWritten() { this.expectedHeaders.add(ReferrerPolicyServerHttpHeadersWriter.REFERRER_POLICY, ReferrerPolicy.NO_REFERRER.getPolicy()); - this.http.headers(headers -> headers.referrerPolicy(withDefaults())); + this.http.headers((headers) -> headers.referrerPolicy(withDefaults())); assertHeaders(); } @@ -326,8 +327,8 @@ public class HeaderSpecTests { public void headersWhenReferrerPolicyCustomEnabledInLambdaThenCustomReferrerPolicyWritten() { this.expectedHeaders.add(ReferrerPolicyServerHttpHeadersWriter.REFERRER_POLICY, ReferrerPolicy.NO_REFERRER_WHEN_DOWNGRADE.getPolicy()); - this.http.headers(headers -> headers - .referrerPolicy(referrerPolicy -> referrerPolicy.policy(ReferrerPolicy.NO_REFERRER_WHEN_DOWNGRADE))); + this.http.headers((headers) -> headers + .referrerPolicy((referrerPolicy) -> referrerPolicy.policy(ReferrerPolicy.NO_REFERRER_WHEN_DOWNGRADE))); assertHeaders(); } @@ -335,8 +336,8 @@ public class HeaderSpecTests { @Test public void headersWhenCustomHeadersWriter() { this.expectedHeaders.add(CUSTOM_HEADER, CUSTOM_VALUE); - this.http.headers(headers -> headers.writer(exchange -> { - return Mono.just(exchange).doOnNext(it -> { + this.http.headers((headers) -> headers.writer((exchange) -> { + return Mono.just(exchange).doOnNext((it) -> { it.getResponse().getHeaders().add(CUSTOM_HEADER, CUSTOM_VALUE); }).then(); diff --git a/config/src/test/java/org/springframework/security/config/web/server/HttpsRedirectSpecTests.java b/config/src/test/java/org/springframework/security/config/web/server/HttpsRedirectSpecTests.java index 71583b5a6c..bd1c597808 100644 --- a/config/src/test/java/org/springframework/security/config/web/server/HttpsRedirectSpecTests.java +++ b/config/src/test/java/org/springframework/security/config/web/server/HttpsRedirectSpecTests.java @@ -174,7 +174,7 @@ public class HttpsRedirectSpecTests { SecurityWebFilterChain springSecurity(ServerHttpSecurity http) { // @formatter:off http - .redirectToHttps(redirectToHttps -> + .redirectToHttps((redirectToHttps) -> redirectToHttps .httpsRedirectWhen(new PathPatternParserServerWebExchangeMatcher("/secure")) ); @@ -215,7 +215,7 @@ public class HttpsRedirectSpecTests { SecurityWebFilterChain springSecurity(ServerHttpSecurity http) { // @formatter:off http - .redirectToHttps(redirectToHttps -> + .redirectToHttps((redirectToHttps) -> redirectToHttps .portMapper(portMapper()) ); diff --git a/config/src/test/java/org/springframework/security/config/web/server/LogoutSpecTests.java b/config/src/test/java/org/springframework/security/config/web/server/LogoutSpecTests.java index 3beabcc3af..7f4b247184 100644 --- a/config/src/test/java/org/springframework/security/config/web/server/LogoutSpecTests.java +++ b/config/src/test/java/org/springframework/security/config/web/server/LogoutSpecTests.java @@ -91,9 +91,9 @@ public class LogoutSpecTests { @Test public void logoutWhenCustomLogoutInLambdaThenCustomLogoutUsed() { SecurityWebFilterChain securityWebFilter = this.http - .authorizeExchange(authorizeExchange -> authorizeExchange.anyExchange().authenticated()) + .authorizeExchange((authorizeExchange) -> authorizeExchange.anyExchange().authenticated()) .formLogin(withDefaults()) - .logout(logout -> logout.requiresLogout(ServerWebExchangeMatchers.pathMatchers("/custom-logout"))) + .logout((logout) -> logout.requiresLogout(ServerWebExchangeMatchers.pathMatchers("/custom-logout"))) .build(); WebTestClient webTestClient = WebTestClientBuilder.bindToWebFilters(securityWebFilter).build(); diff --git a/config/src/test/java/org/springframework/security/config/web/server/OAuth2ClientSpecTests.java b/config/src/test/java/org/springframework/security/config/web/server/OAuth2ClientSpecTests.java index cf7ef9d962..2392649dd4 100644 --- a/config/src/test/java/org/springframework/security/config/web/server/OAuth2ClientSpecTests.java +++ b/config/src/test/java/org/springframework/security/config/web/server/OAuth2ClientSpecTests.java @@ -144,7 +144,7 @@ public class OAuth2ClientSpecTests { given(requestCache.getRedirectUri(any())).willReturn(Mono.just(URI.create("/saved-request"))); this.client.get() - .uri(uriBuilder -> uriBuilder.path("/authorize/oauth2/code/registration-id") + .uri((uriBuilder) -> uriBuilder.path("/authorize/oauth2/code/registration-id") .queryParam(OAuth2ParameterNames.CODE, "code").queryParam(OAuth2ParameterNames.STATE, "state") .build()) .exchange().expectStatus().is3xxRedirection(); @@ -185,7 +185,7 @@ public class OAuth2ClientSpecTests { given(requestCache.getRedirectUri(any())).willReturn(Mono.just(URI.create("/saved-request"))); this.client.get() - .uri(uriBuilder -> uriBuilder.path("/authorize/oauth2/code/registration-id") + .uri((uriBuilder) -> uriBuilder.path("/authorize/oauth2/code/registration-id") .queryParam(OAuth2ParameterNames.CODE, "code").queryParam(OAuth2ParameterNames.STATE, "state") .build()) .exchange().expectStatus().is3xxRedirection(); @@ -264,7 +264,7 @@ public class OAuth2ClientSpecTests { .authenticationManager(this.manager) .authorizationRequestRepository(this.authorizationRequestRepository) .and() - .requestCache(c -> c.requestCache(this.requestCache)); + .requestCache((c) -> c.requestCache(this.requestCache)); // @formatter:on return http.build(); } @@ -287,12 +287,12 @@ public class OAuth2ClientSpecTests { public SecurityWebFilterChain springSecurityFilter(ServerHttpSecurity http) { // @formatter:off http - .oauth2Client(oauth2Client -> + .oauth2Client((oauth2Client) -> oauth2Client .authenticationConverter(this.authenticationConverter) .authenticationManager(this.manager) .authorizationRequestRepository(this.authorizationRequestRepository)) - .requestCache(c -> c.requestCache(this.requestCache)); + .requestCache((c) -> c.requestCache(this.requestCache)); // @formatter:on return http.build(); } diff --git a/config/src/test/java/org/springframework/security/config/web/server/OAuth2LoginTests.java b/config/src/test/java/org/springframework/security/config/web/server/OAuth2LoginTests.java index 428739a1af..ad3da58441 100644 --- a/config/src/test/java/org/springframework/security/config/web/server/OAuth2LoginTests.java +++ b/config/src/test/java/org/springframework/security/config/web/server/OAuth2LoginTests.java @@ -226,7 +226,7 @@ public class OAuth2LoginTests { given(manager.authenticate(any())).willReturn(Mono.just(result)); given(matcher.matches(any())).willReturn(ServerWebExchangeMatcher.MatchResult.match()); given(resolver.resolve(any())).willReturn(Mono.empty()); - given(successHandler.onAuthenticationSuccess(any(), any())).willAnswer((Answer>) invocation -> { + given(successHandler.onAuthenticationSuccess(any(), any())).willAnswer((Answer>) (invocation) -> { WebFilterExchange webFilterExchange = invocation.getArgument(0); Authentication authentication = invocation.getArgument(1); @@ -268,14 +268,14 @@ public class OAuth2LoginTests { .willReturn(Mono.error(new OAuth2AuthenticationException(new OAuth2Error("error"), "message"))); given(matcher.matches(any())).willReturn(ServerWebExchangeMatcher.MatchResult.match()); given(resolver.resolve(any())).willReturn(Mono.empty()); - given(successHandler.onAuthenticationSuccess(any(), any())).willAnswer((Answer>) invocation -> { + given(successHandler.onAuthenticationSuccess(any(), any())).willAnswer((Answer>) (invocation) -> { WebFilterExchange webFilterExchange = invocation.getArgument(0); Authentication authentication = invocation.getArgument(1); return new RedirectServerAuthenticationSuccessHandler(redirectLocation) .onAuthenticationSuccess(webFilterExchange, authentication); }); - given(failureHandler.onAuthenticationFailure(any(), any())).willAnswer((Answer>) invocation -> { + given(failureHandler.onAuthenticationFailure(any(), any())).willAnswer((Answer>) (invocation) -> { WebFilterExchange webFilterExchange = invocation.getArgument(0); AuthenticationException authenticationException = invocation.getArgument(1); @@ -321,7 +321,7 @@ public class OAuth2LoginTests { given(manager.authenticate(any())).willReturn(Mono.just(result)); given(matcher.matches(any())).willReturn(ServerWebExchangeMatcher.MatchResult.match()); given(resolver.resolve(any())).willReturn(Mono.empty()); - given(successHandler.onAuthenticationSuccess(any(), any())).willAnswer((Answer>) invocation -> { + given(successHandler.onAuthenticationSuccess(any(), any())).willAnswer((Answer>) (invocation) -> { WebFilterExchange webFilterExchange = invocation.getArgument(0); Authentication authentication = invocation.getArgument(1); @@ -442,7 +442,7 @@ public class OAuth2LoginTests { ReactiveJwtDecoderFactory jwtDecoderFactory = config.jwtDecoderFactory; OAuth2Error oauth2Error = new OAuth2Error("invalid_id_token", "Invalid ID Token", null); - given(jwtDecoderFactory.createDecoder(any())).willReturn(token -> Mono + given(jwtDecoderFactory.createDecoder(any())).willReturn((token) -> Mono .error(new JwtValidationException("ID Token validation failed", Collections.singleton(oauth2Error)))); webTestClient.get().uri("/login/oauth2/code/google").exchange().expectStatus().is3xxRedirection().expectHeader() @@ -602,11 +602,11 @@ public class OAuth2LoginTests { public SecurityWebFilterChain springSecurityFilter(ServerHttpSecurity http) { // @formatter:off http - .authorizeExchange(exchanges -> + .authorizeExchange((exchanges) -> exchanges .anyExchange().authenticated() ) - .oauth2Login(oauth2Login -> + .oauth2Login((oauth2Login) -> oauth2Login .authenticationConverter(this.authenticationConverter) .authenticationManager(this.manager) @@ -674,13 +674,13 @@ public class OAuth2LoginTests { } private ReactiveJwtDecoder getJwtDecoder() { - return token -> { + return (token) -> { Map claims = new HashMap<>(); claims.put(IdTokenClaimNames.SUB, "subject"); claims.put(IdTokenClaimNames.ISS, "http://localhost/issuer"); claims.put(IdTokenClaimNames.AUD, Collections.singletonList("client")); claims.put(IdTokenClaimNames.AZP, "client"); - Jwt jwt = TestJwts.jwt().claims(c -> c.putAll(claims)).build(); + Jwt jwt = TestJwts.jwt().claims((c) -> c.putAll(claims)).build(); return Mono.just(jwt); }; } diff --git a/config/src/test/java/org/springframework/security/config/web/server/OAuth2ResourceServerSpecTests.java b/config/src/test/java/org/springframework/security/config/web/server/OAuth2ResourceServerSpecTests.java index 3f01bf9d14..019ced220c 100644 --- a/config/src/test/java/org/springframework/security/config/web/server/OAuth2ResourceServerSpecTests.java +++ b/config/src/test/java/org/springframework/security/config/web/server/OAuth2ResourceServerSpecTests.java @@ -135,7 +135,7 @@ public class OAuth2ResourceServerSpecTests { public void getWhenValidThenReturnsOk() { this.spring.register(PublicKeyConfig.class, RootController.class).autowire(); - this.client.get().headers(headers -> headers.setBearerAuth(this.messageReadToken)).exchange().expectStatus() + this.client.get().headers((headers) -> headers.setBearerAuth(this.messageReadToken)).exchange().expectStatus() .isOk(); } @@ -143,7 +143,7 @@ public class OAuth2ResourceServerSpecTests { public void getWhenExpiredThenReturnsInvalidToken() { this.spring.register(PublicKeyConfig.class).autowire(); - this.client.get().headers(headers -> headers.setBearerAuth(this.expired)).exchange().expectStatus() + this.client.get().headers((headers) -> headers.setBearerAuth(this.expired)).exchange().expectStatus() .isUnauthorized().expectHeader() .value(HttpHeaders.WWW_AUTHENTICATE, startsWith("Bearer error=\"invalid_token\"")); } @@ -152,7 +152,7 @@ public class OAuth2ResourceServerSpecTests { public void getWhenUnsignedThenReturnsInvalidToken() { this.spring.register(PublicKeyConfig.class).autowire(); - this.client.get().headers(headers -> headers.setBearerAuth(this.unsignedToken)).exchange().expectStatus() + this.client.get().headers((headers) -> headers.setBearerAuth(this.unsignedToken)).exchange().expectStatus() .isUnauthorized().expectHeader() .value(HttpHeaders.WWW_AUTHENTICATE, startsWith("Bearer error=\"invalid_token\"")); } @@ -161,7 +161,7 @@ public class OAuth2ResourceServerSpecTests { public void getWhenEmptyBearerTokenThenReturnsInvalidToken() { this.spring.register(PublicKeyConfig.class).autowire(); - this.client.get().headers(headers -> headers.add("Authorization", "Bearer ")).exchange().expectStatus() + this.client.get().headers((headers) -> headers.add("Authorization", "Bearer ")).exchange().expectStatus() .isUnauthorized().expectHeader() .value(HttpHeaders.WWW_AUTHENTICATE, startsWith("Bearer error=\"invalid_token\"")); } @@ -170,7 +170,7 @@ public class OAuth2ResourceServerSpecTests { public void getWhenValidTokenAndPublicKeyInLambdaThenReturnsOk() { this.spring.register(PublicKeyInLambdaConfig.class, RootController.class).autowire(); - this.client.get().headers(headers -> headers.setBearerAuth(this.messageReadToken)).exchange().expectStatus() + this.client.get().headers((headers) -> headers.setBearerAuth(this.messageReadToken)).exchange().expectStatus() .isOk(); } @@ -178,7 +178,7 @@ public class OAuth2ResourceServerSpecTests { public void getWhenExpiredTokenAndPublicKeyInLambdaThenReturnsInvalidToken() { this.spring.register(PublicKeyInLambdaConfig.class).autowire(); - this.client.get().headers(headers -> headers.setBearerAuth(this.expired)).exchange().expectStatus() + this.client.get().headers((headers) -> headers.setBearerAuth(this.expired)).exchange().expectStatus() .isUnauthorized().expectHeader() .value(HttpHeaders.WWW_AUTHENTICATE, startsWith("Bearer error=\"invalid_token\"")); } @@ -187,7 +187,7 @@ public class OAuth2ResourceServerSpecTests { public void getWhenValidUsingPlaceholderThenReturnsOk() { this.spring.register(PlaceholderConfig.class, RootController.class).autowire(); - this.client.get().headers(headers -> headers.setBearerAuth(this.messageReadToken)).exchange().expectStatus() + this.client.get().headers((headers) -> headers.setBearerAuth(this.messageReadToken)).exchange().expectStatus() .isOk(); } @@ -198,7 +198,7 @@ public class OAuth2ResourceServerSpecTests { ReactiveJwtDecoder jwtDecoder = this.spring.getContext().getBean(ReactiveJwtDecoder.class); given(jwtDecoder.decode(anyString())).willReturn(Mono.just(this.jwt)); - this.client.get().headers(headers -> headers.setBearerAuth("token")).exchange().expectStatus().isOk(); + this.client.get().headers((headers) -> headers.setBearerAuth("token")).exchange().expectStatus().isOk(); verify(jwtDecoder).decode(anyString()); } @@ -210,7 +210,7 @@ public class OAuth2ResourceServerSpecTests { MockWebServer mockWebServer = this.spring.getContext().getBean(MockWebServer.class); mockWebServer.enqueue(new MockResponse().setBody(this.jwkSet)); - this.client.get().headers(headers -> headers.setBearerAuth(this.messageReadTokenWithKid)).exchange() + this.client.get().headers((headers) -> headers.setBearerAuth(this.messageReadTokenWithKid)).exchange() .expectStatus().isOk(); } @@ -221,7 +221,7 @@ public class OAuth2ResourceServerSpecTests { MockWebServer mockWebServer = this.spring.getContext().getBean(MockWebServer.class); mockWebServer.enqueue(new MockResponse().setBody(this.jwkSet)); - this.client.get().headers(headers -> headers.setBearerAuth(this.messageReadTokenWithKid)).exchange() + this.client.get().headers((headers) -> headers.setBearerAuth(this.messageReadTokenWithKid)).exchange() .expectStatus().isOk(); } @@ -234,7 +234,7 @@ public class OAuth2ResourceServerSpecTests { given(authenticationManager.authenticate(any(Authentication.class))) .willReturn(Mono.error(new OAuth2AuthenticationException(new OAuth2Error("mock-failure")))); - this.client.get().headers(headers -> headers.setBearerAuth(this.messageReadToken)).exchange().expectStatus() + this.client.get().headers((headers) -> headers.setBearerAuth(this.messageReadToken)).exchange().expectStatus() .isUnauthorized().expectHeader() .value(HttpHeaders.WWW_AUTHENTICATE, startsWith("Bearer error=\"mock-failure\"")); } @@ -248,7 +248,7 @@ public class OAuth2ResourceServerSpecTests { given(authenticationManager.authenticate(any(Authentication.class))) .willReturn(Mono.error(new OAuth2AuthenticationException(new OAuth2Error("mock-failure")))); - this.client.get().headers(headers -> headers.setBearerAuth(this.messageReadToken)).exchange().expectStatus() + this.client.get().headers((headers) -> headers.setBearerAuth(this.messageReadToken)).exchange().expectStatus() .isUnauthorized().expectHeader() .value(HttpHeaders.WWW_AUTHENTICATE, startsWith("Bearer error=\"mock-failure\"")); } @@ -268,7 +268,7 @@ public class OAuth2ResourceServerSpecTests { given(authenticationManager.authenticate(any(Authentication.class))) .willReturn(Mono.error(new OAuth2AuthenticationException(new OAuth2Error("mock-failure")))); - this.client.get().headers(headers -> headers.setBearerAuth(this.messageReadToken)).exchange().expectStatus() + this.client.get().headers((headers) -> headers.setBearerAuth(this.messageReadToken)).exchange().expectStatus() .isUnauthorized().expectHeader() .value(HttpHeaders.WWW_AUTHENTICATE, startsWith("Bearer error=\"mock-failure\"")); } @@ -277,7 +277,7 @@ public class OAuth2ResourceServerSpecTests { public void postWhenSignedThenReturnsOk() { this.spring.register(PublicKeyConfig.class, RootController.class).autowire(); - this.client.post().headers(headers -> headers.setBearerAuth(this.messageReadToken)).exchange().expectStatus() + this.client.post().headers((headers) -> headers.setBearerAuth(this.messageReadToken)).exchange().expectStatus() .isOk(); } @@ -285,7 +285,7 @@ public class OAuth2ResourceServerSpecTests { public void getWhenTokenHasInsufficientScopeThenReturnsInsufficientScope() { this.spring.register(DenyAllConfig.class, RootController.class).autowire(); - this.client.get().headers(headers -> headers.setBearerAuth(this.messageReadToken)).exchange().expectStatus() + this.client.get().headers((headers) -> headers.setBearerAuth(this.messageReadToken)).exchange().expectStatus() .isForbidden().expectHeader() .value(HttpHeaders.WWW_AUTHENTICATE, startsWith("Bearer error=\"insufficient_scope\"")); } @@ -308,7 +308,7 @@ public class OAuth2ResourceServerSpecTests { public void getWhenSignedAndCustomConverterThenConverts() { this.spring.register(CustomJwtAuthenticationConverterConfig.class, RootController.class).autowire(); - this.client.get().headers(headers -> headers.setBearerAuth(this.messageReadToken)).exchange().expectStatus() + this.client.get().headers((headers) -> headers.setBearerAuth(this.messageReadToken)).exchange().expectStatus() .isOk(); } @@ -323,7 +323,7 @@ public class OAuth2ResourceServerSpecTests { public void getWhenCustomBearerTokenDeniedHandlerThenResponds() { this.spring.register(CustomErrorHandlingConfig.class).autowire(); - this.client.get().uri("/unobtainable").headers(headers -> headers.setBearerAuth(this.messageReadToken)) + this.client.get().uri("/unobtainable").headers((headers) -> headers.setBearerAuth(this.messageReadToken)) .exchange().expectStatus().isEqualTo(HttpStatus.BANDWIDTH_LIMIT_EXCEEDED); } @@ -392,7 +392,7 @@ public class OAuth2ResourceServerSpecTests { this.spring.getContext().getBean(MockWebServer.class) .setDispatcher(requiresAuth(this.clientId, this.clientSecret, this.active)); - this.client.get().headers(headers -> headers.setBearerAuth(this.messageReadToken)).exchange().expectStatus() + this.client.get().headers((headers) -> headers.setBearerAuth(this.messageReadToken)).exchange().expectStatus() .isOk(); } @@ -402,7 +402,7 @@ public class OAuth2ResourceServerSpecTests { this.spring.getContext().getBean(MockWebServer.class) .setDispatcher(requiresAuth(this.clientId, this.clientSecret, this.active)); - this.client.get().headers(headers -> headers.setBearerAuth(this.messageReadToken)).exchange().expectStatus() + this.client.get().headers((headers) -> headers.setBearerAuth(this.messageReadToken)).exchange().expectStatus() .isOk(); } @@ -417,8 +417,8 @@ public class OAuth2ResourceServerSpecTests { @Override public MockResponse dispatch(RecordedRequest request) { String authorization = request.getHeader(org.springframework.http.HttpHeaders.AUTHORIZATION); - return Optional.ofNullable(authorization).filter(a -> isAuthorized(authorization, username, password)) - .map(a -> ok(response)).orElse(unauthorized()); + return Optional.ofNullable(authorization).filter((a) -> isAuthorized(authorization, username, password)) + .map((a) -> ok(response)).orElse(unauthorized()); } }; } @@ -488,13 +488,13 @@ public class OAuth2ResourceServerSpecTests { SecurityWebFilterChain springSecurity(ServerHttpSecurity http) { // @formatter:off http - .authorizeExchange(exchanges -> + .authorizeExchange((exchanges) -> exchanges .anyExchange().hasAuthority("SCOPE_message:read") ) - .oauth2ResourceServer(oauth2ResourceServer -> + .oauth2ResourceServer((oauth2ResourceServer) -> oauth2ResourceServer - .jwt(jwt -> + .jwt((jwt) -> jwt .publicKey(publicKey()) ) @@ -572,9 +572,9 @@ public class OAuth2ResourceServerSpecTests { // @formatter:off http - .oauth2ResourceServer(oauth2ResourceServer -> + .oauth2ResourceServer((oauth2ResourceServer) -> oauth2ResourceServer - .jwt(jwt -> + .jwt((jwt) -> jwt .jwkSetUri(jwkSetUri) ) @@ -672,9 +672,9 @@ public class OAuth2ResourceServerSpecTests { SecurityWebFilterChain springSecurity(ServerHttpSecurity http) { // @formatter:off http - .oauth2ResourceServer(oauth2ResourceServer -> + .oauth2ResourceServer((oauth2ResourceServer) -> oauth2ResourceServer - .jwt(jwt -> + .jwt((jwt) -> jwt .authenticationManager(authenticationManager()) ) @@ -743,7 +743,7 @@ public class OAuth2ResourceServerSpecTests { @Bean ServerAuthenticationConverter bearerTokenAuthenticationConverter() { - return exchange -> Mono.justOrEmpty(exchange.getRequest().getCookies().getFirst("TOKEN").getValue()) + return (exchange) -> Mono.justOrEmpty(exchange.getRequest().getCookies().getFirst("TOKEN").getValue()) .map(BearerTokenAuthenticationToken::new); } @@ -773,7 +773,7 @@ public class OAuth2ResourceServerSpecTests { Converter> jwtAuthenticationConverter() { JwtAuthenticationConverter converter = new JwtAuthenticationConverter(); - converter.setJwtGrantedAuthoritiesConverter(jwt -> { + converter.setJwtGrantedAuthoritiesConverter((jwt) -> { String[] claims = ((String) jwt.getClaims().get("scope")).split(" "); return Stream.of(claims).map(SimpleGrantedAuthority::new).collect(Collectors.toList()); }); @@ -852,9 +852,9 @@ public class OAuth2ResourceServerSpecTests { // @formatter:off http - .oauth2ResourceServer(oauth2ResourceServer -> + .oauth2ResourceServer((oauth2ResourceServer) -> oauth2ResourceServer - .opaqueToken(opaqueToken -> + .opaqueToken((opaqueToken) -> opaqueToken .introspectionUri(introspectionUri) .introspectionClientCredentials("client", "secret") diff --git a/config/src/test/java/org/springframework/security/config/web/server/RequestCacheTests.java b/config/src/test/java/org/springframework/security/config/web/server/RequestCacheTests.java index e3a438d19e..cccf0f0df9 100644 --- a/config/src/test/java/org/springframework/security/config/web/server/RequestCacheTests.java +++ b/config/src/test/java/org/springframework/security/config/web/server/RequestCacheTests.java @@ -84,9 +84,10 @@ public class RequestCacheTests { @Test public void requestWhenCustomRequestCacheInLambdaThenCustomCacheUsed() { SecurityWebFilterChain securityWebFilter = this.http - .authorizeExchange(authorizeExchange -> authorizeExchange.anyExchange().authenticated()) + .authorizeExchange((authorizeExchange) -> authorizeExchange.anyExchange().authenticated()) .formLogin(withDefaults()) - .requestCache(requestCache -> requestCache.requestCache(NoOpServerRequestCache.getInstance())).build(); + .requestCache((requestCache) -> requestCache.requestCache(NoOpServerRequestCache.getInstance())) + .build(); WebTestClient webTestClient = WebTestClient .bindToController(new SecuredPageController(), new WebTestClientBuilder.Http200RestController()) diff --git a/config/src/test/java/org/springframework/security/config/web/server/ServerHttpSecurityTests.java b/config/src/test/java/org/springframework/security/config/web/server/ServerHttpSecurityTests.java index 0769425fd7..a23964ceec 100644 --- a/config/src/test/java/org/springframework/security/config/web/server/ServerHttpSecurityTests.java +++ b/config/src/test/java/org/springframework/security/config/web/server/ServerHttpSecurityTests.java @@ -133,9 +133,9 @@ public class ServerHttpSecurityTests { WebTestClient client = buildClient(); EntityExchangeResult result = client.get().uri("/") - .headers(headers -> headers.setBasicAuth("rob", "rob")).exchange().expectStatus().isOk().expectHeader() - .valueMatches(HttpHeaders.CACHE_CONTROL, ".+").expectBody(String.class) - .consumeWith(b -> assertThat(b.getResponseBody()).isEqualTo("ok")).returnResult(); + .headers((headers) -> headers.setBasicAuth("rob", "rob")).exchange().expectStatus().isOk() + .expectHeader().valueMatches(HttpHeaders.CACHE_CONTROL, ".+").expectBody(String.class) + .consumeWith((b) -> assertThat(b.getResponseBody()).isEqualTo("ok")).returnResult(); assertThat(result.getResponseCookies().getFirst("SESSION")).isNull(); } @@ -154,9 +154,9 @@ public class ServerHttpSecurityTests { WebTestClient client = buildClient(); EntityExchangeResult result = client.get().uri("/") - .headers(headers -> headers.setBasicAuth("rob", "rob")).exchange().expectStatus().isOk().expectHeader() - .valueMatches(HttpHeaders.CACHE_CONTROL, ".+").expectBody(String.class) - .consumeWith(b -> assertThat(b.getResponseBody()).isEqualTo("ok")).returnResult(); + .headers((headers) -> headers.setBasicAuth("rob", "rob")).exchange().expectStatus().isOk() + .expectHeader().valueMatches(HttpHeaders.CACHE_CONTROL, ".+").expectBody(String.class) + .consumeWith((b) -> assertThat(b.getResponseBody()).isEqualTo("ok")).returnResult(); assertThat(result.getResponseCookies().getFirst("SESSION")).isNotNull(); } @@ -187,7 +187,7 @@ public class ServerHttpSecurityTests { assertThat(getWebFilter(securityWebFilterChain, CsrfWebFilter.class)).isNotPresent(); Optional logoutHandler = getWebFilter(securityWebFilterChain, LogoutWebFilter.class) - .map(logoutWebFilter -> (ServerLogoutHandler) ReflectionTestUtils.getField(logoutWebFilter, + .map((logoutWebFilter) -> (ServerLogoutHandler) ReflectionTestUtils.getField(logoutWebFilter, LogoutWebFilter.class, "logoutHandler")); assertThat(logoutHandler).get().isExactlyInstanceOf(SecurityContextServerLogoutHandler.class); @@ -199,15 +199,15 @@ public class ServerHttpSecurityTests { .and().build(); assertThat(getWebFilter(securityWebFilterChain, CsrfWebFilter.class)).get() - .extracting(csrfWebFilter -> ReflectionTestUtils.getField(csrfWebFilter, "csrfTokenRepository")) + .extracting((csrfWebFilter) -> ReflectionTestUtils.getField(csrfWebFilter, "csrfTokenRepository")) .isEqualTo(this.csrfTokenRepository); Optional logoutHandler = getWebFilter(securityWebFilterChain, LogoutWebFilter.class) - .map(logoutWebFilter -> (ServerLogoutHandler) ReflectionTestUtils.getField(logoutWebFilter, + .map((logoutWebFilter) -> (ServerLogoutHandler) ReflectionTestUtils.getField(logoutWebFilter, LogoutWebFilter.class, "logoutHandler")); assertThat(logoutHandler).get().isExactlyInstanceOf(DelegatingServerLogoutHandler.class) - .extracting(delegatingLogoutHandler -> ((List) ReflectionTestUtils + .extracting((delegatingLogoutHandler) -> ((List) ReflectionTestUtils .getField(delegatingLogoutHandler, DelegatingServerLogoutHandler.class, "delegates")).stream() .map(ServerLogoutHandler::getClass).collect(Collectors.toList())) .isEqualTo(Arrays.asList(SecurityContextServerLogoutHandler.class, CsrfServerLogoutHandler.class)); @@ -271,9 +271,9 @@ public class ServerHttpSecurityTests { WebTestClient client = buildClient(); EntityExchangeResult result = client.get().uri("/") - .headers(headers -> headers.setBasicAuth("rob", "rob")).exchange().expectStatus().isOk().expectHeader() - .valueMatches(HttpHeaders.CACHE_CONTROL, ".+").expectBody(String.class) - .consumeWith(b -> assertThat(b.getResponseBody()).isEqualTo("ok")).returnResult(); + .headers((headers) -> headers.setBasicAuth("rob", "rob")).exchange().expectStatus().isOk() + .expectHeader().valueMatches(HttpHeaders.CACHE_CONTROL, ".+").expectBody(String.class) + .consumeWith((b) -> assertThat(b.getResponseBody()).isEqualTo("ok")).returnResult(); assertThat(result.getResponseCookies().getFirst("SESSION")).isNull(); } @@ -291,7 +291,7 @@ public class ServerHttpSecurityTests { WebTestClient client = buildClient(); EntityExchangeResult result = client.get().uri("/").exchange().expectStatus().isUnauthorized() - .expectHeader().value(HttpHeaders.WWW_AUTHENTICATE, value -> assertThat(value).contains("myrealm")) + .expectHeader().value(HttpHeaders.WWW_AUTHENTICATE, (value) -> assertThat(value).contains("myrealm")) .expectBody(String.class).returnResult(); assertThat(result.getResponseCookies().getFirst("SESSION")).isNull(); @@ -302,7 +302,7 @@ public class ServerHttpSecurityTests { this.http.securityContextRepository(new WebSessionServerSecurityContextRepository()); HttpBasicServerAuthenticationEntryPoint authenticationEntryPoint = new HttpBasicServerAuthenticationEntryPoint(); authenticationEntryPoint.setRealm("myrealm"); - this.http.httpBasic(httpBasic -> httpBasic.authenticationEntryPoint(authenticationEntryPoint)); + this.http.httpBasic((httpBasic) -> httpBasic.authenticationEntryPoint(authenticationEntryPoint)); this.http.authenticationManager(this.authenticationManager); ServerHttpSecurity.AuthorizeExchangeSpec authorize = this.http.authorizeExchange(); authorize.anyExchange().authenticated(); @@ -310,7 +310,7 @@ public class ServerHttpSecurityTests { WebTestClient client = buildClient(); EntityExchangeResult result = client.get().uri("/").exchange().expectStatus().isUnauthorized() - .expectHeader().value(HttpHeaders.WWW_AUTHENTICATE, value -> assertThat(value).contains("myrealm")) + .expectHeader().value(HttpHeaders.WWW_AUTHENTICATE, (value) -> assertThat(value).contains("myrealm")) .expectBody(String.class).returnResult(); assertThat(result.getResponseCookies().getFirst("SESSION")).isNull(); @@ -327,8 +327,8 @@ public class ServerHttpSecurityTests { WebFilterChainProxy springSecurityFilterChain = new WebFilterChainProxy(securityFilterChain); WebTestClient client = WebTestClientBuilder.bindToWebFilters(springSecurityFilterChain).build(); - client.get().uri("/").headers(headers -> headers.setBasicAuth("rob", "rob")).exchange().expectStatus().isOk() - .expectBody(String.class).consumeWith(b -> assertThat(b.getResponseBody()).isEqualTo("ok")); + client.get().uri("/").headers((headers) -> headers.setBasicAuth("rob", "rob")).exchange().expectStatus().isOk() + .expectBody(String.class).consumeWith((b) -> assertThat(b.getResponseBody()).isEqualTo("ok")); verifyZeroInteractions(this.authenticationManager); } @@ -340,12 +340,12 @@ public class ServerHttpSecurityTests { .willReturn(Mono.just(new TestingAuthenticationToken("rob", "rob", "ROLE_USER", "ROLE_ADMIN"))); SecurityWebFilterChain securityFilterChain = this.http - .httpBasic(httpBasic -> httpBasic.authenticationManager(customAuthenticationManager)).build(); + .httpBasic((httpBasic) -> httpBasic.authenticationManager(customAuthenticationManager)).build(); WebFilterChainProxy springSecurityFilterChain = new WebFilterChainProxy(securityFilterChain); WebTestClient client = WebTestClientBuilder.bindToWebFilters(springSecurityFilterChain).build(); - client.get().uri("/").headers(headers -> headers.setBasicAuth("rob", "rob")).exchange().expectStatus().isOk() - .expectBody(String.class).consumeWith(b -> assertThat(b.getResponseBody()).isEqualTo("ok")); + client.get().uri("/").headers((headers) -> headers.setBasicAuth("rob", "rob")).exchange().expectStatus().isOk() + .expectBody(String.class).consumeWith((b) -> assertThat(b.getResponseBody()).isEqualTo("ok")); verifyZeroInteractions(this.authenticationManager); verify(customAuthenticationManager).authenticate(any(Authentication.class)); @@ -370,7 +370,8 @@ public class ServerHttpSecurityTests { X509PrincipalExtractor mockExtractor = mock(X509PrincipalExtractor.class); ReactiveAuthenticationManager mockAuthenticationManager = mock(ReactiveAuthenticationManager.class); - this.http.x509(x509 -> x509.principalExtractor(mockExtractor).authenticationManager(mockAuthenticationManager)); + this.http.x509( + (x509) -> x509.principalExtractor(mockExtractor).authenticationManager(mockAuthenticationManager)); SecurityWebFilterChain securityWebFilterChain = this.http.build(); WebFilter x509WebFilter = securityWebFilterChain.getWebFilters().filter(this::isX509Filter).blockFirst(); @@ -400,7 +401,7 @@ public class ServerHttpSecurityTests { @Test public void postWhenCsrfDisabledThenPermitted() { - SecurityWebFilterChain securityFilterChain = this.http.csrf(csrf -> csrf.disable()).build(); + SecurityWebFilterChain securityFilterChain = this.http.csrf((csrf) -> csrf.disable()).build(); WebFilterChainProxy springSecurityFilterChain = new WebFilterChainProxy(securityFilterChain); WebTestClient client = WebTestClientBuilder.bindToWebFilters(springSecurityFilterChain).build(); @@ -412,7 +413,7 @@ public class ServerHttpSecurityTests { ServerCsrfTokenRepository customServerCsrfTokenRepository = mock(ServerCsrfTokenRepository.class); given(customServerCsrfTokenRepository.loadToken(any(ServerWebExchange.class))).willReturn(Mono.empty()); SecurityWebFilterChain securityFilterChain = this.http - .csrf(csrf -> csrf.csrfTokenRepository(customServerCsrfTokenRepository)).build(); + .csrf((csrf) -> csrf.csrfTokenRepository(customServerCsrfTokenRepository)).build(); WebFilterChainProxy springSecurityFilterChain = new WebFilterChainProxy(securityFilterChain); WebTestClient client = WebTestClientBuilder.bindToWebFilters(springSecurityFilterChain).build(); @@ -429,7 +430,7 @@ public class ServerHttpSecurityTests { SecurityWebFilterChain securityFilterChain = this.http.oauth2Login() .clientRegistrationRepository(clientRegistrationRepository).and().authorizeExchange().anyExchange() - .authenticated().and().requestCache(c -> c.requestCache(requestCache)).build(); + .authenticated().and().requestCache((c) -> c.requestCache(requestCache)).build(); WebTestClient client = WebTestClientBuilder.bindToWebFilters(securityFilterChain).build(); client.get().uri("/test").exchange(); @@ -478,7 +479,7 @@ public class ServerHttpSecurityTests { private Optional getWebFilter(SecurityWebFilterChain filterChain, Class filterClass) { return (Optional) filterChain.getWebFilters().filter(Objects::nonNull) - .filter(filter -> filter.getClass().isAssignableFrom(filterClass)).singleOrEmpty().blockOptional(); + .filter((filter) -> filter.getClass().isAssignableFrom(filterClass)).singleOrEmpty().blockOptional(); } private WebTestClient buildClient() { @@ -491,9 +492,9 @@ public class ServerHttpSecurityTests { @GetMapping("/**") Mono pathWithinApplicationFromContext() { - return Mono.subscriberContext().filter(c -> c.hasKey(ServerWebExchange.class)) - .map(c -> c.get(ServerWebExchange.class)) - .map(e -> e.getRequest().getPath().pathWithinApplication().value()); + return Mono.subscriberContext().filter((c) -> c.hasKey(ServerWebExchange.class)) + .map((c) -> c.get(ServerWebExchange.class)) + .map((e) -> e.getRequest().getPath().pathWithinApplication().value()); } } diff --git a/config/src/test/java/org/springframework/security/htmlunit/server/HtmlUnitWebTestClient.java b/config/src/test/java/org/springframework/security/htmlunit/server/HtmlUnitWebTestClient.java index f6b1ee9aa0..44f2c57947 100644 --- a/config/src/test/java/org/springframework/security/htmlunit/server/HtmlUnitWebTestClient.java +++ b/config/src/test/java/org/springframework/security/htmlunit/server/HtmlUnitWebTestClient.java @@ -81,7 +81,7 @@ final class HtmlUnitWebTestClient { private MultiValueMap formData(List params) { MultiValueMap result = new LinkedMultiValueMap<>(params.size()); - params.forEach(pair -> result.add(pair.getName(), pair.getValue())); + params.forEach((pair) -> result.add(pair.getName(), pair.getValue())); return result; } @@ -139,7 +139,7 @@ final class HtmlUnitWebTestClient { @Override public Mono filter(ClientRequest request, ExchangeFunction next) { - return next.exchange(request).flatMap(response -> redirectIfNecessary(request, next, response)); + return next.exchange(request).flatMap((response) -> redirectIfNecessary(request, next, response)); } private Mono redirectIfNecessary(ClientRequest request, ExchangeFunction next, @@ -153,11 +153,11 @@ final class HtmlUnitWebTestClient { redirectUrl = scheme + "://" + host + location.toASCIIString(); } ClientRequest redirect = ClientRequest.method(HttpMethod.GET, URI.create(redirectUrl)) - .headers(headers -> headers.addAll(request.headers())) - .cookies(cookies -> cookies.addAll(request.cookies())) - .attributes(attributes -> attributes.putAll(request.attributes())).build(); + .headers((headers) -> headers.addAll(request.headers())) + .cookies((cookies) -> cookies.addAll(request.cookies())) + .attributes((attributes) -> attributes.putAll(request.attributes())).build(); - return next.exchange(redirect).flatMap(r -> redirectIfNecessary(request, next, r)); + return next.exchange(redirect).flatMap((r) -> redirectIfNecessary(request, next, r)); } return Mono.just(response); @@ -171,9 +171,9 @@ final class HtmlUnitWebTestClient { @Override public Mono filter(ClientRequest request, ExchangeFunction next) { - return next.exchange(withClientCookies(request)).doOnSuccess(response -> { - response.cookies().values().forEach(cookies -> { - cookies.forEach(cookie -> { + return next.exchange(withClientCookies(request)).doOnSuccess((response) -> { + response.cookies().values().forEach((cookies) -> { + cookies.forEach((cookie) -> { if (cookie.getMaxAge().isZero()) { this.cookies.remove(cookie.getName()); } @@ -186,14 +186,14 @@ final class HtmlUnitWebTestClient { } private ClientRequest withClientCookies(ClientRequest request) { - return ClientRequest.from(request).cookies(c -> { + return ClientRequest.from(request).cookies((c) -> { c.addAll(clientCookies()); }).build(); } private MultiValueMap clientCookies() { MultiValueMap result = new LinkedMultiValueMap<>(this.cookies.size()); - this.cookies.values().forEach(cookie -> result.add(cookie.getName(), cookie.getValue())); + this.cookies.values().forEach((cookie) -> result.add(cookie.getName(), cookie.getValue())); return result; } diff --git a/config/src/test/java/org/springframework/security/htmlunit/server/MockWebResponseBuilder.java b/config/src/test/java/org/springframework/security/htmlunit/server/MockWebResponseBuilder.java index f693f4258f..fe634597b0 100644 --- a/config/src/test/java/org/springframework/security/htmlunit/server/MockWebResponseBuilder.java +++ b/config/src/test/java/org/springframework/security/htmlunit/server/MockWebResponseBuilder.java @@ -67,7 +67,7 @@ final class MockWebResponseBuilder { HttpHeaders responseHeaders = this.exchangeResult.getResponseHeaders(); List result = new ArrayList<>(responseHeaders.size()); responseHeaders.forEach((headerName, headerValues) -> headerValues - .forEach(headerValue -> result.add(new NameValuePair(headerName, headerValue)))); + .forEach((headerValue) -> result.add(new NameValuePair(headerName, headerValue)))); return result; } diff --git a/core/src/main/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandler.java b/core/src/main/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandler.java index 8ed41d8099..95b5bced1b 100644 --- a/core/src/main/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandler.java +++ b/core/src/main/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandler.java @@ -204,7 +204,7 @@ public class DefaultMethodSecurityExpressionHandler extends AbstractSecurityExpr if (filterTarget instanceof Stream) { final Stream original = (Stream) filterTarget; - return original.filter(filterObject -> { + return original.filter((filterObject) -> { rootObject.setFilterObject(filterObject); return ExpressionUtils.evaluateAsBoolean(filterExpression, ctx); }).onClose(original::close); diff --git a/core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java index 5b6c45bd69..eb7a41816a 100644 --- a/core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java +++ b/core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java @@ -156,7 +156,7 @@ public class MapBasedMethodSecurityMetadataSource extends AbstractFallbackMethod if ((regMethodName == null) || (!regMethodName.equals(name) && (regMethodName.length() <= name.length()))) { // no already registered method name, or more specific - // method name specification now -> (re-)register method + // method name specification (now) -> (re-)register method if (regMethodName != null) { this.logger.debug("Replacing attributes for secure method [" + method + "]: current name [" + name + "] is more specific than [" + regMethodName + "]"); diff --git a/core/src/main/java/org/springframework/security/access/prepost/PrePostAdviceReactiveMethodInterceptor.java b/core/src/main/java/org/springframework/security/access/prepost/PrePostAdviceReactiveMethodInterceptor.java index f1552942e5..9bd9efd203 100644 --- a/core/src/main/java/org/springframework/security/access/prepost/PrePostAdviceReactiveMethodInterceptor.java +++ b/core/src/main/java/org/springframework/security/access/prepost/PrePostAdviceReactiveMethodInterceptor.java @@ -86,24 +86,24 @@ public class PrePostAdviceReactiveMethodInterceptor implements MethodInterceptor PreInvocationAttribute preAttr = findPreInvocationAttribute(attributes); Mono toInvoke = ReactiveSecurityContextHolder.getContext() .map(SecurityContext::getAuthentication).defaultIfEmpty(this.anonymous) - .filter(auth -> this.preInvocationAdvice.before(auth, invocation, preAttr)) + .filter((auth) -> this.preInvocationAdvice.before(auth, invocation, preAttr)) .switchIfEmpty(Mono.defer(() -> Mono.error(new AccessDeniedException("Denied")))); PostInvocationAttribute attr = findPostInvocationAttribute(attributes); if (Mono.class.isAssignableFrom(returnType)) { - return toInvoke.flatMap(auth -> PrePostAdviceReactiveMethodInterceptor.>proceed(invocation) - .map(r -> attr == null ? r : this.postAdvice.after(auth, invocation, attr, r))); + return toInvoke.flatMap((auth) -> PrePostAdviceReactiveMethodInterceptor.>proceed(invocation) + .map((r) -> attr == null ? r : this.postAdvice.after(auth, invocation, attr, r))); } if (Flux.class.isAssignableFrom(returnType)) { - return toInvoke.flatMapMany(auth -> PrePostAdviceReactiveMethodInterceptor.>proceed(invocation) - .map(r -> attr == null ? r : this.postAdvice.after(auth, invocation, attr, r))); + return toInvoke.flatMapMany((auth) -> PrePostAdviceReactiveMethodInterceptor.>proceed(invocation) + .map((r) -> attr == null ? r : this.postAdvice.after(auth, invocation, attr, r))); } - return toInvoke - .flatMapMany(auth -> Flux.from(PrePostAdviceReactiveMethodInterceptor.>proceed(invocation)) - .map(r -> attr == null ? r : this.postAdvice.after(auth, invocation, attr, r))); + return toInvoke.flatMapMany( + (auth) -> Flux.from(PrePostAdviceReactiveMethodInterceptor.>proceed(invocation)) + .map((r) -> attr == null ? r : this.postAdvice.after(auth, invocation, attr, r))); } private static > T proceed(final MethodInvocation invocation) { diff --git a/core/src/main/java/org/springframework/security/authentication/AbstractUserDetailsReactiveAuthenticationManager.java b/core/src/main/java/org/springframework/security/authentication/AbstractUserDetailsReactiveAuthenticationManager.java index b936c38b28..08b86ca969 100644 --- a/core/src/main/java/org/springframework/security/authentication/AbstractUserDetailsReactiveAuthenticationManager.java +++ b/core/src/main/java/org/springframework/security/authentication/AbstractUserDetailsReactiveAuthenticationManager.java @@ -57,7 +57,7 @@ public abstract class AbstractUserDetailsReactiveAuthenticationManager implement private Scheduler scheduler = Schedulers.boundedElastic(); - private UserDetailsChecker preAuthenticationChecks = user -> { + private UserDetailsChecker preAuthenticationChecks = (user) -> { if (!user.isAccountNonLocked()) { this.logger.debug("User account is locked"); @@ -80,7 +80,7 @@ public abstract class AbstractUserDetailsReactiveAuthenticationManager implement } }; - private UserDetailsChecker postAuthenticationChecks = user -> { + private UserDetailsChecker postAuthenticationChecks = (user) -> { if (!user.isCredentialsNonExpired()) { this.logger.debug("User account credentials have expired"); @@ -94,9 +94,9 @@ public abstract class AbstractUserDetailsReactiveAuthenticationManager implement final String username = authentication.getName(); final String presentedPassword = (String) authentication.getCredentials(); return retrieveUser(username).doOnNext(this.preAuthenticationChecks::check).publishOn(this.scheduler) - .filter(u -> this.passwordEncoder.matches(presentedPassword, u.getPassword())) + .filter((u) -> this.passwordEncoder.matches(presentedPassword, u.getPassword())) .switchIfEmpty(Mono.defer(() -> Mono.error(new BadCredentialsException("Invalid Credentials")))) - .flatMap(u -> { + .flatMap((u) -> { boolean upgradeEncoding = this.userDetailsPasswordService != null && this.passwordEncoder.upgradeEncoding(u.getPassword()); if (upgradeEncoding) { @@ -105,7 +105,7 @@ public abstract class AbstractUserDetailsReactiveAuthenticationManager implement } return Mono.just(u); }).doOnNext(this.postAuthenticationChecks::check) - .map(u -> new UsernamePasswordAuthenticationToken(u, u.getPassword(), u.getAuthorities())); + .map((u) -> new UsernamePasswordAuthenticationToken(u, u.getPassword(), u.getAuthorities())); } /** diff --git a/core/src/main/java/org/springframework/security/authentication/DelegatingReactiveAuthenticationManager.java b/core/src/main/java/org/springframework/security/authentication/DelegatingReactiveAuthenticationManager.java index 8c1268dc5f..8fd156a10d 100644 --- a/core/src/main/java/org/springframework/security/authentication/DelegatingReactiveAuthenticationManager.java +++ b/core/src/main/java/org/springframework/security/authentication/DelegatingReactiveAuthenticationManager.java @@ -48,7 +48,7 @@ public class DelegatingReactiveAuthenticationManager implements ReactiveAuthenti @Override public Mono authenticate(Authentication authentication) { - return Flux.fromIterable(this.delegates).concatMap(m -> m.authenticate(authentication)).next(); + return Flux.fromIterable(this.delegates).concatMap((m) -> m.authenticate(authentication)).next(); } } diff --git a/core/src/main/java/org/springframework/security/authentication/ReactiveAuthenticationManagerAdapter.java b/core/src/main/java/org/springframework/security/authentication/ReactiveAuthenticationManagerAdapter.java index 69e962dafd..bb5d6dc17e 100644 --- a/core/src/main/java/org/springframework/security/authentication/ReactiveAuthenticationManagerAdapter.java +++ b/core/src/main/java/org/springframework/security/authentication/ReactiveAuthenticationManagerAdapter.java @@ -47,14 +47,14 @@ public class ReactiveAuthenticationManagerAdapter implements ReactiveAuthenticat @Override public Mono authenticate(Authentication token) { - return Mono.just(token).publishOn(this.scheduler).flatMap(t -> { + return Mono.just(token).publishOn(this.scheduler).flatMap((t) -> { try { return Mono.just(this.authenticationManager.authenticate(t)); } catch (Throwable error) { return Mono.error(error); } - }).filter(a -> a.isAuthenticated()); + }).filter((a) -> a.isAuthenticated()); } /** diff --git a/core/src/main/java/org/springframework/security/authorization/AuthenticatedReactiveAuthorizationManager.java b/core/src/main/java/org/springframework/security/authorization/AuthenticatedReactiveAuthorizationManager.java index e20d1ed5a2..b854eac09f 100644 --- a/core/src/main/java/org/springframework/security/authorization/AuthenticatedReactiveAuthorizationManager.java +++ b/core/src/main/java/org/springframework/security/authorization/AuthenticatedReactiveAuthorizationManager.java @@ -39,7 +39,7 @@ public class AuthenticatedReactiveAuthorizationManager implements ReactiveAut @Override public Mono check(Mono authentication, T object) { - return authentication.filter(this::isNotAnonymous).map(a -> new AuthorizationDecision(a.isAuthenticated())) + return authentication.filter(this::isNotAnonymous).map((a) -> new AuthorizationDecision(a.isAuthenticated())) .defaultIfEmpty(new AuthorizationDecision(false)); } diff --git a/core/src/main/java/org/springframework/security/authorization/AuthorityReactiveAuthorizationManager.java b/core/src/main/java/org/springframework/security/authorization/AuthorityReactiveAuthorizationManager.java index e1faf00f95..e8bb7b8fe8 100644 --- a/core/src/main/java/org/springframework/security/authorization/AuthorityReactiveAuthorizationManager.java +++ b/core/src/main/java/org/springframework/security/authorization/AuthorityReactiveAuthorizationManager.java @@ -42,9 +42,9 @@ public class AuthorityReactiveAuthorizationManager implements ReactiveAuthori @Override public Mono check(Mono authentication, T object) { - return authentication.filter(a -> a.isAuthenticated()).flatMapIterable(a -> a.getAuthorities()) - .map(g -> g.getAuthority()).any(a -> this.authorities.contains(a)) - .map(hasAuthority -> new AuthorizationDecision(hasAuthority)) + return authentication.filter((a) -> a.isAuthenticated()).flatMapIterable((a) -> a.getAuthorities()) + .map((g) -> g.getAuthority()).any((a) -> this.authorities.contains(a)) + .map((hasAuthority) -> new AuthorizationDecision(hasAuthority)) .defaultIfEmpty(new AuthorizationDecision(false)); } diff --git a/core/src/main/java/org/springframework/security/authorization/ReactiveAuthorizationManager.java b/core/src/main/java/org/springframework/security/authorization/ReactiveAuthorizationManager.java index 7432427ccc..05b3adc293 100644 --- a/core/src/main/java/org/springframework/security/authorization/ReactiveAuthorizationManager.java +++ b/core/src/main/java/org/springframework/security/authorization/ReactiveAuthorizationManager.java @@ -47,9 +47,9 @@ public interface ReactiveAuthorizationManager { * denied */ default Mono verify(Mono authentication, T object) { - return check(authentication, object).filter(d -> d.isGranted()) + return check(authentication, object).filter((d) -> d.isGranted()) .switchIfEmpty(Mono.defer(() -> Mono.error(new AccessDeniedException("Access Denied")))) - .flatMap(d -> Mono.empty()); + .flatMap((d) -> Mono.empty()); } } diff --git a/core/src/main/java/org/springframework/security/converter/RsaKeyConverters.java b/core/src/main/java/org/springframework/security/converter/RsaKeyConverters.java index 920017fd96..b675c35855 100644 --- a/core/src/main/java/org/springframework/security/converter/RsaKeyConverters.java +++ b/core/src/main/java/org/springframework/security/converter/RsaKeyConverters.java @@ -69,7 +69,7 @@ public final class RsaKeyConverters { */ public static Converter pkcs8() { KeyFactory keyFactory = rsaFactory(); - return source -> { + return (source) -> { List lines = readAllLines(source); Assert.isTrue(!lines.isEmpty() && lines.get(0).startsWith(PKCS8_PEM_HEADER), "Key is not in PEM-encoded PKCS#8 format, " + "please check that the header begins with -----" @@ -102,7 +102,7 @@ public final class RsaKeyConverters { */ public static Converter x509() { KeyFactory keyFactory = rsaFactory(); - return source -> { + return (source) -> { List lines = readAllLines(source); Assert.isTrue(!lines.isEmpty() && lines.get(0).startsWith(X509_PEM_HEADER), "Key is not in PEM-encoded X.509 format, " + "please check that the header begins with -----" diff --git a/core/src/main/java/org/springframework/security/core/context/ReactiveSecurityContextHolder.java b/core/src/main/java/org/springframework/security/core/context/ReactiveSecurityContextHolder.java index ac3366d665..449d461fd7 100644 --- a/core/src/main/java/org/springframework/security/core/context/ReactiveSecurityContextHolder.java +++ b/core/src/main/java/org/springframework/security/core/context/ReactiveSecurityContextHolder.java @@ -41,8 +41,8 @@ public final class ReactiveSecurityContextHolder { * @return the {@code Mono} */ public static Mono getContext() { - return Mono.subscriberContext().filter(c -> c.hasKey(SECURITY_CONTEXT_KEY)) - .flatMap(c -> c.>get(SECURITY_CONTEXT_KEY)); + return Mono.subscriberContext().filter((c) -> c.hasKey(SECURITY_CONTEXT_KEY)) + .flatMap((c) -> c.>get(SECURITY_CONTEXT_KEY)); } /** @@ -51,7 +51,7 @@ public final class ReactiveSecurityContextHolder { * from clearing the context. */ public static Function clearContext() { - return context -> context.delete(SECURITY_CONTEXT_KEY); + return (context) -> context.delete(SECURITY_CONTEXT_KEY); } /** diff --git a/core/src/main/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscoverer.java b/core/src/main/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscoverer.java index 982ed3312a..d2f0f6f0c8 100644 --- a/core/src/main/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscoverer.java +++ b/core/src/main/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscoverer.java @@ -162,10 +162,10 @@ public class AnnotationParameterNameDiscoverer implements ParameterNameDiscovere return null; } - private static final ParameterNameFactory> CONSTRUCTOR_METHODPARAM_FACTORY = constructor -> constructor - .getParameterAnnotations(); + private static final ParameterNameFactory> CONSTRUCTOR_METHODPARAM_FACTORY = ( + constructor) -> constructor.getParameterAnnotations(); - private static final ParameterNameFactory METHOD_METHODPARAM_FACTORY = method -> method + private static final ParameterNameFactory METHOD_METHODPARAM_FACTORY = (method) -> method .getParameterAnnotations(); /** diff --git a/core/src/main/java/org/springframework/security/core/userdetails/MapReactiveUserDetailsService.java b/core/src/main/java/org/springframework/security/core/userdetails/MapReactiveUserDetailsService.java index bab768315a..6d543134bb 100644 --- a/core/src/main/java/org/springframework/security/core/userdetails/MapReactiveUserDetailsService.java +++ b/core/src/main/java/org/springframework/security/core/userdetails/MapReactiveUserDetailsService.java @@ -72,7 +72,7 @@ public class MapReactiveUserDetailsService implements ReactiveUserDetailsService @Override public Mono updatePassword(UserDetails user, String newPassword) { - return Mono.just(user).map(u -> User.withUserDetails(u).password(newPassword).build()).doOnNext(u -> { + return Mono.just(user).map((u) -> User.withUserDetails(u).password(newPassword).build()).doOnNext((u) -> { String key = getKey(user.getUsername()); this.users.put(key, u); }); diff --git a/core/src/main/java/org/springframework/security/core/userdetails/User.java b/core/src/main/java/org/springframework/security/core/userdetails/User.java index e3c8fe469e..d2587154b8 100644 --- a/core/src/main/java/org/springframework/security/core/userdetails/User.java +++ b/core/src/main/java/org/springframework/security/core/userdetails/User.java @@ -359,7 +359,7 @@ public class User implements UserDetails, CredentialsContainer { private boolean disabled; - private Function passwordEncoder = password -> password; + private Function passwordEncoder = (password) -> password; /** * Creates a new instance diff --git a/core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java b/core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java index 16f426334e..f3d6e7ee8a 100644 --- a/core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java +++ b/core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java @@ -198,7 +198,7 @@ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsMa public void createUser(final UserDetails user) { validateUserDetails(user); - getJdbcTemplate().update(this.createUserSql, ps -> { + getJdbcTemplate().update(this.createUserSql, (ps) -> { ps.setString(1, user.getUsername()); ps.setString(2, user.getPassword()); ps.setBoolean(3, user.isEnabled()); @@ -221,7 +221,7 @@ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsMa public void updateUser(final UserDetails user) { validateUserDetails(user); - getJdbcTemplate().update(this.updateUserSql, ps -> { + getJdbcTemplate().update(this.updateUserSql, (ps) -> { ps.setString(1, user.getPassword()); ps.setBoolean(2, user.isEnabled()); @@ -347,7 +347,7 @@ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsMa for (GrantedAuthority a : authorities) { final String authority = a.getAuthority(); - getJdbcTemplate().update(this.insertGroupAuthoritySql, ps -> { + getJdbcTemplate().update(this.insertGroupAuthoritySql, (ps) -> { ps.setInt(1, groupId); ps.setString(2, authority); }); @@ -360,7 +360,7 @@ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsMa Assert.hasText(groupName, "groupName should have text"); final int id = findGroupId(groupName); - PreparedStatementSetter groupIdPSS = ps -> ps.setInt(1, id); + PreparedStatementSetter groupIdPSS = (ps) -> ps.setInt(1, id); getJdbcTemplate().update(this.deleteGroupMembersSql, groupIdPSS); getJdbcTemplate().update(this.deleteGroupAuthoritiesSql, groupIdPSS); getJdbcTemplate().update(this.deleteGroupSql, groupIdPSS); @@ -382,7 +382,7 @@ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsMa Assert.hasText(groupName, "groupName should have text"); final int id = findGroupId(groupName); - getJdbcTemplate().update(this.insertGroupMemberSql, ps -> { + getJdbcTemplate().update(this.insertGroupMemberSql, (ps) -> { ps.setInt(1, id); ps.setString(2, username); }); @@ -398,7 +398,7 @@ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsMa final int id = findGroupId(groupName); - getJdbcTemplate().update(this.deleteGroupMemberSql, ps -> { + getJdbcTemplate().update(this.deleteGroupMemberSql, (ps) -> { ps.setInt(1, id); ps.setString(2, username); }); @@ -426,7 +426,7 @@ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsMa final int id = findGroupId(groupName); - getJdbcTemplate().update(this.deleteGroupAuthoritySql, ps -> { + getJdbcTemplate().update(this.deleteGroupAuthoritySql, (ps) -> { ps.setInt(1, id); ps.setString(2, authority.getAuthority()); }); @@ -439,7 +439,7 @@ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsMa Assert.notNull(authority, "authority cannot be null"); final int id = findGroupId(groupName); - getJdbcTemplate().update(this.insertGroupAuthoritySql, ps -> { + getJdbcTemplate().update(this.insertGroupAuthoritySql, (ps) -> { ps.setInt(1, id); ps.setString(2, authority.getAuthority()); }); diff --git a/core/src/test/java/org/springframework/security/access/expression/SecurityExpressionRootTests.java b/core/src/test/java/org/springframework/security/access/expression/SecurityExpressionRootTests.java index 37d272e78e..c1e953f363 100644 --- a/core/src/test/java/org/springframework/security/access/expression/SecurityExpressionRootTests.java +++ b/core/src/test/java/org/springframework/security/access/expression/SecurityExpressionRootTests.java @@ -63,7 +63,7 @@ public class SecurityExpressionRootTests { @Test public void roleHierarchySupportIsCorrectlyUsedInEvaluatingRoles() { - this.root.setRoleHierarchy(authorities -> AuthorityUtils.createAuthorityList("ROLE_C")); + this.root.setRoleHierarchy((authorities) -> AuthorityUtils.createAuthorityList("ROLE_C")); assertThat(this.root.hasRole("C")).isTrue(); assertThat(this.root.hasAuthority("ROLE_C")).isTrue(); diff --git a/core/src/test/java/org/springframework/security/authentication/UserDetailsRepositoryReactiveAuthenticationManagerTests.java b/core/src/test/java/org/springframework/security/authentication/UserDetailsRepositoryReactiveAuthenticationManagerTests.java index a551d8fcb8..1718a05da4 100644 --- a/core/src/test/java/org/springframework/security/authentication/UserDetailsRepositoryReactiveAuthenticationManagerTests.java +++ b/core/src/test/java/org/springframework/security/authentication/UserDetailsRepositoryReactiveAuthenticationManagerTests.java @@ -78,7 +78,7 @@ public class UserDetailsRepositoryReactiveAuthenticationManagerTests { @Before public void setup() { this.manager = new UserDetailsRepositoryReactiveAuthenticationManager(this.userDetailsService); - given(this.scheduler.schedule(any())).willAnswer(a -> { + given(this.scheduler.schedule(any())).willAnswer((a) -> { Runnable r = a.getArgument(0); return Schedulers.immediate().schedule(r); }); diff --git a/core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java index cf7f5681e4..f474ce4c40 100644 --- a/core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java @@ -236,7 +236,7 @@ public class JaasAuthenticationProviderTests { @Test public void testLoginExceptionResolver() { assertThat(this.jaasProvider.getLoginExceptionResolver()).isNotNull(); - this.jaasProvider.setLoginExceptionResolver(e -> new LockedException("This is just a test!")); + this.jaasProvider.setLoginExceptionResolver((e) -> new LockedException("This is just a test!")); try { this.jaasProvider.authenticate(new UsernamePasswordAuthenticationToken("user", "password")); diff --git a/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnableTests.java b/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnableTests.java index 42bebe98c8..265ab85f16 100644 --- a/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnableTests.java +++ b/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnableTests.java @@ -62,7 +62,7 @@ public class DelegatingSecurityContextRunnableTests { @Before public void setUp() { this.originalSecurityContext = SecurityContextHolder.createEmptyContext(); - willAnswer((Answer) invocation -> { + willAnswer((Answer) (invocation) -> { assertThat(SecurityContextHolder.getContext()).isEqualTo(this.securityContext); return null; }).given(this.delegate).run(); diff --git a/core/src/test/java/org/springframework/security/core/context/ReactiveSecurityContextHolderTests.java b/core/src/test/java/org/springframework/security/core/context/ReactiveSecurityContextHolderTests.java index 573ebaccb8..eb915d7e32 100644 --- a/core/src/test/java/org/springframework/security/core/context/ReactiveSecurityContextHolderTests.java +++ b/core/src/test/java/org/springframework/security/core/context/ReactiveSecurityContextHolderTests.java @@ -42,7 +42,7 @@ public class ReactiveSecurityContextHolderTests { new TestingAuthenticationToken("user", "password", "ROLE_USER")); Mono context = Mono.subscriberContext() - .flatMap(c -> ReactiveSecurityContextHolder.getContext()) + .flatMap((c) -> ReactiveSecurityContextHolder.getContext()) .subscriberContext(ReactiveSecurityContextHolder.withSecurityContext(Mono.just(expectedContext))); StepVerifier.create(context).expectNext(expectedContext).verifyComplete(); @@ -70,7 +70,7 @@ public class ReactiveSecurityContextHolderTests { new TestingAuthenticationToken("user", "password", "ROLE_USER")); Mono context = Mono.subscriberContext() - .flatMap(c -> ReactiveSecurityContextHolder.getContext()) + .flatMap((c) -> ReactiveSecurityContextHolder.getContext()) .subscriberContext(ReactiveSecurityContextHolder.clearContext()) .subscriberContext(ReactiveSecurityContextHolder.withSecurityContext(Mono.just(expectedContext))); @@ -82,7 +82,7 @@ public class ReactiveSecurityContextHolderTests { Authentication expectedAuthentication = new TestingAuthenticationToken("user", "password", "ROLE_USER"); Mono authentication = Mono.subscriberContext() - .flatMap(c -> ReactiveSecurityContextHolder.getContext()).map(SecurityContext::getAuthentication) + .flatMap((c) -> ReactiveSecurityContextHolder.getContext()).map(SecurityContext::getAuthentication) .subscriberContext(ReactiveSecurityContextHolder.withAuthentication(expectedAuthentication)); StepVerifier.create(authentication).expectNext(expectedAuthentication).verifyComplete(); diff --git a/core/src/test/java/org/springframework/security/core/userdetails/PasswordEncodedUser.java b/core/src/test/java/org/springframework/security/core/userdetails/PasswordEncodedUser.java index 60c190c40a..869c0f3538 100644 --- a/core/src/test/java/org/springframework/security/core/userdetails/PasswordEncodedUser.java +++ b/core/src/test/java/org/springframework/security/core/userdetails/PasswordEncodedUser.java @@ -49,7 +49,7 @@ public class PasswordEncodedUser { } private static Function passwordEncoder() { - return rawPassword -> "{noop}" + rawPassword; + return (rawPassword) -> "{noop}" + rawPassword; } protected PasswordEncodedUser() { diff --git a/core/src/test/java/org/springframework/security/core/userdetails/UserDetailsByNameServiceWrapperTests.java b/core/src/test/java/org/springframework/security/core/userdetails/UserDetailsByNameServiceWrapperTests.java index 646b557499..8364a1f360 100644 --- a/core/src/test/java/org/springframework/security/core/userdetails/UserDetailsByNameServiceWrapperTests.java +++ b/core/src/test/java/org/springframework/security/core/userdetails/UserDetailsByNameServiceWrapperTests.java @@ -49,7 +49,7 @@ public class UserDetailsByNameServiceWrapperTests { public final void testGetUserDetails() throws Exception { UserDetailsByNameServiceWrapper svc = new UserDetailsByNameServiceWrapper(); final User user = new User("dummy", "dummy", true, true, true, true, AuthorityUtils.NO_AUTHORITIES); - svc.setUserDetailsService(name -> { + svc.setUserDetailsService((name) -> { if (user != null && user.getUsername().equals(name)) { return user; } diff --git a/core/src/test/java/org/springframework/security/core/userdetails/UserTests.java b/core/src/test/java/org/springframework/security/core/userdetails/UserTests.java index 7138ef8ca0..920d6a249f 100644 --- a/core/src/test/java/org/springframework/security/core/userdetails/UserTests.java +++ b/core/src/test/java/org/springframework/security/core/userdetails/UserTests.java @@ -176,7 +176,8 @@ public class UserTests { public void withUserWhenDetailsPasswordEncoderThenEncodes() { UserDetails userDetails = User.withUsername("user").password("password").roles("USER").build(); - UserDetails withEncodedPassword = User.withUserDetails(userDetails).passwordEncoder(p -> p + "encoded").build(); + UserDetails withEncodedPassword = User.withUserDetails(userDetails).passwordEncoder((p) -> p + "encoded") + .build(); assertThat(withEncodedPassword.getPassword()).isEqualTo("passwordencoded"); } @@ -184,7 +185,7 @@ public class UserTests { @Test public void withUsernameWhenPasswordEncoderAndPasswordThenEncodes() { UserDetails withEncodedPassword = User.withUsername("user").password("password") - .passwordEncoder(p -> p + "encoded").roles("USER").build(); + .passwordEncoder((p) -> p + "encoded").roles("USER").build(); assertThat(withEncodedPassword.getPassword()).isEqualTo("passwordencoded"); } @@ -193,7 +194,7 @@ public class UserTests { public void withUsernameWhenPasswordAndPasswordEncoderThenEncodes() { // @formatter:off UserDetails withEncodedPassword = User.withUsername("user") - .passwordEncoder(p -> p + "encoded") + .passwordEncoder((p) -> p + "encoded") .password("password") .roles("USER") .build(); @@ -204,7 +205,7 @@ public class UserTests { @Test public void withUsernameWhenPasswordAndPasswordEncoderTwiceThenEncodesOnce() { - Function encoder = p -> p + "encoded"; + Function encoder = (p) -> p + "encoded"; // @formatter:off UserDetails withEncodedPassword = User.withUsername("user") .passwordEncoder(encoder) diff --git a/itest/web/src/integration-test/java/org/springframework/security/integration/ConcurrentSessionManagementTests.java b/itest/web/src/integration-test/java/org/springframework/security/integration/ConcurrentSessionManagementTests.java index c2820e8ddc..4f74d2b48f 100644 --- a/itest/web/src/integration-test/java/org/springframework/security/integration/ConcurrentSessionManagementTests.java +++ b/itest/web/src/integration-test/java/org/springframework/security/integration/ConcurrentSessionManagementTests.java @@ -63,7 +63,7 @@ public class ConcurrentSessionManagementTests extends AbstractWebServerIntegrati // Now logout to kill first session mockMvc.perform(post("/logout").with(csrf())).andExpect(status().is3xxRedirection()) - .andDo(result -> this.context.publishEvent(new SessionDestroyedEvent(session1) { + .andDo((result) -> this.context.publishEvent(new SessionDestroyedEvent(session1) { @Override public List getSecurityContexts() { return Collections.emptyList(); diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java index ba1c820021..aadb2faaf9 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java @@ -91,7 +91,7 @@ public class SpringSecurityLdapTemplateITests { @Test public void namingExceptionIsTranslatedCorrectly() { try { - this.template.executeReadOnly((ContextExecutor) dirContext -> { + this.template.executeReadOnly((ContextExecutor) (dirContext) -> { throw new NamingException(); }); fail("Expected UncategorizedLdapException on NamingException"); diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorTests.java index b448b9518b..37cb58cc02 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorTests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorTests.java @@ -184,7 +184,7 @@ public class DefaultLdapAuthoritiesPopulatorTests { @Test public void customAuthoritiesMappingFunction() { - this.populator.setAuthorityMapper(record -> { + this.populator.setAuthorityMapper((record) -> { String dn = record.get(SpringSecurityLdapTemplate.DN_KEY).get(0); String role = record.get(this.populator.getGroupRoleAttribute()).get(0); return new LdapAuthority(role, dn); diff --git a/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityLdapTemplate.java b/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityLdapTemplate.java index e12cdcf848..7c21ead437 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityLdapTemplate.java +++ b/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityLdapTemplate.java @@ -124,7 +124,7 @@ public class SpringSecurityLdapTemplate extends LdapTemplate { */ public DirContextOperations retrieveEntry(final String dn, final String[] attributesToRetrieve) { - return (DirContextOperations) executeReadOnly((ContextExecutor) ctx -> { + return (DirContextOperations) executeReadOnly((ContextExecutor) (ctx) -> { Attributes attrs = ctx.getAttributes(dn, attributesToRetrieve); // Object object = ctx.lookup(LdapUtils.getRelativeName(dn, ctx)); @@ -188,7 +188,7 @@ public class SpringSecurityLdapTemplate extends LdapTemplate { final HashSet>> set = new HashSet<>(); - ContextMapper roleMapper = ctx -> { + ContextMapper roleMapper = (ctx) -> { DirContextAdapter adapter = (DirContextAdapter) ctx; Map> record = new HashMap<>(); if (attributeNames == null || attributeNames.length == 0) { @@ -285,8 +285,8 @@ public class SpringSecurityLdapTemplate extends LdapTemplate { */ public DirContextOperations searchForSingleEntry(final String base, final String filter, final Object[] params) { - return (DirContextOperations) executeReadOnly( - (ContextExecutor) ctx -> searchForSingleEntryInternal(ctx, this.searchControls, base, filter, params)); + return (DirContextOperations) executeReadOnly((ContextExecutor) (ctx) -> searchForSingleEntryInternal(ctx, + this.searchControls, base, filter, params)); } /** diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulator.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulator.java index 6ec5f13606..2fd023c839 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulator.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulator.java @@ -169,7 +169,7 @@ public class DefaultLdapAuthoritiesPopulator implements LdapAuthoritiesPopulator logger.info("groupSearchBase is empty. Searches will be performed from the context source base"); } - this.authorityMapper = record -> { + this.authorityMapper = (record) -> { String role = record.get(this.groupRoleAttribute).get(0); if (this.convertToUpperCase) { diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java index a5a2c9e04e..b2faf060bc 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java @@ -114,7 +114,7 @@ public class LdapUserDetailsManager implements UserDetailsManager { private final LdapTemplate template; /** Default context mapper used to create a set of roles from a list of attributes */ - private AttributesMapper roleMapper = attributes -> { + private AttributesMapper roleMapper = (attributes) -> { Attribute roleAttr = attributes.get(this.groupRoleAttributeName); NamingEnumeration ne = roleAttr.getAll(); @@ -146,7 +146,7 @@ public class LdapUserDetailsManager implements UserDetailsManager { } private DirContextAdapter loadUserAsContext(final DistinguishedName dn, final String username) { - return (DirContextAdapter) this.template.executeReadOnly((ContextExecutor) ctx -> { + return (DirContextAdapter) this.template.executeReadOnly((ContextExecutor) (ctx) -> { try { Attributes attrs = ctx.getAttributes(dn, this.attributesToRetrieve); return new DirContextAdapter(attrs, LdapUtils.getFullDn(dn, ctx)); @@ -210,7 +210,7 @@ public class LdapUserDetailsManager implements UserDetailsManager { */ @SuppressWarnings("unchecked") List getUserAuthorities(final DistinguishedName dn, final String username) { - SearchExecutor se = ctx -> { + SearchExecutor se = (ctx) -> { DistinguishedName fullDn = LdapUtils.getFullDn(dn, ctx); SearchControls ctrls = new SearchControls(); ctrls.setReturningAttributes(new String[] { this.groupRoleAttributeName }); @@ -327,7 +327,7 @@ public class LdapUserDetailsManager implements UserDetailsManager { private void modifyAuthorities(final DistinguishedName userDn, final Collection authorities, final int modType) { - this.template.executeReadWrite((ContextExecutor) ctx -> { + this.template.executeReadWrite((ContextExecutor) (ctx) -> { for (GrantedAuthority authority : authorities) { String group = convertAuthorityToGroup(authority); DistinguishedName fullDn = LdapUtils.getFullDn(userDn, ctx); @@ -428,7 +428,7 @@ public class LdapUserDetailsManager implements UserDetailsManager { return; } - this.template.executeReadWrite(dirCtx -> { + this.template.executeReadWrite((dirCtx) -> { LdapContext ctx = (LdapContext) dirCtx; ctx.removeFromEnvironment("com.sun.jndi.ldap.connect.pool"); ctx.addToEnvironment(Context.SECURITY_PRINCIPAL, LdapUtils.getFullDn(userDn, ctx).toString()); @@ -451,7 +451,7 @@ public class LdapUserDetailsManager implements UserDetailsManager { private void changePasswordUsingExtensionOperation(DistinguishedName userDn, String oldPassword, String newPassword) { - this.template.executeReadWrite(dirCtx -> { + this.template.executeReadWrite((dirCtx) -> { LdapContext ctx = (LdapContext) dirCtx; String userIdentity = LdapUtils.getFullDn(userDn, ctx).encode(); diff --git a/messaging/src/main/java/org/springframework/security/messaging/handler/invocation/reactive/AuthenticationPrincipalArgumentResolver.java b/messaging/src/main/java/org/springframework/security/messaging/handler/invocation/reactive/AuthenticationPrincipalArgumentResolver.java index c2d9fb6483..4f5b14bd5a 100644 --- a/messaging/src/main/java/org/springframework/security/messaging/handler/invocation/reactive/AuthenticationPrincipalArgumentResolver.java +++ b/messaging/src/main/java/org/springframework/security/messaging/handler/invocation/reactive/AuthenticationPrincipalArgumentResolver.java @@ -125,7 +125,7 @@ public class AuthenticationPrincipalArgumentResolver implements HandlerMethodArg @Override public Mono resolveArgument(MethodParameter parameter, Message message) { ReactiveAdapter adapter = this.adapterRegistry.getAdapter(parameter.getParameterType()); - return ReactiveSecurityContextHolder.getContext().map(SecurityContext::getAuthentication).flatMap(a -> { + return ReactiveSecurityContextHolder.getContext().map(SecurityContext::getAuthentication).flatMap((a) -> { Object p = resolvePrincipal(parameter, a.getPrincipal()); Mono principal = Mono.justOrEmpty(p); return adapter == null ? principal : Mono.just(adapter.fromPublisher(principal)); diff --git a/messaging/src/main/java/org/springframework/security/messaging/handler/invocation/reactive/CurrentSecurityContextArgumentResolver.java b/messaging/src/main/java/org/springframework/security/messaging/handler/invocation/reactive/CurrentSecurityContextArgumentResolver.java index ed07e9e893..21165e9363 100644 --- a/messaging/src/main/java/org/springframework/security/messaging/handler/invocation/reactive/CurrentSecurityContextArgumentResolver.java +++ b/messaging/src/main/java/org/springframework/security/messaging/handler/invocation/reactive/CurrentSecurityContextArgumentResolver.java @@ -124,7 +124,7 @@ public class CurrentSecurityContextArgumentResolver implements HandlerMethodArgu @Override public Mono resolveArgument(MethodParameter parameter, Message message) { ReactiveAdapter adapter = this.adapterRegistry.getAdapter(parameter.getParameterType()); - return ReactiveSecurityContextHolder.getContext().flatMap(securityContext -> { + return ReactiveSecurityContextHolder.getContext().flatMap((securityContext) -> { Object sc = resolveSecurityContext(parameter, securityContext); Mono result = Mono.justOrEmpty(sc); return adapter == null ? result : Mono.just(adapter.fromPublisher(result)); diff --git a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcher.java b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcher.java index 95c1c60a0b..12aea1f659 100644 --- a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcher.java +++ b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcher.java @@ -38,7 +38,7 @@ import org.springframework.util.PathMatcher; */ public final class SimpDestinationMessageMatcher implements MessageMatcher { - public static final MessageMatcher NULL_DESTINATION_MATCHER = message -> { + public static final MessageMatcher NULL_DESTINATION_MATCHER = (message) -> { String destination = SimpMessageHeaderAccessor.getDestination(message.getHeaders()); return destination == null; }; diff --git a/messaging/src/test/java/org/springframework/security/messaging/handler/invocation/ResolvableMethod.java b/messaging/src/test/java/org/springframework/security/messaging/handler/invocation/ResolvableMethod.java index 653b3a2c66..2dde084f5d 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/handler/invocation/ResolvableMethod.java +++ b/messaging/src/test/java/org/springframework/security/messaging/handler/invocation/ResolvableMethod.java @@ -120,7 +120,7 @@ import org.springframework.util.ReflectionUtils; * Locate a method by invoking it through a proxy of the target handler: * * 
- * ResolvableMethod.on(TestController.class).mockCall(o -> o.handle(null)).method();
+ * ResolvableMethod.on(TestController.class).mockCall((o) -> o.handle(null)).method();
  *
* * @author Rossen Stoyanchev @@ -323,7 +323,7 @@ public final class ResolvableMethod { * Filter on methods with the given name. */ public Builder named(String methodName) { - addFilter("methodName=" + methodName, method -> method.getName().equals(methodName)); + addFilter("methodName=" + methodName, (method) -> method.getName().equals(methodName)); return this; } @@ -331,7 +331,7 @@ public final class ResolvableMethod { * Filter on methods with the given parameter types. */ public Builder argTypes(Class... argTypes) { - addFilter("argTypes=" + Arrays.toString(argTypes), method -> ObjectUtils.isEmpty(argTypes) + addFilter("argTypes=" + Arrays.toString(argTypes), (method) -> ObjectUtils.isEmpty(argTypes) ? method.getParameterCount() == 0 : Arrays.equals(method.getParameterTypes(), argTypes)); return this; } @@ -354,8 +354,8 @@ public final class ResolvableMethod { @SafeVarargs public final Builder annotPresent(Class... annotationTypes) { String message = "annotationPresent=" + Arrays.toString(annotationTypes); - addFilter(message, candidate -> Arrays.stream(annotationTypes) - .allMatch(annotType -> AnnotatedElementUtils.findMergedAnnotation(candidate, annotType) != null)); + addFilter(message, (candidate) -> Arrays.stream(annotationTypes) + .allMatch((annotType) -> AnnotatedElementUtils.findMergedAnnotation(candidate, annotType) != null)); return this; } @@ -365,10 +365,10 @@ public final class ResolvableMethod { @SafeVarargs public final Builder annotNotPresent(Class... annotationTypes) { String message = "annotationNotPresent=" + Arrays.toString(annotationTypes); - addFilter(message, candidate -> { + addFilter(message, (candidate) -> { if (annotationTypes.length != 0) { return Arrays.stream(annotationTypes).noneMatch( - annotType -> AnnotatedElementUtils.findMergedAnnotation(candidate, annotType) != null); + (annotType) -> AnnotatedElementUtils.findMergedAnnotation(candidate, annotType) != null); } else { return candidate.getAnnotations().length == 0; @@ -403,7 +403,7 @@ public final class ResolvableMethod { public Builder returning(ResolvableType returnType) { String expected = returnType.toString(); String message = "returnType=" + expected; - addFilter(message, m -> expected.equals(ResolvableType.forMethodReturnType(m).toString())); + addFilter(message, (m) -> expected.equals(ResolvableType.forMethodReturnType(m).toString())); return this; } @@ -423,7 +423,7 @@ public final class ResolvableMethod { } private boolean isMatch(Method method) { - return this.filters.stream().allMatch(p -> p.test(method)); + return this.filters.stream().allMatch((p) -> p.test(method)); } private String formatMethods(Set methods) { @@ -581,7 +581,7 @@ public final class ResolvableMethod { */ @SafeVarargs public final ArgResolver annotPresent(Class... annotationTypes) { - this.filters.add(param -> Arrays.stream(annotationTypes).allMatch(param::hasParameterAnnotation)); + this.filters.add((param) -> Arrays.stream(annotationTypes).allMatch(param::hasParameterAnnotation)); return this; } @@ -591,7 +591,7 @@ public final class ResolvableMethod { */ @SafeVarargs public final ArgResolver annotNotPresent(Class... annotationTypes) { - this.filters.add(param -> (annotationTypes.length > 0 + this.filters.add((param) -> (annotationTypes.length > 0 ? Arrays.stream(annotationTypes).noneMatch(param::hasParameterAnnotation) : param.getParameterAnnotations().length == 0)); return this; @@ -618,7 +618,7 @@ public final class ResolvableMethod { * @param type the expected type */ public MethodParameter arg(ResolvableType type) { - this.filters.add(p -> type.toString().equals(ResolvableType.forMethodParameter(p).toString())); + this.filters.add((p) -> type.toString().equals(ResolvableType.forMethodParameter(p).toString())); return arg(); } @@ -638,7 +638,7 @@ public final class ResolvableMethod { for (int i = 0; i < ResolvableMethod.this.method.getParameterCount(); i++) { MethodParameter param = new SynthesizingMethodParameter(ResolvableMethod.this.method, i); param.initParameterNameDiscovery(nameDiscoverer); - if (this.filters.stream().allMatch(p -> p.test(param))) { + if (this.filters.stream().allMatch((p) -> p.test(param))) { matches.add(param); } } diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/AuthorizedClientServiceOAuth2AuthorizedClientManager.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/AuthorizedClientServiceOAuth2AuthorizedClientManager.java index f978419418..e2a4d6a753 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/AuthorizedClientServiceOAuth2AuthorizedClientManager.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/AuthorizedClientServiceOAuth2AuthorizedClientManager.java @@ -138,12 +138,13 @@ public final class AuthorizedClientServiceOAuth2AuthorizedClientManager implemen contextBuilder = OAuth2AuthorizationContext.withClientRegistration(clientRegistration); } } - OAuth2AuthorizationContext authorizationContext = contextBuilder.principal(principal).attributes(attributes -> { - Map contextAttributes = this.contextAttributesMapper.apply(authorizeRequest); - if (!CollectionUtils.isEmpty(contextAttributes)) { - attributes.putAll(contextAttributes); - } - }).build(); + OAuth2AuthorizationContext authorizationContext = contextBuilder.principal(principal) + .attributes((attributes) -> { + Map contextAttributes = this.contextAttributesMapper.apply(authorizeRequest); + if (!CollectionUtils.isEmpty(contextAttributes)) { + attributes.putAll(contextAttributes); + } + }).build(); try { authorizedClient = this.authorizedClientProvider.authorize(authorizationContext); diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/AuthorizedClientServiceReactiveOAuth2AuthorizedClientManager.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/AuthorizedClientServiceReactiveOAuth2AuthorizedClientManager.java index de45d9a6a1..c1a6193e6f 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/AuthorizedClientServiceReactiveOAuth2AuthorizedClientManager.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/AuthorizedClientServiceReactiveOAuth2AuthorizedClientManager.java @@ -122,7 +122,7 @@ public final class AuthorizedClientServiceReactiveOAuth2AuthorizedClientManager Assert.notNull(authorizeRequest, "authorizeRequest cannot be null"); return createAuthorizationContext(authorizeRequest) - .flatMap(authorizationContext -> authorize(authorizationContext, authorizeRequest.getPrincipal())); + .flatMap((authorizationContext) -> authorize(authorizationContext, authorizeRequest.getPrincipal())); } private Mono createAuthorizationContext(OAuth2AuthorizeRequest authorizeRequest) { @@ -132,18 +132,18 @@ public final class AuthorizedClientServiceReactiveOAuth2AuthorizedClientManager .map(OAuth2AuthorizationContext::withAuthorizedClient) .switchIfEmpty(Mono.defer(() -> this.clientRegistrationRepository .findByRegistrationId(clientRegistrationId) - .flatMap(clientRegistration -> this.authorizedClientService + .flatMap((clientRegistration) -> this.authorizedClientService .loadAuthorizedClient(clientRegistrationId, principal.getName()) .map(OAuth2AuthorizationContext::withAuthorizedClient) .switchIfEmpty(Mono.fromSupplier( () -> OAuth2AuthorizationContext.withClientRegistration(clientRegistration)))) .switchIfEmpty(Mono.error(() -> new IllegalArgumentException( "Could not find ClientRegistration with id '" + clientRegistrationId + "'"))))) - .flatMap(contextBuilder -> this.contextAttributesMapper.apply(authorizeRequest) - .defaultIfEmpty(Collections.emptyMap()).map(contextAttributes -> { + .flatMap((contextBuilder) -> this.contextAttributesMapper.apply(authorizeRequest) + .defaultIfEmpty(Collections.emptyMap()).map((contextAttributes) -> { OAuth2AuthorizationContext.Builder builder = contextBuilder.principal(principal); if (!contextAttributes.isEmpty()) { - builder = builder.attributes(attributes -> attributes.putAll(contextAttributes)); + builder = builder.attributes((attributes) -> attributes.putAll(contextAttributes)); } return builder.build(); })); @@ -165,12 +165,12 @@ public final class AuthorizedClientServiceReactiveOAuth2AuthorizedClientManager return this.authorizedClientProvider.authorize(authorizationContext) // Delegate to the authorizationSuccessHandler of the successful // authorization - .flatMap(authorizedClient -> this.authorizationSuccessHandler + .flatMap((authorizedClient) -> this.authorizationSuccessHandler .onAuthorizationSuccess(authorizedClient, principal, Collections.emptyMap()) .thenReturn(authorizedClient)) // Delegate to the authorizationFailureHandler of the failed authorization .onErrorResume(OAuth2AuthorizationException.class, - authorizationException -> this.authorizationFailureHandler + (authorizationException) -> this.authorizationFailureHandler .onAuthorizationFailure(authorizationException, principal, Collections.emptyMap()) .then(Mono.error(authorizationException))) .switchIfEmpty(Mono.defer(() -> Mono.justOrEmpty(authorizationContext.getAuthorizedClient()))); diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/ClientCredentialsReactiveOAuth2AuthorizedClientProvider.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/ClientCredentialsReactiveOAuth2AuthorizedClientProvider.java index 0bdf39e3ec..9a22665efa 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/ClientCredentialsReactiveOAuth2AuthorizedClientProvider.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/ClientCredentialsReactiveOAuth2AuthorizedClientProvider.java @@ -87,8 +87,9 @@ public final class ClientCredentialsReactiveOAuth2AuthorizedClientProvider return Mono.just(new OAuth2ClientCredentialsGrantRequest(clientRegistration)) .flatMap(this.accessTokenResponseClient::getTokenResponse) .onErrorMap(OAuth2AuthorizationException.class, - e -> new ClientAuthorizationException(e.getError(), clientRegistration.getRegistrationId(), e)) - .map(tokenResponse -> new OAuth2AuthorizedClient(clientRegistration, context.getPrincipal().getName(), + (e) -> new ClientAuthorizationException(e.getError(), clientRegistration.getRegistrationId(), + e)) + .map((tokenResponse) -> new OAuth2AuthorizedClient(clientRegistration, context.getPrincipal().getName(), tokenResponse.getAccessToken())); } diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/DelegatingReactiveOAuth2AuthorizedClientProvider.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/DelegatingReactiveOAuth2AuthorizedClientProvider.java index 1d948c43d3..af24c53289 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/DelegatingReactiveOAuth2AuthorizedClientProvider.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/DelegatingReactiveOAuth2AuthorizedClientProvider.java @@ -73,7 +73,7 @@ public final class DelegatingReactiveOAuth2AuthorizedClientProvider implements R public Mono authorize(OAuth2AuthorizationContext context) { Assert.notNull(context, "context cannot be null"); return Flux.fromIterable(this.authorizedClientProviders) - .concatMap(authorizedClientProvider -> authorizedClientProvider.authorize(context)).next(); + .concatMap((authorizedClientProvider) -> authorizedClientProvider.authorize(context)).next(); } } diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/InMemoryReactiveOAuth2AuthorizedClientService.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/InMemoryReactiveOAuth2AuthorizedClientService.java index d14d86cfc6..4d6161a936 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/InMemoryReactiveOAuth2AuthorizedClientService.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/InMemoryReactiveOAuth2AuthorizedClientService.java @@ -62,8 +62,8 @@ public final class InMemoryReactiveOAuth2AuthorizedClientService implements Reac Assert.hasText(clientRegistrationId, "clientRegistrationId cannot be empty"); Assert.hasText(principalName, "principalName cannot be empty"); return (Mono) this.clientRegistrationRepository.findByRegistrationId(clientRegistrationId) - .map(clientRegistration -> new OAuth2AuthorizedClientId(clientRegistrationId, principalName)) - .flatMap(identifier -> Mono.justOrEmpty(this.authorizedClients.get(identifier))); + .map((clientRegistration) -> new OAuth2AuthorizedClientId(clientRegistrationId, principalName)) + .flatMap((identifier) -> Mono.justOrEmpty(this.authorizedClients.get(identifier))); } @Override @@ -82,7 +82,7 @@ public final class InMemoryReactiveOAuth2AuthorizedClientService implements Reac Assert.hasText(clientRegistrationId, "clientRegistrationId cannot be empty"); Assert.hasText(principalName, "principalName cannot be empty"); return this.clientRegistrationRepository.findByRegistrationId(clientRegistrationId) - .map(clientRegistration -> new OAuth2AuthorizedClientId(clientRegistrationId, principalName)) + .map((clientRegistration) -> new OAuth2AuthorizedClientId(clientRegistrationId, principalName)) .doOnNext(this.authorizedClients::remove).then(Mono.empty()); } diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/OAuth2AuthorizedClientProviderBuilder.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/OAuth2AuthorizedClientProviderBuilder.java index cf69c89344..fa109dd2aa 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/OAuth2AuthorizedClientProviderBuilder.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/OAuth2AuthorizedClientProviderBuilder.java @@ -73,7 +73,7 @@ public final class OAuth2AuthorizedClientProviderBuilder { */ public OAuth2AuthorizedClientProviderBuilder provider(OAuth2AuthorizedClientProvider provider) { Assert.notNull(provider, "provider cannot be null"); - this.builders.computeIfAbsent(provider.getClass(), k -> () -> provider); + this.builders.computeIfAbsent(provider.getClass(), (k) -> () -> provider); return OAuth2AuthorizedClientProviderBuilder.this; } @@ -83,7 +83,7 @@ public final class OAuth2AuthorizedClientProviderBuilder { */ public OAuth2AuthorizedClientProviderBuilder authorizationCode() { this.builders.computeIfAbsent(AuthorizationCodeOAuth2AuthorizedClientProvider.class, - k -> new AuthorizationCodeGrantBuilder()); + (k) -> new AuthorizationCodeGrantBuilder()); return OAuth2AuthorizedClientProviderBuilder.this; } @@ -93,7 +93,7 @@ public final class OAuth2AuthorizedClientProviderBuilder { */ public OAuth2AuthorizedClientProviderBuilder refreshToken() { this.builders.computeIfAbsent(RefreshTokenOAuth2AuthorizedClientProvider.class, - k -> new RefreshTokenGrantBuilder()); + (k) -> new RefreshTokenGrantBuilder()); return OAuth2AuthorizedClientProviderBuilder.this; } @@ -104,8 +104,8 @@ public final class OAuth2AuthorizedClientProviderBuilder { * @return the {@link OAuth2AuthorizedClientProviderBuilder} */ public OAuth2AuthorizedClientProviderBuilder refreshToken(Consumer builderConsumer) { - RefreshTokenGrantBuilder builder = (RefreshTokenGrantBuilder) this.builders - .computeIfAbsent(RefreshTokenOAuth2AuthorizedClientProvider.class, k -> new RefreshTokenGrantBuilder()); + RefreshTokenGrantBuilder builder = (RefreshTokenGrantBuilder) this.builders.computeIfAbsent( + RefreshTokenOAuth2AuthorizedClientProvider.class, (k) -> new RefreshTokenGrantBuilder()); builderConsumer.accept(builder); return OAuth2AuthorizedClientProviderBuilder.this; } @@ -116,7 +116,7 @@ public final class OAuth2AuthorizedClientProviderBuilder { */ public OAuth2AuthorizedClientProviderBuilder clientCredentials() { this.builders.computeIfAbsent(ClientCredentialsOAuth2AuthorizedClientProvider.class, - k -> new ClientCredentialsGrantBuilder()); + (k) -> new ClientCredentialsGrantBuilder()); return OAuth2AuthorizedClientProviderBuilder.this; } @@ -129,7 +129,7 @@ public final class OAuth2AuthorizedClientProviderBuilder { public OAuth2AuthorizedClientProviderBuilder clientCredentials( Consumer builderConsumer) { ClientCredentialsGrantBuilder builder = (ClientCredentialsGrantBuilder) this.builders.computeIfAbsent( - ClientCredentialsOAuth2AuthorizedClientProvider.class, k -> new ClientCredentialsGrantBuilder()); + ClientCredentialsOAuth2AuthorizedClientProvider.class, (k) -> new ClientCredentialsGrantBuilder()); builderConsumer.accept(builder); return OAuth2AuthorizedClientProviderBuilder.this; } @@ -139,7 +139,7 @@ public final class OAuth2AuthorizedClientProviderBuilder { * @return the {@link OAuth2AuthorizedClientProviderBuilder} */ public OAuth2AuthorizedClientProviderBuilder password() { - this.builders.computeIfAbsent(PasswordOAuth2AuthorizedClientProvider.class, k -> new PasswordGrantBuilder()); + this.builders.computeIfAbsent(PasswordOAuth2AuthorizedClientProvider.class, (k) -> new PasswordGrantBuilder()); return OAuth2AuthorizedClientProviderBuilder.this; } @@ -151,7 +151,7 @@ public final class OAuth2AuthorizedClientProviderBuilder { */ public OAuth2AuthorizedClientProviderBuilder password(Consumer builderConsumer) { PasswordGrantBuilder builder = (PasswordGrantBuilder) this.builders - .computeIfAbsent(PasswordOAuth2AuthorizedClientProvider.class, k -> new PasswordGrantBuilder()); + .computeIfAbsent(PasswordOAuth2AuthorizedClientProvider.class, (k) -> new PasswordGrantBuilder()); builderConsumer.accept(builder); return OAuth2AuthorizedClientProviderBuilder.this; } diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/PasswordReactiveOAuth2AuthorizedClientProvider.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/PasswordReactiveOAuth2AuthorizedClientProvider.java index cd535abc6d..3b34cf85d9 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/PasswordReactiveOAuth2AuthorizedClientProvider.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/PasswordReactiveOAuth2AuthorizedClientProvider.java @@ -111,8 +111,9 @@ public final class PasswordReactiveOAuth2AuthorizedClientProvider implements Rea return Mono.just(passwordGrantRequest).flatMap(this.accessTokenResponseClient::getTokenResponse) .onErrorMap(OAuth2AuthorizationException.class, - e -> new ClientAuthorizationException(e.getError(), clientRegistration.getRegistrationId(), e)) - .map(tokenResponse -> new OAuth2AuthorizedClient(clientRegistration, context.getPrincipal().getName(), + (e) -> new ClientAuthorizationException(e.getError(), clientRegistration.getRegistrationId(), + e)) + .map((tokenResponse) -> new OAuth2AuthorizedClient(clientRegistration, context.getPrincipal().getName(), tokenResponse.getAccessToken(), tokenResponse.getRefreshToken())); } diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/ReactiveOAuth2AuthorizedClientProviderBuilder.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/ReactiveOAuth2AuthorizedClientProviderBuilder.java index 6852f42c9f..7b0580571d 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/ReactiveOAuth2AuthorizedClientProviderBuilder.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/ReactiveOAuth2AuthorizedClientProviderBuilder.java @@ -73,7 +73,7 @@ public final class ReactiveOAuth2AuthorizedClientProviderBuilder { */ public ReactiveOAuth2AuthorizedClientProviderBuilder provider(ReactiveOAuth2AuthorizedClientProvider provider) { Assert.notNull(provider, "provider cannot be null"); - this.builders.computeIfAbsent(provider.getClass(), k -> () -> provider); + this.builders.computeIfAbsent(provider.getClass(), (k) -> () -> provider); return ReactiveOAuth2AuthorizedClientProviderBuilder.this; } @@ -83,7 +83,7 @@ public final class ReactiveOAuth2AuthorizedClientProviderBuilder { */ public ReactiveOAuth2AuthorizedClientProviderBuilder authorizationCode() { this.builders.computeIfAbsent(AuthorizationCodeReactiveOAuth2AuthorizedClientProvider.class, - k -> new AuthorizationCodeGrantBuilder()); + (k) -> new AuthorizationCodeGrantBuilder()); return ReactiveOAuth2AuthorizedClientProviderBuilder.this; } @@ -93,7 +93,7 @@ public final class ReactiveOAuth2AuthorizedClientProviderBuilder { */ public ReactiveOAuth2AuthorizedClientProviderBuilder refreshToken() { this.builders.computeIfAbsent(RefreshTokenReactiveOAuth2AuthorizedClientProvider.class, - k -> new RefreshTokenGrantBuilder()); + (k) -> new RefreshTokenGrantBuilder()); return ReactiveOAuth2AuthorizedClientProviderBuilder.this; } @@ -106,7 +106,7 @@ public final class ReactiveOAuth2AuthorizedClientProviderBuilder { public ReactiveOAuth2AuthorizedClientProviderBuilder refreshToken( Consumer builderConsumer) { RefreshTokenGrantBuilder builder = (RefreshTokenGrantBuilder) this.builders.computeIfAbsent( - RefreshTokenReactiveOAuth2AuthorizedClientProvider.class, k -> new RefreshTokenGrantBuilder()); + RefreshTokenReactiveOAuth2AuthorizedClientProvider.class, (k) -> new RefreshTokenGrantBuilder()); builderConsumer.accept(builder); return ReactiveOAuth2AuthorizedClientProviderBuilder.this; } @@ -117,7 +117,7 @@ public final class ReactiveOAuth2AuthorizedClientProviderBuilder { */ public ReactiveOAuth2AuthorizedClientProviderBuilder clientCredentials() { this.builders.computeIfAbsent(ClientCredentialsReactiveOAuth2AuthorizedClientProvider.class, - k -> new ClientCredentialsGrantBuilder()); + (k) -> new ClientCredentialsGrantBuilder()); return ReactiveOAuth2AuthorizedClientProviderBuilder.this; } @@ -131,7 +131,7 @@ public final class ReactiveOAuth2AuthorizedClientProviderBuilder { Consumer builderConsumer) { ClientCredentialsGrantBuilder builder = (ClientCredentialsGrantBuilder) this.builders.computeIfAbsent( ClientCredentialsReactiveOAuth2AuthorizedClientProvider.class, - k -> new ClientCredentialsGrantBuilder()); + (k) -> new ClientCredentialsGrantBuilder()); builderConsumer.accept(builder); return ReactiveOAuth2AuthorizedClientProviderBuilder.this; } @@ -142,7 +142,7 @@ public final class ReactiveOAuth2AuthorizedClientProviderBuilder { */ public ReactiveOAuth2AuthorizedClientProviderBuilder password() { this.builders.computeIfAbsent(PasswordReactiveOAuth2AuthorizedClientProvider.class, - k -> new PasswordGrantBuilder()); + (k) -> new PasswordGrantBuilder()); return ReactiveOAuth2AuthorizedClientProviderBuilder.this; } @@ -153,8 +153,8 @@ public final class ReactiveOAuth2AuthorizedClientProviderBuilder { * @return the {@link ReactiveOAuth2AuthorizedClientProviderBuilder} */ public ReactiveOAuth2AuthorizedClientProviderBuilder password(Consumer builderConsumer) { - PasswordGrantBuilder builder = (PasswordGrantBuilder) this.builders - .computeIfAbsent(PasswordReactiveOAuth2AuthorizedClientProvider.class, k -> new PasswordGrantBuilder()); + PasswordGrantBuilder builder = (PasswordGrantBuilder) this.builders.computeIfAbsent( + PasswordReactiveOAuth2AuthorizedClientProvider.class, (k) -> new PasswordGrantBuilder()); builderConsumer.accept(builder); return ReactiveOAuth2AuthorizedClientProviderBuilder.this; } diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/RefreshTokenReactiveOAuth2AuthorizedClientProvider.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/RefreshTokenReactiveOAuth2AuthorizedClientProvider.java index 8abf943725..d93f36e485 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/RefreshTokenReactiveOAuth2AuthorizedClientProvider.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/RefreshTokenReactiveOAuth2AuthorizedClientProvider.java @@ -98,8 +98,9 @@ public final class RefreshTokenReactiveOAuth2AuthorizedClientProvider return Mono.just(refreshTokenGrantRequest).flatMap(this.accessTokenResponseClient::getTokenResponse) .onErrorMap(OAuth2AuthorizationException.class, - e -> new ClientAuthorizationException(e.getError(), clientRegistration.getRegistrationId(), e)) - .map(tokenResponse -> new OAuth2AuthorizedClient(clientRegistration, context.getPrincipal().getName(), + (e) -> new ClientAuthorizationException(e.getError(), clientRegistration.getRegistrationId(), + e)) + .map((tokenResponse) -> new OAuth2AuthorizedClient(clientRegistration, context.getPrincipal().getName(), tokenResponse.getAccessToken(), tokenResponse.getRefreshToken())); } diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/authentication/OAuth2AuthorizationCodeReactiveAuthenticationManager.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/authentication/OAuth2AuthorizationCodeReactiveAuthenticationManager.java index cf5af36cda..034ed3efb7 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/authentication/OAuth2AuthorizationCodeReactiveAuthenticationManager.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/authentication/OAuth2AuthorizationCodeReactiveAuthenticationManager.java @@ -107,7 +107,7 @@ public class OAuth2AuthorizationCodeReactiveAuthenticationManager implements Rea private Function onSuccess( OAuth2AuthorizationCodeAuthenticationToken token) { - return accessTokenResponse -> { + return (accessTokenResponse) -> { ClientRegistration registration = token.getClientRegistration(); OAuth2AuthorizationExchange exchange = token.getAuthorizationExchange(); OAuth2AccessToken accessToken = accessTokenResponse.getAccessToken(); diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/authentication/OAuth2LoginAuthenticationProvider.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/authentication/OAuth2LoginAuthenticationProvider.java index 7edb67e586..e20e0006e9 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/authentication/OAuth2LoginAuthenticationProvider.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/authentication/OAuth2LoginAuthenticationProvider.java @@ -70,7 +70,7 @@ public class OAuth2LoginAuthenticationProvider implements AuthenticationProvider private final OAuth2UserService userService; - private GrantedAuthoritiesMapper authoritiesMapper = (authorities -> authorities); + private GrantedAuthoritiesMapper authoritiesMapper = ((authorities) -> authorities); /** * Constructs an {@code OAuth2LoginAuthenticationProvider} using the provided diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/authentication/OAuth2LoginReactiveAuthenticationManager.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/authentication/OAuth2LoginReactiveAuthenticationManager.java index 470653b2a4..1d3dae2fbe 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/authentication/OAuth2LoginReactiveAuthenticationManager.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/authentication/OAuth2LoginReactiveAuthenticationManager.java @@ -72,7 +72,7 @@ public class OAuth2LoginReactiveAuthenticationManager implements ReactiveAuthent private final ReactiveOAuth2UserService userService; - private GrantedAuthoritiesMapper authoritiesMapper = (authorities -> authorities); + private GrantedAuthoritiesMapper authoritiesMapper = ((authorities) -> authorities); public OAuth2LoginReactiveAuthenticationManager( ReactiveOAuth2AccessTokenResponseClient accessTokenResponseClient, @@ -102,7 +102,7 @@ public class OAuth2LoginReactiveAuthenticationManager implements ReactiveAuthent return this.authorizationCodeManager.authenticate(token) .onErrorMap(OAuth2AuthorizationException.class, - e -> new OAuth2AuthenticationException(e.getError(), e.getError().toString())) + (e) -> new OAuth2AuthenticationException(e.getError(), e.getError().toString())) .cast(OAuth2AuthorizationCodeAuthenticationToken.class).flatMap(this::onSuccess); }); } @@ -125,7 +125,7 @@ public class OAuth2LoginReactiveAuthenticationManager implements ReactiveAuthent Map additionalParameters = authentication.getAdditionalParameters(); OAuth2UserRequest userRequest = new OAuth2UserRequest(authentication.getClientRegistration(), accessToken, additionalParameters); - return this.userService.loadUser(userRequest).map(oauth2User -> { + return this.userService.loadUser(userRequest).map((oauth2User) -> { Collection mappedAuthorities = this.authoritiesMapper .mapAuthorities(oauth2User.getAuthorities()); diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/endpoint/AbstractWebClientReactiveOAuth2AccessTokenResponseClient.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/endpoint/AbstractWebClientReactiveOAuth2AccessTokenResponseClient.java index 2b9f71e890..70e0695c05 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/endpoint/AbstractWebClientReactiveOAuth2AccessTokenResponseClient.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/endpoint/AbstractWebClientReactiveOAuth2AccessTokenResponseClient.java @@ -67,9 +67,9 @@ abstract class AbstractWebClientReactiveOAuth2AccessTokenResponseClient this.webClient.post().uri(clientRegistration(grantRequest).getProviderDetails().getTokenUri()) - .headers(headers -> populateTokenRequestHeaders(grantRequest, headers)) + .headers((headers) -> populateTokenRequestHeaders(grantRequest, headers)) .body(createTokenRequestBody(grantRequest)).exchange() - .flatMap(response -> readTokenResponse(grantRequest, response))); + .flatMap((response) -> readTokenResponse(grantRequest, response))); } /** @@ -170,7 +170,7 @@ abstract class AbstractWebClientReactiveOAuth2AccessTokenResponseClient readTokenResponse(T grantRequest, ClientResponse response) { return response.body(OAuth2BodyExtractors.oauth2AccessTokenResponse()) - .map(tokenResponse -> populateTokenResponse(grantRequest, tokenResponse)); + .map((tokenResponse) -> populateTokenResponse(grantRequest, tokenResponse)); } /** diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/OidcAuthorizationCodeAuthenticationProvider.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/OidcAuthorizationCodeAuthenticationProvider.java index fd47185b60..e4409457d9 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/OidcAuthorizationCodeAuthenticationProvider.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/OidcAuthorizationCodeAuthenticationProvider.java @@ -97,7 +97,7 @@ public class OidcAuthorizationCodeAuthenticationProvider implements Authenticati private JwtDecoderFactory jwtDecoderFactory = new OidcIdTokenDecoderFactory(); - private GrantedAuthoritiesMapper authoritiesMapper = (authorities -> authorities); + private GrantedAuthoritiesMapper authoritiesMapper = ((authorities) -> authorities); /** * Constructs an {@code OidcAuthorizationCodeAuthenticationProvider} using the diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/OidcAuthorizationCodeReactiveAuthenticationManager.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/OidcAuthorizationCodeReactiveAuthenticationManager.java index d602ef81a5..02f5fdfe97 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/OidcAuthorizationCodeReactiveAuthenticationManager.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/OidcAuthorizationCodeReactiveAuthenticationManager.java @@ -97,7 +97,7 @@ public class OidcAuthorizationCodeReactiveAuthenticationManager implements React private final ReactiveOAuth2UserService userService; - private GrantedAuthoritiesMapper authoritiesMapper = (authorities -> authorities); + private GrantedAuthoritiesMapper authoritiesMapper = ((authorities) -> authorities); private ReactiveJwtDecoderFactory jwtDecoderFactory = new ReactiveOidcIdTokenDecoderFactory(); @@ -146,10 +146,10 @@ public class OidcAuthorizationCodeReactiveAuthenticationManager implements React authorizationCodeAuthentication.getAuthorizationExchange()); return this.accessTokenResponseClient.getTokenResponse(authzRequest).flatMap( - accessTokenResponse -> authenticationResult(authorizationCodeAuthentication, accessTokenResponse)) + (accessTokenResponse) -> authenticationResult(authorizationCodeAuthentication, accessTokenResponse)) .onErrorMap(OAuth2AuthorizationException.class, - e -> new OAuth2AuthenticationException(e.getError(), e.getError().toString())) - .onErrorMap(JwtException.class, e -> { + (e) -> new OAuth2AuthenticationException(e.getError(), e.getError().toString())) + .onErrorMap(JwtException.class, (e) -> { OAuth2Error invalidIdTokenError = new OAuth2Error(INVALID_ID_TOKEN_ERROR_CODE, e.getMessage(), null); return new OAuth2AuthenticationException(invalidIdTokenError, invalidIdTokenError.toString(), @@ -200,9 +200,9 @@ public class OidcAuthorizationCodeReactiveAuthenticationManager implements React } return createOidcToken(clientRegistration, accessTokenResponse) - .doOnNext(idToken -> validateNonce(authorizationCodeAuthentication, idToken)) - .map(idToken -> new OidcUserRequest(clientRegistration, accessToken, idToken, additionalParameters)) - .flatMap(this.userService::loadUser).map(oauth2User -> { + .doOnNext((idToken) -> validateNonce(authorizationCodeAuthentication, idToken)) + .map((idToken) -> new OidcUserRequest(clientRegistration, accessToken, idToken, additionalParameters)) + .flatMap(this.userService::loadUser).map((oauth2User) -> { Collection mappedAuthorities = this.authoritiesMapper .mapAuthorities(oauth2User.getAuthorities()); @@ -217,7 +217,7 @@ public class OidcAuthorizationCodeReactiveAuthenticationManager implements React ReactiveJwtDecoder jwtDecoder = this.jwtDecoderFactory.createDecoder(clientRegistration); String rawIdToken = (String) accessTokenResponse.getAdditionalParameters().get(OidcParameterNames.ID_TOKEN); return jwtDecoder.decode(rawIdToken).map( - jwt -> new OidcIdToken(jwt.getTokenValue(), jwt.getIssuedAt(), jwt.getExpiresAt(), jwt.getClaims())); + (jwt) -> new OidcIdToken(jwt.getTokenValue(), jwt.getIssuedAt(), jwt.getExpiresAt(), jwt.getClaims())); } private static Mono validateNonce( diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/OidcIdTokenDecoderFactory.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/OidcIdTokenDecoderFactory.java index 1f9d489e05..5eedbdc2b9 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/OidcIdTokenDecoderFactory.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/OidcIdTokenDecoderFactory.java @@ -81,9 +81,11 @@ public final class OidcIdTokenDecoderFactory implements JwtDecoderFactory> jwtValidatorFactory = new DefaultOidcIdTokenValidatorFactory(); - private Function jwsAlgorithmResolver = clientRegistration -> SignatureAlgorithm.RS256; + private Function jwsAlgorithmResolver = ( + clientRegistration) -> SignatureAlgorithm.RS256; - private Function, Map>> claimTypeConverterFactory = clientRegistration -> DEFAULT_CLAIM_TYPE_CONVERTER; + private Function, Map>> claimTypeConverterFactory = ( + clientRegistration) -> DEFAULT_CLAIM_TYPE_CONVERTER; /** * Returns the default {@link Converter}'s used for type conversion of claim values @@ -115,13 +117,14 @@ public final class OidcIdTokenDecoderFactory implements JwtDecoderFactory getConverter(TypeDescriptor targetDescriptor) { final TypeDescriptor sourceDescriptor = TypeDescriptor.valueOf(Object.class); - return source -> ClaimConversionService.getSharedInstance().convert(source, sourceDescriptor, targetDescriptor); + return (source) -> ClaimConversionService.getSharedInstance().convert(source, sourceDescriptor, + targetDescriptor); } @Override public JwtDecoder createDecoder(ClientRegistration clientRegistration) { Assert.notNull(clientRegistration, "clientRegistration cannot be null"); - return this.jwtDecoders.computeIfAbsent(clientRegistration.getRegistrationId(), key -> { + return this.jwtDecoders.computeIfAbsent(clientRegistration.getRegistrationId(), (key) -> { NimbusJwtDecoder jwtDecoder = buildDecoder(clientRegistration); jwtDecoder.setJwtValidator(this.jwtValidatorFactory.apply(clientRegistration)); Converter, Map> claimTypeConverter = this.claimTypeConverterFactory diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/ReactiveOidcIdTokenDecoderFactory.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/ReactiveOidcIdTokenDecoderFactory.java index 6c15ae8022..a231bb0d57 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/ReactiveOidcIdTokenDecoderFactory.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/ReactiveOidcIdTokenDecoderFactory.java @@ -81,9 +81,11 @@ public final class ReactiveOidcIdTokenDecoderFactory implements ReactiveJwtDecod private Function> jwtValidatorFactory = new DefaultOidcIdTokenValidatorFactory(); - private Function jwsAlgorithmResolver = clientRegistration -> SignatureAlgorithm.RS256; + private Function jwsAlgorithmResolver = ( + clientRegistration) -> SignatureAlgorithm.RS256; - private Function, Map>> claimTypeConverterFactory = clientRegistration -> DEFAULT_CLAIM_TYPE_CONVERTER; + private Function, Map>> claimTypeConverterFactory = ( + clientRegistration) -> DEFAULT_CLAIM_TYPE_CONVERTER; /** * Returns the default {@link Converter}'s used for type conversion of claim values @@ -115,13 +117,14 @@ public final class ReactiveOidcIdTokenDecoderFactory implements ReactiveJwtDecod private static Converter getConverter(TypeDescriptor targetDescriptor) { final TypeDescriptor sourceDescriptor = TypeDescriptor.valueOf(Object.class); - return source -> ClaimConversionService.getSharedInstance().convert(source, sourceDescriptor, targetDescriptor); + return (source) -> ClaimConversionService.getSharedInstance().convert(source, sourceDescriptor, + targetDescriptor); } @Override public ReactiveJwtDecoder createDecoder(ClientRegistration clientRegistration) { Assert.notNull(clientRegistration, "clientRegistration cannot be null"); - return this.jwtDecoders.computeIfAbsent(clientRegistration.getRegistrationId(), key -> { + return this.jwtDecoders.computeIfAbsent(clientRegistration.getRegistrationId(), (key) -> { NimbusReactiveJwtDecoder jwtDecoder = buildDecoder(clientRegistration); jwtDecoder.setJwtValidator(this.jwtValidatorFactory.apply(clientRegistration)); Converter, Map> claimTypeConverter = this.claimTypeConverterFactory diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcReactiveOAuth2UserService.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcReactiveOAuth2UserService.java index 36db6ded08..eb8f0a0fae 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcReactiveOAuth2UserService.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcReactiveOAuth2UserService.java @@ -68,7 +68,8 @@ public class OidcReactiveOAuth2UserService implements ReactiveOAuth2UserService< private ReactiveOAuth2UserService oauth2UserService = new DefaultReactiveOAuth2UserService(); - private Function, Map>> claimTypeConverterFactory = clientRegistration -> DEFAULT_CLAIM_TYPE_CONVERTER; + private Function, Map>> claimTypeConverterFactory = ( + clientRegistration) -> DEFAULT_CLAIM_TYPE_CONVERTER; /** * Returns the default {@link Converter}'s used for type conversion of claim values @@ -90,14 +91,15 @@ public class OidcReactiveOAuth2UserService implements ReactiveOAuth2UserService< private static Converter getConverter(TypeDescriptor targetDescriptor) { final TypeDescriptor sourceDescriptor = TypeDescriptor.valueOf(Object.class); - return source -> ClaimConversionService.getSharedInstance().convert(source, sourceDescriptor, targetDescriptor); + return (source) -> ClaimConversionService.getSharedInstance().convert(source, sourceDescriptor, + targetDescriptor); } @Override public Mono loadUser(OidcUserRequest userRequest) throws OAuth2AuthenticationException { Assert.notNull(userRequest, "userRequest cannot be null"); - return getUserInfo(userRequest).map(userInfo -> new OidcUserAuthority(userRequest.getIdToken(), userInfo)) - .defaultIfEmpty(new OidcUserAuthority(userRequest.getIdToken(), null)).map(authority -> { + return getUserInfo(userRequest).map((userInfo) -> new OidcUserAuthority(userRequest.getIdToken(), userInfo)) + .defaultIfEmpty(new OidcUserAuthority(userRequest.getIdToken(), null)).map((authority) -> { OidcUserInfo userInfo = authority.getUserInfo(); Set authorities = new HashSet<>(); authorities.add(authority); @@ -123,8 +125,8 @@ public class OidcReactiveOAuth2UserService implements ReactiveOAuth2UserService< } return this.oauth2UserService.loadUser(userRequest).map(OAuth2User::getAttributes) - .map(claims -> convertClaims(claims, userRequest.getClientRegistration())).map(OidcUserInfo::new) - .doOnNext(userInfo -> { + .map((claims) -> convertClaims(claims, userRequest.getClientRegistration())).map(OidcUserInfo::new) + .doOnNext((userInfo) -> { String subject = userInfo.getSubject(); if (subject == null || !subject.equals(userRequest.getIdToken().getSubject())) { OAuth2Error oauth2Error = new OAuth2Error(INVALID_USER_INFO_RESPONSE_ERROR_CODE); diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcUserService.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcUserService.java index 19111ad944..6f83c525fa 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcUserService.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcUserService.java @@ -74,7 +74,8 @@ public class OidcUserService implements OAuth2UserService oauth2UserService = new DefaultOAuth2UserService(); - private Function, Map>> claimTypeConverterFactory = clientRegistration -> DEFAULT_CLAIM_TYPE_CONVERTER; + private Function, Map>> claimTypeConverterFactory = ( + clientRegistration) -> DEFAULT_CLAIM_TYPE_CONVERTER; /** * Returns the default {@link Converter}'s used for type conversion of claim values @@ -96,7 +97,8 @@ public class OidcUserService implements OAuth2UserService getConverter(TypeDescriptor targetDescriptor) { final TypeDescriptor sourceDescriptor = TypeDescriptor.valueOf(Object.class); - return source -> ClaimConversionService.getSharedInstance().convert(source, sourceDescriptor, targetDescriptor); + return (source) -> ClaimConversionService.getSharedInstance().convert(source, sourceDescriptor, + targetDescriptor); } @Override diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/web/server/logout/OidcClientInitiatedServerLogoutSuccessHandler.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/web/server/logout/OidcClientInitiatedServerLogoutSuccessHandler.java index c3eac99e96..c4d82104bb 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/web/server/logout/OidcClientInitiatedServerLogoutSuccessHandler.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/web/server/logout/OidcClientInitiatedServerLogoutSuccessHandler.java @@ -77,10 +77,10 @@ public class OidcClientInitiatedServerLogoutSuccessHandler implements ServerLogo @Override public Mono onLogoutSuccess(WebFilterExchange exchange, Authentication authentication) { return Mono.just(authentication).filter(OAuth2AuthenticationToken.class::isInstance) - .filter(token -> authentication.getPrincipal() instanceof OidcUser) + .filter((token) -> authentication.getPrincipal() instanceof OidcUser) .map(OAuth2AuthenticationToken.class::cast) .map(OAuth2AuthenticationToken::getAuthorizedClientRegistrationId) - .flatMap(this.clientRegistrationRepository::findByRegistrationId).flatMap(clientRegistration -> { + .flatMap(this.clientRegistrationRepository::findByRegistrationId).flatMap((clientRegistration) -> { URI endSessionEndpoint = endSessionEndpoint(clientRegistration); if (endSessionEndpoint == null) { return Mono.empty(); @@ -91,7 +91,7 @@ public class OidcClientInitiatedServerLogoutSuccessHandler implements ServerLogo }) .switchIfEmpty( this.serverLogoutSuccessHandler.onLogoutSuccess(exchange, authentication).then(Mono.empty())) - .flatMap(endpointUri -> this.redirectStrategy.sendRedirect(exchange.getExchange(), endpointUri)); + .flatMap((endpointUri) -> this.redirectStrategy.sendRedirect(exchange.getExchange(), endpointUri)); } private URI endSessionEndpoint(ClientRegistration clientRegistration) { diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/registration/ClientRegistration.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/registration/ClientRegistration.java index 33773b60b3..584e44a896 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/registration/ClientRegistration.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/registration/ClientRegistration.java @@ -703,7 +703,7 @@ public final class ClientRegistration implements Serializable { } private static boolean validateScope(String scope) { - return scope == null || scope.chars().allMatch(c -> withinTheRangeOf(c, 0x21, 0x21) + return scope == null || scope.chars().allMatch((c) -> withinTheRangeOf(c, 0x21, 0x21) || withinTheRangeOf(c, 0x23, 0x5B) || withinTheRangeOf(c, 0x5D, 0x7E)); } diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/userinfo/DefaultReactiveOAuth2UserService.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/userinfo/DefaultReactiveOAuth2UserService.java index 97e498207e..9d7212c9e7 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/userinfo/DefaultReactiveOAuth2UserService.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/userinfo/DefaultReactiveOAuth2UserService.java @@ -115,17 +115,17 @@ public class DefaultReactiveOAuth2UserService implements ReactiveOAuth2UserServi else { requestHeadersSpec = this.webClient.get().uri(userInfoUri) .header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE) - .headers(headers -> headers.setBearerAuth(userRequest.getAccessToken().getTokenValue())); + .headers((headers) -> headers.setBearerAuth(userRequest.getAccessToken().getTokenValue())); } Mono> userAttributes = requestHeadersSpec.retrieve() - .onStatus(s -> s != HttpStatus.OK, response -> parse(response).map(userInfoErrorResponse -> { + .onStatus((s) -> s != HttpStatus.OK, (response) -> parse(response).map((userInfoErrorResponse) -> { String description = userInfoErrorResponse.getErrorObject().getDescription(); OAuth2Error oauth2Error = new OAuth2Error(INVALID_USER_INFO_RESPONSE_ERROR_CODE, description, null); throw new OAuth2AuthenticationException(oauth2Error, oauth2Error.toString()); })).bodyToMono(typeReference); - return userAttributes.map(attrs -> { + return userAttributes.map((attrs) -> { GrantedAuthority authority = new OAuth2UserAuthority(attrs); Set authorities = new HashSet<>(); authorities.add(authority); @@ -136,8 +136,9 @@ public class DefaultReactiveOAuth2UserService implements ReactiveOAuth2UserServi return new DefaultOAuth2User(authorities, attrs, userNameAttributeName); }).onErrorMap(IOException.class, - e -> new AuthenticationServiceException("Unable to access the userInfoEndpoint " + userInfoUri, e)) - .onErrorMap(UnsupportedMediaTypeException.class, e -> { + (e) -> new AuthenticationServiceException("Unable to access the userInfoEndpoint " + userInfoUri, + e)) + .onErrorMap(UnsupportedMediaTypeException.class, (e) -> { String errorMessage = "An error occurred while attempting to retrieve the UserInfo Resource from '" + userRequest.getClientRegistration().getProviderDetails().getUserInfoEndpoint() .getUri() @@ -151,7 +152,7 @@ public class DefaultReactiveOAuth2UserService implements ReactiveOAuth2UserServi OAuth2Error oauth2Error = new OAuth2Error(INVALID_USER_INFO_RESPONSE_ERROR_CODE, errorMessage, null); throw new OAuth2AuthenticationException(oauth2Error, oauth2Error.toString(), e); - }).onErrorMap(t -> !(t instanceof AuthenticationServiceException), t -> { + }).onErrorMap((t) -> !(t instanceof AuthenticationServiceException), (t) -> { OAuth2Error oauth2Error = new OAuth2Error(INVALID_USER_INFO_RESPONSE_ERROR_CODE, "An error occurred reading the UserInfo Success response: " + t.getMessage(), null); return new OAuth2AuthenticationException(oauth2Error, oauth2Error.toString(), t); @@ -181,7 +182,7 @@ public class DefaultReactiveOAuth2UserService implements ReactiveOAuth2UserServi }; // Other error? return httpResponse.bodyToMono(typeReference) - .map(body -> new UserInfoErrorResponse(ErrorObject.parse(new JSONObject(body)))); + .map((body) -> new UserInfoErrorResponse(ErrorObject.parse(new JSONObject(body)))); } } diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/userinfo/DelegatingOAuth2UserService.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/userinfo/DelegatingOAuth2UserService.java index 0acad041ae..a0fe26adad 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/userinfo/DelegatingOAuth2UserService.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/userinfo/DelegatingOAuth2UserService.java @@ -58,8 +58,8 @@ public class DelegatingOAuth2UserService userService.loadUser(userRequest)).filter(Objects::nonNull) - .findFirst().orElse(null); + return this.userServices.stream().map((userService) -> userService.loadUser(userRequest)) + .filter(Objects::nonNull).findFirst().orElse(null); } } diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/DefaultOAuth2AuthorizationRequestResolver.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/DefaultOAuth2AuthorizationRequestResolver.java index c93f793a9c..167455f05c 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/DefaultOAuth2AuthorizationRequestResolver.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/DefaultOAuth2AuthorizationRequestResolver.java @@ -79,7 +79,7 @@ public final class DefaultOAuth2AuthorizationRequestResolver implements OAuth2Au private final StringKeyGenerator secureKeyGenerator = new Base64StringKeyGenerator( Base64.getUrlEncoder().withoutPadding(), 96); - private Consumer authorizationRequestCustomizer = customizer -> { + private Consumer authorizationRequestCustomizer = (customizer) -> { }; /** diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/DefaultOAuth2AuthorizedClientManager.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/DefaultOAuth2AuthorizedClientManager.java index 0f4744dc06..6d21a1a243 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/DefaultOAuth2AuthorizedClientManager.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/DefaultOAuth2AuthorizedClientManager.java @@ -159,12 +159,13 @@ public final class DefaultOAuth2AuthorizedClientManager implements OAuth2Authori contextBuilder = OAuth2AuthorizationContext.withClientRegistration(clientRegistration); } } - OAuth2AuthorizationContext authorizationContext = contextBuilder.principal(principal).attributes(attributes -> { - Map contextAttributes = this.contextAttributesMapper.apply(authorizeRequest); - if (!CollectionUtils.isEmpty(contextAttributes)) { - attributes.putAll(contextAttributes); - } - }).build(); + OAuth2AuthorizationContext authorizationContext = contextBuilder.principal(principal) + .attributes((attributes) -> { + Map contextAttributes = this.contextAttributesMapper.apply(authorizeRequest); + if (!CollectionUtils.isEmpty(contextAttributes)) { + attributes.putAll(contextAttributes); + } + }).build(); try { authorizedClient = this.authorizedClientProvider.authorize(authorizationContext); diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/DefaultReactiveOAuth2AuthorizedClientManager.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/DefaultReactiveOAuth2AuthorizedClientManager.java index a9c0df0c9a..aa32c5841d 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/DefaultReactiveOAuth2AuthorizedClientManager.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/DefaultReactiveOAuth2AuthorizedClientManager.java @@ -97,7 +97,7 @@ public final class DefaultReactiveOAuth2AuthorizedClientManager implements React .builder().authorizationCode().refreshToken().clientCredentials().password().build(); private static final Mono currentServerWebExchangeMono = Mono.subscriberContext() - .filter(c -> c.hasKey(ServerWebExchange.class)).map(c -> c.get(ServerWebExchange.class)); + .filter((c) -> c.hasKey(ServerWebExchange.class)).map((c) -> c.get(ServerWebExchange.class)); private final ReactiveClientRegistrationRepository clientRegistrationRepository; @@ -143,13 +143,13 @@ public final class DefaultReactiveOAuth2AuthorizedClientManager implements React return Mono.justOrEmpty(authorizeRequest.getAttribute(ServerWebExchange.class.getName())) .switchIfEmpty(currentServerWebExchangeMono) .switchIfEmpty(Mono.error(() -> new IllegalArgumentException("serverWebExchange cannot be null"))) - .flatMap(serverWebExchange -> Mono.justOrEmpty(authorizeRequest.getAuthorizedClient()) + .flatMap((serverWebExchange) -> Mono.justOrEmpty(authorizeRequest.getAuthorizedClient()) .switchIfEmpty(Mono .defer(() -> loadAuthorizedClient(clientRegistrationId, principal, serverWebExchange))) - .flatMap(authorizedClient -> { + .flatMap((authorizedClient) -> { // Re-authorize return authorizationContext(authorizeRequest, authorizedClient) - .flatMap(authorizationContext -> authorize(authorizationContext, principal, + .flatMap((authorizationContext) -> authorize(authorizationContext, principal, serverWebExchange)) // Default to the existing authorizedClient if the // client was not re-authorized @@ -160,9 +160,9 @@ public final class DefaultReactiveOAuth2AuthorizedClientManager implements React this.clientRegistrationRepository.findByRegistrationId(clientRegistrationId) .switchIfEmpty(Mono.error(() -> new IllegalArgumentException( "Could not find ClientRegistration with id '" + clientRegistrationId + "'"))) - .flatMap(clientRegistration -> authorizationContext(authorizeRequest, + .flatMap((clientRegistration) -> authorizationContext(authorizeRequest, clientRegistration)) - .flatMap(authorizationContext -> authorize(authorizationContext, principal, + .flatMap((authorizationContext) -> authorize(authorizationContext, principal, serverWebExchange))))); } @@ -189,12 +189,12 @@ public final class DefaultReactiveOAuth2AuthorizedClientManager implements React return this.authorizedClientProvider.authorize(authorizationContext) // Delegate to the authorizationSuccessHandler of the successful // authorization - .flatMap(authorizedClient -> this.authorizationSuccessHandler + .flatMap((authorizedClient) -> this.authorizationSuccessHandler .onAuthorizationSuccess(authorizedClient, principal, createAttributes(serverWebExchange)) .thenReturn(authorizedClient)) // Delegate to the authorizationFailureHandler of the failed authorization .onErrorResume(OAuth2AuthorizationException.class, - authorizationException -> this.authorizationFailureHandler + (authorizationException) -> this.authorizationFailureHandler .onAuthorizationFailure(authorizationException, principal, createAttributes(serverWebExchange)) .then(Mono.error(authorizationException))); @@ -207,8 +207,8 @@ public final class DefaultReactiveOAuth2AuthorizedClientManager implements React private Mono authorizationContext(OAuth2AuthorizeRequest authorizeRequest, OAuth2AuthorizedClient authorizedClient) { return Mono.just(authorizeRequest).flatMap(this.contextAttributesMapper) - .map(attrs -> OAuth2AuthorizationContext.withAuthorizedClient(authorizedClient) - .principal(authorizeRequest.getPrincipal()).attributes(attributes -> { + .map((attrs) -> OAuth2AuthorizationContext.withAuthorizedClient(authorizedClient) + .principal(authorizeRequest.getPrincipal()).attributes((attributes) -> { if (!CollectionUtils.isEmpty(attrs)) { attributes.putAll(attrs); } @@ -218,8 +218,8 @@ public final class DefaultReactiveOAuth2AuthorizedClientManager implements React private Mono authorizationContext(OAuth2AuthorizeRequest authorizeRequest, ClientRegistration clientRegistration) { return Mono.just(authorizeRequest).flatMap(this.contextAttributesMapper) - .map(attrs -> OAuth2AuthorizationContext.withClientRegistration(clientRegistration) - .principal(authorizeRequest.getPrincipal()).attributes(attributes -> { + .map((attrs) -> OAuth2AuthorizationContext.withClientRegistration(clientRegistration) + .principal(authorizeRequest.getPrincipal()).attributes((attributes) -> { if (!CollectionUtils.isEmpty(attrs)) { attributes.putAll(attrs); } @@ -291,16 +291,17 @@ public final class DefaultReactiveOAuth2AuthorizedClientManager implements React @Override public Mono> apply(OAuth2AuthorizeRequest authorizeRequest) { ServerWebExchange serverWebExchange = authorizeRequest.getAttribute(ServerWebExchange.class.getName()); - return Mono.justOrEmpty(serverWebExchange).switchIfEmpty(currentServerWebExchangeMono).flatMap(exchange -> { - Map contextAttributes = Collections.emptyMap(); - String scope = exchange.getRequest().getQueryParams().getFirst(OAuth2ParameterNames.SCOPE); - if (StringUtils.hasText(scope)) { - contextAttributes = new HashMap<>(); - contextAttributes.put(OAuth2AuthorizationContext.REQUEST_SCOPE_ATTRIBUTE_NAME, - StringUtils.delimitedListToStringArray(scope, " ")); - } - return Mono.just(contextAttributes); - }).defaultIfEmpty(Collections.emptyMap()); + return Mono.justOrEmpty(serverWebExchange).switchIfEmpty(currentServerWebExchangeMono) + .flatMap((exchange) -> { + Map contextAttributes = Collections.emptyMap(); + String scope = exchange.getRequest().getQueryParams().getFirst(OAuth2ParameterNames.SCOPE); + if (StringUtils.hasText(scope)) { + contextAttributes = new HashMap<>(); + contextAttributes.put(OAuth2AuthorizationContext.REQUEST_SCOPE_ATTRIBUTE_NAME, + StringUtils.delimitedListToStringArray(scope, " ")); + } + return Mono.just(contextAttributes); + }).defaultIfEmpty(Collections.emptyMap()); } } diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/OAuth2AuthorizationRequestRedirectFilter.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/OAuth2AuthorizationRequestRedirectFilter.java index 52acad631a..670ca8006d 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/OAuth2AuthorizationRequestRedirectFilter.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/OAuth2AuthorizationRequestRedirectFilter.java @@ -239,7 +239,7 @@ public class OAuth2AuthorizationRequestRedirectFilter extends OncePerRequestFilt @Override protected void initExtractorMap() { super.initExtractorMap(); - registerExtractor(ServletException.class, throwable -> { + registerExtractor(ServletException.class, (throwable) -> { ThrowableAnalyzer.verifyThrowableHierarchy(throwable, ServletException.class); return ((ServletException) throwable).getRootCause(); }); diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/method/annotation/OAuth2AuthorizedClientArgumentResolver.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/method/annotation/OAuth2AuthorizedClientArgumentResolver.java index 1add61a66a..4a5680a752 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/method/annotation/OAuth2AuthorizedClientArgumentResolver.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/method/annotation/OAuth2AuthorizedClientArgumentResolver.java @@ -188,7 +188,7 @@ public final class OAuth2AuthorizedClientArgumentResolver implements HandlerMeth OAuth2AuthorizedClientProvider authorizedClientProvider = OAuth2AuthorizedClientProviderBuilder.builder() .authorizationCode().refreshToken() .clientCredentials( - configurer -> configurer.accessTokenResponseClient(clientCredentialsTokenResponseClient)) + (configurer) -> configurer.accessTokenResponseClient(clientCredentialsTokenResponseClient)) .password().build(); ((DefaultOAuth2AuthorizedClientManager) this.authorizedClientManager) .setAuthorizedClientProvider(authorizedClientProvider); diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServerOAuth2AuthorizedClientExchangeFilterFunction.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServerOAuth2AuthorizedClientExchangeFilterFunction.java index d8b0dfea79..9970b8255d 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServerOAuth2AuthorizedClientExchangeFilterFunction.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServerOAuth2AuthorizedClientExchangeFilterFunction.java @@ -132,11 +132,11 @@ public final class ServerOAuth2AuthorizedClientExchangeFilterFunction implements .map(SecurityContext::getAuthentication).defaultIfEmpty(ANONYMOUS_USER_TOKEN); private final Mono clientRegistrationIdMono = this.currentAuthenticationMono - .filter(t -> this.defaultOAuth2AuthorizedClient && t instanceof OAuth2AuthenticationToken) + .filter((t) -> this.defaultOAuth2AuthorizedClient && t instanceof OAuth2AuthenticationToken) .cast(OAuth2AuthenticationToken.class).map(OAuth2AuthenticationToken::getAuthorizedClientRegistrationId); private final Mono currentServerWebExchangeMono = Mono.subscriberContext() - .filter(c -> c.hasKey(ServerWebExchange.class)).map(c -> c.get(ServerWebExchange.class)); + .filter((c) -> c.hasKey(ServerWebExchange.class)).map((c) -> c.get(ServerWebExchange.class)); private final ReactiveOAuth2AuthorizedClientManager authorizedClientManager; @@ -275,7 +275,7 @@ public final class ServerOAuth2AuthorizedClientExchangeFilterFunction implements * @return the {@link Consumer} to populate the */ public static Consumer> oauth2AuthorizedClient(OAuth2AuthorizedClient authorizedClient) { - return attributes -> attributes.put(OAUTH2_AUTHORIZED_CLIENT_ATTR_NAME, authorizedClient); + return (attributes) -> attributes.put(OAUTH2_AUTHORIZED_CLIENT_ATTR_NAME, authorizedClient); } private static OAuth2AuthorizedClient oauth2AuthorizedClient(ClientRequest request) { @@ -302,7 +302,7 @@ public final class ServerOAuth2AuthorizedClientExchangeFilterFunction implements * @return the {@link Consumer} to populate the client request attributes */ public static Consumer> serverWebExchange(ServerWebExchange serverWebExchange) { - return attributes -> attributes.put(SERVER_WEB_EXCHANGE_ATTR_NAME, serverWebExchange); + return (attributes) -> attributes.put(SERVER_WEB_EXCHANGE_ATTR_NAME, serverWebExchange); } private static ServerWebExchange serverWebExchange(ClientRequest request) { @@ -318,7 +318,7 @@ public final class ServerOAuth2AuthorizedClientExchangeFilterFunction implements * @return the {@link Consumer} to populate the attributes */ public static Consumer> clientRegistrationId(String clientRegistrationId) { - return attributes -> attributes.put(CLIENT_REGISTRATION_ID_ATTR_NAME, clientRegistrationId); + return (attributes) -> attributes.put(CLIENT_REGISTRATION_ID_ATTR_NAME, clientRegistrationId); } private static String clientRegistrationId(ClientRequest request) { @@ -379,9 +379,9 @@ public final class ServerOAuth2AuthorizedClientExchangeFilterFunction implements private void updateDefaultAuthorizedClientManager() { ReactiveOAuth2AuthorizedClientProvider authorizedClientProvider = ReactiveOAuth2AuthorizedClientProviderBuilder .builder().authorizationCode() - .refreshToken(configurer -> configurer.clockSkew(this.accessTokenExpiresSkew)) + .refreshToken((configurer) -> configurer.clockSkew(this.accessTokenExpiresSkew)) .clientCredentials(this::updateClientCredentialsProvider) - .password(configurer -> configurer.clockSkew(this.accessTokenExpiresSkew)).build(); + .password((configurer) -> configurer.clockSkew(this.accessTokenExpiresSkew)).build(); if (this.authorizedClientManager instanceof UnAuthenticatedReactiveOAuth2AuthorizedClientManager) { ((UnAuthenticatedReactiveOAuth2AuthorizedClientManager) this.authorizedClientManager) .setAuthorizedClientProvider(authorizedClientProvider); @@ -423,14 +423,14 @@ public final class ServerOAuth2AuthorizedClientExchangeFilterFunction implements @Override public Mono filter(ClientRequest request, ExchangeFunction next) { - return authorizedClient(request).map(authorizedClient -> bearer(request, authorizedClient)) - .flatMap(requestWithBearer -> exchangeAndHandleResponse(requestWithBearer, next)) + return authorizedClient(request).map((authorizedClient) -> bearer(request, authorizedClient)) + .flatMap((requestWithBearer) -> exchangeAndHandleResponse(requestWithBearer, next)) .switchIfEmpty(Mono.defer(() -> exchangeAndHandleResponse(request, next))); } private Mono exchangeAndHandleResponse(ClientRequest request, ExchangeFunction next) { return next.exchange(request) - .transform(responseMono -> this.clientResponseHandler.handleResponse(request, responseMono)); + .transform((responseMono) -> this.clientResponseHandler.handleResponse(request, responseMono)); } private Mono authorizedClient(ClientRequest request) { @@ -438,7 +438,7 @@ public final class ServerOAuth2AuthorizedClientExchangeFilterFunction implements return Mono.justOrEmpty(authorizedClientFromAttrs) .switchIfEmpty( Mono.defer(() -> authorizeRequest(request).flatMap(this.authorizedClientManager::authorize))) - .flatMap(authorizedClient -> reauthorizeRequest(request, authorizedClient) + .flatMap((authorizedClient) -> reauthorizeRequest(request, authorizedClient) .flatMap(this.authorizedClientManager::authorize)); } @@ -447,10 +447,10 @@ public final class ServerOAuth2AuthorizedClientExchangeFilterFunction implements Mono> serverWebExchange = effectiveServerWebExchange(request); - return Mono.zip(clientRegistrationId, this.currentAuthenticationMono, serverWebExchange).map(t3 -> { + return Mono.zip(clientRegistrationId, this.currentAuthenticationMono, serverWebExchange).map((t3) -> { OAuth2AuthorizeRequest.Builder builder = OAuth2AuthorizeRequest.withClientRegistrationId(t3.getT1()) .principal(t3.getT2()); - t3.getT3().ifPresent(exchange -> builder.attribute(ServerWebExchange.class.getName(), exchange)); + t3.getT3().ifPresent((exchange) -> builder.attribute(ServerWebExchange.class.getName(), exchange)); return builder.build(); }); } @@ -489,17 +489,17 @@ public final class ServerOAuth2AuthorizedClientExchangeFilterFunction implements OAuth2AuthorizedClient authorizedClient) { Mono> serverWebExchange = effectiveServerWebExchange(request); - return Mono.zip(this.currentAuthenticationMono, serverWebExchange).map(t2 -> { + return Mono.zip(this.currentAuthenticationMono, serverWebExchange).map((t2) -> { OAuth2AuthorizeRequest.Builder builder = OAuth2AuthorizeRequest.withAuthorizedClient(authorizedClient) .principal(t2.getT1()); - t2.getT2().ifPresent(exchange -> builder.attribute(ServerWebExchange.class.getName(), exchange)); + t2.getT2().ifPresent((exchange) -> builder.attribute(ServerWebExchange.class.getName(), exchange)); return builder.build(); }); } private ClientRequest bearer(ClientRequest request, OAuth2AuthorizedClient authorizedClient) { return ClientRequest.from(request) - .headers(headers -> headers.setBearerAuth(authorizedClient.getAccessToken().getTokenValue())).build(); + .headers((headers) -> headers.setBearerAuth(authorizedClient.getAccessToken().getTokenValue())).build(); } /** @@ -565,14 +565,15 @@ public final class ServerOAuth2AuthorizedClientExchangeFilterFunction implements String clientRegistrationId = authorizeRequest.getClientRegistrationId(); Authentication principal = authorizeRequest.getPrincipal(); - return Mono.justOrEmpty(authorizeRequest.getAuthorizedClient()).switchIfEmpty(Mono.defer( - () -> this.authorizedClientRepository.loadAuthorizedClient(clientRegistrationId, principal, null))) - .flatMap(authorizedClient -> { + return Mono.justOrEmpty(authorizeRequest.getAuthorizedClient()) + .switchIfEmpty(Mono.defer(() -> this.authorizedClientRepository + .loadAuthorizedClient(clientRegistrationId, principal, null))) + .flatMap((authorizedClient) -> { // Re-authorize return Mono .just(OAuth2AuthorizationContext.withAuthorizedClient(authorizedClient) .principal(principal).build()) - .flatMap(authorizationContext -> authorize(authorizationContext, principal)) + .flatMap((authorizationContext) -> authorize(authorizationContext, principal)) // Default to the existing authorizedClient if the client // was not re-authorized .defaultIfEmpty(authorizeRequest.getAuthorizedClient() != null @@ -582,9 +583,9 @@ public final class ServerOAuth2AuthorizedClientExchangeFilterFunction implements this.clientRegistrationRepository.findByRegistrationId(clientRegistrationId) .switchIfEmpty(Mono.error(() -> new IllegalArgumentException( "Could not find ClientRegistration with id '" + clientRegistrationId + "'"))) - .flatMap(clientRegistration -> Mono.just(OAuth2AuthorizationContext + .flatMap((clientRegistration) -> Mono.just(OAuth2AuthorizationContext .withClientRegistration(clientRegistration).principal(principal).build())) - .flatMap(authorizationContext -> authorize(authorizationContext, principal)))); + .flatMap((authorizationContext) -> authorize(authorizationContext, principal)))); } /** @@ -604,13 +605,13 @@ public final class ServerOAuth2AuthorizedClientExchangeFilterFunction implements return this.authorizedClientProvider.authorize(authorizationContext) // Delegates to the authorizationSuccessHandler of the successful // authorization - .flatMap(authorizedClient -> this.authorizationSuccessHandler + .flatMap((authorizedClient) -> this.authorizationSuccessHandler .onAuthorizationSuccess(authorizedClient, principal, Collections.emptyMap()) .thenReturn(authorizedClient)) // Delegates to the authorizationFailureHandler of the failed // authorization .onErrorResume(OAuth2AuthorizationException.class, - authorizationException -> this.authorizationFailureHandler + (authorizationException) -> this.authorizationFailureHandler .onAuthorizationFailure(authorizationException, principal, Collections.emptyMap()) .then(Mono.error(authorizationException))); } @@ -654,15 +655,15 @@ public final class ServerOAuth2AuthorizedClientExchangeFilterFunction implements @Override public Mono handleResponse(ClientRequest request, Mono responseMono) { - return responseMono.flatMap(response -> handleResponse(request, response).thenReturn(response)) + return responseMono.flatMap((response) -> handleResponse(request, response).thenReturn(response)) .onErrorResume(WebClientResponseException.class, - e -> handleWebClientResponseException(request, e).then(Mono.error(e))) + (e) -> handleWebClientResponseException(request, e).then(Mono.error(e))) .onErrorResume(OAuth2AuthorizationException.class, - e -> handleAuthorizationException(request, e).then(Mono.error(e))); + (e) -> handleAuthorizationException(request, e).then(Mono.error(e))); } private Mono handleResponse(ClientRequest request, ClientResponse response) { - return Mono.justOrEmpty(resolveErrorIfPossible(response)).flatMap(oauth2Error -> { + return Mono.justOrEmpty(resolveErrorIfPossible(response)).flatMap((oauth2Error) -> { Mono> serverWebExchange = effectiveServerWebExchange(request); Mono clientRegistrationId = effectiveClientRegistrationId(request); @@ -670,7 +671,7 @@ public final class ServerOAuth2AuthorizedClientExchangeFilterFunction implements return Mono .zip(ServerOAuth2AuthorizedClientExchangeFilterFunction.this.currentAuthenticationMono, serverWebExchange, clientRegistrationId) - .flatMap(tuple3 -> handleAuthorizationFailure(tuple3.getT1(), // Authentication + .flatMap((tuple3) -> handleAuthorizationFailure(tuple3.getT1(), // Authentication // principal tuple3.getT2().orElse(null), // ServerWebExchange exchange new ClientAuthorizationException(oauth2Error, tuple3.getT3()))); // String @@ -701,12 +702,13 @@ public final class ServerOAuth2AuthorizedClientExchangeFilterFunction implements } private Map parseAuthParameters(String wwwAuthenticateHeader) { - return Stream.of(wwwAuthenticateHeader).filter(header -> !StringUtils.isEmpty(header)) - .filter(header -> header.toLowerCase().startsWith("bearer")) - .map(header -> header.substring("bearer".length())).map(header -> header.split(",")) - .flatMap(Stream::of).map(parameter -> parameter.split("=")) - .filter(parameter -> parameter.length > 1).collect(Collectors.toMap( - parameters -> parameters[0].trim(), parameters -> parameters[1].trim().replace("\"", ""))); + return Stream.of(wwwAuthenticateHeader).filter((header) -> !StringUtils.isEmpty(header)) + .filter((header) -> header.toLowerCase().startsWith("bearer")) + .map((header) -> header.substring("bearer".length())).map((header) -> header.split(",")) + .flatMap(Stream::of).map((parameter) -> parameter.split("=")) + .filter((parameter) -> parameter.length > 1) + .collect(Collectors.toMap((parameters) -> parameters[0].trim(), + (parameters) -> parameters[1].trim().replace("\"", ""))); } /** @@ -720,7 +722,7 @@ public final class ServerOAuth2AuthorizedClientExchangeFilterFunction implements */ private Mono handleWebClientResponseException(ClientRequest request, WebClientResponseException exception) { - return Mono.justOrEmpty(resolveErrorIfPossible(exception.getRawStatusCode())).flatMap(oauth2Error -> { + return Mono.justOrEmpty(resolveErrorIfPossible(exception.getRawStatusCode())).flatMap((oauth2Error) -> { Mono> serverWebExchange = effectiveServerWebExchange(request); Mono clientRegistrationId = effectiveClientRegistrationId(request); @@ -728,7 +730,7 @@ public final class ServerOAuth2AuthorizedClientExchangeFilterFunction implements return Mono .zip(ServerOAuth2AuthorizedClientExchangeFilterFunction.this.currentAuthenticationMono, serverWebExchange, clientRegistrationId) - .flatMap(tuple3 -> handleAuthorizationFailure(tuple3.getT1(), // Authentication + .flatMap((tuple3) -> handleAuthorizationFailure(tuple3.getT1(), // Authentication // principal tuple3.getT2().orElse(null), // ServerWebExchange exchange new ClientAuthorizationException(oauth2Error, tuple3.getT3(), // String @@ -750,7 +752,7 @@ public final class ServerOAuth2AuthorizedClientExchangeFilterFunction implements return Mono.zip(ServerOAuth2AuthorizedClientExchangeFilterFunction.this.currentAuthenticationMono, serverWebExchange).flatMap( - tuple2 -> handleAuthorizationFailure(tuple2.getT1(), // Authentication + (tuple2) -> handleAuthorizationFailure(tuple2.getT1(), // Authentication // principal tuple2.getT2().orElse(null), // ServerWebExchange // exchange diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServletOAuth2AuthorizedClientExchangeFilterFunction.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServletOAuth2AuthorizedClientExchangeFilterFunction.java index ef8b4a80d9..aa6a237fdb 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServletOAuth2AuthorizedClientExchangeFilterFunction.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServletOAuth2AuthorizedClientExchangeFilterFunction.java @@ -259,9 +259,9 @@ public final class ServletOAuth2AuthorizedClientExchangeFilterFunction implement private void updateDefaultAuthorizedClientManager() { OAuth2AuthorizedClientProvider authorizedClientProvider = OAuth2AuthorizedClientProviderBuilder.builder() - .authorizationCode().refreshToken(configurer -> configurer.clockSkew(this.accessTokenExpiresSkew)) + .authorizationCode().refreshToken((configurer) -> configurer.clockSkew(this.accessTokenExpiresSkew)) .clientCredentials(this::updateClientCredentialsProvider) - .password(configurer -> configurer.clockSkew(this.accessTokenExpiresSkew)).build(); + .password((configurer) -> configurer.clockSkew(this.accessTokenExpiresSkew)).build(); ((DefaultOAuth2AuthorizedClientManager) this.authorizedClientManager) .setAuthorizedClientProvider(authorizedClientProvider); } @@ -302,7 +302,7 @@ public final class ServletOAuth2AuthorizedClientExchangeFilterFunction implement * @return the {@link Consumer} to configure the builder */ public Consumer oauth2Configuration() { - return builder -> builder.defaultRequest(defaultRequest()).filter(this); + return (builder) -> builder.defaultRequest(defaultRequest()).filter(this); } /** @@ -315,7 +315,7 @@ public final class ServletOAuth2AuthorizedClientExchangeFilterFunction implement * @return the {@link Consumer} to populate the attributes */ public Consumer> defaultRequest() { - return spec -> spec.attributes(attrs -> { + return (spec) -> spec.attributes((attrs) -> { populateDefaultRequestResponse(attrs); populateDefaultAuthentication(attrs); }); @@ -328,7 +328,7 @@ public final class ServletOAuth2AuthorizedClientExchangeFilterFunction implement * @return the {@link Consumer} to populate the attributes */ public static Consumer> oauth2AuthorizedClient(OAuth2AuthorizedClient authorizedClient) { - return attributes -> { + return (attributes) -> { if (authorizedClient == null) { attributes.remove(OAUTH2_AUTHORIZED_CLIENT_ATTR_NAME); } @@ -347,7 +347,7 @@ public final class ServletOAuth2AuthorizedClientExchangeFilterFunction implement * @return the {@link Consumer} to populate the attributes */ public static Consumer> clientRegistrationId(String clientRegistrationId) { - return attributes -> attributes.put(CLIENT_REGISTRATION_ID_ATTR_NAME, clientRegistrationId); + return (attributes) -> attributes.put(CLIENT_REGISTRATION_ID_ATTR_NAME, clientRegistrationId); } /** @@ -359,7 +359,7 @@ public final class ServletOAuth2AuthorizedClientExchangeFilterFunction implement * @return the {@link Consumer} to populate the attributes */ public static Consumer> authentication(Authentication authentication) { - return attributes -> attributes.put(AUTHENTICATION_ATTR_NAME, authentication); + return (attributes) -> attributes.put(AUTHENTICATION_ATTR_NAME, authentication); } /** @@ -371,7 +371,7 @@ public final class ServletOAuth2AuthorizedClientExchangeFilterFunction implement * @return the {@link Consumer} to populate the attributes */ public static Consumer> httpServletRequest(HttpServletRequest request) { - return attributes -> attributes.put(HTTP_SERVLET_REQUEST_ATTR_NAME, request); + return (attributes) -> attributes.put(HTTP_SERVLET_REQUEST_ATTR_NAME, request); } /** @@ -383,7 +383,7 @@ public final class ServletOAuth2AuthorizedClientExchangeFilterFunction implement * @return the {@link Consumer} to populate the attributes */ public static Consumer> httpServletResponse(HttpServletResponse response) { - return attributes -> attributes.put(HTTP_SERVLET_RESPONSE_ATTR_NAME, response); + return (attributes) -> attributes.put(HTTP_SERVLET_RESPONSE_ATTR_NAME, response); } /** @@ -432,19 +432,19 @@ public final class ServletOAuth2AuthorizedClientExchangeFilterFunction implement @Override public Mono filter(ClientRequest request, ExchangeFunction next) { return mergeRequestAttributesIfNecessary(request) - .filter(req -> req.attribute(OAUTH2_AUTHORIZED_CLIENT_ATTR_NAME).isPresent()) - .flatMap(req -> reauthorizeClient(getOAuth2AuthorizedClient(req.attributes()), req)) + .filter((req) -> req.attribute(OAUTH2_AUTHORIZED_CLIENT_ATTR_NAME).isPresent()) + .flatMap((req) -> reauthorizeClient(getOAuth2AuthorizedClient(req.attributes()), req)) .switchIfEmpty(Mono.defer(() -> mergeRequestAttributesIfNecessary(request) - .filter(req -> resolveClientRegistrationId(req) != null) - .flatMap(req -> authorizeClient(resolveClientRegistrationId(req), req)))) - .map(authorizedClient -> bearer(request, authorizedClient)) - .flatMap(requestWithBearer -> exchangeAndHandleResponse(requestWithBearer, next)) + .filter((req) -> resolveClientRegistrationId(req) != null) + .flatMap((req) -> authorizeClient(resolveClientRegistrationId(req), req)))) + .map((authorizedClient) -> bearer(request, authorizedClient)) + .flatMap((requestWithBearer) -> exchangeAndHandleResponse(requestWithBearer, next)) .switchIfEmpty(Mono.defer(() -> exchangeAndHandleResponse(request, next))); } private Mono exchangeAndHandleResponse(ClientRequest request, ExchangeFunction next) { return next.exchange(request) - .transform(responseMono -> this.clientResponseHandler.handleResponse(request, responseMono)); + .transform((responseMono) -> this.clientResponseHandler.handleResponse(request, responseMono)); } private Mono mergeRequestAttributesIfNecessary(ClientRequest request) { @@ -460,7 +460,8 @@ public final class ServletOAuth2AuthorizedClientExchangeFilterFunction implement private Mono mergeRequestAttributesFromContext(ClientRequest request) { ClientRequest.Builder builder = ClientRequest.from(request); - return Mono.subscriberContext().map(ctx -> builder.attributes(attrs -> populateRequestAttributes(attrs, ctx))) + return Mono.subscriberContext() + .map((ctx) -> builder.attributes((attrs) -> populateRequestAttributes(attrs, ctx))) .map(ClientRequest.Builder::build); } @@ -532,7 +533,7 @@ public final class ServletOAuth2AuthorizedClientExchangeFilterFunction implement OAuth2AuthorizeRequest.Builder builder = OAuth2AuthorizeRequest.withClientRegistrationId(clientRegistrationId) .principal(authentication); - builder.attributes(attributes -> { + builder.attributes((attributes) -> { if (servletRequest != null) { attributes.put(HttpServletRequest.class.getName(), servletRequest); } @@ -565,7 +566,7 @@ public final class ServletOAuth2AuthorizedClientExchangeFilterFunction implement OAuth2AuthorizeRequest.Builder builder = OAuth2AuthorizeRequest.withAuthorizedClient(authorizedClient) .principal(authentication); - builder.attributes(attributes -> { + builder.attributes((attributes) -> { if (servletRequest != null) { attributes.put(HttpServletRequest.class.getName(), servletRequest); } @@ -585,7 +586,7 @@ public final class ServletOAuth2AuthorizedClientExchangeFilterFunction implement private ClientRequest bearer(ClientRequest request, OAuth2AuthorizedClient authorizedClient) { return ClientRequest.from(request) - .headers(headers -> headers.setBearerAuth(authorizedClient.getAccessToken().getTokenValue())) + .headers((headers) -> headers.setBearerAuth(authorizedClient.getAccessToken().getTokenValue())) .attributes(oauth2AuthorizedClient(authorizedClient)).build(); } @@ -664,15 +665,15 @@ public final class ServletOAuth2AuthorizedClientExchangeFilterFunction implement @Override public Mono handleResponse(ClientRequest request, Mono responseMono) { - return responseMono.flatMap(response -> handleResponse(request, response).thenReturn(response)) + return responseMono.flatMap((response) -> handleResponse(request, response).thenReturn(response)) .onErrorResume(WebClientResponseException.class, - e -> handleWebClientResponseException(request, e).then(Mono.error(e))) + (e) -> handleWebClientResponseException(request, e).then(Mono.error(e))) .onErrorResume(OAuth2AuthorizationException.class, - e -> handleAuthorizationException(request, e).then(Mono.error(e))); + (e) -> handleAuthorizationException(request, e).then(Mono.error(e))); } private Mono handleResponse(ClientRequest request, ClientResponse response) { - return Mono.justOrEmpty(resolveErrorIfPossible(response)).flatMap(oauth2Error -> { + return Mono.justOrEmpty(resolveErrorIfPossible(response)).flatMap((oauth2Error) -> { Map attrs = request.attributes(); OAuth2AuthorizedClient authorizedClient = getOAuth2AuthorizedClient(attrs); if (authorizedClient == null) { @@ -713,12 +714,13 @@ public final class ServletOAuth2AuthorizedClientExchangeFilterFunction implement } private Map parseAuthParameters(String wwwAuthenticateHeader) { - return Stream.of(wwwAuthenticateHeader).filter(header -> !StringUtils.isEmpty(header)) - .filter(header -> header.toLowerCase().startsWith("bearer")) - .map(header -> header.substring("bearer".length())).map(header -> header.split(",")) - .flatMap(Stream::of).map(parameter -> parameter.split("=")) - .filter(parameter -> parameter.length > 1).collect(Collectors.toMap( - parameters -> parameters[0].trim(), parameters -> parameters[1].trim().replace("\"", ""))); + return Stream.of(wwwAuthenticateHeader).filter((header) -> !StringUtils.isEmpty(header)) + .filter((header) -> header.toLowerCase().startsWith("bearer")) + .map((header) -> header.substring("bearer".length())).map((header) -> header.split(",")) + .flatMap(Stream::of).map((parameter) -> parameter.split("=")) + .filter((parameter) -> parameter.length > 1) + .collect(Collectors.toMap((parameters) -> parameters[0].trim(), + (parameters) -> parameters[1].trim().replace("\"", ""))); } /** @@ -732,7 +734,7 @@ public final class ServletOAuth2AuthorizedClientExchangeFilterFunction implement */ private Mono handleWebClientResponseException(ClientRequest request, WebClientResponseException exception) { - return Mono.justOrEmpty(resolveErrorIfPossible(exception.getRawStatusCode())).flatMap(oauth2Error -> { + return Mono.justOrEmpty(resolveErrorIfPossible(exception.getRawStatusCode())).flatMap((oauth2Error) -> { Map attrs = request.attributes(); OAuth2AuthorizedClient authorizedClient = getOAuth2AuthorizedClient(attrs); if (authorizedClient == null) { @@ -761,7 +763,7 @@ public final class ServletOAuth2AuthorizedClientExchangeFilterFunction implement */ private Mono handleAuthorizationException(ClientRequest request, OAuth2AuthorizationException authorizationException) { - return Mono.justOrEmpty(request).flatMap(req -> { + return Mono.justOrEmpty(request).flatMap((req) -> { Map attrs = req.attributes(); OAuth2AuthorizedClient authorizedClient = getOAuth2AuthorizedClient(attrs); if (authorizedClient == null) { diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/result/method/annotation/OAuth2AuthorizedClientArgumentResolver.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/result/method/annotation/OAuth2AuthorizedClientArgumentResolver.java index 68689fadbc..b014eb2dd6 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/result/method/annotation/OAuth2AuthorizedClientArgumentResolver.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/result/method/annotation/OAuth2AuthorizedClientArgumentResolver.java @@ -125,7 +125,7 @@ public final class OAuth2AuthorizedClientArgumentResolver implements HandlerMeth .switchIfEmpty(currentServerWebExchange()); return Mono.zip(defaultedRegistrationId, defaultedAuthentication, defaultedExchange) - .map(t3 -> OAuth2AuthorizeRequest.withClientRegistrationId(t3.getT1()).principal(t3.getT2()) + .map((t3) -> OAuth2AuthorizeRequest.withClientRegistrationId(t3.getT1()).principal(t3.getT2()) .attribute(ServerWebExchange.class.getName(), t3.getT3()).build()); } @@ -135,13 +135,14 @@ public final class OAuth2AuthorizedClientArgumentResolver implements HandlerMeth } private Mono clientRegistrationId(Mono authentication) { - return authentication.filter(t -> t instanceof OAuth2AuthenticationToken).cast(OAuth2AuthenticationToken.class) + return authentication.filter((t) -> t instanceof OAuth2AuthenticationToken) + .cast(OAuth2AuthenticationToken.class) .map(OAuth2AuthenticationToken::getAuthorizedClientRegistrationId); } private Mono currentServerWebExchange() { - return Mono.subscriberContext().filter(c -> c.hasKey(ServerWebExchange.class)) - .map(c -> c.get(ServerWebExchange.class)); + return Mono.subscriberContext().filter((c) -> c.hasKey(ServerWebExchange.class)) + .map((c) -> c.get(ServerWebExchange.class)); } } diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/DefaultServerOAuth2AuthorizationRequestResolver.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/DefaultServerOAuth2AuthorizationRequestResolver.java index a30ce7849b..b8d725a59e 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/DefaultServerOAuth2AuthorizationRequestResolver.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/DefaultServerOAuth2AuthorizationRequestResolver.java @@ -87,7 +87,7 @@ public class DefaultServerOAuth2AuthorizationRequestResolver implements ServerOA private final StringKeyGenerator secureKeyGenerator = new Base64StringKeyGenerator( Base64.getUrlEncoder().withoutPadding(), 96); - private Consumer authorizationRequestCustomizer = customizer -> { + private Consumer authorizationRequestCustomizer = (customizer) -> { }; /** @@ -120,16 +120,16 @@ public class DefaultServerOAuth2AuthorizationRequestResolver implements ServerOA @Override public Mono resolve(ServerWebExchange exchange) { - return this.authorizationRequestMatcher.matches(exchange).filter(matchResult -> matchResult.isMatch()) + return this.authorizationRequestMatcher.matches(exchange).filter((matchResult) -> matchResult.isMatch()) .map(ServerWebExchangeMatcher.MatchResult::getVariables) - .map(variables -> variables.get(DEFAULT_REGISTRATION_ID_URI_VARIABLE_NAME)).cast(String.class) - .flatMap(clientRegistrationId -> resolve(exchange, clientRegistrationId)); + .map((variables) -> variables.get(DEFAULT_REGISTRATION_ID_URI_VARIABLE_NAME)).cast(String.class) + .flatMap((clientRegistrationId) -> resolve(exchange, clientRegistrationId)); } @Override public Mono resolve(ServerWebExchange exchange, String clientRegistrationId) { return this.findByRegistrationId(exchange, clientRegistrationId) - .map(clientRegistration -> authorizationRequest(exchange, clientRegistration)); + .map((clientRegistration) -> authorizationRequest(exchange, clientRegistration)); } /** diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/OAuth2AuthorizationCodeGrantWebFilter.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/OAuth2AuthorizationCodeGrantWebFilter.java index 6ea168f55a..b7e68fbe8a 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/OAuth2AuthorizationCodeGrantWebFilter.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/OAuth2AuthorizationCodeGrantWebFilter.java @@ -204,12 +204,12 @@ public class OAuth2AuthorizationCodeGrantWebFilter implements WebFilter { public Mono filter(ServerWebExchange exchange, WebFilterChain chain) { return this.requiresAuthenticationMatcher.matches(exchange) .filter(ServerWebExchangeMatcher.MatchResult::isMatch) - .flatMap(matchResult -> this.authenticationConverter.convert(exchange).onErrorMap( + .flatMap((matchResult) -> this.authenticationConverter.convert(exchange).onErrorMap( OAuth2AuthorizationException.class, - e -> new OAuth2AuthenticationException(e.getError(), e.getError().toString()))) + (e) -> new OAuth2AuthenticationException(e.getError(), e.getError().toString()))) .switchIfEmpty(chain.filter(exchange).then(Mono.empty())) - .flatMap(token -> authenticate(exchange, chain, token)) - .onErrorResume(AuthenticationException.class, e -> this.authenticationFailureHandler + .flatMap((token) -> authenticate(exchange, chain, token)) + .onErrorResume(AuthenticationException.class, (e) -> this.authenticationFailureHandler .onAuthenticationFailure(new WebFilterExchange(exchange, chain), e)); } @@ -217,12 +217,12 @@ public class OAuth2AuthorizationCodeGrantWebFilter implements WebFilter { WebFilterExchange webFilterExchange = new WebFilterExchange(exchange, chain); return this.authenticationManager.authenticate(token) .onErrorMap(OAuth2AuthorizationException.class, - e -> new OAuth2AuthenticationException(e.getError(), e.getError().toString())) + (e) -> new OAuth2AuthenticationException(e.getError(), e.getError().toString())) .switchIfEmpty(Mono.defer( () -> Mono.error(new IllegalStateException("No provider found for " + token.getClass())))) - .flatMap(authentication -> onAuthenticationSuccess(authentication, webFilterExchange)) + .flatMap((authentication) -> onAuthenticationSuccess(authentication, webFilterExchange)) .onErrorResume(AuthenticationException.class, - e -> this.authenticationFailureHandler.onAuthenticationFailure(webFilterExchange, e)); + (e) -> this.authenticationFailureHandler.onAuthenticationFailure(webFilterExchange, e)); } private Mono onAuthenticationSuccess(Authentication authentication, WebFilterExchange webFilterExchange) { @@ -232,15 +232,15 @@ public class OAuth2AuthorizationCodeGrantWebFilter implements WebFilter { authenticationResult.getAccessToken(), authenticationResult.getRefreshToken()); return this.authenticationSuccessHandler.onAuthenticationSuccess(webFilterExchange, authentication) .then(ReactiveSecurityContextHolder.getContext().map(SecurityContext::getAuthentication) - .defaultIfEmpty(this.anonymousToken).flatMap(principal -> this.authorizedClientRepository + .defaultIfEmpty(this.anonymousToken).flatMap((principal) -> this.authorizedClientRepository .saveAuthorizedClient(authorizedClient, principal, webFilterExchange.getExchange()))); } private Mono matchesAuthorizationResponse(ServerWebExchange exchange) { return Mono.just(exchange).filter( - exch -> OAuth2AuthorizationResponseUtils.isAuthorizationResponse(exch.getRequest().getQueryParams())) - .flatMap(exch -> this.authorizationRequestRepository.loadAuthorizationRequest(exchange) - .flatMap(authorizationRequest -> matchesRedirectUri(exch.getRequest().getURI(), + (exch) -> OAuth2AuthorizationResponseUtils.isAuthorizationResponse(exch.getRequest().getQueryParams())) + .flatMap((exch) -> this.authorizationRequestRepository.loadAuthorizationRequest(exchange) + .flatMap((authorizationRequest) -> matchesRedirectUri(exch.getRequest().getURI(), authorizationRequest.getRedirectUri()))) .switchIfEmpty(ServerWebExchangeMatcher.MatchResult.notMatch()); } diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/OAuth2AuthorizationRequestRedirectWebFilter.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/OAuth2AuthorizationRequestRedirectWebFilter.java index 4eb36c1d5d..b1ae82caaf 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/OAuth2AuthorizationRequestRedirectWebFilter.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/OAuth2AuthorizationRequestRedirectWebFilter.java @@ -130,9 +130,9 @@ public class OAuth2AuthorizationRequestRedirectWebFilter implements WebFilter { return this.authorizationRequestResolver.resolve(exchange) .switchIfEmpty(chain.filter(exchange).then(Mono.empty())) .onErrorResume(ClientAuthorizationRequiredException.class, - e -> this.requestCache.saveRequest(exchange) + (e) -> this.requestCache.saveRequest(exchange) .then(this.authorizationRequestResolver.resolve(exchange, e.getClientRegistrationId()))) - .flatMap(clientRegistration -> sendRedirectForAuthorization(exchange, clientRegistration)); + .flatMap((clientRegistration) -> sendRedirectForAuthorization(exchange, clientRegistration)); } private Mono sendRedirectForAuthorization(ServerWebExchange exchange, diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/ServerOAuth2AuthorizationCodeAuthenticationTokenConverter.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/ServerOAuth2AuthorizationCodeAuthenticationTokenConverter.java index 01dd09a1bc..5dd7a7ce49 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/ServerOAuth2AuthorizationCodeAuthenticationTokenConverter.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/ServerOAuth2AuthorizationCodeAuthenticationTokenConverter.java @@ -72,7 +72,7 @@ public class ServerOAuth2AuthorizationCodeAuthenticationTokenConverter implement public Mono convert(ServerWebExchange serverWebExchange) { return this.authorizationRequestRepository.removeAuthorizationRequest(serverWebExchange) .switchIfEmpty(oauth2AuthorizationException(AUTHORIZATION_REQUEST_NOT_FOUND_ERROR_CODE)) - .flatMap(authorizationRequest -> authenticationRequest(serverWebExchange, authorizationRequest)); + .flatMap((authorizationRequest) -> authenticationRequest(serverWebExchange, authorizationRequest)); } private Mono oauth2AuthorizationException(String errorCode) { @@ -84,14 +84,14 @@ public class ServerOAuth2AuthorizationCodeAuthenticationTokenConverter implement private Mono authenticationRequest(ServerWebExchange exchange, OAuth2AuthorizationRequest authorizationRequest) { - return Mono.just(authorizationRequest).map(OAuth2AuthorizationRequest::getAttributes).flatMap(attributes -> { + return Mono.just(authorizationRequest).map(OAuth2AuthorizationRequest::getAttributes).flatMap((attributes) -> { String id = (String) attributes.get(OAuth2ParameterNames.REGISTRATION_ID); if (id == null) { return oauth2AuthorizationException(CLIENT_REGISTRATION_NOT_FOUND_ERROR_CODE); } return this.clientRegistrationRepository.findByRegistrationId(id); }).switchIfEmpty(oauth2AuthorizationException(CLIENT_REGISTRATION_NOT_FOUND_ERROR_CODE)) - .map(clientRegistration -> { + .map((clientRegistration) -> { OAuth2AuthorizationResponse authorizationResponse = convertResponse(exchange); OAuth2AuthorizationCodeAuthenticationToken authenticationRequest = new OAuth2AuthorizationCodeAuthenticationToken( clientRegistration, diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/WebSessionOAuth2ServerAuthorizationRequestRepository.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/WebSessionOAuth2ServerAuthorizationRequestRepository.java index 558641eeaa..b987ef0b2f 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/WebSessionOAuth2ServerAuthorizationRequestRepository.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/WebSessionOAuth2ServerAuthorizationRequestRepository.java @@ -53,8 +53,8 @@ public final class WebSessionOAuth2ServerAuthorizationRequestRepository return Mono.empty(); } return getStateToAuthorizationRequest(exchange) - .filter(stateToAuthorizationRequest -> stateToAuthorizationRequest.containsKey(state)) - .map(stateToAuthorizationRequest -> stateToAuthorizationRequest.get(state)); + .filter((stateToAuthorizationRequest) -> stateToAuthorizationRequest.containsKey(state)) + .map((stateToAuthorizationRequest) -> stateToAuthorizationRequest.get(state)); } @Override @@ -62,7 +62,7 @@ public final class WebSessionOAuth2ServerAuthorizationRequestRepository ServerWebExchange exchange) { Assert.notNull(authorizationRequest, "authorizationRequest cannot be null"); return saveStateToAuthorizationRequest(exchange) - .doOnNext(stateToAuthorizationRequest -> stateToAuthorizationRequest + .doOnNext((stateToAuthorizationRequest) -> stateToAuthorizationRequest .put(authorizationRequest.getState(), authorizationRequest)) .then(); } @@ -116,13 +116,13 @@ public final class WebSessionOAuth2ServerAuthorizationRequestRepository Assert.notNull(exchange, "exchange cannot be null"); return getSessionAttributes(exchange).flatMap( - sessionAttrs -> Mono.justOrEmpty(this.sessionAttrsMapStateToAuthorizationRequest(sessionAttrs))); + (sessionAttrs) -> Mono.justOrEmpty(this.sessionAttrsMapStateToAuthorizationRequest(sessionAttrs))); } private Mono> saveStateToAuthorizationRequest(ServerWebExchange exchange) { Assert.notNull(exchange, "exchange cannot be null"); - return getSessionAttributes(exchange).doOnNext(sessionAttrs -> { + return getSessionAttributes(exchange).doOnNext((sessionAttrs) -> { Object stateToAuthzRequest = sessionAttrs.get(this.sessionAttributeName); if (stateToAuthzRequest == null) { @@ -133,7 +133,7 @@ public final class WebSessionOAuth2ServerAuthorizationRequestRepository // it into session again // in case of redis or hazelcast session. #6215 sessionAttrs.put(this.sessionAttributeName, stateToAuthzRequest); - }).flatMap(sessionAttrs -> Mono.justOrEmpty(this.sessionAttrsMapStateToAuthorizationRequest(sessionAttrs))); + }).flatMap((sessionAttrs) -> Mono.justOrEmpty(this.sessionAttrsMapStateToAuthorizationRequest(sessionAttrs))); } private Map sessionAttrsMapStateToAuthorizationRequest( diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/WebSessionServerOAuth2AuthorizedClientRepository.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/WebSessionServerOAuth2AuthorizedClientRepository.java index 48fe56bd06..ab410f866f 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/WebSessionServerOAuth2AuthorizedClientRepository.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/WebSessionServerOAuth2AuthorizedClientRepository.java @@ -51,7 +51,7 @@ public final class WebSessionServerOAuth2AuthorizedClientRepository implements S Assert.hasText(clientRegistrationId, "clientRegistrationId cannot be empty"); Assert.notNull(exchange, "exchange cannot be null"); return exchange.getSession().map(this::getAuthorizedClients) - .flatMap(clients -> Mono.justOrEmpty((T) clients.get(clientRegistrationId))); + .flatMap((clients) -> Mono.justOrEmpty((T) clients.get(clientRegistrationId))); } @Override @@ -59,7 +59,7 @@ public final class WebSessionServerOAuth2AuthorizedClientRepository implements S ServerWebExchange exchange) { Assert.notNull(authorizedClient, "authorizedClient cannot be null"); Assert.notNull(exchange, "exchange cannot be null"); - return exchange.getSession().doOnSuccess(session -> { + return exchange.getSession().doOnSuccess((session) -> { Map authorizedClients = getAuthorizedClients(session); authorizedClients.put(authorizedClient.getClientRegistration().getRegistrationId(), authorizedClient); session.getAttributes().put(this.sessionAttributeName, authorizedClients); @@ -71,7 +71,7 @@ public final class WebSessionServerOAuth2AuthorizedClientRepository implements S ServerWebExchange exchange) { Assert.hasText(clientRegistrationId, "clientRegistrationId cannot be empty"); Assert.notNull(exchange, "exchange cannot be null"); - return exchange.getSession().doOnSuccess(session -> { + return exchange.getSession().doOnSuccess((session) -> { Map authorizedClients = getAuthorizedClients(session); authorizedClients.remove(clientRegistrationId); if (authorizedClients.isEmpty()) { diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/OAuth2AuthorizationContextTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/OAuth2AuthorizationContextTests.java index db7d9086a8..103fe77dce 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/OAuth2AuthorizationContextTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/OAuth2AuthorizationContextTests.java @@ -71,7 +71,7 @@ public class OAuth2AuthorizationContextTests { @Test public void withAuthorizedClientWhenAllValuesProvidedThenAllValuesAreSet() { OAuth2AuthorizationContext authorizationContext = OAuth2AuthorizationContext - .withAuthorizedClient(this.authorizedClient).principal(this.principal).attributes(attributes -> { + .withAuthorizedClient(this.authorizedClient).principal(this.principal).attributes((attributes) -> { attributes.put("attribute1", "value1"); attributes.put("attribute2", "value2"); }).build(); diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/OAuth2AuthorizeRequestTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/OAuth2AuthorizeRequestTests.java index 47a0c8420a..5d2d0c8418 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/OAuth2AuthorizeRequestTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/OAuth2AuthorizeRequestTests.java @@ -74,7 +74,7 @@ public class OAuth2AuthorizeRequestTests { public void withClientRegistrationIdWhenAllValuesProvidedThenAllValuesAreSet() { OAuth2AuthorizeRequest authorizeRequest = OAuth2AuthorizeRequest .withClientRegistrationId(this.clientRegistration.getRegistrationId()).principal(this.principal) - .attributes(attrs -> { + .attributes((attrs) -> { attrs.put("name1", "value1"); attrs.put("name2", "value2"); }).build(); @@ -88,7 +88,7 @@ public class OAuth2AuthorizeRequestTests { @Test public void withAuthorizedClientWhenAllValuesProvidedThenAllValuesAreSet() { OAuth2AuthorizeRequest authorizeRequest = OAuth2AuthorizeRequest.withAuthorizedClient(this.authorizedClient) - .principal(this.principal).attributes(attrs -> { + .principal(this.principal).attributes((attrs) -> { attrs.put("name1", "value1"); attrs.put("name2", "value2"); }).build(); diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/OAuth2AuthorizedClientProviderBuilderTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/OAuth2AuthorizedClientProviderBuilderTests.java index 0e3190af46..fae43f8872 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/OAuth2AuthorizedClientProviderBuilderTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/OAuth2AuthorizedClientProviderBuilderTests.java @@ -101,7 +101,8 @@ public class OAuth2AuthorizedClientProviderBuilderTests { @Test public void buildWhenRefreshTokenProviderThenProviderReauthorizes() { OAuth2AuthorizedClientProvider authorizedClientProvider = OAuth2AuthorizedClientProviderBuilder.builder() - .refreshToken(configurer -> configurer.accessTokenResponseClient(this.refreshTokenTokenResponseClient)) + .refreshToken( + (configurer) -> configurer.accessTokenResponseClient(this.refreshTokenTokenResponseClient)) .build(); OAuth2AuthorizedClient authorizedClient = new OAuth2AuthorizedClient( @@ -120,7 +121,7 @@ public class OAuth2AuthorizedClientProviderBuilderTests { public void buildWhenClientCredentialsProviderThenProviderAuthorizes() { OAuth2AuthorizedClientProvider authorizedClientProvider = OAuth2AuthorizedClientProviderBuilder.builder() .clientCredentials( - configurer -> configurer.accessTokenResponseClient(this.clientCredentialsTokenResponseClient)) + (configurer) -> configurer.accessTokenResponseClient(this.clientCredentialsTokenResponseClient)) .build(); OAuth2AuthorizationContext authorizationContext = OAuth2AuthorizationContext @@ -135,7 +136,8 @@ public class OAuth2AuthorizedClientProviderBuilderTests { @Test public void buildWhenPasswordProviderThenProviderAuthorizes() { OAuth2AuthorizedClientProvider authorizedClientProvider = OAuth2AuthorizedClientProviderBuilder.builder() - .password(configurer -> configurer.accessTokenResponseClient(this.passwordTokenResponseClient)).build(); + .password((configurer) -> configurer.accessTokenResponseClient(this.passwordTokenResponseClient)) + .build(); OAuth2AuthorizationContext authorizationContext = OAuth2AuthorizationContext .withClientRegistration(TestClientRegistrations.password().build()).principal(this.principal) @@ -151,10 +153,12 @@ public class OAuth2AuthorizedClientProviderBuilderTests { public void buildWhenAllProvidersThenProvidersAuthorize() { OAuth2AuthorizedClientProvider authorizedClientProvider = OAuth2AuthorizedClientProviderBuilder.builder() .authorizationCode() - .refreshToken(configurer -> configurer.accessTokenResponseClient(this.refreshTokenTokenResponseClient)) + .refreshToken( + (configurer) -> configurer.accessTokenResponseClient(this.refreshTokenTokenResponseClient)) .clientCredentials( - configurer -> configurer.accessTokenResponseClient(this.clientCredentialsTokenResponseClient)) - .password(configurer -> configurer.accessTokenResponseClient(this.passwordTokenResponseClient)).build(); + (configurer) -> configurer.accessTokenResponseClient(this.clientCredentialsTokenResponseClient)) + .password((configurer) -> configurer.accessTokenResponseClient(this.passwordTokenResponseClient)) + .build(); ClientRegistration clientRegistration = TestClientRegistrations.clientRegistration().build(); diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/authentication/OAuth2LoginAuthenticationProviderTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/authentication/OAuth2LoginAuthenticationProviderTests.java index 840d60e630..7833f2ab05 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/authentication/OAuth2LoginAuthenticationProviderTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/authentication/OAuth2LoginAuthenticationProviderTests.java @@ -167,7 +167,7 @@ public class OAuth2LoginAuthenticationProviderTests { OAuth2User principal = mock(OAuth2User.class); List authorities = AuthorityUtils.createAuthorityList("ROLE_USER"); - given(principal.getAuthorities()).willAnswer((Answer>) invocation -> authorities); + given(principal.getAuthorities()).willAnswer((Answer>) (invocation) -> authorities); given(this.userService.loadUser(any())).willReturn(principal); OAuth2LoginAuthenticationToken authentication = (OAuth2LoginAuthenticationToken) this.authenticationProvider @@ -190,13 +190,13 @@ public class OAuth2LoginAuthenticationProviderTests { OAuth2User principal = mock(OAuth2User.class); List authorities = AuthorityUtils.createAuthorityList("ROLE_USER"); - given(principal.getAuthorities()).willAnswer((Answer>) invocation -> authorities); + given(principal.getAuthorities()).willAnswer((Answer>) (invocation) -> authorities); given(this.userService.loadUser(any())).willReturn(principal); List mappedAuthorities = AuthorityUtils.createAuthorityList("ROLE_OAUTH2_USER"); GrantedAuthoritiesMapper authoritiesMapper = mock(GrantedAuthoritiesMapper.class); given(authoritiesMapper.mapAuthorities(anyCollection())) - .willAnswer((Answer>) invocation -> mappedAuthorities); + .willAnswer((Answer>) (invocation) -> mappedAuthorities); this.authenticationProvider.setAuthoritiesMapper(authoritiesMapper); OAuth2LoginAuthenticationToken authentication = (OAuth2LoginAuthenticationToken) this.authenticationProvider @@ -213,7 +213,7 @@ public class OAuth2LoginAuthenticationProviderTests { OAuth2User principal = mock(OAuth2User.class); List authorities = AuthorityUtils.createAuthorityList("ROLE_USER"); - given(principal.getAuthorities()).willAnswer((Answer>) invocation -> authorities); + given(principal.getAuthorities()).willAnswer((Answer>) (invocation) -> authorities); ArgumentCaptor userRequestArgCaptor = ArgumentCaptor.forClass(OAuth2UserRequest.class); given(this.userService.loadUser(userRequestArgCaptor.capture())).willReturn(principal); diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/authentication/OAuth2LoginReactiveAuthenticationManagerTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/authentication/OAuth2LoginReactiveAuthenticationManagerTests.java index f16c1db8c6..977feff17d 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/authentication/OAuth2LoginReactiveAuthenticationManagerTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/authentication/OAuth2LoginReactiveAuthenticationManagerTests.java @@ -197,7 +197,7 @@ public class OAuth2LoginReactiveAuthenticationManagerTests { List mappedAuthorities = AuthorityUtils.createAuthorityList("ROLE_OAUTH_USER"); GrantedAuthoritiesMapper authoritiesMapper = mock(GrantedAuthoritiesMapper.class); given(authoritiesMapper.mapAuthorities(anyCollection())) - .willAnswer((Answer>) invocation -> mappedAuthorities); + .willAnswer((Answer>) (invocation) -> mappedAuthorities); this.manager.setAuthoritiesMapper(authoritiesMapper); OAuth2LoginAuthenticationToken result = (OAuth2LoginAuthenticationToken) this.manager.authenticate(loginToken()) diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveAuthorizationCodeTokenResponseClientTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveAuthorizationCodeTokenResponseClientTests.java index 16f7d1c589..f2a2dba39e 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveAuthorizationCodeTokenResponseClientTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveAuthorizationCodeTokenResponseClientTests.java @@ -190,7 +190,7 @@ public class WebClientReactiveAuthorizationCodeTokenResponseClientTests { assertThatThrownBy(() -> this.tokenResponseClient.getTokenResponse(authorizationCodeGrantRequest()).block()) .isInstanceOfSatisfying(OAuth2AuthorizationException.class, - e -> assertThat(e.getError().getErrorCode()).isEqualTo("unauthorized_client")) + (e) -> assertThat(e.getError().getErrorCode()).isEqualTo("unauthorized_client")) .hasMessageContaining("unauthorized_client"); } diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveClientCredentialsTokenResponseClientTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveClientCredentialsTokenResponseClientTests.java index b28b286f59..46ce905b07 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveClientCredentialsTokenResponseClientTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveClientCredentialsTokenResponseClientTests.java @@ -149,7 +149,7 @@ public class WebClientReactiveClientCredentialsTokenResponseClientTests { assertThatThrownBy(() -> this.client.getTokenResponse(request).block()) .isInstanceOfSatisfying(OAuth2AuthorizationException.class, - e -> assertThat(e.getError().getErrorCode()).isEqualTo("invalid_token_response")) + (e) -> assertThat(e.getError().getErrorCode()).isEqualTo("invalid_token_response")) .hasMessageContaining("[invalid_token_response]") .hasMessageContaining("Empty OAuth 2.0 Access Token Response"); diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactivePasswordTokenResponseClientTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactivePasswordTokenResponseClientTests.java index b5ff9d5fae..a131e93910 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactivePasswordTokenResponseClientTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactivePasswordTokenResponseClientTests.java @@ -149,7 +149,7 @@ public class WebClientReactivePasswordTokenResponseClientTests { assertThatThrownBy(() -> this.tokenResponseClient.getTokenResponse(passwordGrantRequest).block()) .isInstanceOfSatisfying(OAuth2AuthorizationException.class, - e -> assertThat(e.getError().getErrorCode()).isEqualTo("invalid_token_response")) + (e) -> assertThat(e.getError().getErrorCode()).isEqualTo("invalid_token_response")) .hasMessageContaining("[invalid_token_response]") .hasMessageContaining("An error occurred parsing the Access Token response") .hasCauseInstanceOf(Throwable.class); @@ -185,7 +185,7 @@ public class WebClientReactivePasswordTokenResponseClientTests { assertThatThrownBy(() -> this.tokenResponseClient.getTokenResponse(passwordGrantRequest).block()) .isInstanceOfSatisfying(OAuth2AuthorizationException.class, - e -> assertThat(e.getError().getErrorCode()).isEqualTo("unauthorized_client")) + (e) -> assertThat(e.getError().getErrorCode()).isEqualTo("unauthorized_client")) .hasMessageContaining("[unauthorized_client]"); } @@ -198,7 +198,7 @@ public class WebClientReactivePasswordTokenResponseClientTests { assertThatThrownBy(() -> this.tokenResponseClient.getTokenResponse(passwordGrantRequest).block()) .isInstanceOfSatisfying(OAuth2AuthorizationException.class, - e -> assertThat(e.getError().getErrorCode()).isEqualTo("invalid_token_response")) + (e) -> assertThat(e.getError().getErrorCode()).isEqualTo("invalid_token_response")) .hasMessageContaining("[invalid_token_response]") .hasMessageContaining("Empty OAuth 2.0 Access Token Response"); } diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveRefreshTokenTokenResponseClientTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveRefreshTokenTokenResponseClientTests.java index 57fc0de01d..4599d702e6 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveRefreshTokenTokenResponseClientTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveRefreshTokenTokenResponseClientTests.java @@ -189,7 +189,7 @@ public class WebClientReactiveRefreshTokenTokenResponseClientTests { assertThatThrownBy(() -> this.tokenResponseClient.getTokenResponse(refreshTokenGrantRequest).block()) .isInstanceOfSatisfying(OAuth2AuthorizationException.class, - e -> assertThat(e.getError().getErrorCode()).isEqualTo("unauthorized_client")) + (e) -> assertThat(e.getError().getErrorCode()).isEqualTo("unauthorized_client")) .hasMessageContaining("[unauthorized_client]"); } @@ -202,7 +202,7 @@ public class WebClientReactiveRefreshTokenTokenResponseClientTests { assertThatThrownBy(() -> this.tokenResponseClient.getTokenResponse(refreshTokenGrantRequest).block()) .isInstanceOfSatisfying(OAuth2AuthorizationException.class, - e -> assertThat(e.getError().getErrorCode()).isEqualTo("invalid_token_response")) + (e) -> assertThat(e.getError().getErrorCode()).isEqualTo("invalid_token_response")) .hasMessageContaining("[invalid_token_response]") .hasMessageContaining("Empty OAuth 2.0 Access Token Response"); } diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/jackson2/OAuth2AuthenticationTokenMixinTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/jackson2/OAuth2AuthenticationTokenMixinTests.java index d1cb9de693..42c4c66a25 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/jackson2/OAuth2AuthenticationTokenMixinTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/jackson2/OAuth2AuthenticationTokenMixinTests.java @@ -267,7 +267,7 @@ public class OAuth2AuthenticationTokenMixinTests { private static String asJson(List simpleAuthorities) { // @formatter:off return simpleAuthorities.stream() - .map(authority -> "{\n" + + .map((authority) -> "{\n" + " \"@class\": \"org.springframework.security.core.authority.SimpleGrantedAuthority\",\n" + " \"authority\": \"" + authority.getAuthority() + "\"\n" + " }") diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/jackson2/OAuth2AuthorizationRequestMixinTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/jackson2/OAuth2AuthorizationRequestMixinTests.java index 06e51a0d04..e7e3bd7919 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/jackson2/OAuth2AuthorizationRequestMixinTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/jackson2/OAuth2AuthorizationRequestMixinTests.java @@ -139,14 +139,14 @@ public class OAuth2AuthorizationRequestMixinTests { } String additionalParameters = "\"@class\": \"java.util.Collections$UnmodifiableMap\""; if (!CollectionUtils.isEmpty(authorizationRequest.getAdditionalParameters())) { - additionalParameters += "," + authorizationRequest.getAdditionalParameters().keySet().stream() - .map(key -> "\"" + key + "\": \"" + authorizationRequest.getAdditionalParameters().get(key) + "\"") + additionalParameters += "," + authorizationRequest.getAdditionalParameters().keySet().stream().map( + (key) -> "\"" + key + "\": \"" + authorizationRequest.getAdditionalParameters().get(key) + "\"") .collect(Collectors.joining(",")); } String attributes = "\"@class\": \"java.util.Collections$UnmodifiableMap\""; if (!CollectionUtils.isEmpty(authorizationRequest.getAttributes())) { attributes += "," + authorizationRequest.getAttributes().keySet().stream() - .map(key -> "\"" + key + "\": \"" + authorizationRequest.getAttributes().get(key) + "\"") + .map((key) -> "\"" + key + "\": \"" + authorizationRequest.getAttributes().get(key) + "\"") .collect(Collectors.joining(",")); } // @formatter:off diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/jackson2/OAuth2AuthorizedClientMixinTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/jackson2/OAuth2AuthorizedClientMixinTests.java index 45aa8e959d..1fe9558934 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/jackson2/OAuth2AuthorizedClientMixinTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/jackson2/OAuth2AuthorizedClientMixinTests.java @@ -215,7 +215,7 @@ public class OAuth2AuthorizedClientMixinTests { String configurationMetadata = "\"@class\": \"java.util.Collections$UnmodifiableMap\""; if (!CollectionUtils.isEmpty(providerDetails.getConfigurationMetadata())) { configurationMetadata += "," + providerDetails.getConfigurationMetadata().keySet().stream() - .map(key -> "\"" + key + "\": \"" + providerDetails.getConfigurationMetadata().get(key) + "\"") + .map((key) -> "\"" + key + "\": \"" + providerDetails.getConfigurationMetadata().get(key) + "\"") .collect(Collectors.joining(",")); } // @formatter:off diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/authentication/OidcAuthorizationCodeAuthenticationProviderTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/authentication/OidcAuthorizationCodeAuthenticationProviderTests.java index 56cf74b35e..2246bed695 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/authentication/OidcAuthorizationCodeAuthenticationProviderTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/authentication/OidcAuthorizationCodeAuthenticationProviderTests.java @@ -232,7 +232,7 @@ public class OidcAuthorizationCodeAuthenticationProviderTests { JwtDecoder jwtDecoder = mock(JwtDecoder.class); given(jwtDecoder.decode(anyString())).willThrow(new JwtException("ID Token Validation Error")); - this.authenticationProvider.setJwtDecoderFactory(registration -> jwtDecoder); + this.authenticationProvider.setJwtDecoderFactory((registration) -> jwtDecoder); this.authenticationProvider .authenticate(new OAuth2LoginAuthenticationToken(this.clientRegistration, this.authorizationExchange)); @@ -267,7 +267,7 @@ public class OidcAuthorizationCodeAuthenticationProviderTests { OidcUser principal = mock(OidcUser.class); List authorities = AuthorityUtils.createAuthorityList("ROLE_USER"); - given(principal.getAuthorities()).willAnswer((Answer>) invocation -> authorities); + given(principal.getAuthorities()).willAnswer((Answer>) (invocation) -> authorities); given(this.userService.loadUser(any())).willReturn(principal); OAuth2LoginAuthenticationToken authentication = (OAuth2LoginAuthenticationToken) this.authenticationProvider @@ -295,13 +295,13 @@ public class OidcAuthorizationCodeAuthenticationProviderTests { OidcUser principal = mock(OidcUser.class); List authorities = AuthorityUtils.createAuthorityList("ROLE_USER"); - given(principal.getAuthorities()).willAnswer((Answer>) invocation -> authorities); + given(principal.getAuthorities()).willAnswer((Answer>) (invocation) -> authorities); given(this.userService.loadUser(any())).willReturn(principal); List mappedAuthorities = AuthorityUtils.createAuthorityList("ROLE_OIDC_USER"); GrantedAuthoritiesMapper authoritiesMapper = mock(GrantedAuthoritiesMapper.class); given(authoritiesMapper.mapAuthorities(anyCollection())) - .willAnswer((Answer>) invocation -> mappedAuthorities); + .willAnswer((Answer>) (invocation) -> mappedAuthorities); this.authenticationProvider.setAuthoritiesMapper(authoritiesMapper); OAuth2LoginAuthenticationToken authentication = (OAuth2LoginAuthenticationToken) this.authenticationProvider @@ -323,7 +323,7 @@ public class OidcAuthorizationCodeAuthenticationProviderTests { OidcUser principal = mock(OidcUser.class); List authorities = AuthorityUtils.createAuthorityList("ROLE_USER"); - given(principal.getAuthorities()).willAnswer((Answer>) invocation -> authorities); + given(principal.getAuthorities()).willAnswer((Answer>) (invocation) -> authorities); ArgumentCaptor userRequestArgCaptor = ArgumentCaptor.forClass(OidcUserRequest.class); given(this.userService.loadUser(userRequestArgCaptor.capture())).willReturn(principal); @@ -335,10 +335,10 @@ public class OidcAuthorizationCodeAuthenticationProviderTests { } private void setUpIdToken(Map claims) { - Jwt idToken = TestJwts.jwt().claims(c -> c.putAll(claims)).build(); + Jwt idToken = TestJwts.jwt().claims((c) -> c.putAll(claims)).build(); JwtDecoder jwtDecoder = mock(JwtDecoder.class); given(jwtDecoder.decode(anyString())).willReturn(idToken); - this.authenticationProvider.setJwtDecoderFactory(registration -> jwtDecoder); + this.authenticationProvider.setJwtDecoderFactory((registration) -> jwtDecoder); } private OAuth2AccessTokenResponse accessTokenSuccessResponse() { diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/authentication/OidcAuthorizationCodeReactiveAuthenticationManagerTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/authentication/OidcAuthorizationCodeReactiveAuthenticationManagerTests.java index eb87575457..ceb35a8a25 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/authentication/OidcAuthorizationCodeReactiveAuthenticationManagerTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/authentication/OidcAuthorizationCodeReactiveAuthenticationManagerTests.java @@ -174,7 +174,7 @@ public class OidcAuthorizationCodeReactiveAuthenticationManagerTests { given(this.accessTokenResponseClient.getTokenResponse(any())).willReturn(Mono.just(accessTokenResponse)); given(this.jwtDecoder.decode(any())).willThrow(new JwtException("ID Token Validation Error")); - this.manager.setJwtDecoderFactory(c -> this.jwtDecoder); + this.manager.setJwtDecoderFactory((c) -> this.jwtDecoder); assertThatThrownBy(() -> this.manager.authenticate(loginToken()).block()) .isInstanceOf(OAuth2AuthenticationException.class) @@ -195,11 +195,11 @@ public class OidcAuthorizationCodeReactiveAuthenticationManagerTests { claims.put(IdTokenClaimNames.SUB, "sub"); claims.put(IdTokenClaimNames.AUD, Arrays.asList("client-id")); claims.put(IdTokenClaimNames.NONCE, "invalid-nonce-hash"); - Jwt idToken = TestJwts.jwt().claims(c -> c.putAll(claims)).build(); + Jwt idToken = TestJwts.jwt().claims((c) -> c.putAll(claims)).build(); given(this.accessTokenResponseClient.getTokenResponse(any())).willReturn(Mono.just(accessTokenResponse)); given(this.jwtDecoder.decode(any())).willReturn(Mono.just(idToken)); - this.manager.setJwtDecoderFactory(c -> this.jwtDecoder); + this.manager.setJwtDecoderFactory((c) -> this.jwtDecoder); assertThatThrownBy(() -> this.manager.authenticate(authorizationCodeAuthentication).block()) .isInstanceOf(OAuth2AuthenticationException.class).hasMessageContaining("[invalid_nonce]"); @@ -220,12 +220,12 @@ public class OidcAuthorizationCodeReactiveAuthenticationManagerTests { claims.put(IdTokenClaimNames.SUB, "rob"); claims.put(IdTokenClaimNames.AUD, Arrays.asList("client-id")); claims.put(IdTokenClaimNames.NONCE, this.nonceHash); - Jwt idToken = TestJwts.jwt().claims(c -> c.putAll(claims)).build(); + Jwt idToken = TestJwts.jwt().claims((c) -> c.putAll(claims)).build(); given(this.accessTokenResponseClient.getTokenResponse(any())).willReturn(Mono.just(accessTokenResponse)); given(this.userService.loadUser(any())).willReturn(Mono.empty()); given(this.jwtDecoder.decode(any())).willReturn(Mono.just(idToken)); - this.manager.setJwtDecoderFactory(c -> this.jwtDecoder); + this.manager.setJwtDecoderFactory((c) -> this.jwtDecoder); assertThat(this.manager.authenticate(authorizationCodeAuthentication).block()).isNull(); } @@ -243,13 +243,13 @@ public class OidcAuthorizationCodeReactiveAuthenticationManagerTests { claims.put(IdTokenClaimNames.SUB, "rob"); claims.put(IdTokenClaimNames.AUD, Arrays.asList("client-id")); claims.put(IdTokenClaimNames.NONCE, this.nonceHash); - Jwt idToken = TestJwts.jwt().claims(c -> c.putAll(claims)).build(); + Jwt idToken = TestJwts.jwt().claims((c) -> c.putAll(claims)).build(); given(this.accessTokenResponseClient.getTokenResponse(any())).willReturn(Mono.just(accessTokenResponse)); DefaultOidcUser user = new DefaultOidcUser(AuthorityUtils.createAuthorityList("ROLE_USER"), this.idToken); given(this.userService.loadUser(any())).willReturn(Mono.just(user)); given(this.jwtDecoder.decode(any())).willReturn(Mono.just(idToken)); - this.manager.setJwtDecoderFactory(c -> this.jwtDecoder); + this.manager.setJwtDecoderFactory((c) -> this.jwtDecoder); OAuth2LoginAuthenticationToken result = (OAuth2LoginAuthenticationToken) this.manager .authenticate(authorizationCodeAuthentication).block(); @@ -274,13 +274,13 @@ public class OidcAuthorizationCodeReactiveAuthenticationManagerTests { claims.put(IdTokenClaimNames.SUB, "rob"); claims.put(IdTokenClaimNames.AUD, Arrays.asList("client-id")); claims.put(IdTokenClaimNames.NONCE, this.nonceHash); - Jwt idToken = TestJwts.jwt().claims(c -> c.putAll(claims)).build(); + Jwt idToken = TestJwts.jwt().claims((c) -> c.putAll(claims)).build(); given(this.accessTokenResponseClient.getTokenResponse(any())).willReturn(Mono.just(accessTokenResponse)); DefaultOidcUser user = new DefaultOidcUser(AuthorityUtils.createAuthorityList("ROLE_USER"), this.idToken); given(this.userService.loadUser(any())).willReturn(Mono.just(user)); given(this.jwtDecoder.decode(any())).willReturn(Mono.just(idToken)); - this.manager.setJwtDecoderFactory(c -> this.jwtDecoder); + this.manager.setJwtDecoderFactory((c) -> this.jwtDecoder); OAuth2LoginAuthenticationToken result = (OAuth2LoginAuthenticationToken) this.manager .authenticate(authorizationCodeAuthentication).block(); @@ -309,14 +309,14 @@ public class OidcAuthorizationCodeReactiveAuthenticationManagerTests { claims.put(IdTokenClaimNames.SUB, "rob"); claims.put(IdTokenClaimNames.AUD, Arrays.asList(clientRegistration.getClientId())); claims.put(IdTokenClaimNames.NONCE, this.nonceHash); - Jwt idToken = TestJwts.jwt().claims(c -> c.putAll(claims)).build(); + Jwt idToken = TestJwts.jwt().claims((c) -> c.putAll(claims)).build(); given(this.accessTokenResponseClient.getTokenResponse(any())).willReturn(Mono.just(accessTokenResponse)); DefaultOidcUser user = new DefaultOidcUser(AuthorityUtils.createAuthorityList("ROLE_USER"), this.idToken); ArgumentCaptor userRequestArgCaptor = ArgumentCaptor.forClass(OidcUserRequest.class); given(this.userService.loadUser(userRequestArgCaptor.capture())).willReturn(Mono.just(user)); given(this.jwtDecoder.decode(any())).willReturn(Mono.just(idToken)); - this.manager.setJwtDecoderFactory(c -> this.jwtDecoder); + this.manager.setJwtDecoderFactory((c) -> this.jwtDecoder); this.manager.authenticate(authorizationCodeAuthentication).block(); @@ -339,7 +339,7 @@ public class OidcAuthorizationCodeReactiveAuthenticationManagerTests { claims.put(IdTokenClaimNames.SUB, "rob"); claims.put(IdTokenClaimNames.AUD, Collections.singletonList(clientRegistration.getClientId())); claims.put(IdTokenClaimNames.NONCE, this.nonceHash); - Jwt idToken = TestJwts.jwt().claims(c -> c.putAll(claims)).build(); + Jwt idToken = TestJwts.jwt().claims((c) -> c.putAll(claims)).build(); given(this.accessTokenResponseClient.getTokenResponse(any())).willReturn(Mono.just(accessTokenResponse)); DefaultOidcUser user = new DefaultOidcUser(AuthorityUtils.createAuthorityList("ROLE_USER"), this.idToken); @@ -349,9 +349,9 @@ public class OidcAuthorizationCodeReactiveAuthenticationManagerTests { List mappedAuthorities = AuthorityUtils.createAuthorityList("ROLE_OIDC_USER"); GrantedAuthoritiesMapper authoritiesMapper = mock(GrantedAuthoritiesMapper.class); given(authoritiesMapper.mapAuthorities(anyCollection())) - .willAnswer((Answer>) invocation -> mappedAuthorities); + .willAnswer((Answer>) (invocation) -> mappedAuthorities); given(this.jwtDecoder.decode(any())).willReturn(Mono.just(idToken)); - this.manager.setJwtDecoderFactory(c -> this.jwtDecoder); + this.manager.setJwtDecoderFactory((c) -> this.jwtDecoder); this.manager.setAuthoritiesMapper(authoritiesMapper); Authentication result = this.manager.authenticate(authorizationCodeAuthentication).block(); diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/authentication/OidcIdTokenDecoderFactoryTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/authentication/OidcIdTokenDecoderFactoryTests.java index 36f74b3f96..38ea444a74 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/authentication/OidcIdTokenDecoderFactoryTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/authentication/OidcIdTokenDecoderFactoryTests.java @@ -109,7 +109,7 @@ public class OidcIdTokenDecoderFactoryTests { @Test public void createDecoderWhenJwsAlgorithmEcAndJwkSetUriEmptyThenThrowOAuth2AuthenticationException() { - this.idTokenDecoderFactory.setJwsAlgorithmResolver(clientRegistration -> SignatureAlgorithm.ES256); + this.idTokenDecoderFactory.setJwsAlgorithmResolver((clientRegistration) -> SignatureAlgorithm.ES256); assertThatThrownBy(() -> this.idTokenDecoderFactory.createDecoder(this.registration.jwkSetUri(null).build())) .isInstanceOf(OAuth2AuthenticationException.class) .hasMessage("[missing_signature_verifier] Failed to find a Signature Verifier " @@ -119,7 +119,7 @@ public class OidcIdTokenDecoderFactoryTests { @Test public void createDecoderWhenJwsAlgorithmHmacAndClientSecretNullThenThrowOAuth2AuthenticationException() { - this.idTokenDecoderFactory.setJwsAlgorithmResolver(clientRegistration -> MacAlgorithm.HS256); + this.idTokenDecoderFactory.setJwsAlgorithmResolver((clientRegistration) -> MacAlgorithm.HS256); assertThatThrownBy(() -> this.idTokenDecoderFactory.createDecoder(this.registration.clientSecret(null).build())) .isInstanceOf(OAuth2AuthenticationException.class) .hasMessage("[missing_signature_verifier] Failed to find a Signature Verifier " @@ -129,7 +129,7 @@ public class OidcIdTokenDecoderFactoryTests { @Test public void createDecoderWhenJwsAlgorithmNullThenThrowOAuth2AuthenticationException() { - this.idTokenDecoderFactory.setJwsAlgorithmResolver(clientRegistration -> null); + this.idTokenDecoderFactory.setJwsAlgorithmResolver((clientRegistration) -> null); assertThatThrownBy(() -> this.idTokenDecoderFactory.createDecoder(this.registration.build())) .isInstanceOf(OAuth2AuthenticationException.class) .hasMessage("[missing_signature_verifier] Failed to find a Signature Verifier " diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/authentication/OidcIdTokenValidatorTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/authentication/OidcIdTokenValidatorTests.java index f7547e6b4f..8f1023628b 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/authentication/OidcIdTokenValidatorTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/authentication/OidcIdTokenValidatorTests.java @@ -92,7 +92,7 @@ public class OidcIdTokenValidatorTests { public void validateWhenIssuerNullThenHasErrors() { this.claims.remove(IdTokenClaimNames.ISS); assertThat(this.validateIdToken()).hasSize(1).extracting(OAuth2Error::getDescription) - .allMatch(msg -> msg.contains(IdTokenClaimNames.ISS)); + .allMatch((msg) -> msg.contains(IdTokenClaimNames.ISS)); } @Test @@ -104,7 +104,7 @@ public class OidcIdTokenValidatorTests { this.registration = this.registration.issuerUri("https://somethingelse.com"); assertThat(this.validateIdToken()).hasSize(1).extracting(OAuth2Error::getDescription) - .allMatch(msg -> msg.contains(IdTokenClaimNames.ISS)); + .allMatch((msg) -> msg.contains(IdTokenClaimNames.ISS)); } @Test @@ -122,42 +122,42 @@ public class OidcIdTokenValidatorTests { public void validateWhenSubNullThenHasErrors() { this.claims.remove(IdTokenClaimNames.SUB); assertThat(this.validateIdToken()).hasSize(1).extracting(OAuth2Error::getDescription) - .allMatch(msg -> msg.contains(IdTokenClaimNames.SUB)); + .allMatch((msg) -> msg.contains(IdTokenClaimNames.SUB)); } @Test public void validateWhenAudNullThenHasErrors() { this.claims.remove(IdTokenClaimNames.AUD); assertThat(this.validateIdToken()).hasSize(1).extracting(OAuth2Error::getDescription) - .allMatch(msg -> msg.contains(IdTokenClaimNames.AUD)); + .allMatch((msg) -> msg.contains(IdTokenClaimNames.AUD)); } @Test public void validateWhenIssuedAtNullThenHasErrors() { this.issuedAt = null; assertThat(this.validateIdToken()).hasSize(1).extracting(OAuth2Error::getDescription) - .allMatch(msg -> msg.contains(IdTokenClaimNames.IAT)); + .allMatch((msg) -> msg.contains(IdTokenClaimNames.IAT)); } @Test public void validateWhenExpiresAtNullThenHasErrors() { this.expiresAt = null; assertThat(this.validateIdToken()).hasSize(1).extracting(OAuth2Error::getDescription) - .allMatch(msg -> msg.contains(IdTokenClaimNames.EXP)); + .allMatch((msg) -> msg.contains(IdTokenClaimNames.EXP)); } @Test public void validateWhenAudMultipleAndAzpNullThenHasErrors() { this.claims.put(IdTokenClaimNames.AUD, Arrays.asList("client-id", "other")); assertThat(this.validateIdToken()).hasSize(1).extracting(OAuth2Error::getDescription) - .allMatch(msg -> msg.contains(IdTokenClaimNames.AZP)); + .allMatch((msg) -> msg.contains(IdTokenClaimNames.AZP)); } @Test public void validateWhenAzpNotClientIdThenHasErrors() { this.claims.put(IdTokenClaimNames.AZP, "other"); assertThat(this.validateIdToken()).hasSize(1).extracting(OAuth2Error::getDescription) - .allMatch(msg -> msg.contains(IdTokenClaimNames.AZP)); + .allMatch((msg) -> msg.contains(IdTokenClaimNames.AZP)); } @Test @@ -172,14 +172,14 @@ public class OidcIdTokenValidatorTests { this.claims.put(IdTokenClaimNames.AUD, Arrays.asList("client-id-1", "client-id-2")); this.claims.put(IdTokenClaimNames.AZP, "other-client"); assertThat(this.validateIdToken()).hasSize(1).extracting(OAuth2Error::getDescription) - .allMatch(msg -> msg.contains(IdTokenClaimNames.AZP)); + .allMatch((msg) -> msg.contains(IdTokenClaimNames.AZP)); } @Test public void validateWhenAudNotClientIdThenHasErrors() { this.claims.put(IdTokenClaimNames.AUD, Collections.singletonList("other-client")); assertThat(this.validateIdToken()).hasSize(1).extracting(OAuth2Error::getDescription) - .allMatch(msg -> msg.contains(IdTokenClaimNames.AUD)); + .allMatch((msg) -> msg.contains(IdTokenClaimNames.AUD)); } @Test @@ -196,7 +196,7 @@ public class OidcIdTokenValidatorTests { this.expiresAt = this.issuedAt.plus(Duration.ofSeconds(30)); this.clockSkew = Duration.ofSeconds(0); assertThat(this.validateIdToken()).hasSize(1).extracting(OAuth2Error::getDescription) - .allMatch(msg -> msg.contains(IdTokenClaimNames.EXP)); + .allMatch((msg) -> msg.contains(IdTokenClaimNames.EXP)); } @Test @@ -213,7 +213,7 @@ public class OidcIdTokenValidatorTests { this.expiresAt = this.issuedAt.plus(Duration.ofSeconds(60)); this.clockSkew = Duration.ofMinutes(0); assertThat(this.validateIdToken()).hasSize(1).extracting(OAuth2Error::getDescription) - .allMatch(msg -> msg.contains(IdTokenClaimNames.IAT)); + .allMatch((msg) -> msg.contains(IdTokenClaimNames.IAT)); } @Test @@ -222,7 +222,7 @@ public class OidcIdTokenValidatorTests { this.expiresAt = this.issuedAt.plus(Duration.ofSeconds(5)); this.clockSkew = Duration.ofSeconds(0); assertThat(this.validateIdToken()).hasSize(1).extracting(OAuth2Error::getDescription) - .allMatch(msg -> msg.contains(IdTokenClaimNames.EXP)); + .allMatch((msg) -> msg.contains(IdTokenClaimNames.EXP)); } @Test @@ -232,10 +232,10 @@ public class OidcIdTokenValidatorTests { this.issuedAt = null; this.expiresAt = null; assertThat(this.validateIdToken()).hasSize(1).extracting(OAuth2Error::getDescription) - .allMatch(msg -> msg.contains(IdTokenClaimNames.SUB)) - .allMatch(msg -> msg.contains(IdTokenClaimNames.AUD)) - .allMatch(msg -> msg.contains(IdTokenClaimNames.IAT)) - .allMatch(msg -> msg.contains(IdTokenClaimNames.EXP)); + .allMatch((msg) -> msg.contains(IdTokenClaimNames.SUB)) + .allMatch((msg) -> msg.contains(IdTokenClaimNames.AUD)) + .allMatch((msg) -> msg.contains(IdTokenClaimNames.IAT)) + .allMatch((msg) -> msg.contains(IdTokenClaimNames.EXP)); } @Test @@ -243,12 +243,12 @@ public class OidcIdTokenValidatorTests { this.claims.remove(IdTokenClaimNames.SUB); this.claims.remove(IdTokenClaimNames.AUD); assertThat(this.validateIdToken()).hasSize(1).extracting(OAuth2Error::getDescription) - .allMatch(msg -> msg.equals("The ID Token contains invalid claims: {sub=null, aud=null}")); + .allMatch((msg) -> msg.equals("The ID Token contains invalid claims: {sub=null, aud=null}")); } private Collection validateIdToken() { Jwt idToken = Jwt.withTokenValue("token").issuedAt(this.issuedAt).expiresAt(this.expiresAt) - .headers(h -> h.putAll(this.headers)).claims(c -> c.putAll(this.claims)).build(); + .headers((h) -> h.putAll(this.headers)).claims((c) -> c.putAll(this.claims)).build(); OidcIdTokenValidator validator = new OidcIdTokenValidator(this.registration.build()); validator.setClockSkew(this.clockSkew); return validator.validate(idToken).getErrors(); diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/authentication/ReactiveOidcIdTokenDecoderFactoryTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/authentication/ReactiveOidcIdTokenDecoderFactoryTests.java index e4d626dde9..99d2525d1b 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/authentication/ReactiveOidcIdTokenDecoderFactoryTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/authentication/ReactiveOidcIdTokenDecoderFactoryTests.java @@ -109,7 +109,7 @@ public class ReactiveOidcIdTokenDecoderFactoryTests { @Test public void createDecoderWhenJwsAlgorithmEcAndJwkSetUriEmptyThenThrowOAuth2AuthenticationException() { - this.idTokenDecoderFactory.setJwsAlgorithmResolver(clientRegistration -> SignatureAlgorithm.ES256); + this.idTokenDecoderFactory.setJwsAlgorithmResolver((clientRegistration) -> SignatureAlgorithm.ES256); assertThatThrownBy(() -> this.idTokenDecoderFactory.createDecoder(this.registration.jwkSetUri(null).build())) .isInstanceOf(OAuth2AuthenticationException.class) .hasMessage("[missing_signature_verifier] Failed to find a Signature Verifier " @@ -119,7 +119,7 @@ public class ReactiveOidcIdTokenDecoderFactoryTests { @Test public void createDecoderWhenJwsAlgorithmHmacAndClientSecretNullThenThrowOAuth2AuthenticationException() { - this.idTokenDecoderFactory.setJwsAlgorithmResolver(clientRegistration -> MacAlgorithm.HS256); + this.idTokenDecoderFactory.setJwsAlgorithmResolver((clientRegistration) -> MacAlgorithm.HS256); assertThatThrownBy(() -> this.idTokenDecoderFactory.createDecoder(this.registration.clientSecret(null).build())) .isInstanceOf(OAuth2AuthenticationException.class) .hasMessage("[missing_signature_verifier] Failed to find a Signature Verifier " @@ -129,7 +129,7 @@ public class ReactiveOidcIdTokenDecoderFactoryTests { @Test public void createDecoderWhenJwsAlgorithmNullThenThrowOAuth2AuthenticationException() { - this.idTokenDecoderFactory.setJwsAlgorithmResolver(clientRegistration -> null); + this.idTokenDecoderFactory.setJwsAlgorithmResolver((clientRegistration) -> null); assertThatThrownBy(() -> this.idTokenDecoderFactory.createDecoder(this.registration.build())) .isInstanceOf(OAuth2AuthenticationException.class) .hasMessage("[missing_signature_verifier] Failed to find a Signature Verifier " diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/userinfo/DefaultReactiveOAuth2UserServiceTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/userinfo/DefaultReactiveOAuth2UserServiceTests.java index 2ac7888a57..5476241816 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/userinfo/DefaultReactiveOAuth2UserServiceTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/userinfo/DefaultReactiveOAuth2UserServiceTests.java @@ -98,7 +98,7 @@ public class DefaultReactiveOAuth2UserServiceTests { public void loadUserWhenUserInfoUriIsNullThenThrowOAuth2AuthenticationException() { this.clientRegistration.userInfoUri(null); - StepVerifier.create(this.userService.loadUser(oauth2UserRequest())).expectErrorSatisfies(t -> assertThat(t) + StepVerifier.create(this.userService.loadUser(oauth2UserRequest())).expectErrorSatisfies((t) -> assertThat(t) .isInstanceOf(OAuth2AuthenticationException.class).hasMessageContaining("missing_user_info_uri")) .verify(); } @@ -107,7 +107,7 @@ public class DefaultReactiveOAuth2UserServiceTests { public void loadUserWhenUserNameAttributeNameIsNullThenThrowOAuth2AuthenticationException() { this.clientRegistration.userNameAttributeName(null); - StepVerifier.create(this.userService.loadUser(oauth2UserRequest())).expectErrorSatisfies(t -> assertThat(t) + StepVerifier.create(this.userService.loadUser(oauth2UserRequest())).expectErrorSatisfies((t) -> assertThat(t) .isInstanceOf(OAuth2AuthenticationException.class).hasMessageContaining("missing_user_name_attribute")) .verify(); } diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/DefaultOAuth2AuthorizationRequestResolverTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/DefaultOAuth2AuthorizationRequestResolverTests.java index 04fe13aa16..832bce8902 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/DefaultOAuth2AuthorizationRequestResolverTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/DefaultOAuth2AuthorizationRequestResolverTests.java @@ -458,8 +458,8 @@ public class DefaultOAuth2AuthorizationRequestResolverTests { request.setServletPath(requestUri); this.resolver.setAuthorizationRequestCustomizer( - customizer -> customizer.additionalParameters(params -> params.remove(OidcParameterNames.NONCE)) - .attributes(attrs -> attrs.remove(OidcParameterNames.NONCE))); + (customizer) -> customizer.additionalParameters((params) -> params.remove(OidcParameterNames.NONCE)) + .attributes((attrs) -> attrs.remove(OidcParameterNames.NONCE))); OAuth2AuthorizationRequest authorizationRequest = this.resolver.resolve(request); assertThat(authorizationRequest.getAdditionalParameters()).doesNotContainKey(OidcParameterNames.NONCE); @@ -478,10 +478,11 @@ public class DefaultOAuth2AuthorizationRequestResolverTests { MockHttpServletRequest request = new MockHttpServletRequest("GET", requestUri); request.setServletPath(requestUri); - this.resolver.setAuthorizationRequestCustomizer(customizer -> customizer.authorizationRequestUri(uriBuilder -> { - uriBuilder.queryParam("param1", "value1"); - return uriBuilder.build(); - })); + this.resolver + .setAuthorizationRequestCustomizer((customizer) -> customizer.authorizationRequestUri((uriBuilder) -> { + uriBuilder.queryParam("param1", "value1"); + return uriBuilder.build(); + })); OAuth2AuthorizationRequest authorizationRequest = this.resolver.resolve(request); assertThat(authorizationRequest.getAuthorizationRequestUri()) @@ -498,7 +499,7 @@ public class DefaultOAuth2AuthorizationRequestResolverTests { MockHttpServletRequest request = new MockHttpServletRequest("GET", requestUri); request.setServletPath(requestUri); - this.resolver.setAuthorizationRequestCustomizer(customizer -> customizer.parameters(params -> { + this.resolver.setAuthorizationRequestCustomizer((customizer) -> customizer.parameters((params) -> { params.put("appid", params.get("client_id")); params.remove("client_id"); })); diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/DefaultOAuth2AuthorizedClientManagerTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/DefaultOAuth2AuthorizedClientManagerTests.java index 75fe20dab2..445dfa9fa6 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/DefaultOAuth2AuthorizedClientManagerTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/DefaultOAuth2AuthorizedClientManagerTests.java @@ -194,7 +194,7 @@ public class DefaultOAuth2AuthorizedClientManagerTests { @Test public void authorizeWhenClientRegistrationNotFoundThenThrowIllegalArgumentException() { OAuth2AuthorizeRequest authorizeRequest = OAuth2AuthorizeRequest - .withClientRegistrationId("invalid-registration-id").principal(this.principal).attributes(attrs -> { + .withClientRegistrationId("invalid-registration-id").principal(this.principal).attributes((attrs) -> { attrs.put(HttpServletRequest.class.getName(), this.request); attrs.put(HttpServletResponse.class.getName(), this.response); }).build(); @@ -211,7 +211,7 @@ public class DefaultOAuth2AuthorizedClientManagerTests { OAuth2AuthorizeRequest authorizeRequest = OAuth2AuthorizeRequest .withClientRegistrationId(this.clientRegistration.getRegistrationId()).principal(this.principal) - .attributes(attrs -> { + .attributes((attrs) -> { attrs.put(HttpServletRequest.class.getName(), this.request); attrs.put(HttpServletResponse.class.getName(), this.response); }).build(); @@ -241,7 +241,7 @@ public class DefaultOAuth2AuthorizedClientManagerTests { OAuth2AuthorizeRequest authorizeRequest = OAuth2AuthorizeRequest .withClientRegistrationId(this.clientRegistration.getRegistrationId()).principal(this.principal) - .attributes(attrs -> { + .attributes((attrs) -> { attrs.put(HttpServletRequest.class.getName(), this.request); attrs.put(HttpServletResponse.class.getName(), this.response); }).build(); @@ -278,7 +278,7 @@ public class DefaultOAuth2AuthorizedClientManagerTests { OAuth2AuthorizeRequest authorizeRequest = OAuth2AuthorizeRequest .withClientRegistrationId(this.clientRegistration.getRegistrationId()).principal(this.principal) - .attributes(attrs -> { + .attributes((attrs) -> { attrs.put(HttpServletRequest.class.getName(), this.request); attrs.put(HttpServletResponse.class.getName(), this.response); }).build(); @@ -308,7 +308,7 @@ public class DefaultOAuth2AuthorizedClientManagerTests { .willReturn(this.authorizedClient); // Set custom contextAttributesMapper - this.authorizedClientManager.setContextAttributesMapper(authorizeRequest -> { + this.authorizedClientManager.setContextAttributesMapper((authorizeRequest) -> { Map contextAttributes = new HashMap<>(); HttpServletRequest servletRequest = authorizeRequest.getAttribute(HttpServletRequest.class.getName()); String username = servletRequest.getParameter(OAuth2ParameterNames.USERNAME); @@ -325,7 +325,7 @@ public class DefaultOAuth2AuthorizedClientManagerTests { OAuth2AuthorizeRequest authorizeRequest = OAuth2AuthorizeRequest .withClientRegistrationId(this.clientRegistration.getRegistrationId()).principal(this.principal) - .attributes(attrs -> { + .attributes((attrs) -> { attrs.put(HttpServletRequest.class.getName(), this.request); attrs.put(HttpServletResponse.class.getName(), this.response); }).build(); @@ -344,7 +344,7 @@ public class DefaultOAuth2AuthorizedClientManagerTests { @Test public void reauthorizeWhenUnsupportedProviderThenNotReauthorized() { OAuth2AuthorizeRequest reauthorizeRequest = OAuth2AuthorizeRequest.withAuthorizedClient(this.authorizedClient) - .principal(this.principal).attributes(attrs -> { + .principal(this.principal).attributes((attrs) -> { attrs.put(HttpServletRequest.class.getName(), this.request); attrs.put(HttpServletResponse.class.getName(), this.response); }).build(); @@ -374,7 +374,7 @@ public class DefaultOAuth2AuthorizedClientManagerTests { .willReturn(reauthorizedClient); OAuth2AuthorizeRequest reauthorizeRequest = OAuth2AuthorizeRequest.withAuthorizedClient(this.authorizedClient) - .principal(this.principal).attributes(attrs -> { + .principal(this.principal).attributes((attrs) -> { attrs.put(HttpServletRequest.class.getName(), this.request); attrs.put(HttpServletResponse.class.getName(), this.response); }).build(); @@ -410,7 +410,7 @@ public class DefaultOAuth2AuthorizedClientManagerTests { this.request.addParameter(OAuth2ParameterNames.SCOPE, "read write"); OAuth2AuthorizeRequest reauthorizeRequest = OAuth2AuthorizeRequest.withAuthorizedClient(this.authorizedClient) - .principal(this.principal).attributes(attrs -> { + .principal(this.principal).attributes((attrs) -> { attrs.put(HttpServletRequest.class.getName(), this.request); attrs.put(HttpServletResponse.class.getName(), this.response); }).build(); @@ -434,7 +434,7 @@ public class DefaultOAuth2AuthorizedClientManagerTests { .willThrow(authorizationException); OAuth2AuthorizeRequest reauthorizeRequest = OAuth2AuthorizeRequest.withAuthorizedClient(this.authorizedClient) - .principal(this.principal).attributes(attrs -> { + .principal(this.principal).attributes((attrs) -> { attrs.put(HttpServletRequest.class.getName(), this.request); attrs.put(HttpServletResponse.class.getName(), this.response); }).build(); @@ -457,7 +457,7 @@ public class DefaultOAuth2AuthorizedClientManagerTests { .willThrow(authorizationException); OAuth2AuthorizeRequest reauthorizeRequest = OAuth2AuthorizeRequest.withAuthorizedClient(this.authorizedClient) - .principal(this.principal).attributes(attrs -> { + .principal(this.principal).attributes((attrs) -> { attrs.put(HttpServletRequest.class.getName(), this.request); attrs.put(HttpServletResponse.class.getName(), this.response); }).build(); diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/DefaultReactiveOAuth2AuthorizedClientManagerTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/DefaultReactiveOAuth2AuthorizedClientManagerTests.java index 838f1b3205..0548e9fbff 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/DefaultReactiveOAuth2AuthorizedClientManagerTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/DefaultReactiveOAuth2AuthorizedClientManagerTests.java @@ -498,8 +498,8 @@ public class DefaultReactiveOAuth2AuthorizedClientManagerTests { .willReturn(Mono.just(this.authorizedClient)); // Set custom contextAttributesMapper capable of mapping the form parameters - this.authorizedClientManager.setContextAttributesMapper( - authorizeRequest -> currentServerWebExchange().flatMap(ServerWebExchange::getFormData).map(formData -> { + this.authorizedClientManager.setContextAttributesMapper((authorizeRequest) -> currentServerWebExchange() + .flatMap(ServerWebExchange::getFormData).map((formData) -> { Map contextAttributes = new HashMap<>(); String username = formData.getFirst(OAuth2ParameterNames.USERNAME); contextAttributes.put(OAuth2AuthorizationContext.USERNAME_ATTRIBUTE_NAME, username); @@ -605,8 +605,8 @@ public class DefaultReactiveOAuth2AuthorizedClientManagerTests { } private Mono currentServerWebExchange() { - return Mono.subscriberContext().filter(c -> c.hasKey(ServerWebExchange.class)) - .map(c -> c.get(ServerWebExchange.class)); + return Mono.subscriberContext().filter((c) -> c.hasKey(ServerWebExchange.class)) + .map((c) -> c.get(ServerWebExchange.class)); } } diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/OAuth2AuthorizationCodeGrantFilterTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/OAuth2AuthorizationCodeGrantFilterTests.java index af32d31d4a..4977086d0b 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/OAuth2AuthorizationCodeGrantFilterTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/OAuth2AuthorizationCodeGrantFilterTests.java @@ -445,7 +445,7 @@ public class OAuth2AuthorizationCodeGrantFilterTests { request.setServletPath(requestUri); if (!CollectionUtils.isEmpty(parameters)) { parameters.forEach(request::addParameter); - request.setQueryString(parameters.entrySet().stream().map(e -> e.getKey() + "=" + e.getValue()) + request.setQueryString(parameters.entrySet().stream().map((e) -> e.getKey() + "=" + e.getValue()) .collect(Collectors.joining("&"))); } return request; @@ -465,7 +465,7 @@ public class OAuth2AuthorizationCodeGrantFilterTests { authorizationResponse.addParameter(OAuth2ParameterNames.STATE, "state"); additionalParameters.forEach(authorizationResponse::addParameter); authorizationResponse.setQueryString(authorizationResponse.getParameterMap().entrySet().stream() - .map(e -> e.getKey() + "=" + e.getValue()[0]).collect(Collectors.joining("&"))); + .map((e) -> e.getKey() + "=" + e.getValue()[0]).collect(Collectors.joining("&"))); authorizationResponse.setSession(authorizationRequest.getSession()); return authorizationResponse; } diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/method/annotation/OAuth2AuthorizedClientArgumentResolverTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/method/annotation/OAuth2AuthorizedClientArgumentResolverTests.java index 1250f1e267..04b820fe0c 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/method/annotation/OAuth2AuthorizedClientArgumentResolverTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/method/annotation/OAuth2AuthorizedClientArgumentResolverTests.java @@ -303,7 +303,7 @@ public class OAuth2AuthorizedClientArgumentResolverTests { authorizedClientManager.setAuthorizedClientProvider(passwordAuthorizedClientProvider); // Set custom contextAttributesMapper - authorizedClientManager.setContextAttributesMapper(authorizeRequest -> { + authorizedClientManager.setContextAttributesMapper((authorizeRequest) -> { Map contextAttributes = new HashMap<>(); HttpServletRequest servletRequest = authorizeRequest.getAttribute(HttpServletRequest.class.getName()); String username = servletRequest.getParameter(OAuth2ParameterNames.USERNAME); diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServerOAuth2AuthorizedClientExchangeFilterFunctionITests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServerOAuth2AuthorizedClientExchangeFilterFunctionITests.java index a1bb3d12c3..041a5283d9 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServerOAuth2AuthorizedClientExchangeFilterFunctionITests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServerOAuth2AuthorizedClientExchangeFilterFunctionITests.java @@ -228,7 +228,7 @@ public class ServerOAuth2AuthorizedClientExchangeFilterFunctionITests { .attributes(ServletOAuth2AuthorizedClientExchangeFilterFunction .clientRegistrationId(clientRegistration1.getRegistrationId())) .retrieve().bodyToMono(String.class) - .flatMap(response -> this.webClient.get().uri(this.serverUrl) + .flatMap((response) -> this.webClient.get().uri(this.serverUrl) .attributes(ServletOAuth2AuthorizedClientExchangeFilterFunction .clientRegistrationId(clientRegistration2.getRegistrationId())) .retrieve().bodyToMono(String.class)) @@ -281,7 +281,7 @@ public class ServerOAuth2AuthorizedClientExchangeFilterFunctionITests { // first try should fail, and remove the cached authorized client assertThatCode(requestMono::block).isInstanceOfSatisfying(WebClientResponseException.class, - e -> assertThat(e.getStatusCode()).isEqualTo(HttpStatus.UNAUTHORIZED)); + (e) -> assertThat(e.getStatusCode()).isEqualTo(HttpStatus.UNAUTHORIZED)); assertThat(this.server.getRequestCount()).isEqualTo(1); diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServerOAuth2AuthorizedClientExchangeFilterFunctionTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServerOAuth2AuthorizedClientExchangeFilterFunctionTests.java index 0c9bdbdb07..3896a725ed 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServerOAuth2AuthorizedClientExchangeFilterFunctionTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServerOAuth2AuthorizedClientExchangeFilterFunctionTests.java @@ -162,10 +162,12 @@ public class ServerOAuth2AuthorizedClientExchangeFilterFunctionTests { public void setup() { ReactiveOAuth2AuthorizedClientProvider authorizedClientProvider = ReactiveOAuth2AuthorizedClientProviderBuilder .builder().authorizationCode() - .refreshToken(configurer -> configurer.accessTokenResponseClient(this.refreshTokenTokenResponseClient)) + .refreshToken( + (configurer) -> configurer.accessTokenResponseClient(this.refreshTokenTokenResponseClient)) .clientCredentials( - configurer -> configurer.accessTokenResponseClient(this.clientCredentialsTokenResponseClient)) - .password(configurer -> configurer.accessTokenResponseClient(this.passwordTokenResponseClient)).build(); + (configurer) -> configurer.accessTokenResponseClient(this.clientCredentialsTokenResponseClient)) + .password((configurer) -> configurer.accessTokenResponseClient(this.passwordTokenResponseClient)) + .build(); this.authorizedClientManager = new DefaultReactiveOAuth2AuthorizedClientManager( this.clientRegistrationRepository, this.authorizedClientRepository); this.authorizedClientManager.setAuthorizedClientProvider(authorizedClientProvider); @@ -445,7 +447,7 @@ public class ServerOAuth2AuthorizedClientExchangeFilterFunctionTests { this.authenticationCaptor.capture(), this.attributesCaptor.capture()); assertThat(this.authorizationExceptionCaptor.getValue()) - .isInstanceOfSatisfying(ClientAuthorizationException.class, e -> { + .isInstanceOfSatisfying(ClientAuthorizationException.class, (e) -> { assertThat(e.getClientRegistrationId()).isEqualTo(this.registration.getRegistrationId()); assertThat(e.getError().getErrorCode()).isEqualTo("invalid_token"); assertThat(e).hasNoCause(); @@ -474,7 +476,7 @@ public class ServerOAuth2AuthorizedClientExchangeFilterFunctionTests { WebClientResponseException exception = WebClientResponseException.create(HttpStatus.UNAUTHORIZED.value(), HttpStatus.UNAUTHORIZED.getReasonPhrase(), HttpHeaders.EMPTY, new byte[0], StandardCharsets.UTF_8); - ExchangeFunction throwingExchangeFunction = r -> Mono.error(exception); + ExchangeFunction throwingExchangeFunction = (r) -> Mono.error(exception); assertThatCode(() -> this.function.filter(request, throwingExchangeFunction) .subscriberContext(serverWebExchange()).block()).isEqualTo(exception); @@ -485,7 +487,7 @@ public class ServerOAuth2AuthorizedClientExchangeFilterFunctionTests { this.authenticationCaptor.capture(), this.attributesCaptor.capture()); assertThat(this.authorizationExceptionCaptor.getValue()) - .isInstanceOfSatisfying(ClientAuthorizationException.class, e -> { + .isInstanceOfSatisfying(ClientAuthorizationException.class, (e) -> { assertThat(e.getClientRegistrationId()).isEqualTo(this.registration.getRegistrationId()); assertThat(e.getError().getErrorCode()).isEqualTo("invalid_token"); assertThat(e).hasCause(exception); @@ -521,7 +523,7 @@ public class ServerOAuth2AuthorizedClientExchangeFilterFunctionTests { this.authenticationCaptor.capture(), this.attributesCaptor.capture()); assertThat(this.authorizationExceptionCaptor.getValue()) - .isInstanceOfSatisfying(ClientAuthorizationException.class, e -> { + .isInstanceOfSatisfying(ClientAuthorizationException.class, (e) -> { assertThat(e.getClientRegistrationId()).isEqualTo(this.registration.getRegistrationId()); assertThat(e.getError().getErrorCode()).isEqualTo("insufficient_scope"); assertThat(e).hasNoCause(); @@ -550,7 +552,7 @@ public class ServerOAuth2AuthorizedClientExchangeFilterFunctionTests { WebClientResponseException exception = WebClientResponseException.create(HttpStatus.FORBIDDEN.value(), HttpStatus.FORBIDDEN.getReasonPhrase(), HttpHeaders.EMPTY, new byte[0], StandardCharsets.UTF_8); - ExchangeFunction throwingExchangeFunction = r -> Mono.error(exception); + ExchangeFunction throwingExchangeFunction = (r) -> Mono.error(exception); assertThatCode(() -> this.function.filter(request, throwingExchangeFunction) .subscriberContext(serverWebExchange()).block()).isEqualTo(exception); @@ -561,7 +563,7 @@ public class ServerOAuth2AuthorizedClientExchangeFilterFunctionTests { this.authenticationCaptor.capture(), this.attributesCaptor.capture()); assertThat(this.authorizationExceptionCaptor.getValue()) - .isInstanceOfSatisfying(ClientAuthorizationException.class, e -> { + .isInstanceOfSatisfying(ClientAuthorizationException.class, (e) -> { assertThat(e.getClientRegistrationId()).isEqualTo(this.registration.getRegistrationId()); assertThat(e.getError().getErrorCode()).isEqualTo("insufficient_scope"); assertThat(e).hasCause(exception); @@ -603,7 +605,7 @@ public class ServerOAuth2AuthorizedClientExchangeFilterFunctionTests { this.authenticationCaptor.capture(), this.attributesCaptor.capture()); assertThat(this.authorizationExceptionCaptor.getValue()) - .isInstanceOfSatisfying(ClientAuthorizationException.class, e -> { + .isInstanceOfSatisfying(ClientAuthorizationException.class, (e) -> { assertThat(e.getClientRegistrationId()).isEqualTo(this.registration.getRegistrationId()); assertThat(e.getError().getErrorCode()).isEqualTo(OAuth2ErrorCodes.INSUFFICIENT_SCOPE); assertThat(e.getError().getDescription()) @@ -635,7 +637,7 @@ public class ServerOAuth2AuthorizedClientExchangeFilterFunctionTests { OAuth2AuthorizationException exception = new OAuth2AuthorizationException( new OAuth2Error(OAuth2ErrorCodes.INVALID_TOKEN, null, null)); - ExchangeFunction throwingExchangeFunction = r -> Mono.error(exception); + ExchangeFunction throwingExchangeFunction = (r) -> Mono.error(exception); assertThatCode(() -> this.function.filter(request, throwingExchangeFunction) .subscriberContext(serverWebExchange()).block()).isEqualTo(exception); @@ -684,9 +686,9 @@ public class ServerOAuth2AuthorizedClientExchangeFilterFunctionTests { eq(authentication), any())).willReturn(Mono.empty()); // Set custom contextAttributesMapper capable of mapping the form parameters - this.authorizedClientManager.setContextAttributesMapper(authorizeRequest -> { + this.authorizedClientManager.setContextAttributesMapper((authorizeRequest) -> { ServerWebExchange serverWebExchange = authorizeRequest.getAttribute(ServerWebExchange.class.getName()); - return Mono.just(serverWebExchange).flatMap(ServerWebExchange::getFormData).map(formData -> { + return Mono.just(serverWebExchange).flatMap(ServerWebExchange::getFormData).map((formData) -> { Map contextAttributes = new HashMap<>(); String username = formData.getFirst(OAuth2ParameterNames.USERNAME); String password = formData.getFirst(OAuth2ParameterNames.PASSWORD); diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServletOAuth2AuthorizedClientExchangeFilterFunctionITests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServletOAuth2AuthorizedClientExchangeFilterFunctionITests.java index e717a08a5b..7bd2bab3ae 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServletOAuth2AuthorizedClientExchangeFilterFunctionITests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServletOAuth2AuthorizedClientExchangeFilterFunctionITests.java @@ -244,7 +244,7 @@ public class ServletOAuth2AuthorizedClientExchangeFilterFunctionITests { .attributes(ServletOAuth2AuthorizedClientExchangeFilterFunction .clientRegistrationId(clientRegistration1.getRegistrationId())) .retrieve().bodyToMono(String.class) - .flatMap(response -> this.webClient.get().uri(this.serverUrl) + .flatMap((response) -> this.webClient.get().uri(this.serverUrl) .attributes(ServletOAuth2AuthorizedClientExchangeFilterFunction .clientRegistrationId(clientRegistration2.getRegistrationId())) .retrieve().bodyToMono(String.class)) diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServletOAuth2AuthorizedClientExchangeFilterFunctionTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServletOAuth2AuthorizedClientExchangeFilterFunctionTests.java index 932e3dfe2f..c486b01ec4 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServletOAuth2AuthorizedClientExchangeFilterFunctionTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServletOAuth2AuthorizedClientExchangeFilterFunctionTests.java @@ -182,10 +182,12 @@ public class ServletOAuth2AuthorizedClientExchangeFilterFunctionTests { this.authentication = new TestingAuthenticationToken("test", "this"); OAuth2AuthorizedClientProvider authorizedClientProvider = OAuth2AuthorizedClientProviderBuilder.builder() .authorizationCode() - .refreshToken(configurer -> configurer.accessTokenResponseClient(this.refreshTokenTokenResponseClient)) + .refreshToken( + (configurer) -> configurer.accessTokenResponseClient(this.refreshTokenTokenResponseClient)) .clientCredentials( - configurer -> configurer.accessTokenResponseClient(this.clientCredentialsTokenResponseClient)) - .password(configurer -> configurer.accessTokenResponseClient(this.passwordTokenResponseClient)).build(); + (configurer) -> configurer.accessTokenResponseClient(this.clientCredentialsTokenResponseClient)) + .password((configurer) -> configurer.accessTokenResponseClient(this.passwordTokenResponseClient)) + .build(); this.authorizedClientManager = new DefaultOAuth2AuthorizedClientManager(this.clientRegistrationRepository, this.authorizedClientRepository); this.authorizedClientManager.setAuthorizedClientProvider(authorizedClientProvider); @@ -506,7 +508,7 @@ public class ServletOAuth2AuthorizedClientExchangeFilterFunctionTests { .willReturn(registration); // Set custom contextAttributesMapper - this.authorizedClientManager.setContextAttributesMapper(authorizeRequest -> { + this.authorizedClientManager.setContextAttributesMapper((authorizeRequest) -> { Map contextAttributes = new HashMap<>(); HttpServletRequest servletRequest = authorizeRequest.getAttribute(HttpServletRequest.class.getName()); String username = servletRequest.getParameter(OAuth2ParameterNames.USERNAME); @@ -658,15 +660,16 @@ public class ServletOAuth2AuthorizedClientExchangeFilterFunctionTests { // Default request attributes set final ClientRequest request1 = ClientRequest.create(HttpMethod.GET, URI.create("https://example1.com")) - .attributes(attrs -> attrs.putAll(getDefaultRequestAttributes())).build(); + .attributes((attrs) -> attrs.putAll(getDefaultRequestAttributes())).build(); // Default request attributes NOT set final ClientRequest request2 = ClientRequest.create(HttpMethod.GET, URI.create("https://example2.com")).build(); Context context = context(servletRequest, servletResponse, authentication); - this.function.filter(request1, this.exchange).flatMap(response -> this.function.filter(request2, this.exchange)) - .subscriberContext(context).block(); + this.function.filter(request1, this.exchange) + .flatMap((response) -> this.function.filter(request2, this.exchange)).subscriberContext(context) + .block(); List requests = this.exchange.getRequests(); assertThat(requests).hasSize(2); @@ -716,7 +719,7 @@ public class ServletOAuth2AuthorizedClientExchangeFilterFunctionTests { this.authenticationCaptor.capture(), this.attributesCaptor.capture()); assertThat(this.authorizationExceptionCaptor.getValue()) - .isInstanceOfSatisfying(ClientAuthorizationException.class, e -> { + .isInstanceOfSatisfying(ClientAuthorizationException.class, (e) -> { assertThat(e.getClientRegistrationId()).isEqualTo(this.registration.getRegistrationId()); assertThat(e.getError().getErrorCode()).isEqualTo(expectedErrorCode); assertThat(e).hasNoCause(); @@ -756,7 +759,7 @@ public class ServletOAuth2AuthorizedClientExchangeFilterFunctionTests { this.authenticationCaptor.capture(), this.attributesCaptor.capture()); assertThat(this.authorizationExceptionCaptor.getValue()) - .isInstanceOfSatisfying(ClientAuthorizationException.class, e -> { + .isInstanceOfSatisfying(ClientAuthorizationException.class, (e) -> { assertThat(e.getClientRegistrationId()).isEqualTo(this.registration.getRegistrationId()); assertThat(e.getError().getErrorCode()).isEqualTo(OAuth2ErrorCodes.INSUFFICIENT_SCOPE); assertThat(e.getError().getDescription()) @@ -799,7 +802,7 @@ public class ServletOAuth2AuthorizedClientExchangeFilterFunctionTests { WebClientResponseException exception = WebClientResponseException.create(httpStatus.value(), httpStatus.getReasonPhrase(), HttpHeaders.EMPTY, new byte[0], StandardCharsets.UTF_8); - ExchangeFunction throwingExchangeFunction = r -> Mono.error(exception); + ExchangeFunction throwingExchangeFunction = (r) -> Mono.error(exception); this.function.setAuthorizationFailureHandler(this.authorizationFailureHandler); assertThatCode(() -> this.function.filter(request, throwingExchangeFunction).block()).isEqualTo(exception); @@ -808,7 +811,7 @@ public class ServletOAuth2AuthorizedClientExchangeFilterFunctionTests { this.authenticationCaptor.capture(), this.attributesCaptor.capture()); assertThat(this.authorizationExceptionCaptor.getValue()) - .isInstanceOfSatisfying(ClientAuthorizationException.class, e -> { + .isInstanceOfSatisfying(ClientAuthorizationException.class, (e) -> { assertThat(e.getClientRegistrationId()).isEqualTo(this.registration.getRegistrationId()); assertThat(e.getError().getErrorCode()).isEqualTo(expectedErrorCode); assertThat(e).hasCause(exception); @@ -835,7 +838,7 @@ public class ServletOAuth2AuthorizedClientExchangeFilterFunctionTests { OAuth2AuthorizationException authorizationException = new OAuth2AuthorizationException( new OAuth2Error(OAuth2ErrorCodes.INVALID_TOKEN)); - ExchangeFunction throwingExchangeFunction = r -> Mono.error(authorizationException); + ExchangeFunction throwingExchangeFunction = (r) -> Mono.error(authorizationException); this.function.setAuthorizationFailureHandler(this.authorizationFailureHandler); assertThatCode(() -> this.function.filter(request, throwingExchangeFunction).block()) @@ -845,7 +848,7 @@ public class ServletOAuth2AuthorizedClientExchangeFilterFunctionTests { this.authenticationCaptor.capture(), this.attributesCaptor.capture()); assertThat(this.authorizationExceptionCaptor.getValue()) - .isInstanceOfSatisfying(OAuth2AuthorizationException.class, e -> { + .isInstanceOfSatisfying(OAuth2AuthorizationException.class, (e) -> { assertThat(e.getError().getErrorCode()).isEqualTo(authorizationException.getError().getErrorCode()); assertThat(e).hasNoCause(); assertThat(e).hasMessageContaining(OAuth2ErrorCodes.INVALID_TOKEN); diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/DefaultServerOAuth2AuthorizationRequestResolverTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/DefaultServerOAuth2AuthorizationRequestResolverTests.java index 5307448290..a85ef616f4 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/DefaultServerOAuth2AuthorizationRequestResolverTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/DefaultServerOAuth2AuthorizationRequestResolverTests.java @@ -146,8 +146,8 @@ public class DefaultServerOAuth2AuthorizationRequestResolverTests { .willReturn(Mono.just(TestClientRegistrations.clientRegistration().scope(OidcScopes.OPENID).build())); this.resolver.setAuthorizationRequestCustomizer( - customizer -> customizer.additionalParameters(params -> params.remove(OidcParameterNames.NONCE)) - .attributes(attrs -> attrs.remove(OidcParameterNames.NONCE))); + (customizer) -> customizer.additionalParameters((params) -> params.remove(OidcParameterNames.NONCE)) + .attributes((attrs) -> attrs.remove(OidcParameterNames.NONCE))); OAuth2AuthorizationRequest authorizationRequest = resolve("/oauth2/authorization/registration-id"); @@ -164,10 +164,11 @@ public class DefaultServerOAuth2AuthorizationRequestResolverTests { given(this.clientRegistrationRepository.findByRegistrationId(any())) .willReturn(Mono.just(TestClientRegistrations.clientRegistration().scope(OidcScopes.OPENID).build())); - this.resolver.setAuthorizationRequestCustomizer(customizer -> customizer.authorizationRequestUri(uriBuilder -> { - uriBuilder.queryParam("param1", "value1"); - return uriBuilder.build(); - })); + this.resolver + .setAuthorizationRequestCustomizer((customizer) -> customizer.authorizationRequestUri((uriBuilder) -> { + uriBuilder.queryParam("param1", "value1"); + return uriBuilder.build(); + })); OAuth2AuthorizationRequest authorizationRequest = resolve("/oauth2/authorization/registration-id"); @@ -182,7 +183,7 @@ public class DefaultServerOAuth2AuthorizationRequestResolverTests { given(this.clientRegistrationRepository.findByRegistrationId(any())) .willReturn(Mono.just(TestClientRegistrations.clientRegistration().scope(OidcScopes.OPENID).build())); - this.resolver.setAuthorizationRequestCustomizer(customizer -> customizer.parameters(params -> { + this.resolver.setAuthorizationRequestCustomizer((customizer) -> customizer.parameters((params) -> { params.put("appid", params.get("client_id")); params.remove("client_id"); })); diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/OAuth2AuthorizationCodeGrantWebFilterTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/OAuth2AuthorizationCodeGrantWebFilterTests.java index 41d9d22b97..6b1369601a 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/OAuth2AuthorizationCodeGrantWebFilterTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/OAuth2AuthorizationCodeGrantWebFilterTests.java @@ -119,7 +119,7 @@ public class OAuth2AuthorizationCodeGrantWebFilterTests { @Test public void filterWhenNotMatchThenAuthenticationManagerNotCalled() { MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/")); - DefaultWebFilterChain chain = new DefaultWebFilterChain(e -> e.getResponse().setComplete(), + DefaultWebFilterChain chain = new DefaultWebFilterChain((e) -> e.getResponse().setComplete(), Collections.emptyList()); this.filter.filter(exchange, chain).block(); @@ -146,7 +146,7 @@ public class OAuth2AuthorizationCodeGrantWebFilterTests { MockServerHttpRequest authorizationResponse = createAuthorizationResponse(authorizationRequest); MockServerWebExchange exchange = MockServerWebExchange.from(authorizationResponse); - DefaultWebFilterChain chain = new DefaultWebFilterChain(e -> e.getResponse().setComplete(), + DefaultWebFilterChain chain = new DefaultWebFilterChain((e) -> e.getResponse().setComplete(), Collections.emptyList()); this.filter.filter(exchange, chain).block(); @@ -178,7 +178,7 @@ public class OAuth2AuthorizationCodeGrantWebFilterTests { MockServerHttpRequest authorizationResponse = createAuthorizationResponse(authorizationRequest); MockServerWebExchange exchange = MockServerWebExchange.from(authorizationResponse); - DefaultWebFilterChain chain = new DefaultWebFilterChain(e -> e.getResponse().setComplete(), + DefaultWebFilterChain chain = new DefaultWebFilterChain((e) -> e.getResponse().setComplete(), Collections.emptyList()); this.filter.filter(exchange, chain).block(); @@ -216,7 +216,7 @@ public class OAuth2AuthorizationCodeGrantWebFilterTests { MockServerHttpRequest authorizationResponse = createAuthorizationResponse( createAuthorizationRequest(requestUri, parametersNotMatch)); MockServerWebExchange exchange = MockServerWebExchange.from(authorizationResponse); - DefaultWebFilterChain chain = new DefaultWebFilterChain(e -> e.getResponse().setComplete(), + DefaultWebFilterChain chain = new DefaultWebFilterChain((e) -> e.getResponse().setComplete(), Collections.emptyList()); this.filter.filter(exchange, chain).block(); @@ -260,7 +260,7 @@ public class OAuth2AuthorizationCodeGrantWebFilterTests { MockServerHttpRequest authorizationResponse = createAuthorizationResponse(authorizationRequest); MockServerWebExchange exchange = MockServerWebExchange.from(authorizationResponse); - DefaultWebFilterChain chain = new DefaultWebFilterChain(e -> e.getResponse().setComplete(), + DefaultWebFilterChain chain = new DefaultWebFilterChain((e) -> e.getResponse().setComplete(), Collections.emptyList()); ServerRequestCache requestCache = mock(ServerRequestCache.class); @@ -291,12 +291,12 @@ public class OAuth2AuthorizationCodeGrantWebFilterTests { MockServerHttpRequest authorizationResponse = createAuthorizationResponse(authorizationRequest); MockServerWebExchange exchange = MockServerWebExchange.from(authorizationResponse); - DefaultWebFilterChain chain = new DefaultWebFilterChain(e -> e.getResponse().setComplete(), + DefaultWebFilterChain chain = new DefaultWebFilterChain((e) -> e.getResponse().setComplete(), Collections.emptyList()); assertThatThrownBy(() -> this.filter.filter(exchange, chain).block()) .isInstanceOf(OAuth2AuthenticationException.class) - .extracting(ex -> ((OAuth2AuthenticationException) ex).getError()).extracting("errorCode") + .extracting((ex) -> ((OAuth2AuthenticationException) ex).getError()).extracting("errorCode") .isEqualTo("client_registration_not_found"); verifyNoInteractions(this.authenticationManager); } @@ -320,12 +320,12 @@ public class OAuth2AuthorizationCodeGrantWebFilterTests { MockServerHttpRequest authorizationResponse = createAuthorizationResponse(authorizationRequest); MockServerWebExchange exchange = MockServerWebExchange.from(authorizationResponse); - DefaultWebFilterChain chain = new DefaultWebFilterChain(e -> e.getResponse().setComplete(), + DefaultWebFilterChain chain = new DefaultWebFilterChain((e) -> e.getResponse().setComplete(), Collections.emptyList()); assertThatThrownBy(() -> this.filter.filter(exchange, chain).block()) .isInstanceOf(OAuth2AuthenticationException.class) - .extracting(ex -> ((OAuth2AuthenticationException) ex).getError()).extracting("errorCode") + .extracting((ex) -> ((OAuth2AuthenticationException) ex).getError()).extracting("errorCode") .isEqualTo("authorization_error"); } diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/OAuth2AuthorizationRequestRedirectWebFilterTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/OAuth2AuthorizationRequestRedirectWebFilterTests.java index 41852e6ff3..b18bd9442b 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/OAuth2AuthorizationRequestRedirectWebFilterTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/OAuth2AuthorizationRequestRedirectWebFilterTests.java @@ -69,7 +69,7 @@ public class OAuth2AuthorizationRequestRedirectWebFilterTests { public void setup() { this.filter = new OAuth2AuthorizationRequestRedirectWebFilter(this.clientRepository); this.filter.setAuthorizationRequestRepository(this.authzRequestRepository); - FilteringWebHandler webHandler = new FilteringWebHandler(e -> e.getResponse().setComplete(), + FilteringWebHandler webHandler = new FilteringWebHandler((e) -> e.getResponse().setComplete(), Arrays.asList(this.filter)); this.client = WebTestClient.bindToWebHandler(webHandler).build(); @@ -125,7 +125,7 @@ public class OAuth2AuthorizationRequestRedirectWebFilterTests { @Test public void filterWhenExceptionThenRedirected() { FilteringWebHandler webHandler = new FilteringWebHandler( - e -> Mono.error(new ClientAuthorizationRequiredException(this.registration.getRegistrationId())), + (e) -> Mono.error(new ClientAuthorizationRequiredException(this.registration.getRegistrationId())), Arrays.asList(this.filter)); this.client = WebTestClient.bindToWebHandler(webHandler).build(); FluxExchangeResult result = this.client.get().uri("https://example.com/foo").exchange().expectStatus() @@ -137,7 +137,7 @@ public class OAuth2AuthorizationRequestRedirectWebFilterTests { this.filter.setRequestCache(this.requestCache); given(this.requestCache.saveRequest(any())).willReturn(Mono.empty()); FilteringWebHandler webHandler = new FilteringWebHandler( - e -> Mono.error(new ClientAuthorizationRequiredException(this.registration.getRegistrationId())), + (e) -> Mono.error(new ClientAuthorizationRequiredException(this.registration.getRegistrationId())), Arrays.asList(this.filter)); this.client = WebTestClient.bindToWebHandler(webHandler).build(); this.client.get().uri("https://example.com/foo").exchange().expectStatus().is3xxRedirection() diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/WebSessionOAuth2ServerAuthorizationRequestRepositoryTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/WebSessionOAuth2ServerAuthorizationRequestRepositoryTests.java index ddb447c74c..4b027dac97 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/WebSessionOAuth2ServerAuthorizationRequestRepositoryTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/WebSessionOAuth2ServerAuthorizationRequestRepositoryTests.java @@ -75,7 +75,7 @@ public class WebSessionOAuth2ServerAuthorizationRequestRepositoryTests { @Test public void loadAuthorizationRequestWhenSessionAndNoRequestThenEmpty() { Mono setAttrThenLoad = this.exchange.getSession().map(WebSession::getAttributes) - .doOnNext(attrs -> attrs.put("foo", "bar")) + .doOnNext((attrs) -> attrs.put("foo", "bar")) .then(this.repository.loadAuthorizationRequest(this.exchange)); StepVerifier.create(setAttrThenLoad).verifyComplete(); @@ -109,7 +109,7 @@ public class WebSessionOAuth2ServerAuthorizationRequestRepositoryTests { .authorizationUri("https://example.com/oauth2/authorize").clientId("client-id") .redirectUri("http://localhost/client-1").state(oldState).build(); - WebSessionManager sessionManager = e -> this.exchange.getSession(); + WebSessionManager sessionManager = (e) -> this.exchange.getSession(); this.exchange = new DefaultServerWebExchange(this.exchange.getRequest(), new MockServerHttpResponse(), sessionManager, ServerCodecConfigurer.create(), new AcceptHeaderLocaleContextResolver()); @@ -192,7 +192,7 @@ public class WebSessionOAuth2ServerAuthorizationRequestRepositoryTests { .authorizationUri("https://example.com/oauth2/authorize").clientId("client-id") .redirectUri("http://localhost/client-1").state(oldState).build(); - WebSessionManager sessionManager = e -> this.exchange.getSession(); + WebSessionManager sessionManager = (e) -> this.exchange.getSession(); this.exchange = new DefaultServerWebExchange(this.exchange.getRequest(), new MockServerHttpResponse(), sessionManager, ServerCodecConfigurer.create(), new AcceptHeaderLocaleContextResolver()); @@ -226,7 +226,7 @@ public class WebSessionOAuth2ServerAuthorizationRequestRepositoryTests { Map sessionAttrs = spy(new HashMap<>()); WebSession session = mock(WebSession.class); given(session.getAttributes()).willReturn(sessionAttrs); - WebSessionManager sessionManager = e -> Mono.just(session); + WebSessionManager sessionManager = (e) -> Mono.just(session); this.exchange = new DefaultServerWebExchange(this.exchange.getRequest(), new MockServerHttpResponse(), sessionManager, ServerCodecConfigurer.create(), new AcceptHeaderLocaleContextResolver()); diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/authentication/OAuth2LoginAuthenticationWebFilterTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/authentication/OAuth2LoginAuthenticationWebFilterTests.java index 64dfebf040..5f262d97f6 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/authentication/OAuth2LoginAuthenticationWebFilterTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/authentication/OAuth2LoginAuthenticationWebFilterTests.java @@ -74,7 +74,7 @@ public class OAuth2LoginAuthenticationWebFilterTests { this.filter = new OAuth2LoginAuthenticationWebFilter(this.authenticationManager, this.authorizedClientRepository); this.webFilterExchange = new WebFilterExchange(MockServerWebExchange.from(MockServerHttpRequest.get("/")), - new DefaultWebFilterChain(exchange -> exchange.getResponse().setComplete())); + new DefaultWebFilterChain((exchange) -> exchange.getResponse().setComplete())); given(this.authorizedClientRepository.saveAuthorizedClient(any(), any(), any())).willReturn(Mono.empty()); } diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/OAuth2AuthorizationRequest.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/OAuth2AuthorizationRequest.java index bab9ec52d7..b86c189a65 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/OAuth2AuthorizationRequest.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/OAuth2AuthorizationRequest.java @@ -245,14 +245,14 @@ public final class OAuth2AuthorizationRequest implements Serializable { private Map additionalParameters = new LinkedHashMap<>(); - private Consumer> parametersConsumer = params -> { + private Consumer> parametersConsumer = (params) -> { }; private Map attributes = new LinkedHashMap<>(); private String authorizationRequestUri; - private Function authorizationRequestUriFunction = builder -> builder.build(); + private Function authorizationRequestUriFunction = (builder) -> builder.build(); private final DefaultUriBuilderFactory uriBuilderFactory; diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/http/converter/OAuth2AccessTokenResponseHttpMessageConverter.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/http/converter/OAuth2AccessTokenResponseHttpMessageConverter.java index 54affc9e7f..f714634822 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/http/converter/OAuth2AccessTokenResponseHttpMessageConverter.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/http/converter/OAuth2AccessTokenResponseHttpMessageConverter.java @@ -80,7 +80,7 @@ public class OAuth2AccessTokenResponseHttpMessageConverter Map tokenResponseParameters = (Map) this.jsonMessageConverter .read(PARAMETERIZED_RESPONSE_TYPE.getType(), null, inputMessage); return this.tokenResponseConverter.convert(tokenResponseParameters.entrySet().stream() - .collect(Collectors.toMap(Map.Entry::getKey, entry -> String.valueOf(entry.getValue())))); + .collect(Collectors.toMap(Map.Entry::getKey, (entry) -> String.valueOf(entry.getValue())))); } catch (Exception ex) { throw new HttpMessageNotReadableException( diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/http/converter/OAuth2ErrorHttpMessageConverter.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/http/converter/OAuth2ErrorHttpMessageConverter.java index 5ea6e7edcc..9ed1069af5 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/http/converter/OAuth2ErrorHttpMessageConverter.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/http/converter/OAuth2ErrorHttpMessageConverter.java @@ -79,7 +79,7 @@ public class OAuth2ErrorHttpMessageConverter extends AbstractHttpMessageConverte Map errorParameters = (Map) this.jsonMessageConverter .read(PARAMETERIZED_RESPONSE_TYPE.getType(), null, inputMessage); return this.errorConverter.convert(errorParameters.entrySet().stream() - .collect(Collectors.toMap(Map.Entry::getKey, entry -> String.valueOf(entry.getValue())))); + .collect(Collectors.toMap(Map.Entry::getKey, (entry) -> String.valueOf(entry.getValue())))); } catch (Exception ex) { throw new HttpMessageNotReadableException( diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/web/reactive/function/OAuth2AccessTokenResponseBodyExtractor.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/web/reactive/function/OAuth2AccessTokenResponseBodyExtractor.java index 00462bd2e0..3eaf03d205 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/web/reactive/function/OAuth2AccessTokenResponseBodyExtractor.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/web/reactive/function/OAuth2AccessTokenResponseBodyExtractor.java @@ -62,7 +62,7 @@ class OAuth2AccessTokenResponseBodyExtractor }; BodyExtractor>, ReactiveHttpInputMessage> delegate = BodyExtractors.toMono(type); return delegate.extract(inputMessage, context) - .onErrorMap(e -> new OAuth2AuthorizationException( + .onErrorMap((e) -> new OAuth2AuthorizationException( invalidTokenResponse("An error occurred parsing the Access Token response: " + e.getMessage()), e)) .switchIfEmpty(Mono.error(() -> new OAuth2AuthorizationException( diff --git a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/converter/ClaimTypeConverterTests.java b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/converter/ClaimTypeConverterTests.java index 9a06a8407b..c295fa2694 100644 --- a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/converter/ClaimTypeConverterTests.java +++ b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/converter/ClaimTypeConverterTests.java @@ -84,7 +84,8 @@ public class ClaimTypeConverterTests { private static Converter getConverter(TypeDescriptor targetDescriptor) { final TypeDescriptor sourceDescriptor = TypeDescriptor.valueOf(Object.class); - return source -> ClaimConversionService.getSharedInstance().convert(source, sourceDescriptor, targetDescriptor); + return (source) -> ClaimConversionService.getSharedInstance().convert(source, sourceDescriptor, + targetDescriptor); } @Test diff --git a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/OAuth2AuthorizationRequestTests.java b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/OAuth2AuthorizationRequestTests.java index e716082f58..e6c64edd15 100644 --- a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/OAuth2AuthorizationRequestTests.java +++ b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/OAuth2AuthorizationRequestTests.java @@ -165,7 +165,7 @@ public class OAuth2AuthorizationRequestTests { public void buildWhenAuthorizationRequestUriFunctionSetThenOverridesDefault() { OAuth2AuthorizationRequest authorizationRequest = OAuth2AuthorizationRequest.authorizationCode() .authorizationUri(AUTHORIZATION_URI).clientId(CLIENT_ID).redirectUri(REDIRECT_URI).scopes(SCOPES) - .state(STATE).authorizationRequestUri(uriBuilder -> URI.create(AUTHORIZATION_URI)).build(); + .state(STATE).authorizationRequestUri((uriBuilder) -> URI.create(AUTHORIZATION_URI)).build(); assertThat(authorizationRequest.getAuthorizationRequestUri()).isEqualTo(AUTHORIZATION_URI); } diff --git a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/oidc/OidcIdTokenBuilderTests.java b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/oidc/OidcIdTokenBuilderTests.java index 07ba4d5834..dc9b96c0cf 100644 --- a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/oidc/OidcIdTokenBuilderTests.java +++ b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/oidc/OidcIdTokenBuilderTests.java @@ -97,7 +97,7 @@ public class OidcIdTokenBuilderTests { public void claimsWhenRemovingAClaimThenIsNotPresent() { OidcIdToken.Builder idTokenBuilder = OidcIdToken.withTokenValue("token").claim("needs", "a claim"); - OidcIdToken idToken = idTokenBuilder.subject("sub").claims(claims -> claims.remove(IdTokenClaimNames.SUB)) + OidcIdToken idToken = idTokenBuilder.subject("sub").claims((claims) -> claims.remove(IdTokenClaimNames.SUB)) .build(); assertThat(idToken.getSubject()).isNull(); } @@ -108,7 +108,7 @@ public class OidcIdTokenBuilderTests { String name = new String("name"); String value = new String("value"); - OidcIdToken idToken = idTokenBuilder.claims(claims -> claims.put(name, value)).build(); + OidcIdToken idToken = idTokenBuilder.claims((claims) -> claims.put(name, value)).build(); assertThat(idToken.getClaims()).hasSize(1); assertThat(idToken.getClaims().get(name)).isSameAs(value); diff --git a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/oidc/OidcUserInfoBuilderTests.java b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/oidc/OidcUserInfoBuilderTests.java index 84bdf7f5e9..fe5a579734 100644 --- a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/oidc/OidcUserInfoBuilderTests.java +++ b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/oidc/OidcUserInfoBuilderTests.java @@ -59,7 +59,7 @@ public class OidcUserInfoBuilderTests { public void claimsWhenRemovingAClaimThenIsNotPresent() { OidcUserInfo.Builder userInfoBuilder = OidcUserInfo.builder().claim("needs", "a claim"); - OidcUserInfo userInfo = userInfoBuilder.subject("sub").claims(claims -> claims.remove(IdTokenClaimNames.SUB)) + OidcUserInfo userInfo = userInfoBuilder.subject("sub").claims((claims) -> claims.remove(IdTokenClaimNames.SUB)) .build(); assertThat(userInfo.getSubject()).isNull(); } @@ -70,7 +70,7 @@ public class OidcUserInfoBuilderTests { String name = new String("name"); String value = new String("value"); - OidcUserInfo userInfo = userInfoBuilder.claims(claims -> claims.put(name, value)).build(); + OidcUserInfo userInfo = userInfoBuilder.claims((claims) -> claims.put(name, value)).build(); assertThat(userInfo.getClaims()).hasSize(1); assertThat(userInfo.getClaims().get(name)).isSameAs(value); diff --git a/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/MappedJwtClaimSetConverter.java b/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/MappedJwtClaimSetConverter.java index b59cdfd2f8..d5c6c23670 100644 --- a/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/MappedJwtClaimSetConverter.java +++ b/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/MappedJwtClaimSetConverter.java @@ -112,7 +112,7 @@ public final class MappedJwtClaimSetConverter implements Converter getConverter(TypeDescriptor targetDescriptor) { - return source -> CONVERSION_SERVICE.convert(source, OBJECT_TYPE_DESCRIPTOR, targetDescriptor); + return (source) -> CONVERSION_SERVICE.convert(source, OBJECT_TYPE_DESCRIPTOR, targetDescriptor); } private static Instant convertInstant(Object source) { diff --git a/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoder.java b/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoder.java index c15da7031a..aa76a21151 100644 --- a/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoder.java +++ b/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoder.java @@ -149,7 +149,7 @@ public final class NimbusJwtDecoder implements JwtDecoder { Map headers = new LinkedHashMap<>(parsedJwt.getHeader().toJSONObject()); Map claims = this.claimSetConverter.convert(jwtClaimsSet.getClaims()); - return Jwt.withTokenValue(token).headers(h -> h.putAll(headers)).claims(c -> c.putAll(claims)).build(); + return Jwt.withTokenValue(token).headers((h) -> h.putAll(headers)).claims((c) -> c.putAll(claims)).build(); } catch (RemoteKeySourceException ex) { if (ex.getCause() instanceof ParseException) { diff --git a/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/NimbusReactiveJwtDecoder.java b/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/NimbusReactiveJwtDecoder.java index 740e5e0307..fa457aa1e2 100644 --- a/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/NimbusReactiveJwtDecoder.java +++ b/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/NimbusReactiveJwtDecoder.java @@ -159,9 +159,10 @@ public final class NimbusReactiveJwtDecoder implements ReactiveJwtDecoder { private Mono decode(JWT parsedToken) { try { - return this.jwtProcessor.convert(parsedToken).map(set -> createJwt(parsedToken, set)).map(this::validateJwt) - .onErrorMap(e -> !(e instanceof IllegalStateException) && !(e instanceof JwtException), - e -> new JwtException("An error occurred while attempting to decode the Jwt: ", e)); + return this.jwtProcessor.convert(parsedToken).map((set) -> createJwt(parsedToken, set)) + .map(this::validateJwt) + .onErrorMap((e) -> !(e instanceof IllegalStateException) && !(e instanceof JwtException), + (e) -> new JwtException("An error occurred while attempting to decode the Jwt: ", e)); } catch (JwtException ex) { throw ex; @@ -176,8 +177,8 @@ public final class NimbusReactiveJwtDecoder implements ReactiveJwtDecoder { Map headers = new LinkedHashMap<>(parsedJwt.getHeader().toJSONObject()); Map claims = this.claimSetConverter.convert(jwtClaimsSet.getClaims()); - return Jwt.withTokenValue(parsedJwt.getParsedString()).headers(h -> h.putAll(headers)) - .claims(c -> c.putAll(claims)).build(); + return Jwt.withTokenValue(parsedJwt.getParsedString()).headers((h) -> h.putAll(headers)) + .claims((c) -> c.putAll(claims)).build(); } catch (Exception ex) { throw new BadJwtException("An error occurred while attempting to decode the Jwt: " + ex.getMessage(), ex); @@ -376,10 +377,10 @@ public final class NimbusReactiveJwtDecoder implements ReactiveJwtDecoder { source.setWebClient(this.webClient); Function expectedJwsAlgorithms = getExpectedJwsAlgorithms(jwsKeySelector); - return jwt -> { + return (jwt) -> { JWKSelector selector = createSelector(expectedJwsAlgorithms, jwt.getHeader()); - return source.get(selector).onErrorMap(e -> new IllegalStateException("Could not obtain the keys", e)) - .map(jwkList -> createClaimsSet(jwtProcessor, jwt, new JWKSecurityContext(jwkList))); + return source.get(selector).onErrorMap((e) -> new IllegalStateException("Could not obtain the keys", e)) + .map((jwkList) -> createClaimsSet(jwtProcessor, jwt, new JWKSecurityContext(jwkList))); }; } @@ -478,7 +479,7 @@ public final class NimbusReactiveJwtDecoder implements ReactiveJwtDecoder { this.jwtProcessorCustomizer.accept(jwtProcessor); - return jwt -> Mono.just(createClaimsSet(jwtProcessor, jwt, null)); + return (jwt) -> Mono.just(createClaimsSet(jwtProcessor, jwt, null)); } } @@ -556,7 +557,7 @@ public final class NimbusReactiveJwtDecoder implements ReactiveJwtDecoder { this.jwtProcessorCustomizer.accept(jwtProcessor); - return jwt -> Mono.just(createClaimsSet(jwtProcessor, jwt, null)); + return (jwt) -> Mono.just(createClaimsSet(jwtProcessor, jwt, null)); } } @@ -628,11 +629,11 @@ public final class NimbusReactiveJwtDecoder implements ReactiveJwtDecoder { this.jwtProcessorCustomizer.accept(jwtProcessor); - return jwt -> { + return (jwt) -> { if (jwt instanceof SignedJWT) { return this.jwkSource.apply((SignedJWT) jwt) - .onErrorMap(e -> new IllegalStateException("Could not obtain the keys", e)).collectList() - .map(jwks -> createClaimsSet(jwtProcessor, jwt, new JWKSecurityContext(jwks))); + .onErrorMap((e) -> new IllegalStateException("Could not obtain the keys", e)).collectList() + .map((jwks) -> createClaimsSet(jwtProcessor, jwt, new JWKSecurityContext(jwks))); } throw new BadJwtException("Unsupported algorithm of " + jwt.getHeader().getAlgorithm()); }; diff --git a/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/ReactiveRemoteJWKSource.java b/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/ReactiveRemoteJWKSource.java index bb2e249598..8ee61a32f8 100644 --- a/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/ReactiveRemoteJWKSource.java +++ b/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/ReactiveRemoteJWKSource.java @@ -55,8 +55,8 @@ class ReactiveRemoteJWKSource implements ReactiveJWKSource { @Override public Mono> get(JWKSelector jwkSelector) { return this.cachedJWKSet.get().switchIfEmpty(Mono.defer(() -> getJWKSet())) - .flatMap(jwkSet -> get(jwkSelector, jwkSet)) - .switchIfEmpty(Mono.defer(() -> getJWKSet().map(jwkSet -> jwkSelector.select(jwkSet)))); + .flatMap((jwkSet) -> get(jwkSelector, jwkSet)) + .switchIfEmpty(Mono.defer(() -> getJWKSet().map((jwkSet) -> jwkSelector.select(jwkSet)))); } private Mono> get(JWKSelector jwkSelector, JWKSet jwkSet) { @@ -96,7 +96,7 @@ class ReactiveRemoteJWKSource implements ReactiveJWKSource { */ private Mono getJWKSet() { return this.webClient.get().uri(this.jwkSetURL).retrieve().bodyToMono(String.class).map(this::parse) - .doOnNext(jwkSet -> this.cachedJWKSet.set(Mono.just(jwkSet))).cache(); + .doOnNext((jwkSet) -> this.cachedJWKSet.set(Mono.just(jwkSet))).cache(); } private JWKSet parse(String body) { diff --git a/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/JwtBuilderTests.java b/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/JwtBuilderTests.java index 39db3c7598..d91c78a928 100644 --- a/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/JwtBuilderTests.java +++ b/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/JwtBuilderTests.java @@ -105,7 +105,7 @@ public class JwtBuilderTests { public void claimsWhenRemovingAClaimThenIsNotPresent() { Jwt.Builder jwtBuilder = Jwt.withTokenValue("token").claim("needs", "a claim").header("needs", "a header"); - Jwt jwt = jwtBuilder.subject("sub").claims(claims -> claims.remove(JwtClaimNames.SUB)).build(); + Jwt jwt = jwtBuilder.subject("sub").claims((claims) -> claims.remove(JwtClaimNames.SUB)).build(); assertThat(jwt.getSubject()).isNull(); } @@ -115,7 +115,7 @@ public class JwtBuilderTests { String name = new String("name"); String value = new String("value"); - Jwt jwt = jwtBuilder.claims(claims -> claims.put(name, value)).build(); + Jwt jwt = jwtBuilder.claims((claims) -> claims.put(name, value)).build(); assertThat(jwt.getClaims()).hasSize(1); assertThat(jwt.getClaims().get(name)).isSameAs(value); @@ -125,7 +125,7 @@ public class JwtBuilderTests { public void headersWhenRemovingAClaimThenIsNotPresent() { Jwt.Builder jwtBuilder = Jwt.withTokenValue("token").claim("needs", "a claim").header("needs", "a header"); - Jwt jwt = jwtBuilder.header("alg", "none").headers(headers -> headers.remove("alg")).build(); + Jwt jwt = jwtBuilder.header("alg", "none").headers((headers) -> headers.remove("alg")).build(); assertThat(jwt.getHeaders().get("alg")).isNull(); } @@ -135,7 +135,7 @@ public class JwtBuilderTests { String name = new String("name"); String value = new String("value"); - Jwt jwt = jwtBuilder.headers(headers -> headers.put(name, value)).build(); + Jwt jwt = jwtBuilder.headers((headers) -> headers.put(name, value)).build(); assertThat(jwt.getHeaders()).hasSize(1); assertThat(jwt.getHeaders().get(name)).isSameAs(value); diff --git a/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/JwtClaimValidatorTests.java b/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/JwtClaimValidatorTests.java index cb9881c168..26e60fed35 100644 --- a/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/JwtClaimValidatorTests.java +++ b/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/JwtClaimValidatorTests.java @@ -32,7 +32,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; */ public class JwtClaimValidatorTests { - private static final Predicate test = claim -> claim.equals("http://test"); + private static final Predicate test = (claim) -> claim.equals("http://test"); private final JwtClaimValidator validator = new JwtClaimValidator<>(JwtClaimNames.ISS, test); diff --git a/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/JwtTimestampValidatorTests.java b/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/JwtTimestampValidatorTests.java index ef3d6f8f4e..cba1158652 100644 --- a/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/JwtTimestampValidatorTests.java +++ b/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/JwtTimestampValidatorTests.java @@ -129,7 +129,7 @@ public class JwtTimestampValidatorTests { @Test public void validateWhenNeitherExpiryNorNotBeforeIsSpecifiedThenReturnsSuccessfulResult() { - Jwt jwt = TestJwts.jwt().claims(c -> c.remove(JwtClaimNames.EXP)).build(); + Jwt jwt = TestJwts.jwt().claims((c) -> c.remove(JwtClaimNames.EXP)).build(); JwtTimestampValidator jwtValidator = new JwtTimestampValidator(); assertThat(jwtValidator.validate(jwt).hasErrors()).isFalse(); @@ -137,7 +137,7 @@ public class JwtTimestampValidatorTests { @Test public void validateWhenNotBeforeIsValidAndExpiryIsNotSpecifiedThenReturnsSuccessfulResult() { - Jwt jwt = TestJwts.jwt().claims(c -> c.remove(JwtClaimNames.EXP)).notBefore(Instant.MIN).build(); + Jwt jwt = TestJwts.jwt().claims((c) -> c.remove(JwtClaimNames.EXP)).notBefore(Instant.MIN).build(); JwtTimestampValidator jwtValidator = new JwtTimestampValidator(); assertThat(jwtValidator.validate(jwt).hasErrors()).isFalse(); diff --git a/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderJwkSupportTests.java b/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderJwkSupportTests.java index f1fa57de9b..18a4a00aa2 100644 --- a/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderJwkSupportTests.java +++ b/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderJwkSupportTests.java @@ -104,7 +104,7 @@ public class NimbusJwtDecoderJwkSupportTests { public void decodeWhenExpClaimNullThenDoesNotThrowException() { NimbusJwtDecoderJwkSupport jwtDecoder = new NimbusJwtDecoderJwkSupport(JWK_SET_URL); jwtDecoder.setRestOperations(mockJwkSetResponse(JWK_SET)); - jwtDecoder.setClaimSetConverter(map -> { + jwtDecoder.setClaimSetConverter((map) -> { Map claims = new HashMap<>(map); claims.remove(JwtClaimNames.EXP); return claims; diff --git a/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderTests.java b/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderTests.java index ce12e04584..32b04cc858 100644 --- a/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderTests.java +++ b/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderTests.java @@ -360,7 +360,7 @@ public class NimbusJwtDecoderTests { NimbusJwtDecoder decoder = NimbusJwtDecoder.withPublicKey(publicKey) .signatureAlgorithm(SignatureAlgorithm.RS256) .jwtProcessorCustomizer( - p -> p.setJWSTypeVerifier(new DefaultJOSEObjectTypeVerifier<>(new JOSEObjectType("JWS")))) + (p) -> p.setJWSTypeVerifier(new DefaultJOSEObjectTypeVerifier<>(new JOSEObjectType("JWS")))) .build(); assertThat(decoder.decode(signedJwt.serialize()).containsClaim(JwtClaimNames.EXP)).isNotNull(); } @@ -429,7 +429,7 @@ public class NimbusJwtDecoderTests { SignedJWT signedJwt = signedJwt(secretKey, header, claimsSet); NimbusJwtDecoder decoder = NimbusJwtDecoder.withSecretKey(secretKey).macAlgorithm(MacAlgorithm.HS256) .jwtProcessorCustomizer( - p -> p.setJWSTypeVerifier(new DefaultJOSEObjectTypeVerifier<>(new JOSEObjectType("JWS")))) + (p) -> p.setJWSTypeVerifier(new DefaultJOSEObjectTypeVerifier<>(new JOSEObjectType("JWS")))) .build(); assertThat(decoder.decode(signedJwt.serialize()).containsClaim(JwtClaimNames.EXP)).isNotNull(); } @@ -541,7 +541,7 @@ public class NimbusJwtDecoderTests { .willReturn(new ResponseEntity<>(JWK_SET, HttpStatus.OK)); NimbusJwtDecoder jwtDecoder = NimbusJwtDecoder.withJwkSetUri(JWK_SET_URI).restOperations(restOperations) .jwtProcessorCustomizer( - p -> p.setJWSTypeVerifier(new DefaultJOSEObjectTypeVerifier<>(new JOSEObjectType("JWS")))) + (p) -> p.setJWSTypeVerifier(new DefaultJOSEObjectTypeVerifier<>(new JOSEObjectType("JWS")))) .build(); assertThatCode(() -> jwtDecoder.decode(SIGNED_JWT)).isInstanceOf(BadJwtException.class).hasMessageContaining( "An error occurred while attempting to decode the Jwt: Required JOSE header \"typ\" (type) parameter is missing"); diff --git a/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusReactiveJwtDecoderTests.java b/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusReactiveJwtDecoderTests.java index 7449f4381f..fb9906cffc 100644 --- a/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusReactiveJwtDecoderTests.java +++ b/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusReactiveJwtDecoderTests.java @@ -308,7 +308,7 @@ public class NimbusReactiveJwtDecoderTests { WebClient webClient = mockJwkSetResponse(this.jwkSet); NimbusReactiveJwtDecoder decoder = NimbusReactiveJwtDecoder.withJwkSetUri(this.jwkSetUri).webClient(webClient) .jwtProcessorCustomizer( - p -> p.setJWSTypeVerifier(new DefaultJOSEObjectTypeVerifier<>(new JOSEObjectType("JWS")))) + (p) -> p.setJWSTypeVerifier(new DefaultJOSEObjectTypeVerifier<>(new JOSEObjectType("JWS")))) .build(); assertThatCode(() -> decoder.decode(this.messageReadToken).block()).isInstanceOf(BadJwtException.class) .hasRootCauseMessage("Required JOSE header \"typ\" (type) parameter is missing"); @@ -357,7 +357,7 @@ public class NimbusReactiveJwtDecoderTests { public void withPublicKeyWhenUsingCustomTypeHeaderThenRefuseOmittedType() throws Exception { NimbusReactiveJwtDecoder decoder = NimbusReactiveJwtDecoder.withPublicKey(key()) .jwtProcessorCustomizer( - p -> p.setJWSTypeVerifier(new DefaultJOSEObjectTypeVerifier<>(new JOSEObjectType("JWS")))) + (p) -> p.setJWSTypeVerifier(new DefaultJOSEObjectTypeVerifier<>(new JOSEObjectType("JWS")))) .build(); AssertionsForClassTypes.assertThatCode(() -> decoder.decode(this.rsa256).block()) @@ -372,16 +372,15 @@ public class NimbusReactiveJwtDecoderTests { @Test public void withJwkSourceWhenJwtProcessorCustomizerNullThenThrowsIllegalArgumentException() { - assertThatCode( - () -> NimbusReactiveJwtDecoder.withJwkSource(jwt -> Flux.empty()).jwtProcessorCustomizer(null).build()) - .isInstanceOf(IllegalArgumentException.class) + assertThatCode(() -> NimbusReactiveJwtDecoder.withJwkSource((jwt) -> Flux.empty()).jwtProcessorCustomizer(null) + .build()).isInstanceOf(IllegalArgumentException.class) .hasMessage("jwtProcessorCustomizer cannot be null"); } @Test public void decodeWhenCustomJwkSourceResolutionThenDecodes() { NimbusReactiveJwtDecoder decoder = NimbusReactiveJwtDecoder - .withJwkSource(jwt -> Flux.fromIterable(parseJWKSet(this.jwkSet).getKeys())).build(); + .withJwkSource((jwt) -> Flux.fromIterable(parseJWKSet(this.jwkSet).getKeys())).build(); assertThat(decoder.decode(this.messageReadToken).block()).extracting(Jwt::getExpiresAt).isNotNull(); } @@ -389,9 +388,9 @@ public class NimbusReactiveJwtDecoderTests { // gh-8730 @Test public void withJwkSourceWhenUsingCustomTypeHeaderThenRefuseOmittedType() { - NimbusReactiveJwtDecoder decoder = NimbusReactiveJwtDecoder.withJwkSource(jwt -> Flux.empty()) + NimbusReactiveJwtDecoder decoder = NimbusReactiveJwtDecoder.withJwkSource((jwt) -> Flux.empty()) .jwtProcessorCustomizer( - p -> p.setJWSTypeVerifier(new DefaultJOSEObjectTypeVerifier<>(new JOSEObjectType("JWS")))) + (p) -> p.setJWSTypeVerifier(new DefaultJOSEObjectTypeVerifier<>(new JOSEObjectType("JWS")))) .build(); assertThatCode(() -> decoder.decode(this.messageReadToken).block()).isInstanceOf(BadJwtException.class) @@ -437,7 +436,7 @@ public class NimbusReactiveJwtDecoderTests { SecretKey secretKey = TestKeys.DEFAULT_SECRET_KEY; NimbusReactiveJwtDecoder decoder = NimbusReactiveJwtDecoder.withSecretKey(secretKey) .jwtProcessorCustomizer( - p -> p.setJWSTypeVerifier(new DefaultJOSEObjectTypeVerifier<>(new JOSEObjectType("JWS")))) + (p) -> p.setJWSTypeVerifier(new DefaultJOSEObjectTypeVerifier<>(new JOSEObjectType("JWS")))) .build(); assertThatCode(() -> decoder.decode(this.messageReadToken).block()).isInstanceOf(BadJwtException.class) .hasRootCauseMessage("Required JOSE header \"typ\" (type) parameter is missing"); diff --git a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/BearerTokenError.java b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/BearerTokenError.java index 59fe9f399c..0fa0463d5c 100644 --- a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/BearerTokenError.java +++ b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/BearerTokenError.java @@ -89,22 +89,22 @@ public final class BearerTokenError extends OAuth2Error { } private static boolean isDescriptionValid(String description) { - return description == null || description.chars().allMatch(c -> withinTheRangeOf(c, 0x20, 0x21) + return description == null || description.chars().allMatch((c) -> withinTheRangeOf(c, 0x20, 0x21) || withinTheRangeOf(c, 0x23, 0x5B) || withinTheRangeOf(c, 0x5D, 0x7E)); } private static boolean isErrorCodeValid(String errorCode) { - return errorCode.chars().allMatch(c -> withinTheRangeOf(c, 0x20, 0x21) || withinTheRangeOf(c, 0x23, 0x5B) + return errorCode.chars().allMatch((c) -> withinTheRangeOf(c, 0x20, 0x21) || withinTheRangeOf(c, 0x23, 0x5B) || withinTheRangeOf(c, 0x5D, 0x7E)); } private static boolean isErrorUriValid(String errorUri) { return errorUri == null || errorUri.chars() - .allMatch(c -> c == 0x21 || withinTheRangeOf(c, 0x23, 0x5B) || withinTheRangeOf(c, 0x5D, 0x7E)); + .allMatch((c) -> c == 0x21 || withinTheRangeOf(c, 0x23, 0x5B) || withinTheRangeOf(c, 0x5D, 0x7E)); } private static boolean isScopeValid(String scope) { - return scope == null || scope.chars().allMatch(c -> withinTheRangeOf(c, 0x20, 0x21) + return scope == null || scope.chars().allMatch((c) -> withinTheRangeOf(c, 0x20, 0x21) || withinTheRangeOf(c, 0x23, 0x5B) || withinTheRangeOf(c, 0x5D, 0x7E)); } diff --git a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/JwtIssuerAuthenticationManagerResolver.java b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/JwtIssuerAuthenticationManagerResolver.java index 9ae5945975..0542792f01 100644 --- a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/JwtIssuerAuthenticationManagerResolver.java +++ b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/JwtIssuerAuthenticationManagerResolver.java @@ -162,7 +162,7 @@ public final class JwtIssuerAuthenticationManagerResolver implements Authenticat @Override public AuthenticationManager resolve(String issuer) { if (this.trustedIssuer.test(issuer)) { - return this.authenticationManagers.computeIfAbsent(issuer, k -> { + return this.authenticationManagers.computeIfAbsent(issuer, (k) -> { JwtDecoder jwtDecoder = JwtDecoders.fromIssuerLocation(issuer); return new JwtAuthenticationProvider(jwtDecoder)::authenticate; }); diff --git a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/JwtIssuerReactiveAuthenticationManagerResolver.java b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/JwtIssuerReactiveAuthenticationManagerResolver.java index 422f70c0b3..e4741235e3 100644 --- a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/JwtIssuerReactiveAuthenticationManagerResolver.java +++ b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/JwtIssuerReactiveAuthenticationManagerResolver.java @@ -101,7 +101,7 @@ public final class JwtIssuerReactiveAuthenticationManagerResolver * authenticationManagers.put("https://issuerOne.example.org", managerOne); * authenticationManagers.put("https://issuerTwo.example.org", managerTwo); * JwtIssuerReactiveAuthenticationManagerResolver resolver = new JwtIssuerReactiveAuthenticationManagerResolver - * (issuer -> Mono.justOrEmpty(authenticationManagers.get(issuer)); + * ((issuer) -> Mono.justOrEmpty(authenticationManagers.get(issuer)); * * * The keys in the {@link Map} are the trusted issuers. @@ -124,7 +124,7 @@ public final class JwtIssuerReactiveAuthenticationManagerResolver @Override public Mono resolve(ServerWebExchange exchange) { return this.issuerConverter.convert(exchange) - .flatMap(issuer -> this.issuerAuthenticationManagerResolver.resolve(issuer) + .flatMap((issuer) -> this.issuerAuthenticationManagerResolver.resolve(issuer) .switchIfEmpty(Mono.error(() -> new InvalidBearerTokenException("Invalid issuer " + issuer)))); } @@ -134,7 +134,7 @@ public final class JwtIssuerReactiveAuthenticationManagerResolver @Override public Mono convert(@NonNull ServerWebExchange exchange) { - return this.converter.convert(exchange).map(convertedToken -> { + return this.converter.convert(exchange).map((convertedToken) -> { BearerTokenAuthenticationToken token = (BearerTokenAuthenticationToken) convertedToken; try { String issuer = JWTParser.parse(token.getToken()).getJWTClaimsSet().getIssuer(); @@ -170,7 +170,7 @@ public final class JwtIssuerReactiveAuthenticationManagerResolver return Mono.empty(); } return this.authenticationManagers.computeIfAbsent(issuer, - k -> Mono.fromCallable( + (k) -> Mono.fromCallable( () -> new JwtReactiveAuthenticationManager(ReactiveJwtDecoders.fromIssuerLocation(k))) .subscribeOn(Schedulers.boundedElastic()).cache()); } diff --git a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/JwtReactiveAuthenticationManager.java b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/JwtReactiveAuthenticationManager.java index 81018df14e..4b8641f323 100644 --- a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/JwtReactiveAuthenticationManager.java +++ b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/JwtReactiveAuthenticationManager.java @@ -52,7 +52,7 @@ public final class JwtReactiveAuthenticationManager implements ReactiveAuthentic @Override public Mono authenticate(Authentication authentication) { - return Mono.justOrEmpty(authentication).filter(a -> a instanceof BearerTokenAuthenticationToken) + return Mono.justOrEmpty(authentication).filter((a) -> a instanceof BearerTokenAuthenticationToken) .cast(BearerTokenAuthenticationToken.class).map(BearerTokenAuthenticationToken::getToken) .flatMap(this.jwtDecoder::decode).flatMap(this.jwtAuthenticationConverter::convert) .cast(Authentication.class).onErrorMap(JwtException.class, this::onError); diff --git a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/OpaqueTokenReactiveAuthenticationManager.java b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/OpaqueTokenReactiveAuthenticationManager.java index fe57778e28..dfd7fbd211 100644 --- a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/OpaqueTokenReactiveAuthenticationManager.java +++ b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/OpaqueTokenReactiveAuthenticationManager.java @@ -81,7 +81,7 @@ public class OpaqueTokenReactiveAuthenticationManager implements ReactiveAuthent } private Mono authenticate(String token) { - return this.introspector.introspect(token).map(principal -> { + return this.introspector.introspect(token).map((principal) -> { Instant iat = principal.getAttribute(OAuth2IntrospectionClaimNames.ISSUED_AT); Instant exp = principal.getAttribute(OAuth2IntrospectionClaimNames.EXPIRES_AT); diff --git a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/ReactiveJwtAuthenticationConverter.java b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/ReactiveJwtAuthenticationConverter.java index 51e80f776b..d9730174e8 100644 --- a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/ReactiveJwtAuthenticationConverter.java +++ b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/ReactiveJwtAuthenticationConverter.java @@ -40,7 +40,7 @@ public final class ReactiveJwtAuthenticationConverter implements Converter convert(Jwt jwt) { return this.jwtGrantedAuthoritiesConverter.convert(jwt).collectList() - .map(authorities -> new JwtAuthenticationToken(jwt, authorities)); + .map((authorities) -> new JwtAuthenticationToken(jwt, authorities)); } /** diff --git a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/introspection/NimbusOpaqueTokenIntrospector.java b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/introspection/NimbusOpaqueTokenIntrospector.java index 992a58ad58..bbeae6fe85 100644 --- a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/introspection/NimbusOpaqueTokenIntrospector.java +++ b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/introspection/NimbusOpaqueTokenIntrospector.java @@ -98,7 +98,7 @@ public class NimbusOpaqueTokenIntrospector implements OpaqueTokenIntrospector { } private Converter> defaultRequestEntityConverter(URI introspectionUri) { - return token -> { + return (token) -> { HttpHeaders headers = requestHeaders(); MultiValueMap body = requestBody(token); return new RequestEntity<>(body, headers, HttpMethod.POST, introspectionUri); diff --git a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/introspection/NimbusReactiveOpaqueTokenIntrospector.java b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/introspection/NimbusReactiveOpaqueTokenIntrospector.java index 6b37ddbeb4..5a6603b8a0 100644 --- a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/introspection/NimbusReactiveOpaqueTokenIntrospector.java +++ b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/introspection/NimbusReactiveOpaqueTokenIntrospector.java @@ -73,7 +73,7 @@ public class NimbusReactiveOpaqueTokenIntrospector implements ReactiveOpaqueToke Assert.notNull(clientSecret, "clientSecret cannot be null"); this.introspectionUri = URI.create(introspectionUri); - this.webClient = WebClient.builder().defaultHeaders(h -> h.setBasicAuth(clientId, clientSecret)).build(); + this.webClient = WebClient.builder().defaultHeaders((h) -> h.setBasicAuth(clientId, clientSecret)).build(); } /** @@ -97,8 +97,8 @@ public class NimbusReactiveOpaqueTokenIntrospector implements ReactiveOpaqueToke public Mono introspect(String token) { return Mono.just(token).flatMap(this::makeRequest).flatMap(this::adaptToNimbusResponse) .map(this::parseNimbusResponse).map(this::castToNimbusSuccess) - .doOnNext(response -> validate(token, response)).map(this::convertClaimsSet) - .onErrorMap(e -> !(e instanceof OAuth2IntrospectionException), this::onError); + .doOnNext((response) -> validate(token, response)).map(this::convertClaimsSet) + .onErrorMap((e) -> !(e instanceof OAuth2IntrospectionException), this::onError); } private Mono makeRequest(String token) { @@ -115,7 +115,7 @@ public class NimbusReactiveOpaqueTokenIntrospector implements ReactiveOpaqueToke .then(Mono.error(new OAuth2IntrospectionException( "Introspection endpoint responded with " + response.getStatusCode()))); } - return responseEntity.bodyToMono(String.class).doOnNext(response::setContent).map(body -> response); + return responseEntity.bodyToMono(String.class).doOnNext(response::setContent).map((body) -> response); } private TokenIntrospectionResponse parseNimbusResponse(HTTPResponse response) { diff --git a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/BearerTokenAuthenticationFilter.java b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/BearerTokenAuthenticationFilter.java index d294fb9d48..4abad2a8df 100644 --- a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/BearerTokenAuthenticationFilter.java +++ b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/BearerTokenAuthenticationFilter.java @@ -85,7 +85,7 @@ public final class BearerTokenAuthenticationFilter extends OncePerRequestFilter */ public BearerTokenAuthenticationFilter(AuthenticationManager authenticationManager) { Assert.notNull(authenticationManager, "authenticationManager cannot be null"); - this.authenticationManagerResolver = request -> authenticationManager; + this.authenticationManagerResolver = (request) -> authenticationManager; } /** diff --git a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/access/server/BearerTokenServerAccessDeniedHandler.java b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/access/server/BearerTokenServerAccessDeniedHandler.java index 7b0c43c0ed..a6b7884de0 100644 --- a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/access/server/BearerTokenServerAccessDeniedHandler.java +++ b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/access/server/BearerTokenServerAccessDeniedHandler.java @@ -63,8 +63,8 @@ public class BearerTokenServerAccessDeniedHandler implements ServerAccessDeniedH } return exchange.getPrincipal().filter(AbstractOAuth2TokenAuthenticationToken.class::isInstance) - .map(token -> errorMessageParameters(parameters)).switchIfEmpty(Mono.just(parameters)) - .flatMap(params -> respond(exchange, params)); + .map((token) -> errorMessageParameters(parameters)).switchIfEmpty(Mono.just(parameters)) + .flatMap((params) -> respond(exchange, params)); } /** diff --git a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/reactive/function/client/ServerBearerExchangeFilterFunction.java b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/reactive/function/client/ServerBearerExchangeFilterFunction.java index ccf4a8c1f5..19d4839f1e 100644 --- a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/reactive/function/client/ServerBearerExchangeFilterFunction.java +++ b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/reactive/function/client/ServerBearerExchangeFilterFunction.java @@ -56,12 +56,12 @@ public final class ServerBearerExchangeFilterFunction implements ExchangeFilterF */ @Override public Mono filter(ClientRequest request, ExchangeFunction next) { - return oauth2Token().map(token -> bearer(request, token)).defaultIfEmpty(request).flatMap(next::exchange); + return oauth2Token().map((token) -> bearer(request, token)).defaultIfEmpty(request).flatMap(next::exchange); } private Mono oauth2Token() { return currentAuthentication() - .filter(authentication -> authentication.getCredentials() instanceof AbstractOAuth2Token) + .filter((authentication) -> authentication.getCredentials() instanceof AbstractOAuth2Token) .map(Authentication::getCredentials).cast(AbstractOAuth2Token.class); } @@ -70,7 +70,7 @@ public final class ServerBearerExchangeFilterFunction implements ExchangeFilterF } private ClientRequest bearer(ClientRequest request, AbstractOAuth2Token token) { - return ClientRequest.from(request).headers(headers -> headers.setBearerAuth(token.getTokenValue())).build(); + return ClientRequest.from(request).headers((headers) -> headers.setBearerAuth(token.getTokenValue())).build(); } } diff --git a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/reactive/function/client/ServletBearerExchangeFilterFunction.java b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/reactive/function/client/ServletBearerExchangeFilterFunction.java index 3e9d377678..556c326cdd 100644 --- a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/reactive/function/client/ServletBearerExchangeFilterFunction.java +++ b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/reactive/function/client/ServletBearerExchangeFilterFunction.java @@ -67,12 +67,12 @@ public final class ServletBearerExchangeFilterFunction implements ExchangeFilter */ @Override public Mono filter(ClientRequest request, ExchangeFunction next) { - return oauth2Token().map(token -> bearer(request, token)).defaultIfEmpty(request).flatMap(next::exchange); + return oauth2Token().map((token) -> bearer(request, token)).defaultIfEmpty(request).flatMap(next::exchange); } private Mono oauth2Token() { return Mono.subscriberContext().flatMap(this::currentAuthentication) - .filter(authentication -> authentication.getCredentials() instanceof AbstractOAuth2Token) + .filter((authentication) -> authentication.getCredentials() instanceof AbstractOAuth2Token) .map(Authentication::getCredentials).cast(AbstractOAuth2Token.class); } @@ -91,7 +91,7 @@ public final class ServletBearerExchangeFilterFunction implements ExchangeFilter } private ClientRequest bearer(ClientRequest request, AbstractOAuth2Token token) { - return ClientRequest.from(request).headers(headers -> headers.setBearerAuth(token.getTokenValue())).build(); + return ClientRequest.from(request).headers((headers) -> headers.setBearerAuth(token.getTokenValue())).build(); } } diff --git a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/server/ServerBearerTokenAuthenticationConverter.java b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/server/ServerBearerTokenAuthenticationConverter.java index be467f65a4..dff1306dba 100644 --- a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/server/ServerBearerTokenAuthenticationConverter.java +++ b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/server/ServerBearerTokenAuthenticationConverter.java @@ -54,7 +54,7 @@ public class ServerBearerTokenAuthenticationConverter implements ServerAuthentic @Override public Mono convert(ServerWebExchange exchange) { - return Mono.fromCallable(() -> token(exchange.getRequest())).map(token -> { + return Mono.fromCallable(() -> token(exchange.getRequest())).map((token) -> { if (token.isEmpty()) { BearerTokenError error = invalidTokenError(); throw new OAuth2AuthenticationException(error); diff --git a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/core/TestOAuth2AuthenticatedPrincipals.java b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/core/TestOAuth2AuthenticatedPrincipals.java index 0876c52748..3a7e07471c 100644 --- a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/core/TestOAuth2AuthenticatedPrincipals.java +++ b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/core/TestOAuth2AuthenticatedPrincipals.java @@ -42,7 +42,7 @@ public final class TestOAuth2AuthenticatedPrincipals { } public static OAuth2AuthenticatedPrincipal active() { - return active(attributes -> { + return active((attributes) -> { }); } diff --git a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/JwtAuthenticationConverterTests.java b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/JwtAuthenticationConverterTests.java index e51eeba4c5..64e14fd6e2 100644 --- a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/JwtAuthenticationConverterTests.java +++ b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/JwtAuthenticationConverterTests.java @@ -63,7 +63,7 @@ public class JwtAuthenticationConverterTests { public void convertWithOverriddenGrantedAuthoritiesConverter() { Jwt jwt = TestJwts.jwt().claim("scope", "message:read message:write").build(); - Converter> grantedAuthoritiesConverter = token -> Arrays + Converter> grantedAuthoritiesConverter = (token) -> Arrays .asList(new SimpleGrantedAuthority("blah")); this.jwtAuthenticationConverter.setJwtGrantedAuthoritiesConverter(grantedAuthoritiesConverter); diff --git a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/JwtAuthenticationProviderTests.java b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/JwtAuthenticationProviderTests.java index 4d764ddbde..abbb3be03b 100644 --- a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/JwtAuthenticationProviderTests.java +++ b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/JwtAuthenticationProviderTests.java @@ -83,7 +83,7 @@ public class JwtAuthenticationProviderTests { given(this.jwtDecoder.decode("token")).willThrow(BadJwtException.class); assertThatCode(() -> this.provider.authenticate(token)) - .matches(failed -> failed instanceof OAuth2AuthenticationException) + .matches((failed) -> failed instanceof OAuth2AuthenticationException) .matches(errorCode(BearerTokenErrorCodes.INVALID_TOKEN)); } @@ -134,7 +134,7 @@ public class JwtAuthenticationProviderTests { } private Predicate errorCode(String errorCode) { - return failed -> ((OAuth2AuthenticationException) failed).getError().getErrorCode() == errorCode; + return (failed) -> ((OAuth2AuthenticationException) failed).getError().getErrorCode() == errorCode; } } diff --git a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/JwtIssuerAuthenticationManagerResolverTests.java b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/JwtIssuerAuthenticationManagerResolverTests.java index 041c0a4f5a..8a4e57e1b4 100644 --- a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/JwtIssuerAuthenticationManagerResolverTests.java +++ b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/JwtIssuerAuthenticationManagerResolverTests.java @@ -97,7 +97,7 @@ public class JwtIssuerAuthenticationManagerResolverTests { public void resolveWhenUsingCustomIssuerAuthenticationManagerResolverThenUses() { AuthenticationManager authenticationManager = mock(AuthenticationManager.class); JwtIssuerAuthenticationManagerResolver authenticationManagerResolver = new JwtIssuerAuthenticationManagerResolver( - issuer -> authenticationManager); + (issuer) -> authenticationManager); MockHttpServletRequest request = new MockHttpServletRequest(); request.addHeader("Authorization", "Bearer " + this.jwt); diff --git a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/JwtIssuerReactiveAuthenticationManagerResolverTests.java b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/JwtIssuerReactiveAuthenticationManagerResolverTests.java index 1c3ffd4c09..d0dc716d5c 100644 --- a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/JwtIssuerReactiveAuthenticationManagerResolverTests.java +++ b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/JwtIssuerReactiveAuthenticationManagerResolverTests.java @@ -98,7 +98,7 @@ public class JwtIssuerReactiveAuthenticationManagerResolverTests { public void resolveWhenUsingCustomIssuerAuthenticationManagerResolverThenUses() { ReactiveAuthenticationManager authenticationManager = mock(ReactiveAuthenticationManager.class); JwtIssuerReactiveAuthenticationManagerResolver authenticationManagerResolver = new JwtIssuerReactiveAuthenticationManagerResolver( - issuer -> Mono.just(authenticationManager)); + (issuer) -> Mono.just(authenticationManager)); MockServerWebExchange exchange = withBearerToken(this.jwt); assertThat(authenticationManagerResolver.resolve(exchange).block()).isSameAs(authenticationManager); @@ -110,7 +110,7 @@ public class JwtIssuerReactiveAuthenticationManagerResolverTests { Map authenticationManagers = new HashMap<>(); JwtIssuerReactiveAuthenticationManagerResolver authenticationManagerResolver = new JwtIssuerReactiveAuthenticationManagerResolver( - issuer -> Mono.justOrEmpty(authenticationManagers.get(issuer))); + (issuer) -> Mono.justOrEmpty(authenticationManagers.get(issuer))); assertThatCode(() -> authenticationManagerResolver.resolve(exchange).block()) .isInstanceOf(OAuth2AuthenticationException.class).hasMessageContaining("Invalid issuer"); diff --git a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/OpaqueTokenAuthenticationProviderTests.java b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/OpaqueTokenAuthenticationProviderTests.java index 1dc4b6a69a..dc4cb4bf45 100644 --- a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/OpaqueTokenAuthenticationProviderTests.java +++ b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/OpaqueTokenAuthenticationProviderTests.java @@ -50,7 +50,7 @@ public class OpaqueTokenAuthenticationProviderTests { @Test public void authenticateWhenActiveTokenThenOk() throws Exception { OAuth2AuthenticatedPrincipal principal = TestOAuth2AuthenticatedPrincipals - .active(attributes -> attributes.put("extension_field", "twenty-seven")); + .active((attributes) -> attributes.put("extension_field", "twenty-seven")); OpaqueTokenIntrospector introspector = mock(OpaqueTokenIntrospector.class); given(introspector.introspect(any())).willReturn(principal); OpaqueTokenAuthenticationProvider provider = new OpaqueTokenAuthenticationProvider(introspector); diff --git a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/OpaqueTokenReactiveAuthenticationManagerTests.java b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/OpaqueTokenReactiveAuthenticationManagerTests.java index d71c354e38..2e1782bfd0 100644 --- a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/OpaqueTokenReactiveAuthenticationManagerTests.java +++ b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/OpaqueTokenReactiveAuthenticationManagerTests.java @@ -51,7 +51,7 @@ public class OpaqueTokenReactiveAuthenticationManagerTests { @Test public void authenticateWhenActiveTokenThenOk() throws Exception { OAuth2AuthenticatedPrincipal authority = TestOAuth2AuthenticatedPrincipals - .active(attributes -> attributes.put("extension_field", "twenty-seven")); + .active((attributes) -> attributes.put("extension_field", "twenty-seven")); ReactiveOpaqueTokenIntrospector introspector = mock(ReactiveOpaqueTokenIntrospector.class); given(introspector.introspect(any())).willReturn(Mono.just(authority)); OpaqueTokenReactiveAuthenticationManager provider = new OpaqueTokenReactiveAuthenticationManager(introspector); diff --git a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/ReactiveJwtAuthenticationConverterTests.java b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/ReactiveJwtAuthenticationConverterTests.java index d80b9f7800..0c7b24be76 100644 --- a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/ReactiveJwtAuthenticationConverterTests.java +++ b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/ReactiveJwtAuthenticationConverterTests.java @@ -63,7 +63,7 @@ public class ReactiveJwtAuthenticationConverterTests { public void convertWithOverriddenGrantedAuthoritiesConverter() { Jwt jwt = TestJwts.jwt().claim("scope", "message:read message:write").build(); - Converter> grantedAuthoritiesConverter = token -> Flux + Converter> grantedAuthoritiesConverter = (token) -> Flux .just(new SimpleGrantedAuthority("blah")); this.jwtAuthenticationConverter.setJwtGrantedAuthoritiesConverter(grantedAuthoritiesConverter); diff --git a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/ReactiveJwtGrantedAuthoritiesConverterAdapterTests.java b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/ReactiveJwtGrantedAuthoritiesConverterAdapterTests.java index 66c550fcfd..bfda0ea627 100644 --- a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/ReactiveJwtGrantedAuthoritiesConverterAdapterTests.java +++ b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/ReactiveJwtGrantedAuthoritiesConverterAdapterTests.java @@ -43,7 +43,7 @@ public class ReactiveJwtGrantedAuthoritiesConverterAdapterTests { public void convertWithGrantedAuthoritiesConverter() { Jwt jwt = TestJwts.jwt().claim("scope", "message:read message:write").build(); - Converter> grantedAuthoritiesConverter = token -> Arrays + Converter> grantedAuthoritiesConverter = (token) -> Arrays .asList(new SimpleGrantedAuthority("blah")); Collection authorities = new ReactiveJwtGrantedAuthoritiesConverterAdapter( diff --git a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/introspection/NimbusOpaqueTokenIntrospectorTests.java b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/introspection/NimbusOpaqueTokenIntrospectorTests.java index 8eaa70a584..1e3a601581 100644 --- a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/introspection/NimbusOpaqueTokenIntrospectorTests.java +++ b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/introspection/NimbusOpaqueTokenIntrospectorTests.java @@ -287,8 +287,8 @@ public class NimbusOpaqueTokenIntrospectorTests { @Override public MockResponse dispatch(RecordedRequest request) { String authorization = request.getHeader(HttpHeaders.AUTHORIZATION); - return Optional.ofNullable(authorization).filter(a -> isAuthorized(authorization, username, password)) - .map(a -> ok(response)).orElse(unauthorized()); + return Optional.ofNullable(authorization).filter((a) -> isAuthorized(authorization, username, password)) + .map((a) -> ok(response)).orElse(unauthorized()); } }; } diff --git a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/introspection/NimbusReactiveOpaqueTokenIntrospectorTests.java b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/introspection/NimbusReactiveOpaqueTokenIntrospectorTests.java index 45e3194ee1..51ffbbf947 100644 --- a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/introspection/NimbusReactiveOpaqueTokenIntrospectorTests.java +++ b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/introspection/NimbusReactiveOpaqueTokenIntrospectorTests.java @@ -238,8 +238,8 @@ public class NimbusReactiveOpaqueTokenIntrospectorTests { @Override public MockResponse dispatch(RecordedRequest request) { String authorization = request.getHeader(HttpHeaders.AUTHORIZATION); - return Optional.ofNullable(authorization).filter(a -> isAuthorized(authorization, username, password)) - .map(a -> ok(response)).orElse(unauthorized()); + return Optional.ofNullable(authorization).filter((a) -> isAuthorized(authorization, username, password)) + .map((a) -> ok(response)).orElse(unauthorized()); } }; } diff --git a/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationFilterTests.java b/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationFilterTests.java index fbedaae1dc..d114122f43 100644 --- a/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationFilterTests.java +++ b/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationFilterTests.java @@ -64,7 +64,7 @@ public class OpenIDAuthenticationFilterTests { SavedRequestAwareAuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler(); this.filter.setAuthenticationSuccessHandler(new SavedRequestAwareAuthenticationSuccessHandler()); successHandler.setDefaultTargetUrl(DEFAULT_TARGET_URL); - this.filter.setAuthenticationManager(a -> a); + this.filter.setAuthenticationManager((a) -> a); this.filter.afterPropertiesSet(); } diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/authentication/AnonymousPayloadInterceptor.java b/rsocket/src/main/java/org/springframework/security/rsocket/authentication/AnonymousPayloadInterceptor.java index b3f9e2c9d4..e659bb6850 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/authentication/AnonymousPayloadInterceptor.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/authentication/AnonymousPayloadInterceptor.java @@ -87,7 +87,7 @@ public class AnonymousPayloadInterceptor implements PayloadInterceptor, Ordered return chain.next(exchange) .subscriberContext(ReactiveSecurityContextHolder.withAuthentication(authentication)) .then(Mono.empty()); - })).flatMap(securityContext -> chain.next(exchange)); + })).flatMap((securityContext) -> chain.next(exchange)); } } diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadExchangeConverter.java b/rsocket/src/main/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadExchangeConverter.java index aaf4f1c3ac..ebc4d6cfc2 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadExchangeConverter.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadExchangeConverter.java @@ -63,7 +63,7 @@ public class AuthenticationPayloadExchangeConverter implements PayloadExchangeAu return Mono .fromCallable(() -> this.metadataExtractor.extract(exchange.getPayload(), AuthenticationPayloadExchangeConverter.COMPOSITE_METADATA_MIME_TYPE)) - .flatMap(metadata -> Mono.justOrEmpty(authentication(metadata))); + .flatMap((metadata) -> Mono.justOrEmpty(authentication(metadata))); } private Authentication authentication(Map metadata) { diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadInterceptor.java b/rsocket/src/main/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadInterceptor.java index 6a3e94b2a6..0a0aa58777 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadInterceptor.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadInterceptor.java @@ -73,8 +73,8 @@ public class AuthenticationPayloadInterceptor implements PayloadInterceptor, Ord @Override public Mono intercept(PayloadExchange exchange, PayloadInterceptorChain chain) { return this.authenticationConverter.convert(exchange).switchIfEmpty(chain.next(exchange).then(Mono.empty())) - .flatMap(a -> this.authenticationManager.authenticate(a)) - .flatMap(a -> onAuthenticationSuccess(chain.next(exchange), a)); + .flatMap((a) -> this.authenticationManager.authenticate(a)) + .flatMap((a) -> onAuthenticationSuccess(chain.next(exchange), a)); } private Mono onAuthenticationSuccess(Mono payload, Authentication authentication) { diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/authentication/BasicAuthenticationPayloadExchangeConverter.java b/rsocket/src/main/java/org/springframework/security/rsocket/authentication/BasicAuthenticationPayloadExchangeConverter.java index 4da1b0db74..1a806c3bb8 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/authentication/BasicAuthenticationPayloadExchangeConverter.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/authentication/BasicAuthenticationPayloadExchangeConverter.java @@ -47,10 +47,10 @@ public class BasicAuthenticationPayloadExchangeConverter implements PayloadExcha @Override public Mono convert(PayloadExchange exchange) { return Mono.fromCallable(() -> this.metadataExtractor.extract(exchange.getPayload(), this.metadataMimetype)) - .flatMap(metadata -> Mono + .flatMap((metadata) -> Mono .justOrEmpty(metadata.get(UsernamePasswordMetadata.BASIC_AUTHENTICATION_MIME_TYPE.toString()))) .cast(UsernamePasswordMetadata.class) - .map(credentials -> new UsernamePasswordAuthenticationToken(credentials.getUsername(), + .map((credentials) -> new UsernamePasswordAuthenticationToken(credentials.getUsername(), credentials.getPassword())); } diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/authorization/AuthorizationPayloadInterceptor.java b/rsocket/src/main/java/org/springframework/security/rsocket/authorization/AuthorizationPayloadInterceptor.java index bdaadec7eb..05b030afb7 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/authorization/AuthorizationPayloadInterceptor.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/authorization/AuthorizationPayloadInterceptor.java @@ -56,11 +56,11 @@ public class AuthorizationPayloadInterceptor implements PayloadInterceptor, Orde @Override public Mono intercept(PayloadExchange exchange, PayloadInterceptorChain chain) { - return ReactiveSecurityContextHolder.getContext().filter(c -> c.getAuthentication() != null) + return ReactiveSecurityContextHolder.getContext().filter((c) -> c.getAuthentication() != null) .map(SecurityContext::getAuthentication) .switchIfEmpty(Mono.error(() -> new AuthenticationCredentialsNotFoundException( "An Authentication (possibly AnonymousAuthenticationToken) is required."))) - .as(authentication -> this.authorizationManager.verify(authentication, exchange)) + .as((authentication) -> this.authorizationManager.verify(authentication, exchange)) .then(chain.next(exchange)); } diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/authorization/PayloadExchangeMatcherReactiveAuthorizationManager.java b/rsocket/src/main/java/org/springframework/security/rsocket/authorization/PayloadExchangeMatcherReactiveAuthorizationManager.java index cd3e7015aa..13e43d15ca 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/authorization/PayloadExchangeMatcherReactiveAuthorizationManager.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/authorization/PayloadExchangeMatcherReactiveAuthorizationManager.java @@ -52,9 +52,9 @@ public final class PayloadExchangeMatcherReactiveAuthorizationManager @Override public Mono check(Mono authentication, PayloadExchange exchange) { return Flux.fromIterable(this.mappings) - .concatMap(mapping -> mapping.getMatcher().matches(exchange) - .filter(PayloadExchangeMatcher.MatchResult::isMatch).map(r -> r.getVariables()) - .flatMap(variables -> mapping.getEntry().check(authentication, + .concatMap((mapping) -> mapping.getMatcher().matches(exchange) + .filter(PayloadExchangeMatcher.MatchResult::isMatch).map((r) -> r.getVariables()) + .flatMap((variables) -> mapping.getEntry().check(authentication, new PayloadExchangeAuthorizationContext(exchange, variables)))) .next().switchIfEmpty(Mono.fromCallable(() -> new AuthorizationDecision(false))); } diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/core/ContextPayloadInterceptorChain.java b/rsocket/src/main/java/org/springframework/security/rsocket/core/ContextPayloadInterceptorChain.java index 601abccd90..6697abc725 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/core/ContextPayloadInterceptorChain.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/core/ContextPayloadInterceptorChain.java @@ -76,7 +76,7 @@ class ContextPayloadInterceptorChain implements PayloadInterceptorChain { @Override public Mono next(PayloadExchange exchange) { return Mono.defer(() -> shouldIntercept() ? this.currentInterceptor.intercept(exchange, this.next) - : Mono.subscriberContext().doOnNext(c -> this.context = c).then()); + : Mono.subscriberContext().doOnNext((c) -> this.context = c).then()); } Context getContext() { diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/core/PayloadInterceptorRSocket.java b/rsocket/src/main/java/org/springframework/security/rsocket/core/PayloadInterceptorRSocket.java index f297fe322b..3120cab77c 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/core/PayloadInterceptorRSocket.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/core/PayloadInterceptorRSocket.java @@ -72,37 +72,37 @@ class PayloadInterceptorRSocket extends RSocketProxy { @Override public Mono fireAndForget(Payload payload) { return intercept(PayloadExchangeType.FIRE_AND_FORGET, payload) - .flatMap(context -> this.source.fireAndForget(payload).subscriberContext(context)); + .flatMap((context) -> this.source.fireAndForget(payload).subscriberContext(context)); } @Override public Mono requestResponse(Payload payload) { return intercept(PayloadExchangeType.REQUEST_RESPONSE, payload) - .flatMap(context -> this.source.requestResponse(payload).subscriberContext(context)); + .flatMap((context) -> this.source.requestResponse(payload).subscriberContext(context)); } @Override public Flux requestStream(Payload payload) { return intercept(PayloadExchangeType.REQUEST_STREAM, payload) - .flatMapMany(context -> this.source.requestStream(payload).subscriberContext(context)); + .flatMapMany((context) -> this.source.requestStream(payload).subscriberContext(context)); } @Override public Flux requestChannel(Publisher payloads) { return Flux.from(payloads).switchOnFirst((signal, innerFlux) -> { Payload firstPayload = signal.get(); - return intercept(PayloadExchangeType.REQUEST_CHANNEL, firstPayload).flatMapMany( - context -> innerFlux.skip(1).flatMap(p -> intercept(PayloadExchangeType.PAYLOAD, p).thenReturn(p)) - .transform(securedPayloads -> Flux.concat(Flux.just(firstPayload), securedPayloads)) - .transform(securedPayloads -> this.source.requestChannel(securedPayloads)) - .subscriberContext(context)); + return intercept(PayloadExchangeType.REQUEST_CHANNEL, firstPayload).flatMapMany((context) -> innerFlux + .skip(1).flatMap((p) -> intercept(PayloadExchangeType.PAYLOAD, p).thenReturn(p)) + .transform((securedPayloads) -> Flux.concat(Flux.just(firstPayload), securedPayloads)) + .transform((securedPayloads) -> this.source.requestChannel(securedPayloads)) + .subscriberContext(context)); }); } @Override public Mono metadataPush(Payload payload) { return intercept(PayloadExchangeType.METADATA_PUSH, payload) - .flatMap(c -> this.source.metadataPush(payload).subscriberContext(c)); + .flatMap((c) -> this.source.metadataPush(payload).subscriberContext(c)); } private Mono intercept(PayloadExchangeType type, Payload payload) { diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/core/PayloadSocketAcceptor.java b/rsocket/src/main/java/org/springframework/security/rsocket/core/PayloadSocketAcceptor.java index 848eae1cda..9809fa788e 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/core/PayloadSocketAcceptor.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/core/PayloadSocketAcceptor.java @@ -73,8 +73,8 @@ class PayloadSocketAcceptor implements SocketAcceptor { // FIXME do we want to make the sendingSocket available in the PayloadExchange return intercept(setup, dataMimeType, metadataMimeType) .flatMap( - ctx -> this.delegate.accept(setup, sendingSocket) - .map(acceptingSocket -> new PayloadInterceptorRSocket(acceptingSocket, + (ctx) -> this.delegate.accept(setup, sendingSocket) + .map((acceptingSocket) -> new PayloadInterceptorRSocket(acceptingSocket, this.interceptors, metadataMimeType, dataMimeType, ctx)) .subscriberContext(ctx)); } diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/metadata/BasicAuthenticationDecoder.java b/rsocket/src/main/java/org/springframework/security/rsocket/metadata/BasicAuthenticationDecoder.java index 85d75dc4e9..07ba2ab348 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/metadata/BasicAuthenticationDecoder.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/metadata/BasicAuthenticationDecoder.java @@ -45,7 +45,7 @@ public class BasicAuthenticationDecoder extends AbstractDecoder decode(Publisher input, ResolvableType elementType, MimeType mimeType, Map hints) { - return Flux.from(input).map(DataBuffer::asByteBuffer).map(byteBuffer -> { + return Flux.from(input).map(DataBuffer::asByteBuffer).map((byteBuffer) -> { byte[] sizeBytes = new byte[4]; byteBuffer.get(sizeBytes); @@ -63,7 +63,7 @@ public class BasicAuthenticationDecoder extends AbstractDecoder decodeToMono(Publisher input, ResolvableType elementType, MimeType mimeType, Map hints) { - return Mono.from(input).map(DataBuffer::asByteBuffer).map(byteBuffer -> { + return Mono.from(input).map(DataBuffer::asByteBuffer).map((byteBuffer) -> { int usernameSize = byteBuffer.getInt(); byte[] usernameBytes = new byte[usernameSize]; byteBuffer.get(usernameBytes); diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/metadata/BasicAuthenticationEncoder.java b/rsocket/src/main/java/org/springframework/security/rsocket/metadata/BasicAuthenticationEncoder.java index 327c900e03..d1b6f739ad 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/metadata/BasicAuthenticationEncoder.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/metadata/BasicAuthenticationEncoder.java @@ -49,7 +49,7 @@ public class BasicAuthenticationEncoder extends AbstractEncoder encode(Publisher inputStream, DataBufferFactory bufferFactory, ResolvableType elementType, MimeType mimeType, Map hints) { return Flux.from(inputStream) - .map(credentials -> encodeValue(credentials, bufferFactory, elementType, mimeType, hints)); + .map((credentials) -> encodeValue(credentials, bufferFactory, elementType, mimeType, hints)); } @Override diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/metadata/BearerTokenAuthenticationEncoder.java b/rsocket/src/main/java/org/springframework/security/rsocket/metadata/BearerTokenAuthenticationEncoder.java index ac7c61496a..e822fa8bff 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/metadata/BearerTokenAuthenticationEncoder.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/metadata/BearerTokenAuthenticationEncoder.java @@ -55,7 +55,7 @@ public class BearerTokenAuthenticationEncoder extends AbstractEncoder encode(Publisher inputStream, DataBufferFactory bufferFactory, ResolvableType elementType, MimeType mimeType, Map hints) { return Flux.from(inputStream) - .map(credentials -> encodeValue(credentials, bufferFactory, elementType, mimeType, hints)); + .map((credentials) -> encodeValue(credentials, bufferFactory, elementType, mimeType, hints)); } @Override diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/metadata/SimpleAuthenticationEncoder.java b/rsocket/src/main/java/org/springframework/security/rsocket/metadata/SimpleAuthenticationEncoder.java index 4bbc479f98..1c31395de7 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/metadata/SimpleAuthenticationEncoder.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/metadata/SimpleAuthenticationEncoder.java @@ -55,7 +55,7 @@ public class SimpleAuthenticationEncoder extends AbstractEncoder encode(Publisher inputStream, DataBufferFactory bufferFactory, ResolvableType elementType, MimeType mimeType, Map hints) { return Flux.from(inputStream) - .map(credentials -> encodeValue(credentials, bufferFactory, elementType, mimeType, hints)); + .map((credentials) -> encodeValue(credentials, bufferFactory, elementType, mimeType, hints)); } @Override diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/util/matcher/RoutePayloadExchangeMatcher.java b/rsocket/src/main/java/org/springframework/security/rsocket/util/matcher/RoutePayloadExchangeMatcher.java index 8496a5ffec..ca9fe9d9ef 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/util/matcher/RoutePayloadExchangeMatcher.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/util/matcher/RoutePayloadExchangeMatcher.java @@ -53,8 +53,8 @@ public class RoutePayloadExchangeMatcher implements PayloadExchangeMatcher { Map metadata = this.metadataExtractor.extract(exchange.getPayload(), exchange.getMetadataMimeType()); return Optional.ofNullable((String) metadata.get(MetadataExtractor.ROUTE_KEY)) - .map(routeValue -> this.routeMatcher.parseRoute(routeValue)) - .map(route -> this.routeMatcher.matchAndExtract(this.pattern, route)).map(v -> MatchResult.match(v)) + .map((routeValue) -> this.routeMatcher.parseRoute(routeValue)) + .map((route) -> this.routeMatcher.matchAndExtract(this.pattern, route)).map((v) -> MatchResult.match(v)) .orElse(MatchResult.notMatch()); } diff --git a/rsocket/src/test/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadInterceptorChain.java b/rsocket/src/test/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadInterceptorChain.java index b503f15bba..c68cce9196 100644 --- a/rsocket/src/test/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadInterceptorChain.java +++ b/rsocket/src/test/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadInterceptorChain.java @@ -34,7 +34,7 @@ class AuthenticationPayloadInterceptorChain implements PayloadInterceptorChain { @Override public Mono next(PayloadExchange exchange) { return ReactiveSecurityContextHolder.getContext().map(SecurityContext::getAuthentication) - .doOnNext(a -> this.setAuthentication(a)).then(); + .doOnNext((a) -> this.setAuthentication(a)).then(); } public Authentication getAuthentication() { diff --git a/rsocket/src/test/java/org/springframework/security/rsocket/authorization/PayloadExchangeMatcherReactiveAuthorizationManagerTests.java b/rsocket/src/test/java/org/springframework/security/rsocket/authorization/PayloadExchangeMatcherReactiveAuthorizationManagerTests.java index 835a50c02b..ba65b66254 100644 --- a/rsocket/src/test/java/org/springframework/security/rsocket/authorization/PayloadExchangeMatcherReactiveAuthorizationManagerTests.java +++ b/rsocket/src/test/java/org/springframework/security/rsocket/authorization/PayloadExchangeMatcherReactiveAuthorizationManagerTests.java @@ -77,7 +77,8 @@ public class PayloadExchangeMatcherReactiveAuthorizationManagerTests { given(this.authz.check(any(), any())).willReturn(Mono.just(expected)); PayloadExchangeMatcherReactiveAuthorizationManager manager = PayloadExchangeMatcherReactiveAuthorizationManager .builder().add(new PayloadExchangeMatcherEntry<>(PayloadExchangeMatchers.anyExchange(), this.authz)) - .add(new PayloadExchangeMatcherEntry<>(e -> PayloadExchangeMatcher.MatchResult.notMatch(), this.authz2)) + .add(new PayloadExchangeMatcherEntry<>((e) -> PayloadExchangeMatcher.MatchResult.notMatch(), + this.authz2)) .build(); assertThat(manager.check(Mono.empty(), this.exchange).block()).isEqualTo(expected); @@ -89,7 +90,8 @@ public class PayloadExchangeMatcherReactiveAuthorizationManagerTests { given(this.authz2.check(any(), any())).willReturn(Mono.just(expected)); PayloadExchangeMatcherReactiveAuthorizationManager manager = PayloadExchangeMatcherReactiveAuthorizationManager .builder() - .add(new PayloadExchangeMatcherEntry<>(e -> PayloadExchangeMatcher.MatchResult.notMatch(), this.authz)) + .add(new PayloadExchangeMatcherEntry<>((e) -> PayloadExchangeMatcher.MatchResult.notMatch(), + this.authz)) .add(new PayloadExchangeMatcherEntry<>(PayloadExchangeMatchers.anyExchange(), this.authz2)).build(); assertThat(manager.check(Mono.empty(), this.exchange).block()).isEqualTo(expected); diff --git a/rsocket/src/test/java/org/springframework/security/rsocket/core/CaptureSecurityContextSocketAcceptor.java b/rsocket/src/test/java/org/springframework/security/rsocket/core/CaptureSecurityContextSocketAcceptor.java index 0146455715..6c6e25e608 100644 --- a/rsocket/src/test/java/org/springframework/security/rsocket/core/CaptureSecurityContextSocketAcceptor.java +++ b/rsocket/src/test/java/org/springframework/security/rsocket/core/CaptureSecurityContextSocketAcceptor.java @@ -43,7 +43,7 @@ class CaptureSecurityContextSocketAcceptor implements SocketAcceptor { @Override public Mono accept(ConnectionSetupPayload setup, RSocket sendingSocket) { return ReactiveSecurityContextHolder.getContext() - .doOnNext(securityContext -> this.securityContext = securityContext).thenReturn(this.accept); + .doOnNext((securityContext) -> this.securityContext = securityContext).thenReturn(this.accept); } public SecurityContext getSecurityContext() { diff --git a/rsocket/src/test/java/org/springframework/security/rsocket/core/PayloadInterceptorRSocketTests.java b/rsocket/src/test/java/org/springframework/security/rsocket/core/PayloadInterceptorRSocketTests.java index f5aa79ab3b..a96324d2f6 100644 --- a/rsocket/src/test/java/org/springframework/security/rsocket/core/PayloadInterceptorRSocketTests.java +++ b/rsocket/src/test/java/org/springframework/security/rsocket/core/PayloadInterceptorRSocketTests.java @@ -140,7 +140,7 @@ public class PayloadInterceptorRSocketTests { StepVerifier.create(interceptor.fireAndForget(this.payload)) .then(() -> this.voidResult.assertWasNotSubscribed()) - .verifyErrorSatisfies(e -> assertThat(e).isEqualTo(expected)); + .verifyErrorSatisfies((e) -> assertThat(e).isEqualTo(expected)); verify(this.interceptor).intercept(this.exchange.capture(), any()); assertThat(this.exchange.getValue().getPayload()).isEqualTo(this.payload); @@ -155,7 +155,7 @@ public class PayloadInterceptorRSocketTests { RSocket assertAuthentication = new RSocketProxy(this.delegate) { @Override public Mono fireAndForget(Payload payload) { - return assertAuthentication(authentication).flatMap(a -> super.fireAndForget(payload)); + return assertAuthentication(authentication).flatMap((a) -> super.fireAndForget(payload)); } }; PayloadInterceptorRSocket interceptor = new PayloadInterceptorRSocket(assertAuthentication, @@ -209,7 +209,7 @@ public class PayloadInterceptorRSocketTests { RSocket assertAuthentication = new RSocketProxy(this.delegate) { @Override public Mono requestResponse(Payload payload) { - return assertAuthentication(authentication).flatMap(a -> super.requestResponse(payload)); + return assertAuthentication(authentication).flatMap((a) -> super.requestResponse(payload)); } }; PayloadInterceptorRSocket interceptor = new PayloadInterceptorRSocket(assertAuthentication, @@ -249,7 +249,7 @@ public class PayloadInterceptorRSocketTests { StepVerifier.create(interceptor.requestStream(this.payload)) .then(() -> this.payloadResult.assertNoSubscribers()) - .verifyErrorSatisfies(e -> assertThat(e).isEqualTo(expected)); + .verifyErrorSatisfies((e) -> assertThat(e).isEqualTo(expected)); verify(this.interceptor).intercept(this.exchange.capture(), any()); assertThat(this.exchange.getValue().getPayload()).isEqualTo(this.payload); @@ -264,7 +264,7 @@ public class PayloadInterceptorRSocketTests { RSocket assertAuthentication = new RSocketProxy(this.delegate) { @Override public Flux requestStream(Payload payload) { - return assertAuthentication(authentication).flatMapMany(a -> super.requestStream(payload)); + return assertAuthentication(authentication).flatMapMany((a) -> super.requestStream(payload)); } }; PayloadInterceptorRSocket interceptor = new PayloadInterceptorRSocket(assertAuthentication, @@ -305,7 +305,7 @@ public class PayloadInterceptorRSocketTests { StepVerifier.create(interceptor.requestChannel(Flux.just(this.payload))) .then(() -> this.payloadResult.assertNoSubscribers()) - .verifyErrorSatisfies(e -> assertThat(e).isEqualTo(expected)); + .verifyErrorSatisfies((e) -> assertThat(e).isEqualTo(expected)); verify(this.interceptor).intercept(this.exchange.capture(), any()); assertThat(this.exchange.getValue().getPayload()).isEqualTo(this.payload); @@ -321,7 +321,7 @@ public class PayloadInterceptorRSocketTests { RSocket assertAuthentication = new RSocketProxy(this.delegate) { @Override public Flux requestChannel(Publisher payload) { - return assertAuthentication(authentication).flatMapMany(a -> super.requestChannel(payload)); + return assertAuthentication(authentication).flatMapMany((a) -> super.requestChannel(payload)); } }; PayloadInterceptorRSocket interceptor = new PayloadInterceptorRSocket(assertAuthentication, @@ -359,7 +359,7 @@ public class PayloadInterceptorRSocketTests { Arrays.asList(this.interceptor), this.metadataMimeType, this.dataMimeType); StepVerifier.create(interceptor.metadataPush(this.payload)).then(() -> this.voidResult.assertWasNotSubscribed()) - .verifyErrorSatisfies(e -> assertThat(e).isEqualTo(expected)); + .verifyErrorSatisfies((e) -> assertThat(e).isEqualTo(expected)); verify(this.interceptor).intercept(this.exchange.capture(), any()); assertThat(this.exchange.getValue().getPayload()).isEqualTo(this.payload); @@ -374,7 +374,7 @@ public class PayloadInterceptorRSocketTests { RSocket assertAuthentication = new RSocketProxy(this.delegate) { @Override public Mono metadataPush(Payload payload) { - return assertAuthentication(authentication).flatMap(a -> super.metadataPush(payload)); + return assertAuthentication(authentication).flatMap((a) -> super.metadataPush(payload)); } }; PayloadInterceptorRSocket interceptor = new PayloadInterceptorRSocket(assertAuthentication, @@ -459,11 +459,11 @@ public class PayloadInterceptorRSocketTests { private Mono assertAuthentication(Authentication authentication) { return ReactiveSecurityContextHolder.getContext().map(SecurityContext::getAuthentication) - .doOnNext(a -> assertThat(a).isEqualTo(authentication)); + .doOnNext((a) -> assertThat(a).isEqualTo(authentication)); } private Answer withAuthenticated(Authentication authentication) { - return invocation -> { + return (invocation) -> { PayloadInterceptorChain c = (PayloadInterceptorChain) invocation.getArguments()[1]; return c.next(new DefaultPayloadExchange(PayloadExchangeType.REQUEST_CHANNEL, this.payload, this.metadataMimeType, this.dataMimeType)) @@ -472,7 +472,7 @@ public class PayloadInterceptorRSocketTests { } private static Answer> withChainNext() { - return invocation -> { + return (invocation) -> { PayloadExchange exchange = (PayloadExchange) invocation.getArguments()[0]; PayloadInterceptorChain chain = (PayloadInterceptorChain) invocation.getArguments()[1]; return chain.next(exchange); diff --git a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/core/OpenSamlInitializationService.java b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/core/OpenSamlInitializationService.java index 90c1c275b4..d617fdafc1 100644 --- a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/core/OpenSamlInitializationService.java +++ b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/core/OpenSamlInitializationService.java @@ -52,7 +52,7 @@ import org.springframework.security.saml2.Saml2Exception; * * 
  * 	static {
- *  	OpenSamlInitializationService.requireInitialize(registry -> {
+ *  	OpenSamlInitializationService.requireInitialize((registry) -> {
  *  	 	registry.setParserPool(...);
  *  		registry.getBuilderFactory().registerBuilder(...);
  *  	});
@@ -94,7 +94,7 @@ public final class OpenSamlInitializationService {
 	 * @throws Saml2Exception if OpenSAML failed to initialize
 	 */
 	public static boolean initialize() {
-		return initialize(registry -> {
+		return initialize((registry) -> {
 		});
 	}
 
diff --git a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlAuthenticationProvider.java b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlAuthenticationProvider.java
index 30e796ec73..0a5b4cd4ba 100644
--- a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlAuthenticationProvider.java
+++ b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlAuthenticationProvider.java
@@ -175,20 +175,22 @@ public final class OpenSamlAuthenticationProvider implements AuthenticationProvi
 
 	private final ParserPool parserPool;
 
-	private Converter> authoritiesExtractor = (a -> Collections
+	private Converter> authoritiesExtractor = ((a) -> Collections
 			.singletonList(new SimpleGrantedAuthority("ROLE_USER")));
 
-	private GrantedAuthoritiesMapper authoritiesMapper = (a -> a);
+	private GrantedAuthoritiesMapper authoritiesMapper = ((a) -> a);
 
 	private Duration responseTimeValidationSkew = Duration.ofMinutes(5);
 
-	private Function> authenticationConverter = token -> response -> {
-		Assertion assertion = CollectionUtils.firstElement(response.getAssertions());
-		String username = assertion.getSubject().getNameID().getValue();
-		Map> attributes = getAssertionAttributes(assertion);
-		return new Saml2Authentication(new DefaultSaml2AuthenticatedPrincipal(username, attributes),
-				token.getSaml2Response(), this.authoritiesMapper.mapAuthorities(getAssertionAuthorities(assertion)));
-	};
+	private Function> authenticationConverter = (
+			token) -> (response) -> {
+				Assertion assertion = CollectionUtils.firstElement(response.getAssertions());
+				String username = assertion.getSubject().getNameID().getValue();
+				Map> attributes = getAssertionAttributes(assertion);
+				return new Saml2Authentication(new DefaultSaml2AuthenticatedPrincipal(username, attributes),
+						token.getSaml2Response(),
+						this.authoritiesMapper.mapAuthorities(getAssertionAuthorities(assertion)));
+			};
 
 	private Converter signatureTrustEngineConverter = new SignatureTrustEngineConverter();
 
diff --git a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlAuthenticationRequestFactory.java b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlAuthenticationRequestFactory.java
index e5a57b44f6..af788ed70b 100644
--- a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlAuthenticationRequestFactory.java
+++ b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlAuthenticationRequestFactory.java
@@ -79,15 +79,16 @@ public class OpenSamlAuthenticationRequestFactory implements Saml2Authentication
 
 	private IssuerBuilder issuerBuilder;
 
-	private Converter protocolBindingResolver = context -> {
+	private Converter protocolBindingResolver = (context) -> {
 		if (context == null) {
 			return SAMLConstants.SAML2_POST_BINDING_URI;
 		}
 		return context.getRelyingPartyRegistration().getAssertionConsumerServiceBinding().getUrn();
 	};
 
-	private Function> authnRequestConsumerResolver = context -> authnRequest -> {
-	};
+	private Function> authnRequestConsumerResolver = (
+			context) -> (authnRequest) -> {
+			};
 
 	/**
 	 * Creates an {@link OpenSamlAuthenticationRequestFactory}
@@ -220,7 +221,7 @@ public class OpenSamlAuthenticationRequestFactory implements Saml2Authentication
 		if (!isAllowedBinding) {
 			throw new IllegalArgumentException("Invalid protocol binding: " + protocolBinding);
 		}
-		this.protocolBindingResolver = context -> protocolBinding;
+		this.protocolBindingResolver = (context) -> protocolBinding;
 	}
 
 	private AuthnRequest sign(AuthnRequest authnRequest, RelyingPartyRegistration relyingPartyRegistration) {
diff --git a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/Saml2AuthenticationRequest.java b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/Saml2AuthenticationRequest.java
index 495709919b..1cac7d9fb5 100644
--- a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/Saml2AuthenticationRequest.java
+++ b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/Saml2AuthenticationRequest.java
@@ -113,7 +113,7 @@ public final class Saml2AuthenticationRequest {
 	public static Builder withAuthenticationRequestContext(Saml2AuthenticationRequestContext context) {
 		return new Builder().assertionConsumerServiceUrl(context.getAssertionConsumerServiceUrl())
 				.issuer(context.getIssuer()).destination(context.getDestination())
-				.credentials(c -> c.addAll(context.getRelyingPartyRegistration().getCredentials()));
+				.credentials((c) -> c.addAll(context.getRelyingPartyRegistration().getCredentials()));
 	}
 
 	/**
@@ -148,7 +148,7 @@ public final class Saml2AuthenticationRequest {
 		 * request. For example: 
 		 *     Saml2X509Credential credential = ...;
 		 *     return Saml2AuthenticationRequest.withLocalSpEntityId("id")
-		 *             .credentials(c -> c.add(credential))
+		 *             .credentials((c) -> c.add(credential))
 		 *             ...
 		 *             .build();
 		 * 
diff --git a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/Saml2AuthenticationToken.java b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/Saml2AuthenticationToken.java
index 8e32c57a7f..c235157147 100644
--- a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/Saml2AuthenticationToken.java
+++ b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/Saml2AuthenticationToken.java
@@ -78,9 +78,8 @@ public class Saml2AuthenticationToken extends AbstractAuthenticationToken {
 		super(null);
 		this.relyingPartyRegistration = RelyingPartyRegistration.withRegistrationId(idpEntityId)
 				.entityId(localSpEntityId).assertionConsumerServiceLocation(recipientUri)
-				.credentials(c -> c.addAll(credentials))
-				.assertingPartyDetails(
-						assertingParty -> assertingParty.entityId(idpEntityId).singleSignOnServiceLocation(idpEntityId))
+				.credentials((c) -> c.addAll(credentials)).assertingPartyDetails((assertingParty) -> assertingParty
+						.entityId(idpEntityId).singleSignOnServiceLocation(idpEntityId))
 				.build();
 		this.saml2Response = saml2Response;
 	}
diff --git a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/registration/OpenSamlRelyingPartyRegistrationBuilderHttpMessageConverter.java b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/registration/OpenSamlRelyingPartyRegistrationBuilderHttpMessageConverter.java
index 9616db50e7..52aa839ddd 100644
--- a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/registration/OpenSamlRelyingPartyRegistrationBuilderHttpMessageConverter.java
+++ b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/registration/OpenSamlRelyingPartyRegistrationBuilderHttpMessageConverter.java
@@ -160,10 +160,10 @@ public class OpenSamlRelyingPartyRegistrationBuilderHttpMessageConverter
 					"Metadata response is missing verification certificates, necessary for verifying SAML assertions");
 		}
 		RelyingPartyRegistration.Builder builder = RelyingPartyRegistration.withRegistrationId(descriptor.getEntityID())
-				.assertingPartyDetails(party -> party.entityId(descriptor.getEntityID())
+				.assertingPartyDetails((party) -> party.entityId(descriptor.getEntityID())
 						.wantAuthnRequestsSigned(Boolean.TRUE.equals(idpssoDescriptor.getWantAuthnRequestsSigned()))
-						.verificationX509Credentials(c -> c.addAll(verification))
-						.encryptionX509Credentials(c -> c.addAll(encryption)));
+						.verificationX509Credentials((c) -> c.addAll(verification))
+						.encryptionX509Credentials((c) -> c.addAll(encryption)));
 		for (SingleSignOnService singleSignOnService : idpssoDescriptor.getSingleSignOnServices()) {
 			Saml2MessageBinding binding;
 			if (singleSignOnService.getBinding().equals(Saml2MessageBinding.POST.getUrn())) {
@@ -175,8 +175,9 @@ public class OpenSamlRelyingPartyRegistrationBuilderHttpMessageConverter
 			else {
 				continue;
 			}
-			builder.assertingPartyDetails(party -> party.singleSignOnServiceLocation(singleSignOnService.getLocation())
-					.singleSignOnServiceBinding(binding));
+			builder.assertingPartyDetails(
+					(party) -> party.singleSignOnServiceLocation(singleSignOnService.getLocation())
+							.singleSignOnServiceBinding(binding));
 			return builder;
 		}
 		throw new Saml2Exception(
diff --git a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/registration/RelyingPartyRegistration.java b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/registration/RelyingPartyRegistration.java
index 3927cd2c6b..ccbf33791f 100644
--- a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/registration/RelyingPartyRegistration.java
+++ b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/registration/RelyingPartyRegistration.java
@@ -59,11 +59,11 @@ import org.springframework.util.Assert;
  *	RelyingPartyRegistration rp = RelyingPartyRegistration.withRegistrationId(registrationId)
  * 			.entityId(relyingPartyEntityId)
  * 			.assertionConsumerServiceLocation(assertingConsumerServiceLocation)
- * 		 	.signingX509Credentials(c -> c.add(relyingPartySigningCredential))
- * 			.assertingPartyDetails(details -> details
+ * 		 	.signingX509Credentials((c) -> c.add(relyingPartySigningCredential))
+ * 			.assertingPartyDetails((details) -> details
  * 				.entityId(assertingPartyEntityId));
  * 				.singleSignOnServiceLocation(singleSignOnServiceLocation))
- * 				.verifyingX509Credentials(c -> c.add(assertingPartyVerificationCredential))
+ * 				.verifyingX509Credentials((c) -> c.add(assertingPartyVerificationCredential))
  * 			.build();
  *
* @@ -362,17 +362,17 @@ public final class RelyingPartyRegistration { public static Builder withRelyingPartyRegistration(RelyingPartyRegistration registration) { Assert.notNull(registration, "registration cannot be null"); return withRegistrationId(registration.getRegistrationId()).entityId(registration.getEntityId()) - .signingX509Credentials(c -> c.addAll(registration.getSigningX509Credentials())) - .decryptionX509Credentials(c -> c.addAll(registration.getDecryptionX509Credentials())) + .signingX509Credentials((c) -> c.addAll(registration.getSigningX509Credentials())) + .decryptionX509Credentials((c) -> c.addAll(registration.getDecryptionX509Credentials())) .assertionConsumerServiceLocation(registration.getAssertionConsumerServiceLocation()) .assertionConsumerServiceBinding(registration.getAssertionConsumerServiceBinding()) - .assertingPartyDetails(assertingParty -> assertingParty + .assertingPartyDetails((assertingParty) -> assertingParty .entityId(registration.getAssertingPartyDetails().getEntityId()) .wantAuthnRequestsSigned(registration.getAssertingPartyDetails().getWantAuthnRequestsSigned()) - .verificationX509Credentials( - c -> c.addAll(registration.getAssertingPartyDetails().getVerificationX509Credentials())) + .verificationX509Credentials((c) -> c + .addAll(registration.getAssertingPartyDetails().getVerificationX509Credentials())) .encryptionX509Credentials( - c -> c.addAll(registration.getAssertingPartyDetails().getEncryptionX509Credentials())) + (c) -> c.addAll(registration.getAssertingPartyDetails().getEncryptionX509Credentials())) .singleSignOnServiceLocation( registration.getAssertingPartyDetails().getSingleSignOnServiceLocation()) .singleSignOnServiceBinding( @@ -913,7 +913,7 @@ public final class RelyingPartyRegistration { * communication between IDP and SP For example: * Saml2X509Credential credential = ...; * return RelyingPartyRegistration.withRegistrationId("id") - * .credentials(c -> c.add(credential)) + * .credentials((c) -> c.add(credential)) * ... * .build(); * @@ -959,7 +959,7 @@ public final class RelyingPartyRegistration { */ @Deprecated public Builder remoteIdpEntityId(String entityId) { - assertingPartyDetails(idp -> idp.entityId(entityId)); + assertingPartyDetails((idp) -> idp.entityId(entityId)); return this; } @@ -973,7 +973,7 @@ public final class RelyingPartyRegistration { */ @Deprecated public Builder idpWebSsoUrl(String url) { - assertingPartyDetails(config -> config.singleSignOnServiceLocation(url)); + assertingPartyDetails((config) -> config.singleSignOnServiceLocation(url)); return this; } @@ -1013,16 +1013,16 @@ public final class RelyingPartyRegistration { for (org.springframework.security.saml2.credentials.Saml2X509Credential credential : this.credentials) { Saml2X509Credential mapped = fromDeprecated(credential); if (credential.isSigningCredential()) { - signingX509Credentials(c -> c.add(mapped)); + signingX509Credentials((c) -> c.add(mapped)); } if (credential.isDecryptionCredential()) { - decryptionX509Credentials(c -> c.add(mapped)); + decryptionX509Credentials((c) -> c.add(mapped)); } if (credential.isSignatureVerficationCredential()) { - this.providerDetails.assertingPartyDetailsBuilder.verificationX509Credentials(c -> c.add(mapped)); + this.providerDetails.assertingPartyDetailsBuilder.verificationX509Credentials((c) -> c.add(mapped)); } if (credential.isEncryptionCredential()) { - this.providerDetails.assertingPartyDetailsBuilder.encryptionX509Credentials(c -> c.add(mapped)); + this.providerDetails.assertingPartyDetailsBuilder.encryptionX509Credentials((c) -> c.add(mapped)); } } diff --git a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/DefaultRelyingPartyRegistrationResolver.java b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/DefaultRelyingPartyRegistrationResolver.java index d5fa8df8b5..c81f6b2b6d 100644 --- a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/DefaultRelyingPartyRegistrationResolver.java +++ b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/DefaultRelyingPartyRegistrationResolver.java @@ -80,7 +80,7 @@ public final class DefaultRelyingPartyRegistrationResolver } private Function templateResolver(String applicationUri, RelyingPartyRegistration relyingParty) { - return template -> resolveUrlTemplate(template, applicationUri, relyingParty); + return (template) -> resolveUrlTemplate(template, applicationUri, relyingParty); } private static String resolveUrlTemplate(String template, String baseUrl, RelyingPartyRegistration relyingParty) { diff --git a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/core/OpenSamlInitializationServiceTests.java b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/core/OpenSamlInitializationServiceTests.java index ca2924b3fd..85bb9bbb48 100644 --- a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/core/OpenSamlInitializationServiceTests.java +++ b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/core/OpenSamlInitializationServiceTests.java @@ -37,7 +37,7 @@ public class OpenSamlInitializationServiceTests { OpenSamlInitializationService.initialize(); XMLObjectProviderRegistry registry = ConfigurationService.get(XMLObjectProviderRegistry.class); assertThat(registry.getParserPool()).isNotNull(); - assertThatCode(() -> OpenSamlInitializationService.requireInitialize(r -> { + assertThatCode(() -> OpenSamlInitializationService.requireInitialize((r) -> { })).isInstanceOf(Saml2Exception.class).hasMessageContaining("OpenSAML was already initialized previously"); } diff --git a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlAuthenticationProviderTests.java b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlAuthenticationProviderTests.java index b4afd923c2..02a3be00ad 100644 --- a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlAuthenticationProviderTests.java +++ b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlAuthenticationProviderTests.java @@ -210,7 +210,7 @@ public class OpenSamlAuthenticationProviderTests { Response response = TestOpenSamlObjects.response(); Assertion assertion = TestOpenSamlObjects.assertion(); assertion.getSubject().getSubjectConfirmations() - .forEach(sc -> sc.getSubjectConfirmationData().setAddress("10.10.10.10")); + .forEach((sc) -> sc.getSubjectConfirmationData().setAddress("10.10.10.10")); TestOpenSamlObjects.signed(assertion, TestSaml2X509Credentials.assertingPartySigningCredential(), RELYING_PARTY_ENTITY_ID); response.getAssertions().add(assertion); @@ -401,7 +401,7 @@ public class OpenSamlAuthenticationProviderTests { ValidationContext context = mock(ValidationContext.class); given(context.getStaticParameters()).willReturn(parameters); OpenSamlAuthenticationProvider provider = new OpenSamlAuthenticationProvider(); - provider.setValidationContextConverter(tuple -> context); + provider.setValidationContextConverter((tuple) -> context); Response response = TestOpenSamlObjects.response(); Assertion assertion = TestOpenSamlObjects.assertion(); response.getAssertions().add(assertion); diff --git a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlAuthenticationRequestFactoryTests.java b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlAuthenticationRequestFactoryTests.java index 7a40ec0b9a..1d17a31016 100644 --- a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlAuthenticationRequestFactoryTests.java +++ b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlAuthenticationRequestFactoryTests.java @@ -70,9 +70,9 @@ public class OpenSamlAuthenticationRequestFactoryTests { public void setUp() { this.relyingPartyRegistrationBuilder = RelyingPartyRegistration.withRegistrationId("id") .assertionConsumerServiceLocation("template") - .providerDetails(c -> c.webSsoUrl("https://destination/sso")) - .providerDetails(c -> c.entityId("remote-entity-id")).localEntityIdTemplate("local-entity-id") - .credentials(c -> c.add(TestSaml2X509Credentials.relyingPartySigningCredential())); + .providerDetails((c) -> c.webSsoUrl("https://destination/sso")) + .providerDetails((c) -> c.entityId("remote-entity-id")).localEntityIdTemplate("local-entity-id") + .credentials((c) -> c.add(TestSaml2X509Credentials.relyingPartySigningCredential())); this.relyingPartyRegistration = this.relyingPartyRegistrationBuilder.build(); this.contextBuilder = Saml2AuthenticationRequestContext.builder().issuer("https://issuer") .relyingPartyRegistration(this.relyingPartyRegistration) @@ -107,7 +107,7 @@ public class OpenSamlAuthenticationRequestFactoryTests { this.context = this.contextBuilder.relayState("Relay State Value") .relyingPartyRegistration( RelyingPartyRegistration.withRelyingPartyRegistration(this.relyingPartyRegistration) - .providerDetails(c -> c.signAuthNRequest(false)).build()) + .providerDetails((c) -> c.signAuthNRequest(false)).build()) .build(); Saml2RedirectAuthenticationRequest result = this.factory.createRedirectAuthenticationRequest(this.context); assertThat(result.getSamlRequest()).isNotEmpty(); @@ -122,7 +122,7 @@ public class OpenSamlAuthenticationRequestFactoryTests { this.context = this.contextBuilder.relayState("Relay State Value") .relyingPartyRegistration( RelyingPartyRegistration.withRelyingPartyRegistration(this.relyingPartyRegistration) - .providerDetails(c -> c.signAuthNRequest(false)).build()) + .providerDetails((c) -> c.signAuthNRequest(false)).build()) .build(); Saml2PostAuthenticationRequest result = this.factory.createPostAuthenticationRequest(this.context); assertThat(result.getSamlRequest()).isNotEmpty(); @@ -170,7 +170,7 @@ public class OpenSamlAuthenticationRequestFactoryTests { public void createPostAuthenticationRequestWhenAuthnRequestConsumerThenUses() { Function> authnRequestConsumerResolver = mock( Function.class); - given(authnRequestConsumerResolver.apply(this.context)).willReturn(authnRequest -> { + given(authnRequestConsumerResolver.apply(this.context)).willReturn((authnRequest) -> { }); this.factory.setAuthnRequestConsumerResolver(authnRequestConsumerResolver); @@ -182,7 +182,7 @@ public class OpenSamlAuthenticationRequestFactoryTests { public void createRedirectAuthenticationRequestWhenAuthnRequestConsumerThenUses() { Function> authnRequestConsumerResolver = mock( Function.class); - given(authnRequestConsumerResolver.apply(this.context)).willReturn(authnRequest -> { + given(authnRequestConsumerResolver.apply(this.context)).willReturn((authnRequest) -> { }); this.factory.setAuthnRequestConsumerResolver(authnRequestConsumerResolver); diff --git a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/authentication/Saml2AuthenticationRequestFactoryTests.java b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/authentication/Saml2AuthenticationRequestFactoryTests.java index 383b0ed5f9..c5b611e6d6 100644 --- a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/authentication/Saml2AuthenticationRequestFactoryTests.java +++ b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/authentication/Saml2AuthenticationRequestFactoryTests.java @@ -32,14 +32,14 @@ public class Saml2AuthenticationRequestFactoryTests { private RelyingPartyRegistration registration = RelyingPartyRegistration.withRegistrationId("id") .assertionConsumerServiceUrlTemplate("template") - .providerDetails(c -> c.webSsoUrl("https://example.com/destination")) - .providerDetails(c -> c.entityId("remote-entity-id")).localEntityIdTemplate("local-entity-id") - .credentials(c -> c.add(TestSaml2X509Credentials.relyingPartySigningCredential())).build(); + .providerDetails((c) -> c.webSsoUrl("https://example.com/destination")) + .providerDetails((c) -> c.entityId("remote-entity-id")).localEntityIdTemplate("local-entity-id") + .credentials((c) -> c.add(TestSaml2X509Credentials.relyingPartySigningCredential())).build(); @Test public void createAuthenticationRequestParametersWhenRedirectDefaultIsUsedMessageIsDeflatedAndEncoded() { final String value = "Test String: " + UUID.randomUUID().toString(); - Saml2AuthenticationRequestFactory factory = request -> value; + Saml2AuthenticationRequestFactory factory = (request) -> value; Saml2AuthenticationRequestContext request = Saml2AuthenticationRequestContext.builder() .relyingPartyRegistration(this.registration).issuer("https://example.com/issuer") .assertionConsumerServiceUrl("https://example.com/acs-url").build(); @@ -53,7 +53,7 @@ public class Saml2AuthenticationRequestFactoryTests { @Test public void createAuthenticationRequestParametersWhenPostDefaultIsUsedMessageIsEncoded() { final String value = "Test String: " + UUID.randomUUID().toString(); - Saml2AuthenticationRequestFactory factory = request -> value; + Saml2AuthenticationRequestFactory factory = (request) -> value; Saml2AuthenticationRequestContext request = Saml2AuthenticationRequestContext.builder() .relyingPartyRegistration(this.registration).issuer("https://example.com/issuer") .assertionConsumerServiceUrl("https://example.com/acs-url").build(); diff --git a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/metadata/OpenSamlMetadataResolverTests.java b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/metadata/OpenSamlMetadataResolverTests.java index 4d66195f89..3d7344705d 100644 --- a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/metadata/OpenSamlMetadataResolverTests.java +++ b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/metadata/OpenSamlMetadataResolverTests.java @@ -53,8 +53,8 @@ public class OpenSamlMetadataResolverTests { public void resolveWhenRelyingPartyNoCredentialsThenMetadataMatches() { // given RelyingPartyRegistration relyingPartyRegistration = TestRelyingPartyRegistrations.noCredentials() - .assertingPartyDetails(party -> party.verificationX509Credentials( - c -> c.add(TestSaml2X509Credentials.relyingPartyVerifyingCredential()))) + .assertingPartyDetails((party) -> party.verificationX509Credentials( + (c) -> c.add(TestSaml2X509Credentials.relyingPartyVerifyingCredential()))) .build(); OpenSamlMetadataResolver openSamlMetadataResolver = new OpenSamlMetadataResolver(); diff --git a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/registration/RelyingPartyRegistrationTests.java b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/registration/RelyingPartyRegistrationTests.java index cc85cac289..2c6fd22f4d 100644 --- a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/registration/RelyingPartyRegistrationTests.java +++ b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/registration/RelyingPartyRegistrationTests.java @@ -28,8 +28,8 @@ public class RelyingPartyRegistrationTests { @Test public void withRelyingPartyRegistrationWorks() { RelyingPartyRegistration registration = TestRelyingPartyRegistrations.relyingPartyRegistration() - .providerDetails(p -> p.binding(Saml2MessageBinding.POST)) - .providerDetails(p -> p.signAuthNRequest(false)) + .providerDetails((p) -> p.binding(Saml2MessageBinding.POST)) + .providerDetails((p) -> p.signAuthNRequest(false)) .assertionConsumerServiceBinding(Saml2MessageBinding.REDIRECT).build(); RelyingPartyRegistration copy = RelyingPartyRegistration.withRelyingPartyRegistration(registration).build(); compareRegistrations(registration, copy); @@ -77,9 +77,9 @@ public class RelyingPartyRegistrationTests { public void buildWhenUsingDefaultsThenAssertionConsumerServiceBindingDefaultsToPost() { RelyingPartyRegistration relyingPartyRegistration = RelyingPartyRegistration.withRegistrationId("id") .entityId("entity-id").assertionConsumerServiceLocation("location") - .assertingPartyDetails( - assertingParty -> assertingParty.entityId("entity-id").singleSignOnServiceLocation("location")) - .credentials(c -> c.add(TestSaml2X509Credentials.relyingPartyVerifyingCredential())).build(); + .assertingPartyDetails((assertingParty) -> assertingParty.entityId("entity-id") + .singleSignOnServiceLocation("location")) + .credentials((c) -> c.add(TestSaml2X509Credentials.relyingPartyVerifyingCredential())).build(); assertThat(relyingPartyRegistration.getAssertionConsumerServiceBinding()).isEqualTo(Saml2MessageBinding.POST); } diff --git a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/registration/TestRelyingPartyRegistrations.java b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/registration/TestRelyingPartyRegistrations.java index 6cca53f78a..4a1b693f49 100644 --- a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/registration/TestRelyingPartyRegistrations.java +++ b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/registration/TestRelyingPartyRegistrations.java @@ -42,25 +42,25 @@ public final class TestRelyingPartyRegistrations { return RelyingPartyRegistration.withRegistrationId(registrationId).entityId(rpEntityId) .assertionConsumerServiceLocation(assertionConsumerServiceLocation) - .credentials(c -> c.add(signingCredential)) - .providerDetails(c -> c.entityId(apEntityId).webSsoUrl(singleSignOnServiceLocation)) - .credentials(c -> c.add(verificationCertificate)); + .credentials((c) -> c.add(signingCredential)) + .providerDetails((c) -> c.entityId(apEntityId).webSsoUrl(singleSignOnServiceLocation)) + .credentials((c) -> c.add(verificationCertificate)); } public static RelyingPartyRegistration.Builder noCredentials() { return RelyingPartyRegistration.withRegistrationId("registration-id").entityId("rp-entity-id") - .assertionConsumerServiceLocation("https://rp.example.org/acs").assertingPartyDetails(party -> party + .assertionConsumerServiceLocation("https://rp.example.org/acs").assertingPartyDetails((party) -> party .entityId("ap-entity-id").singleSignOnServiceLocation("https://ap.example.org/sso")); } public static RelyingPartyRegistration.Builder full() { return noCredentials() - .signingX509Credentials(c -> c.add(org.springframework.security.saml2.core.TestSaml2X509Credentials + .signingX509Credentials((c) -> c.add(org.springframework.security.saml2.core.TestSaml2X509Credentials .relyingPartySigningCredential())) - .decryptionX509Credentials(c -> c.add(org.springframework.security.saml2.core.TestSaml2X509Credentials + .decryptionX509Credentials((c) -> c.add(org.springframework.security.saml2.core.TestSaml2X509Credentials .relyingPartyDecryptingCredential())) - .assertingPartyDetails(party -> party.verificationX509Credentials( - c -> c.add(org.springframework.security.saml2.core.TestSaml2X509Credentials + .assertingPartyDetails((party) -> party.verificationX509Credentials( + (c) -> c.add(org.springframework.security.saml2.core.TestSaml2X509Credentials .relyingPartyVerifyingCredential()))); } diff --git a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationRequestFilterTests.java b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationRequestFilterTests.java index 78a1e50025..fa3c2774de 100644 --- a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationRequestFilterTests.java +++ b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationRequestFilterTests.java @@ -76,9 +76,9 @@ public class Saml2WebSsoAuthenticationRequestFilterTests { this.filterChain = new MockFilterChain(); this.rpBuilder = RelyingPartyRegistration.withRegistrationId("registration-id") - .providerDetails(c -> c.entityId("idp-entity-id")).providerDetails(c -> c.webSsoUrl(IDP_SSO_URL)) + .providerDetails((c) -> c.entityId("idp-entity-id")).providerDetails((c) -> c.webSsoUrl(IDP_SSO_URL)) .assertionConsumerServiceUrlTemplate("template") - .credentials(c -> c.add(TestSaml2X509Credentials.assertingPartyPrivateCredential())); + .credentials((c) -> c.add(TestSaml2X509Credentials.assertingPartyPrivateCredential())); } @Test @@ -121,7 +121,7 @@ public class Saml2WebSsoAuthenticationRequestFilterTests { @Test public void doFilterWhenSignatureIsDisabledThenSignatureParametersAreNotInTheRedirectURL() throws Exception { given(this.repository.findByRegistrationId("registration-id")) - .willReturn(this.rpBuilder.providerDetails(c -> c.signAuthNRequest(false)).build()); + .willReturn(this.rpBuilder.providerDetails((c) -> c.signAuthNRequest(false)).build()); final String relayStateValue = "https://my-relay-state.example.com?with=param&other=param"; final String relayStateEncoded = UriUtils.encode(relayStateValue, StandardCharsets.ISO_8859_1); this.request.setParameter("RelayState", relayStateValue); @@ -133,7 +133,7 @@ public class Saml2WebSsoAuthenticationRequestFilterTests { @Test public void doFilterWhenPostFormDataIsPresent() throws Exception { given(this.repository.findByRegistrationId("registration-id")) - .willReturn(this.rpBuilder.providerDetails(c -> c.binding(Saml2MessageBinding.POST)).build()); + .willReturn(this.rpBuilder.providerDetails((c) -> c.binding(Saml2MessageBinding.POST)).build()); final String relayStateValue = "https://my-relay-state.example.com?with=param&other=param&javascript{alert('1');}"; final String relayStateEncoded = HtmlUtils.htmlEscape(relayStateValue); this.request.setParameter("RelayState", relayStateValue); @@ -147,8 +147,8 @@ public class Saml2WebSsoAuthenticationRequestFilterTests { @Test public void doFilterWhenSetAuthenticationRequestFactoryThenUses() throws Exception { - RelyingPartyRegistration relyingParty = this.rpBuilder.providerDetails(c -> c.binding(Saml2MessageBinding.POST)) - .build(); + RelyingPartyRegistration relyingParty = this.rpBuilder + .providerDetails((c) -> c.binding(Saml2MessageBinding.POST)).build(); Saml2PostAuthenticationRequest authenticationRequest = mock(Saml2PostAuthenticationRequest.class); given(authenticationRequest.getAuthenticationRequestUri()).willReturn("uri"); given(authenticationRequest.getRelayState()).willReturn("relay"); @@ -167,8 +167,8 @@ public class Saml2WebSsoAuthenticationRequestFilterTests { @Test public void doFilterWhenCustomAuthenticationRequestFactoryThenUses() throws Exception { - RelyingPartyRegistration relyingParty = this.rpBuilder.providerDetails(c -> c.binding(Saml2MessageBinding.POST)) - .build(); + RelyingPartyRegistration relyingParty = this.rpBuilder + .providerDetails((c) -> c.binding(Saml2MessageBinding.POST)).build(); Saml2PostAuthenticationRequest authenticationRequest = mock(Saml2PostAuthenticationRequest.class); given(authenticationRequest.getAuthenticationRequestUri()).willReturn("uri"); given(authenticationRequest.getRelayState()).willReturn("relay"); @@ -201,7 +201,7 @@ public class Saml2WebSsoAuthenticationRequestFilterTests { @Test public void doFilterWhenRequestMatcherFailsThenSkipsFilter() throws Exception { Saml2WebSsoAuthenticationRequestFilter filter = new Saml2WebSsoAuthenticationRequestFilter(this.repository); - filter.setRedirectMatcher(request -> false); + filter.setRedirectMatcher((request) -> false); filter.doFilter(this.request, this.response, this.filterChain); verifyNoInteractions(this.repository); } diff --git a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/DefaultSaml2AuthenticationRequestContextResolverTests.java b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/DefaultSaml2AuthenticationRequestContextResolverTests.java index e12618d650..dbd7eecadc 100644 --- a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/DefaultSaml2AuthenticationRequestContextResolverTests.java +++ b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/DefaultSaml2AuthenticationRequestContextResolverTests.java @@ -50,7 +50,7 @@ public class DefaultSaml2AuthenticationRequestContextResolverTests { private RelyingPartyRegistration.Builder relyingPartyBuilder; private Saml2AuthenticationRequestContextResolver authenticationRequestContextResolver = new DefaultSaml2AuthenticationRequestContextResolver( - new DefaultRelyingPartyRegistrationResolver(id -> this.relyingPartyBuilder.build())); + new DefaultRelyingPartyRegistrationResolver((id) -> this.relyingPartyBuilder.build())); @Before public void setup() { @@ -58,10 +58,10 @@ public class DefaultSaml2AuthenticationRequestContextResolverTests { this.request.setPathInfo("/saml2/authenticate/registration-id"); this.relyingPartyBuilder = RelyingPartyRegistration.withRegistrationId(REGISTRATION_ID) .localEntityIdTemplate(RELYING_PARTY_ENTITY_ID) - .providerDetails(c -> c.entityId(ASSERTING_PARTY_ENTITY_ID)) - .providerDetails(c -> c.webSsoUrl(ASSERTING_PARTY_SSO_URL)) + .providerDetails((c) -> c.entityId(ASSERTING_PARTY_ENTITY_ID)) + .providerDetails((c) -> c.webSsoUrl(ASSERTING_PARTY_SSO_URL)) .assertionConsumerServiceUrlTemplate(RELYING_PARTY_SSO_URL) - .credentials(c -> c.add(TestSaml2X509Credentials.relyingPartyVerifyingCredential())); + .credentials((c) -> c.add(TestSaml2X509Credentials.relyingPartyVerifyingCredential())); } @Test diff --git a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/Saml2MetadataFilterTests.java b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/Saml2MetadataFilterTests.java index 672b53f6f7..3cb5214a36 100644 --- a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/Saml2MetadataFilterTests.java +++ b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/Saml2MetadataFilterTests.java @@ -109,14 +109,14 @@ public class Saml2MetadataFilterTests { // given this.request.setPathInfo("/saml2/service-provider-metadata/validRegistration"); RelyingPartyRegistration validRegistration = TestRelyingPartyRegistrations.noCredentials() - .assertingPartyDetails(party -> party.verificationX509Credentials( - c -> c.add(TestSaml2X509Credentials.relyingPartyVerifyingCredential()))) + .assertingPartyDetails((party) -> party.verificationX509Credentials( + (c) -> c.add(TestSaml2X509Credentials.relyingPartyVerifyingCredential()))) .build(); String generatedMetadata = "test"; given(this.resolver.resolve(validRegistration)).willReturn(generatedMetadata); - this.filter = new Saml2MetadataFilter(request -> validRegistration, this.resolver); + this.filter = new Saml2MetadataFilter((request) -> validRegistration, this.resolver); // when this.filter.doFilter(this.request, this.response, this.chain); diff --git a/samples/boot/hellorsocket/src/integration-test/java/sample/HelloRSocketApplicationITests.java b/samples/boot/hellorsocket/src/integration-test/java/sample/HelloRSocketApplicationITests.java index 962b00f0c8..0709dd93bc 100644 --- a/samples/boot/hellorsocket/src/integration-test/java/sample/HelloRSocketApplicationITests.java +++ b/samples/boot/hellorsocket/src/integration-test/java/sample/HelloRSocketApplicationITests.java @@ -53,7 +53,7 @@ public class HelloRSocketApplicationITests { public void messageWhenAuthenticatedThenSuccess() { UsernamePasswordMetadata credentials = new UsernamePasswordMetadata("user", "password"); RSocketRequester requester = this.requester - .rsocketStrategies(builder -> builder.encoder(new BasicAuthenticationEncoder())) + .rsocketStrategies((builder) -> builder.encoder(new BasicAuthenticationEncoder())) .setupMetadata(credentials, BASIC_AUTHENTICATION_MIME_TYPE) .connectTcp("localhost", this.port) .block(); diff --git a/samples/boot/hellowebflux-method/src/integration-test/java/sample/HelloWebfluxMethodApplicationITests.java b/samples/boot/hellowebflux-method/src/integration-test/java/sample/HelloWebfluxMethodApplicationITests.java index 40974df660..d95956b2d6 100644 --- a/samples/boot/hellowebflux-method/src/integration-test/java/sample/HelloWebfluxMethodApplicationITests.java +++ b/samples/boot/hellowebflux-method/src/integration-test/java/sample/HelloWebfluxMethodApplicationITests.java @@ -70,11 +70,11 @@ public class HelloWebfluxMethodApplicationITests { } private Consumer robsCredentials() { - return httpHeaders -> httpHeaders.setBasicAuth("rob", "rob"); + return (httpHeaders) -> httpHeaders.setBasicAuth("rob", "rob"); } private Consumer adminCredentials() { - return httpHeaders -> httpHeaders.setBasicAuth("admin", "admin"); + return (httpHeaders) -> httpHeaders.setBasicAuth("admin", "admin"); } } diff --git a/samples/boot/hellowebflux-method/src/main/java/sample/SecurityConfig.java b/samples/boot/hellowebflux-method/src/main/java/sample/SecurityConfig.java index cf8cd0e92b..fbbcdc835e 100644 --- a/samples/boot/hellowebflux-method/src/main/java/sample/SecurityConfig.java +++ b/samples/boot/hellowebflux-method/src/main/java/sample/SecurityConfig.java @@ -40,7 +40,7 @@ public class SecurityConfig { return http // Demonstrate that method security works // Best practice to use both for defense in depth - .authorizeExchange(exchanges -> exchanges + .authorizeExchange((exchanges) -> exchanges .anyExchange().permitAll() ) .httpBasic(withDefaults()) diff --git a/samples/boot/hellowebflux-method/src/test/java/sample/HelloWebfluxMethodApplicationTests.java b/samples/boot/hellowebflux-method/src/test/java/sample/HelloWebfluxMethodApplicationTests.java index cf361e2bc2..6a2e2898ed 100644 --- a/samples/boot/hellowebflux-method/src/test/java/sample/HelloWebfluxMethodApplicationTests.java +++ b/samples/boot/hellowebflux-method/src/test/java/sample/HelloWebfluxMethodApplicationTests.java @@ -123,10 +123,10 @@ public class HelloWebfluxMethodApplicationTests { } private Consumer robsCredentials() { - return httpHeaders -> httpHeaders.setBasicAuth("rob", "rob"); + return (httpHeaders) -> httpHeaders.setBasicAuth("rob", "rob"); } private Consumer adminCredentials() { - return httpHeaders -> httpHeaders.setBasicAuth("admin", "admin"); + return (httpHeaders) -> httpHeaders.setBasicAuth("admin", "admin"); } } diff --git a/samples/boot/hellowebflux/src/integration-test/java/sample/HelloWebfluxApplicationITests.java b/samples/boot/hellowebflux/src/integration-test/java/sample/HelloWebfluxApplicationITests.java index 4f8aa5d3ad..6d1dda2fac 100644 --- a/samples/boot/hellowebflux/src/integration-test/java/sample/HelloWebfluxApplicationITests.java +++ b/samples/boot/hellowebflux/src/integration-test/java/sample/HelloWebfluxApplicationITests.java @@ -69,10 +69,10 @@ public class HelloWebfluxApplicationITests { } private Consumer userCredentials() { - return httpHeaders -> httpHeaders.setBasicAuth("user", "user"); + return (httpHeaders) -> httpHeaders.setBasicAuth("user", "user"); } private Consumer invalidCredentials() { - return httpHeaders -> httpHeaders.setBasicAuth("user", "INVALID"); + return (httpHeaders) -> httpHeaders.setBasicAuth("user", "INVALID"); } } diff --git a/samples/boot/hellowebflux/src/test/java/sample/HelloWebfluxApplicationTests.java b/samples/boot/hellowebflux/src/test/java/sample/HelloWebfluxApplicationTests.java index 591c4dd46b..cc7892116f 100644 --- a/samples/boot/hellowebflux/src/test/java/sample/HelloWebfluxApplicationTests.java +++ b/samples/boot/hellowebflux/src/test/java/sample/HelloWebfluxApplicationTests.java @@ -105,10 +105,10 @@ public class HelloWebfluxApplicationTests { } private Consumer userCredentials() { - return httpHeaders -> httpHeaders.setBasicAuth("user", "user"); + return (httpHeaders) -> httpHeaders.setBasicAuth("user", "user"); } private Consumer invalidCredentials() { - return httpHeaders -> httpHeaders.setBasicAuth("user", "INVALID"); + return (httpHeaders) -> httpHeaders.setBasicAuth("user", "INVALID"); } } diff --git a/samples/boot/hellowebfluxfn/src/integration-test/java/sample/HelloWebfluxFnApplicationITests.java b/samples/boot/hellowebfluxfn/src/integration-test/java/sample/HelloWebfluxFnApplicationITests.java index 515f321f8b..de42538a78 100644 --- a/samples/boot/hellowebfluxfn/src/integration-test/java/sample/HelloWebfluxFnApplicationITests.java +++ b/samples/boot/hellowebfluxfn/src/integration-test/java/sample/HelloWebfluxFnApplicationITests.java @@ -75,10 +75,10 @@ public class HelloWebfluxFnApplicationITests { } private Consumer userCredentials() { - return httpHeaders -> httpHeaders.setBasicAuth("user", "user"); + return (httpHeaders) -> httpHeaders.setBasicAuth("user", "user"); } private Consumer invalidCredentials() { - return httpHeaders -> httpHeaders.setBasicAuth("user", "INVALID"); + return (httpHeaders) -> httpHeaders.setBasicAuth("user", "INVALID"); } } diff --git a/samples/boot/hellowebfluxfn/src/main/java/sample/HelloUserController.java b/samples/boot/hellowebfluxfn/src/main/java/sample/HelloUserController.java index e1fd699e3d..e0c0810cee 100644 --- a/samples/boot/hellowebfluxfn/src/main/java/sample/HelloUserController.java +++ b/samples/boot/hellowebfluxfn/src/main/java/sample/HelloUserController.java @@ -36,7 +36,7 @@ public class HelloUserController { public Mono hello(ServerRequest serverRequest) { return serverRequest.principal() .map(Principal::getName) - .flatMap(username -> + .flatMap((username) -> ServerResponse.ok() .contentType(MediaType.APPLICATION_JSON) .syncBody(Collections.singletonMap("message", "Hello " + username + "!")) diff --git a/samples/boot/hellowebfluxfn/src/test/java/sample/HelloWebfluxFnApplicationTests.java b/samples/boot/hellowebfluxfn/src/test/java/sample/HelloWebfluxFnApplicationTests.java index 392dcdfce8..826fe95cf3 100644 --- a/samples/boot/hellowebfluxfn/src/test/java/sample/HelloWebfluxFnApplicationTests.java +++ b/samples/boot/hellowebfluxfn/src/test/java/sample/HelloWebfluxFnApplicationTests.java @@ -106,10 +106,10 @@ public class HelloWebfluxFnApplicationTests { } private Consumer userCredentials() { - return httpHeaders -> httpHeaders.setBasicAuth("user", "user"); + return (httpHeaders) -> httpHeaders.setBasicAuth("user", "user"); } private Consumer invalidCredentials() { - return httpHeaders -> httpHeaders.setBasicAuth("user", "INVALID"); + return (httpHeaders) -> httpHeaders.setBasicAuth("user", "INVALID"); } } diff --git a/samples/boot/helloworld/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/boot/helloworld/src/main/java/org/springframework/security/samples/config/SecurityConfig.java index 8a8a3dd07b..c3c71cf2fe 100644 --- a/samples/boot/helloworld/src/main/java/org/springframework/security/samples/config/SecurityConfig.java +++ b/samples/boot/helloworld/src/main/java/org/springframework/security/samples/config/SecurityConfig.java @@ -35,11 +35,11 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { @Override protected void configure(HttpSecurity http) throws Exception { http - .authorizeRequests(authorize -> authorize + .authorizeRequests((authorize) -> authorize .antMatchers("/css/**", "/index").permitAll() .antMatchers("/user/**").hasRole("USER") ) - .formLogin(formLogin -> formLogin + .formLogin((formLogin) -> formLogin .loginPage("/login") .failureUrl("/login-error") ); diff --git a/samples/boot/oauth2authorizationserver/src/main/java/sample/AuthorizationServerConfiguration.java b/samples/boot/oauth2authorizationserver/src/main/java/sample/AuthorizationServerConfiguration.java index 77efa11928..4b20b0c88c 100644 --- a/samples/boot/oauth2authorizationserver/src/main/java/sample/AuthorizationServerConfiguration.java +++ b/samples/boot/oauth2authorizationserver/src/main/java/sample/AuthorizationServerConfiguration.java @@ -167,7 +167,7 @@ class UserConfig extends WebSecurityConfigurerAdapter { .and() .httpBasic() .and() - .csrf().ignoringRequestMatchers(request -> "/introspect".equals(request.getRequestURI())); + .csrf().ignoringRequestMatchers((request) -> "/introspect".equals(request.getRequestURI())); } @Bean diff --git a/samples/boot/oauth2login-webflux/src/integration-test/java/sample/OAuth2LoginApplicationTests.java b/samples/boot/oauth2login-webflux/src/integration-test/java/sample/OAuth2LoginApplicationTests.java index 9f3d47193c..c3e2b63af6 100644 --- a/samples/boot/oauth2login-webflux/src/integration-test/java/sample/OAuth2LoginApplicationTests.java +++ b/samples/boot/oauth2login-webflux/src/integration-test/java/sample/OAuth2LoginApplicationTests.java @@ -46,7 +46,7 @@ public class OAuth2LoginApplicationTests { @Test public void requestWhenMockOidcLoginThenIndex() { this.clientRegistrationRepository.findByRegistrationId("github") - .map(clientRegistration -> + .map((clientRegistration) -> this.test.mutateWith(mockOAuth2Login().clientRegistration(clientRegistration)) .get().uri("/") .exchange() diff --git a/samples/boot/oauth2login-webflux/src/test/java/sample/OAuth2LoginControllerTests.java b/samples/boot/oauth2login-webflux/src/test/java/sample/OAuth2LoginControllerTests.java index d1fb3c5b3e..11ae5f8ba6 100644 --- a/samples/boot/oauth2login-webflux/src/test/java/sample/OAuth2LoginControllerTests.java +++ b/samples/boot/oauth2login-webflux/src/test/java/sample/OAuth2LoginControllerTests.java @@ -65,12 +65,12 @@ public class OAuth2LoginControllerTests { .bindToController(this.controller) .apply(springSecurity()) .webFilter(new SecurityContextServerWebExchangeWebFilter()) - .argumentResolvers(c -> { + .argumentResolvers((c) -> { c.addCustomResolver(new AuthenticationPrincipalArgumentResolver(new ReactiveAdapterRegistry())); c.addCustomResolver(new OAuth2AuthorizedClientArgumentResolver (this.clientRegistrationRepository, this.authorizedClientRepository)); }) - .viewResolvers(c -> c.viewResolver(this.viewResolver)) + .viewResolvers((c) -> c.viewResolver(this.viewResolver)) .build(); } diff --git a/samples/boot/oauth2login/src/integration-test/java/sample/OAuth2LoginApplicationTests.java b/samples/boot/oauth2login/src/integration-test/java/sample/OAuth2LoginApplicationTests.java index f4488cb00d..77867dbbc8 100644 --- a/samples/boot/oauth2login/src/integration-test/java/sample/OAuth2LoginApplicationTests.java +++ b/samples/boot/oauth2login/src/integration-test/java/sample/OAuth2LoginApplicationTests.java @@ -308,7 +308,7 @@ public class OAuth2LoginApplicationTests { private HtmlAnchor getClientAnchorElement(HtmlPage page, ClientRegistration clientRegistration) { Optional clientAnchorElement = page.getAnchors().stream() - .filter(e -> e.asText().equals(clientRegistration.getClientName())).findFirst(); + .filter((e) -> e.asText().equals(clientRegistration.getClientName())).findFirst(); return (clientAnchorElement.orElse(null)); } @@ -335,17 +335,17 @@ public class OAuth2LoginApplicationTests { @Override protected void configure(HttpSecurity http) throws Exception { http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().authenticated() ) - .oauth2Login(oauth2Login -> + .oauth2Login((oauth2Login) -> oauth2Login - .tokenEndpoint(tokenEndpoint -> + .tokenEndpoint((tokenEndpoint) -> tokenEndpoint .accessTokenResponseClient(this.mockAccessTokenResponseClient()) ) - .userInfoEndpoint(userInfoEndpoint -> + .userInfoEndpoint((userInfoEndpoint) -> userInfoEndpoint .userService(this.mockUserService()) ) diff --git a/samples/boot/oauth2login/src/test/java/sample/web/OAuth2LoginControllerTests.java b/samples/boot/oauth2login/src/test/java/sample/web/OAuth2LoginControllerTests.java index 3779bb7ff8..6a3af42ff7 100644 --- a/samples/boot/oauth2login/src/test/java/sample/web/OAuth2LoginControllerTests.java +++ b/samples/boot/oauth2login/src/test/java/sample/web/OAuth2LoginControllerTests.java @@ -63,7 +63,7 @@ public class OAuth2LoginControllerTests { this.mvc.perform(get("/").with(oauth2Login() .clientRegistration(clientRegistration) - .attributes(a -> a.put("sub", "spring-security")))) + .attributes((a) -> a.put("sub", "spring-security")))) .andExpect(model().attribute("userName", "spring-security")) .andExpect(model().attribute("clientName", "my-client-name")) .andExpect(model().attribute("userAttributes", Collections.singletonMap("sub", "spring-security"))); diff --git a/samples/boot/oauth2resourceserver-jwe/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java b/samples/boot/oauth2resourceserver-jwe/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java index 9e5e53f22e..dfe4135d4b 100644 --- a/samples/boot/oauth2resourceserver-jwe/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java +++ b/samples/boot/oauth2resourceserver-jwe/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java @@ -69,12 +69,12 @@ public class OAuth2ResourceServerSecurityConfiguration extends WebSecurityConfig protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .antMatchers("/message/**").hasAuthority("SCOPE_message:read") .anyRequest().authenticated() ) - .oauth2ResourceServer(oauth2ResourceServer -> + .oauth2ResourceServer((oauth2ResourceServer) -> oauth2ResourceServer .jwt(withDefaults()) ); diff --git a/samples/boot/oauth2resourceserver-multitenancy/src/main/java/org/springframework/boot/env/MockWebServerPropertySource.java b/samples/boot/oauth2resourceserver-multitenancy/src/main/java/org/springframework/boot/env/MockWebServerPropertySource.java index f0663200de..9e3f58e628 100644 --- a/samples/boot/oauth2resourceserver-multitenancy/src/main/java/org/springframework/boot/env/MockWebServerPropertySource.java +++ b/samples/boot/oauth2resourceserver-multitenancy/src/main/java/org/springframework/boot/env/MockWebServerPropertySource.java @@ -156,10 +156,10 @@ public class MockWebServerPropertySource extends PropertySource i if ("/introspect".equals(request.getPath())) { return Optional.ofNullable(request.getHeader(HttpHeaders.AUTHORIZATION)) - .filter(authorization -> isAuthorized(authorization, "client", "secret")) - .map(authorization -> parseBody(request.getBody())) - .map(parameters -> parameters.get("token")) - .map(token -> { + .filter((authorization) -> isAuthorized(authorization, "client", "secret")) + .map((authorization) -> parseBody(request.getBody())) + .map((parameters) -> parameters.get("token")) + .map((token) -> { if ("00ed5855-1869-47a0-b0c9-0f3ce520aee7".equals(token)) { return NO_SCOPES_RESPONSE; } else if ("b43d1500-c405-4dc9-b9c9-6cfd966c34c9".equals(token)) { @@ -181,8 +181,8 @@ public class MockWebServerPropertySource extends PropertySource i private Map parseBody(Buffer body) { return Stream.of(body.readUtf8().split("&")) - .map(parameter -> parameter.split("=")) - .collect(Collectors.toMap(parts -> parts[0], parts -> parts[1])); + .map((parameter) -> parameter.split("=")) + .collect(Collectors.toMap((parts) -> parts[0], (parts) -> parts[1])); } private static MockResponse response(String body, int status) { diff --git a/samples/boot/oauth2resourceserver-multitenancy/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java b/samples/boot/oauth2resourceserver-multitenancy/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java index 5a8822631e..75bf3865b9 100644 --- a/samples/boot/oauth2resourceserver-multitenancy/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java +++ b/samples/boot/oauth2resourceserver-multitenancy/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java @@ -37,11 +37,11 @@ public class OAuth2ResourceServerSecurityConfiguration extends WebSecurityConfig protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authz -> authz + .authorizeRequests((authz) -> authz .antMatchers("/message/**").hasAuthority("SCOPE_message:read") .anyRequest().authenticated() ) - .oauth2ResourceServer(oauth2 -> oauth2 + .oauth2ResourceServer((oauth2) -> oauth2 .authenticationManagerResolver(this.authenticationManagerResolver) ); // @formatter:on diff --git a/samples/boot/oauth2resourceserver-opaque/src/main/java/org/springframework/boot/env/MockWebServerPropertySource.java b/samples/boot/oauth2resourceserver-opaque/src/main/java/org/springframework/boot/env/MockWebServerPropertySource.java index 32e1cdbd35..0bc6b57558 100644 --- a/samples/boot/oauth2resourceserver-opaque/src/main/java/org/springframework/boot/env/MockWebServerPropertySource.java +++ b/samples/boot/oauth2resourceserver-opaque/src/main/java/org/springframework/boot/env/MockWebServerPropertySource.java @@ -142,10 +142,10 @@ public class MockWebServerPropertySource extends PropertySource i private MockResponse doDispatch(RecordedRequest request) { if ("/introspect".equals(request.getPath())) { return Optional.ofNullable(request.getHeader(HttpHeaders.AUTHORIZATION)) - .filter(authorization -> isAuthorized(authorization, "client", "secret")) - .map(authorization -> parseBody(request.getBody())) - .map(parameters -> parameters.get("token")) - .map(token -> { + .filter((authorization) -> isAuthorized(authorization, "client", "secret")) + .map((authorization) -> parseBody(request.getBody())) + .map((parameters) -> parameters.get("token")) + .map((token) -> { if ("00ed5855-1869-47a0-b0c9-0f3ce520aee7".equals(token)) { return NO_SCOPES_RESPONSE; } else if ("b43d1500-c405-4dc9-b9c9-6cfd966c34c9".equals(token)) { @@ -167,8 +167,8 @@ public class MockWebServerPropertySource extends PropertySource i private Map parseBody(Buffer body) { return Stream.of(body.readUtf8().split("&")) - .map(parameter -> parameter.split("=")) - .collect(Collectors.toMap(parts -> parts[0], parts -> parts[1])); + .map((parameter) -> parameter.split("=")) + .collect(Collectors.toMap((parts) -> parts[0], (parts) -> parts[1])); } private static MockResponse response(String body, int status) { diff --git a/samples/boot/oauth2resourceserver-opaque/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java b/samples/boot/oauth2resourceserver-opaque/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java index f32a5d70c4..6fc3444c73 100644 --- a/samples/boot/oauth2resourceserver-opaque/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java +++ b/samples/boot/oauth2resourceserver-opaque/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java @@ -36,15 +36,15 @@ public class OAuth2ResourceServerSecurityConfiguration extends WebSecurityConfig protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .antMatchers(HttpMethod.GET, "/message/**").hasAuthority("SCOPE_message:read") .antMatchers(HttpMethod.POST, "/message/**").hasAuthority("SCOPE_message:write") .anyRequest().authenticated() ) - .oauth2ResourceServer(oauth2ResourceServer -> + .oauth2ResourceServer((oauth2ResourceServer) -> oauth2ResourceServer - .opaqueToken(opaqueToken -> + .opaqueToken((opaqueToken) -> opaqueToken .introspectionUri(this.introspectionUri) .introspectionClientCredentials(this.clientId, this.clientSecret) diff --git a/samples/boot/oauth2resourceserver-opaque/src/test/java/sample/OAuth2ResourceServerControllerTests.java b/samples/boot/oauth2resourceserver-opaque/src/test/java/sample/OAuth2ResourceServerControllerTests.java index 29d1cd1ea8..ee3318f246 100644 --- a/samples/boot/oauth2resourceserver-opaque/src/test/java/sample/OAuth2ResourceServerControllerTests.java +++ b/samples/boot/oauth2resourceserver-opaque/src/test/java/sample/OAuth2ResourceServerControllerTests.java @@ -46,13 +46,13 @@ public class OAuth2ResourceServerControllerTests { @Test public void indexGreetsAuthenticatedUser() throws Exception { - this.mvc.perform(get("/").with(opaqueToken().attributes(a -> a.put("sub", "ch4mpy")))) + this.mvc.perform(get("/").with(opaqueToken().attributes((a) -> a.put("sub", "ch4mpy")))) .andExpect(content().string(is("Hello, ch4mpy!"))); } @Test public void messageCanBeReadWithScopeMessageReadAuthority() throws Exception { - this.mvc.perform(get("/message").with(opaqueToken().attributes(a -> a.put("scope", "message:read")))) + this.mvc.perform(get("/message").with(opaqueToken().attributes((a) -> a.put("scope", "message:read")))) .andExpect(content().string(is("secret message"))); this.mvc.perform(get("/message") diff --git a/samples/boot/oauth2resourceserver-static/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java b/samples/boot/oauth2resourceserver-static/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java index 4d70204150..a57bed2d51 100644 --- a/samples/boot/oauth2resourceserver-static/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java +++ b/samples/boot/oauth2resourceserver-static/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java @@ -39,14 +39,14 @@ public class OAuth2ResourceServerSecurityConfiguration extends WebSecurityConfig protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .antMatchers("/message/**").hasAuthority("SCOPE_message:read") .anyRequest().authenticated() ) - .oauth2ResourceServer(oauth2ResourceServer -> + .oauth2ResourceServer((oauth2ResourceServer) -> oauth2ResourceServer - .jwt(jwt -> + .jwt((jwt) -> jwt.decoder(jwtDecoder()) ) ); diff --git a/samples/boot/oauth2resourceserver-webflux/src/integration-test/java/sample/ServerOAuth2ResourceServerApplicationITests.java b/samples/boot/oauth2resourceserver-webflux/src/integration-test/java/sample/ServerOAuth2ResourceServerApplicationITests.java index 763d28a71e..9cbdcf2b36 100644 --- a/samples/boot/oauth2resourceserver-webflux/src/integration-test/java/sample/ServerOAuth2ResourceServerApplicationITests.java +++ b/samples/boot/oauth2resourceserver-webflux/src/integration-test/java/sample/ServerOAuth2ResourceServerApplicationITests.java @@ -38,8 +38,8 @@ import static org.hamcrest.Matchers.containsString; @RunWith(SpringJUnit4ClassRunner.class) public class ServerOAuth2ResourceServerApplicationITests { - Consumer noScopesToken = http -> http.setBearerAuth("eyJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJzdWJqZWN0IiwiZXhwIjo0NjgzODA1MTI4fQ.ULEPdHG-MK5GlrTQMhgqcyug2brTIZaJIrahUeq9zaiwUSdW83fJ7W1IDd2Z3n4a25JY2uhEcoV95lMfccHR6y_2DLrNvfta22SumY9PEDF2pido54LXG6edIGgarnUbJdR4rpRe_5oRGVa8gDx8FnuZsNv6StSZHAzw5OsuevSTJ1UbJm4UfX3wiahFOQ2OI6G-r5TB2rQNdiPHuNyzG5yznUqRIZ7-GCoMqHMaC-1epKxiX8gYXRROuUYTtcMNa86wh7OVDmvwVmFioRcR58UWBRoO1XQexTtOQq_t8KYsrPZhb9gkyW8x2bAQF-d0J0EJY8JslaH6n4RBaZISww"); - Consumer messageReadToken = http -> http.setBearerAuth("eyJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJzdWJqZWN0Iiwic2NvcGUiOiJtZXNzYWdlOnJlYWQiLCJleHAiOjQ2ODM4MDUxNDF9.h-j6FKRFdnTdmAueTZCdep45e6DPwqM68ZQ8doIJ1exi9YxAlbWzOwId6Bd0L5YmCmp63gGQgsBUBLzwnZQ8kLUgUOBEC3UzSWGRqMskCY9_k9pX0iomX6IfF3N0PaYs0WPC4hO1s8wfZQ-6hKQ4KigFi13G9LMLdH58PRMK0pKEvs3gCbHJuEPw-K5ORlpdnleUTQIwINafU57cmK3KocTeknPAM_L716sCuSYGvDl6xUTXO7oPdrXhS_EhxLP6KxrpI1uD4Ea_5OWTh7S0Wx5LLDfU6wBG1DowN20d374zepOIEkR-Jnmr_QlR44vmRqS5ncrF-1R0EGcPX49U6A"); + Consumer noScopesToken = (http) -> http.setBearerAuth("eyJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJzdWJqZWN0IiwiZXhwIjo0NjgzODA1MTI4fQ.ULEPdHG-MK5GlrTQMhgqcyug2brTIZaJIrahUeq9zaiwUSdW83fJ7W1IDd2Z3n4a25JY2uhEcoV95lMfccHR6y_2DLrNvfta22SumY9PEDF2pido54LXG6edIGgarnUbJdR4rpRe_5oRGVa8gDx8FnuZsNv6StSZHAzw5OsuevSTJ1UbJm4UfX3wiahFOQ2OI6G-r5TB2rQNdiPHuNyzG5yznUqRIZ7-GCoMqHMaC-1epKxiX8gYXRROuUYTtcMNa86wh7OVDmvwVmFioRcR58UWBRoO1XQexTtOQq_t8KYsrPZhb9gkyW8x2bAQF-d0J0EJY8JslaH6n4RBaZISww"); + Consumer messageReadToken = (http) -> http.setBearerAuth("eyJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJzdWJqZWN0Iiwic2NvcGUiOiJtZXNzYWdlOnJlYWQiLCJleHAiOjQ2ODM4MDUxNDF9.h-j6FKRFdnTdmAueTZCdep45e6DPwqM68ZQ8doIJ1exi9YxAlbWzOwId6Bd0L5YmCmp63gGQgsBUBLzwnZQ8kLUgUOBEC3UzSWGRqMskCY9_k9pX0iomX6IfF3N0PaYs0WPC4hO1s8wfZQ-6hKQ4KigFi13G9LMLdH58PRMK0pKEvs3gCbHJuEPw-K5ORlpdnleUTQIwINafU57cmK3KocTeknPAM_L716sCuSYGvDl6xUTXO7oPdrXhS_EhxLP6KxrpI1uD4Ea_5OWTh7S0Wx5LLDfU6wBG1DowN20d374zepOIEkR-Jnmr_QlR44vmRqS5ncrF-1R0EGcPX49U6A"); @Autowired private WebTestClient rest; diff --git a/samples/boot/oauth2resourceserver-webflux/src/main/java/sample/SecurityConfig.java b/samples/boot/oauth2resourceserver-webflux/src/main/java/sample/SecurityConfig.java index fad9309c02..d4f6429b51 100644 --- a/samples/boot/oauth2resourceserver-webflux/src/main/java/sample/SecurityConfig.java +++ b/samples/boot/oauth2resourceserver-webflux/src/main/java/sample/SecurityConfig.java @@ -34,13 +34,13 @@ public class SecurityConfig { @Bean SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { http - .authorizeExchange(exchanges -> + .authorizeExchange((exchanges) -> exchanges .pathMatchers(HttpMethod.GET, "/message/**").hasAuthority("SCOPE_message:read") .pathMatchers(HttpMethod.POST, "/message/**").hasAuthority("SCOPE_message:write") .anyExchange().authenticated() ) - .oauth2ResourceServer(oauth2ResourceServer -> + .oauth2ResourceServer((oauth2ResourceServer) -> oauth2ResourceServer .jwt(withDefaults()) ); diff --git a/samples/boot/oauth2resourceserver-webflux/src/test/java/sample/OAuth2ResourceServerControllerTests.java b/samples/boot/oauth2resourceserver-webflux/src/test/java/sample/OAuth2ResourceServerControllerTests.java index 3f1291c6fa..8fc72574f1 100644 --- a/samples/boot/oauth2resourceserver-webflux/src/test/java/sample/OAuth2ResourceServerControllerTests.java +++ b/samples/boot/oauth2resourceserver-webflux/src/test/java/sample/OAuth2ResourceServerControllerTests.java @@ -50,14 +50,14 @@ public class OAuth2ResourceServerControllerTests { @Test public void indexGreetsAuthenticatedUser() { - this.rest.mutateWith(mockJwt().jwt(jwt -> jwt.subject("test-subject"))) + this.rest.mutateWith(mockJwt().jwt((jwt) -> jwt.subject("test-subject"))) .get().uri("/").exchange() .expectBody(String.class).isEqualTo("Hello, test-subject!"); } @Test public void messageCanBeReadWithScopeMessageReadAuthority() { - this.rest.mutateWith(mockJwt().jwt(jwt -> jwt.claim("scope", "message:read"))) + this.rest.mutateWith(mockJwt().jwt((jwt) -> jwt.claim("scope", "message:read"))) .get().uri("/message").exchange() .expectBody(String.class).isEqualTo("secret message"); @@ -78,7 +78,7 @@ public class OAuth2ResourceServerControllerTests { Jwt jwt = jwt().claim("scope", "").build(); when(this.jwtDecoder.decode(anyString())).thenReturn(Mono.just(jwt)); this.rest.post().uri("/message") - .headers(headers -> headers.setBearerAuth(jwt.getTokenValue())) + .headers((headers) -> headers.setBearerAuth(jwt.getTokenValue())) .syncBody("Hello message").exchange() .expectStatus().isForbidden(); } @@ -88,7 +88,7 @@ public class OAuth2ResourceServerControllerTests { Jwt jwt = jwt().claim("scope", "message:read").build(); when(this.jwtDecoder.decode(anyString())).thenReturn(Mono.just(jwt)); this.rest.post().uri("/message") - .headers(headers -> headers.setBearerAuth(jwt.getTokenValue())) + .headers((headers) -> headers.setBearerAuth(jwt.getTokenValue())) .syncBody("Hello message").exchange() .expectStatus().isForbidden(); } @@ -98,7 +98,7 @@ public class OAuth2ResourceServerControllerTests { Jwt jwt = jwt().claim("scope", "message:write").build(); when(this.jwtDecoder.decode(anyString())).thenReturn(Mono.just(jwt)); this.rest.post().uri("/message") - .headers(headers -> headers.setBearerAuth(jwt.getTokenValue())) + .headers((headers) -> headers.setBearerAuth(jwt.getTokenValue())) .syncBody("Hello message").exchange() .expectStatus().isOk() .expectBody(String.class).isEqualTo("Message was created. Content: Hello message"); diff --git a/samples/boot/oauth2resourceserver/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java b/samples/boot/oauth2resourceserver/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java index f003ee37d9..d7e157cfc6 100644 --- a/samples/boot/oauth2resourceserver/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java +++ b/samples/boot/oauth2resourceserver/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java @@ -38,7 +38,7 @@ public class OAuth2ResourceServerSecurityConfiguration extends WebSecurityConfig protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .antMatchers(HttpMethod.GET, "/message/**").hasAuthority("SCOPE_message:read") .antMatchers(HttpMethod.POST, "/message/**").hasAuthority("SCOPE_message:write") diff --git a/samples/boot/oauth2resourceserver/src/test/java/sample/OAuth2ResourceServerControllerTests.java b/samples/boot/oauth2resourceserver/src/test/java/sample/OAuth2ResourceServerControllerTests.java index 8160062ebd..565212b073 100644 --- a/samples/boot/oauth2resourceserver/src/test/java/sample/OAuth2ResourceServerControllerTests.java +++ b/samples/boot/oauth2resourceserver/src/test/java/sample/OAuth2ResourceServerControllerTests.java @@ -48,13 +48,13 @@ public class OAuth2ResourceServerControllerTests { @Test public void indexGreetsAuthenticatedUser() throws Exception { - mockMvc.perform(get("/").with(jwt().jwt(jwt -> jwt.subject("ch4mpy")))) + mockMvc.perform(get("/").with(jwt().jwt((jwt) -> jwt.subject("ch4mpy")))) .andExpect(content().string(is("Hello, ch4mpy!"))); } @Test public void messageCanBeReadWithScopeMessageReadAuthority() throws Exception { - mockMvc.perform(get("/message").with(jwt().jwt(jwt -> jwt.claim("scope", "message:read")))) + mockMvc.perform(get("/message").with(jwt().jwt((jwt) -> jwt.claim("scope", "message:read")))) .andExpect(content().string(is("secret message"))); mockMvc.perform(get("/message") @@ -80,7 +80,7 @@ public class OAuth2ResourceServerControllerTests { public void messageCanNotBeCreatedWithScopeMessageReadAuthority() throws Exception { mockMvc.perform(post("/message") .content("Hello message") - .with(jwt().jwt(jwt -> jwt.claim("scope", "message:read")))) + .with(jwt().jwt((jwt) -> jwt.claim("scope", "message:read")))) .andExpect(status().isForbidden()); } @@ -89,7 +89,7 @@ public class OAuth2ResourceServerControllerTests { throws Exception { mockMvc.perform(post("/message") .content("Hello message") - .with(jwt().jwt(jwt -> jwt.claim("scope", "message:write")))) + .with(jwt().jwt((jwt) -> jwt.claim("scope", "message:write")))) .andExpect(status().isOk()) .andExpect(content().string(is("Message was created. Content: Hello message"))); } diff --git a/samples/boot/oauth2webclient-webflux/src/main/java/sample/config/SecurityConfig.java b/samples/boot/oauth2webclient-webflux/src/main/java/sample/config/SecurityConfig.java index 279aae17cb..33fb8b7867 100644 --- a/samples/boot/oauth2webclient-webflux/src/main/java/sample/config/SecurityConfig.java +++ b/samples/boot/oauth2webclient-webflux/src/main/java/sample/config/SecurityConfig.java @@ -35,7 +35,7 @@ public class SecurityConfig { @Bean SecurityWebFilterChain configure(ServerHttpSecurity http) { http - .authorizeExchange(exchanges -> + .authorizeExchange((exchanges) -> exchanges .pathMatchers("/", "/public/**").permitAll() .anyExchange().authenticated() diff --git a/samples/boot/oauth2webclient/src/main/java/sample/config/SecurityConfig.java b/samples/boot/oauth2webclient/src/main/java/sample/config/SecurityConfig.java index 4ac610bf04..e5602d812d 100644 --- a/samples/boot/oauth2webclient/src/main/java/sample/config/SecurityConfig.java +++ b/samples/boot/oauth2webclient/src/main/java/sample/config/SecurityConfig.java @@ -36,7 +36,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { @Override protected void configure(HttpSecurity http) throws Exception { http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .mvcMatchers("/", "/public/**").permitAll() .anyRequest().authenticated() diff --git a/samples/boot/saml2login/src/integration-test/java/org/springframework/security/saml2/provider/service/authentication/Saml2LoginIntegrationTests.java b/samples/boot/saml2login/src/integration-test/java/org/springframework/security/saml2/provider/service/authentication/Saml2LoginIntegrationTests.java index d51d2cdc4b..330e9a58d2 100644 --- a/samples/boot/saml2login/src/integration-test/java/org/springframework/security/saml2/provider/service/authentication/Saml2LoginIntegrationTests.java +++ b/samples/boot/saml2login/src/integration-test/java/org/springframework/security/saml2/provider/service/authentication/Saml2LoginIntegrationTests.java @@ -483,7 +483,7 @@ public class Saml2LoginIntegrationTests { String code, Matcher message ) { - return result -> { + return (result) -> { final HttpSession session = result.getRequest().getSession(false); AssertionErrors.assertNotNull("HttpSession", session); Object exception = session.getAttribute(AUTHENTICATION_EXCEPTION); diff --git a/samples/boot/webflux-form/src/main/java/sample/WebfluxFormSecurityConfig.java b/samples/boot/webflux-form/src/main/java/sample/WebfluxFormSecurityConfig.java index c87bc0a4af..94642742dc 100644 --- a/samples/boot/webflux-form/src/main/java/sample/WebfluxFormSecurityConfig.java +++ b/samples/boot/webflux-form/src/main/java/sample/WebfluxFormSecurityConfig.java @@ -46,13 +46,13 @@ public class WebfluxFormSecurityConfig { @Bean SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { http - .authorizeExchange(exchanges -> + .authorizeExchange((exchanges) -> exchanges .pathMatchers("/login").permitAll() .anyExchange().authenticated() ) .httpBasic(withDefaults()) - .formLogin(formLogin -> + .formLogin((formLogin) -> formLogin .loginPage("/login") ); diff --git a/samples/boot/webflux-x509/src/main/java/sample/MeController.java b/samples/boot/webflux-x509/src/main/java/sample/MeController.java index f7a3958784..7c10c6aedf 100644 --- a/samples/boot/webflux-x509/src/main/java/sample/MeController.java +++ b/samples/boot/webflux-x509/src/main/java/sample/MeController.java @@ -35,6 +35,6 @@ public class MeController { public Mono me() { return ReactiveSecurityContextHolder.getContext() .map(SecurityContext::getAuthentication) - .map(authentication -> "Hello, " + authentication.getName()); + .map((authentication) -> "Hello, " + authentication.getName()); } } diff --git a/samples/boot/webflux-x509/src/main/java/sample/WebfluxX509Application.java b/samples/boot/webflux-x509/src/main/java/sample/WebfluxX509Application.java index 02e145c14b..89813d073b 100644 --- a/samples/boot/webflux-x509/src/main/java/sample/WebfluxX509Application.java +++ b/samples/boot/webflux-x509/src/main/java/sample/WebfluxX509Application.java @@ -46,7 +46,7 @@ public class WebfluxX509Application { // @formatter:off http .x509(withDefaults()) - .authorizeExchange(exchanges -> + .authorizeExchange((exchanges) -> exchanges .anyExchange().authenticated() ); diff --git a/samples/boot/webflux-x509/src/test/java/sample/WebfluxX509ApplicationTest.java b/samples/boot/webflux-x509/src/test/java/sample/WebfluxX509ApplicationTest.java index 604692d5ad..e6ed9cf200 100644 --- a/samples/boot/webflux-x509/src/test/java/sample/WebfluxX509ApplicationTest.java +++ b/samples/boot/webflux-x509/src/test/java/sample/WebfluxX509ApplicationTest.java @@ -55,7 +55,7 @@ public class WebfluxX509ApplicationTest { .exchange() .expectStatus().isOk() .expectBody() - .consumeWith(result -> { + .consumeWith((result) -> { String responseBody = new String(result.getResponseBody()); assertThat(responseBody).contains("Hello, client"); }); @@ -79,7 +79,7 @@ public class WebfluxX509ApplicationTest { .trustManager(devCA) .keyManager(clientKey, clientCrt); - HttpClient httpClient = HttpClient.create().secure(sslContextSpec -> sslContextSpec.sslContext(sslContextBuilder)); + HttpClient httpClient = HttpClient.create().secure((sslContextSpec) -> sslContextSpec.sslContext(sslContextBuilder)); ClientHttpConnector httpConnector = new ReactorClientHttpConnector(httpClient); return WebTestClient diff --git a/samples/javaconfig/concurrency/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/javaconfig/concurrency/src/main/java/org/springframework/security/samples/config/SecurityConfig.java index 99328c184e..45773f3eb7 100644 --- a/samples/javaconfig/concurrency/src/main/java/org/springframework/security/samples/config/SecurityConfig.java +++ b/samples/javaconfig/concurrency/src/main/java/org/springframework/security/samples/config/SecurityConfig.java @@ -43,14 +43,14 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { protected void configure( HttpSecurity http) throws Exception { http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().authenticated() ) .formLogin(withDefaults()) - .sessionManagement(sessionManagement -> + .sessionManagement((sessionManagement) -> sessionManagement - .sessionConcurrency(sessionConcurrency -> + .sessionConcurrency((sessionConcurrency) -> sessionConcurrency .maximumSessions(1) .expiredUrl("/login?expired") diff --git a/samples/javaconfig/form/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/javaconfig/form/src/main/java/org/springframework/security/samples/config/SecurityConfig.java index b1ee5fa3f3..8f9cbba6f6 100644 --- a/samples/javaconfig/form/src/main/java/org/springframework/security/samples/config/SecurityConfig.java +++ b/samples/javaconfig/form/src/main/java/org/springframework/security/samples/config/SecurityConfig.java @@ -30,17 +30,17 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { @Override protected void configure(HttpSecurity http) throws Exception { http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .antMatchers("/resources/**").permitAll() .anyRequest().authenticated() ) - .formLogin(formLogin -> + .formLogin((formLogin) -> formLogin .loginPage("/login") .permitAll() ) - .logout(logout -> + .logout((logout) -> logout .permitAll() ); diff --git a/samples/javaconfig/openid/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/javaconfig/openid/src/main/java/org/springframework/security/samples/config/SecurityConfig.java index a5335e512a..9645aac23b 100644 --- a/samples/javaconfig/openid/src/main/java/org/springframework/security/samples/config/SecurityConfig.java +++ b/samples/javaconfig/openid/src/main/java/org/springframework/security/samples/config/SecurityConfig.java @@ -32,64 +32,64 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { @Override protected void configure(HttpSecurity http) throws Exception { http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .antMatchers("/resources/**").permitAll() .anyRequest().authenticated() ) - .openidLogin(openidLogin -> + .openidLogin((openidLogin) -> openidLogin .loginPage("/login") .permitAll() .authenticationUserDetailsService(new CustomUserDetailsService()) - .attributeExchange(googleExchange -> + .attributeExchange((googleExchange) -> googleExchange .identifierPattern("https://www.google.com/.*") - .attribute(emailAttribute -> + .attribute((emailAttribute) -> emailAttribute .name("email") .type("https://axschema.org/contact/email") .required(true) ) - .attribute(firstnameAttribute -> + .attribute((firstnameAttribute) -> firstnameAttribute .name("firstname") .type("https://axschema.org/namePerson/first") .required(true) ) - .attribute(lastnameAttribute -> + .attribute((lastnameAttribute) -> lastnameAttribute .name("lastname") .type("https://axschema.org/namePerson/last") .required(true) ) ) - .attributeExchange(yahooExchange -> + .attributeExchange((yahooExchange) -> yahooExchange .identifierPattern(".*yahoo.com.*") - .attribute(emailAttribute -> + .attribute((emailAttribute) -> emailAttribute .name("email") .type("https://axschema.org/contact/email") .required(true) ) - .attribute(fullnameAttribute -> + .attribute((fullnameAttribute) -> fullnameAttribute .name("fullname") .type("https://axschema.org/namePerson") .required(true) ) ) - .attributeExchange(myopenidExchange -> + .attributeExchange((myopenidExchange) -> myopenidExchange .identifierPattern(".*myopenid.com.*") - .attribute(emailAttribute -> + .attribute((emailAttribute) -> emailAttribute .name("email") .type("https://schema.openid.net/contact/email") .required(true) ) - .attribute(fullnameAttribute -> + .attribute((fullnameAttribute) -> fullnameAttribute .name("fullname") .type("https://schema.openid.net/namePerson") diff --git a/samples/javaconfig/preauth/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/javaconfig/preauth/src/main/java/org/springframework/security/samples/config/SecurityConfig.java index a7fcc345cc..512365bcf0 100644 --- a/samples/javaconfig/preauth/src/main/java/org/springframework/security/samples/config/SecurityConfig.java +++ b/samples/javaconfig/preauth/src/main/java/org/springframework/security/samples/config/SecurityConfig.java @@ -27,12 +27,12 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { @Override protected void configure(HttpSecurity http) throws Exception { http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .antMatchers("/login", "/resources/**").permitAll() .anyRequest().authenticated() ) - .jee(jee -> + .jee((jee) -> jee .mappableRoles("USER", "ADMIN") ); diff --git a/samples/javaconfig/rememberme/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/javaconfig/rememberme/src/main/java/org/springframework/security/samples/config/SecurityConfig.java index 5b2a543684..2570717394 100644 --- a/samples/javaconfig/rememberme/src/main/java/org/springframework/security/samples/config/SecurityConfig.java +++ b/samples/javaconfig/rememberme/src/main/java/org/springframework/security/samples/config/SecurityConfig.java @@ -42,12 +42,12 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { @Override protected void configure(HttpSecurity http) throws Exception { http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .antMatchers("/resources/**").permitAll() .anyRequest().authenticated() ) - .formLogin(formLogin -> + .formLogin((formLogin) -> formLogin .loginPage("/login") .permitAll() diff --git a/samples/javaconfig/saml2login/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/javaconfig/saml2login/src/main/java/org/springframework/security/samples/config/SecurityConfig.java index cb0fc35dfe..15a24f5b50 100644 --- a/samples/javaconfig/saml2login/src/main/java/org/springframework/security/samples/config/SecurityConfig.java +++ b/samples/javaconfig/saml2login/src/main/java/org/springframework/security/samples/config/SecurityConfig.java @@ -57,11 +57,11 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { return RelyingPartyRegistration.withRegistrationId(registrationId) .entityId(localEntityIdTemplate) .assertionConsumerServiceLocation(acsUrlTemplate) - .signingX509Credentials(c -> c.add(signingCredential)) - .assertingPartyDetails(config -> config + .signingX509Credentials((c) -> c.add(signingCredential)) + .assertingPartyDetails((config) -> config .entityId(idpEntityId) .singleSignOnServiceLocation(webSsoEndpoint) - .verificationX509Credentials(c -> c.add(idpVerificationCertificate))) + .verificationX509Credentials((c) -> c.add(idpVerificationCertificate))) .build(); } diff --git a/samples/javaconfig/saml2login/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/javaconfig/saml2login/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java index 2edd87332e..8a416b95c1 100644 --- a/samples/javaconfig/saml2login/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java +++ b/samples/javaconfig/saml2login/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java @@ -52,7 +52,7 @@ public class SecurityConfigTests { Saml2WebSsoAuthenticationFilter filter = (Saml2WebSsoAuthenticationFilter) filters .stream() .filter( - f -> f instanceof Saml2WebSsoAuthenticationFilter + (f) -> f instanceof Saml2WebSsoAuthenticationFilter ) .findFirst() .get(); diff --git a/samples/javaconfig/x509/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/javaconfig/x509/src/main/java/org/springframework/security/samples/config/SecurityConfig.java index fcb1274018..040dd75762 100644 --- a/samples/javaconfig/x509/src/main/java/org/springframework/security/samples/config/SecurityConfig.java +++ b/samples/javaconfig/x509/src/main/java/org/springframework/security/samples/config/SecurityConfig.java @@ -43,7 +43,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { @Override protected void configure(HttpSecurity http) throws Exception { http - .authorizeRequests(authorizeRequests -> + .authorizeRequests((authorizeRequests) -> authorizeRequests .anyRequest().authenticated() ) diff --git a/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/CasSampleProxyTests.java b/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/CasSampleProxyTests.java index 7dc347151f..906952cb63 100644 --- a/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/CasSampleProxyTests.java +++ b/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/CasSampleProxyTests.java @@ -117,14 +117,14 @@ public class CasSampleProxyTests { public void extremelySecurePageWhenReusingTicketThenDisplays() { this.login.to(this::serviceParam).assertAt().login("rod"); Map ptCache = new HashMap<>(); - this.extremelySecure.to(url -> url + "?ticket=" + ptCache.computeIfAbsent(url, this::getPt)).assertAt(); - this.extremelySecure.to(url -> url + "?ticket=" + ptCache.get(url)).assertAt(); + this.extremelySecure.to((url) -> url + "?ticket=" + ptCache.computeIfAbsent(url, this::getPt)).assertAt(); + this.extremelySecure.to((url) -> url + "?ticket=" + ptCache.get(url)).assertAt(); } @Test public void securePageWhenInvalidTicketThenFails() { this.login.to(this::serviceParam).assertAt().login("scott"); - this.secure.to(url -> url + "?ticket=invalid"); + this.secure.to((url) -> url + "?ticket=invalid"); this.unauthorized.assertAt(); } diff --git a/samples/xml/contacts/src/integration-test/java/org/springframework/security/samples/pages/ContactsPage.java b/samples/xml/contacts/src/integration-test/java/org/springframework/security/samples/pages/ContactsPage.java index 182c074369..a6b4ff5d6f 100644 --- a/samples/xml/contacts/src/integration-test/java/org/springframework/security/samples/pages/ContactsPage.java +++ b/samples/xml/contacts/src/integration-test/java/org/springframework/security/samples/pages/ContactsPage.java @@ -66,19 +66,19 @@ public class ContactsPage { } Predicate byEmail(final String val) { - return e -> e.findElements(By.xpath("td[position()=3 and normalize-space()='" + val + "']")).size() == 1; + return (e) -> e.findElements(By.xpath("td[position()=3 and normalize-space()='" + val + "']")).size() == 1; } Predicate byName(final String val) { - return e -> e.findElements(By.xpath("td[position()=2 and normalize-space()='" + val + "']")).size() == 1; + return (e) -> e.findElements(By.xpath("td[position()=2 and normalize-space()='" + val + "']")).size() == 1; } public DeleteContactLink andHasContact(final String name, final String email) { return this.contacts.stream() .filter(byEmail(email).and(byName(name))) - .map(e -> e.findElement(By.cssSelector("td:nth-child(4) > a"))) + .map((e) -> e.findElement(By.cssSelector("td:nth-child(4) > a"))) .findFirst() - .map(e -> new DeleteContactLink(webDriver, e)) + .map((e) -> new DeleteContactLink(webDriver, e)) .get(); } diff --git a/samples/xml/contacts/src/main/java/sample/contact/ContactDaoSpring.java b/samples/xml/contacts/src/main/java/sample/contact/ContactDaoSpring.java index 175c4c2f4e..f2b8029516 100644 --- a/samples/xml/contacts/src/main/java/sample/contact/ContactDaoSpring.java +++ b/samples/xml/contacts/src/main/java/sample/contact/ContactDaoSpring.java @@ -33,7 +33,7 @@ public class ContactDaoSpring extends JdbcDaoSupport implements ContactDao { public void create(final Contact contact) { getJdbcTemplate().update("insert into contacts values (?, ?, ?)", - ps -> { + (ps) -> { ps.setLong(1, contact.getId()); ps.setString(2, contact.getName()); ps.setString(3, contact.getEmail()); @@ -42,13 +42,13 @@ public class ContactDaoSpring extends JdbcDaoSupport implements ContactDao { public void delete(final Long contactId) { getJdbcTemplate().update("delete from contacts where id = ?", - ps -> ps.setLong(1, contactId)); + (ps) -> ps.setLong(1, contactId)); } public void update(final Contact contact) { getJdbcTemplate().update( "update contacts set contact_name = ?, address = ? where id = ?", - ps -> { + (ps) -> { ps.setString(1, contact.getName()); ps.setString(2, contact.getEmail()); ps.setLong(3, contact.getId()); diff --git a/samples/xml/contacts/src/main/java/sample/contact/DataSourcePopulator.java b/samples/xml/contacts/src/main/java/sample/contact/DataSourcePopulator.java index 52b20eb646..2315426909 100644 --- a/samples/xml/contacts/src/main/java/sample/contact/DataSourcePopulator.java +++ b/samples/xml/contacts/src/main/java/sample/contact/DataSourcePopulator.java @@ -162,7 +162,7 @@ public class DataSourcePopulator implements InitializingBean { for (int i = 1; i < createEntities; i++) { final ObjectIdentity objectIdentity = new ObjectIdentityImpl(Contact.class, (long) i); - tt.execute(arg0 -> { + tt.execute((arg0) -> { mutableAclService.createAcl(objectIdentity); return null; @@ -267,7 +267,7 @@ public class DataSourcePopulator implements InitializingBean { } private void updateAclInTransaction(final MutableAcl acl) { - tt.execute(arg0 -> { + tt.execute((arg0) -> { mutableAclService.updateAcl(acl); return null; diff --git a/test/src/main/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurers.java b/test/src/main/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurers.java index 77240f33ae..49fe636a7c 100644 --- a/test/src/main/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurers.java +++ b/test/src/main/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurers.java @@ -110,7 +110,7 @@ public final class SecurityMockServerConfigurers { return new MockServerConfigurer() { @Override public void beforeServerCreated(WebHttpHandlerBuilder builder) { - builder.filters(filters -> filters.add(0, new MutatorFilter())); + builder.filters((filters) -> filters.add(0, new MutatorFilter())); } }; } @@ -253,8 +253,8 @@ public final class SecurityMockServerConfigurers { public void afterConfigurerAdded(WebTestClient.Builder builder, @Nullable WebHttpHandlerBuilder httpHandlerBuilder, @Nullable ClientHttpConnector connector) { CsrfWebFilter filter = new CsrfWebFilter(); - filter.setRequireCsrfProtectionMatcher(e -> ServerWebExchangeMatcher.MatchResult.notMatch()); - httpHandlerBuilder.filters(filters -> filters.add(0, filter)); + filter.setRequireCsrfProtectionMatcher((e) -> ServerWebExchangeMatcher.MatchResult.notMatch()); + httpHandlerBuilder.filters((filters) -> filters.add(0, filter)); } @Override @@ -399,7 +399,7 @@ public final class SecurityMockServerConfigurers { } private Consumer> addSetupMutatorFilter() { - return filters -> filters.add(0, new SetupMutatorFilter(this.context)); + return (filters) -> filters.add(0, new SetupMutatorFilter(this.context)); } } @@ -414,7 +414,7 @@ public final class SecurityMockServerConfigurers { @Override public Mono filter(ServerWebExchange exchange, WebFilterChain webFilterChain) { - exchange.getAttributes().computeIfAbsent(MutatorFilter.ATTRIBUTE_NAME, key -> this.context); + exchange.getAttributes().computeIfAbsent(MutatorFilter.ATTRIBUTE_NAME, (key) -> this.context); return webFilterChain.filter(exchange); } @@ -494,7 +494,7 @@ public final class SecurityMockServerConfigurers { */ public JwtMutator authorities(Collection authorities) { Assert.notNull(authorities, "authorities cannot be null"); - this.authoritiesConverter = jwt -> authorities; + this.authoritiesConverter = (jwt) -> authorities; return this; } @@ -505,7 +505,7 @@ public final class SecurityMockServerConfigurers { */ public JwtMutator authorities(GrantedAuthority... authorities) { Assert.notNull(authorities, "authorities cannot be null"); - this.authoritiesConverter = jwt -> Arrays.asList(authorities); + this.authoritiesConverter = (jwt) -> Arrays.asList(authorities); return this; } @@ -672,7 +672,7 @@ public final class SecurityMockServerConfigurers { } private Collection getAuthorities(Collection scopes) { - return scopes.stream().map(scope -> new SimpleGrantedAuthority("SCOPE_" + scope)) + return scopes.stream().map((scope) -> new SimpleGrantedAuthority("SCOPE_" + scope)) .collect(Collectors.toList()); } @@ -1046,7 +1046,7 @@ public final class SecurityMockServerConfigurers { private OAuth2ClientMutator(String registrationId) { this.registrationId = registrationId; - clientRegistration(c -> { + clientRegistration((c) -> { }); } @@ -1119,7 +1119,7 @@ public final class SecurityMockServerConfigurers { private Consumer> addAuthorizedClientFilter() { OAuth2AuthorizedClient client = getClient(); - return filters -> filters.add(0, (exchange, chain) -> { + return (filters) -> filters.add(0, (exchange, chain) -> { ReactiveOAuth2AuthorizedClientManager authorizationClientManager = OAuth2ClientServerTestUtils .getOAuth2AuthorizedClientManager(exchange); if (!(authorizationClientManager instanceof TestReactiveOAuth2AuthorizedClientManager)) { @@ -1209,7 +1209,7 @@ public final class SecurityMockServerConfigurers { OAuth2AuthorizedClientArgumentResolver resolver = findResolver(exchange, OAuth2AuthorizedClientArgumentResolver.class); if (resolver == null) { - return authorizeRequest -> DEFAULT_CLIENT_REPO.loadAuthorizedClient( + return (authorizeRequest) -> DEFAULT_CLIENT_REPO.loadAuthorizedClient( authorizeRequest.getClientRegistrationId(), authorizeRequest.getPrincipal(), exchange); } return (ReactiveOAuth2AuthorizedClientManager) ReflectionTestUtils.getField(resolver, diff --git a/test/src/main/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessors.java b/test/src/main/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessors.java index b78591eab6..d39845c055 100644 --- a/test/src/main/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessors.java +++ b/test/src/main/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessors.java @@ -1094,7 +1094,7 @@ public final class SecurityMockMvcRequestPostProcessors { */ public JwtRequestPostProcessor authorities(Collection authorities) { Assert.notNull(authorities, "authorities cannot be null"); - this.authoritiesConverter = jwt -> authorities; + this.authoritiesConverter = (jwt) -> authorities; return this; } @@ -1105,7 +1105,7 @@ public final class SecurityMockMvcRequestPostProcessors { */ public JwtRequestPostProcessor authorities(GrantedAuthority... authorities) { Assert.notNull(authorities, "authorities cannot be null"); - this.authoritiesConverter = jwt -> Arrays.asList(authorities); + this.authoritiesConverter = (jwt) -> Arrays.asList(authorities); return this; } @@ -1237,7 +1237,7 @@ public final class SecurityMockMvcRequestPostProcessors { } private Collection getAuthorities(Collection scopes) { - return scopes.stream().map(scope -> new SimpleGrantedAuthority("SCOPE_" + scope)) + return scopes.stream().map((scope) -> new SimpleGrantedAuthority("SCOPE_" + scope)) .collect(Collectors.toList()); } @@ -1556,7 +1556,7 @@ public final class SecurityMockMvcRequestPostProcessors { private OAuth2ClientRequestPostProcessor(String registrationId) { this.registrationId = registrationId; - clientRegistration(c -> { + clientRegistration((c) -> { }); } @@ -1686,7 +1686,7 @@ public final class SecurityMockMvcRequestPostProcessors { OAuth2AuthorizedClientArgumentResolver resolver = findResolver(request, OAuth2AuthorizedClientArgumentResolver.class); if (resolver == null) { - return authorizeRequest -> DEFAULT_CLIENT_REPO.loadAuthorizedClient( + return (authorizeRequest) -> DEFAULT_CLIENT_REPO.loadAuthorizedClient( authorizeRequest.getClientRegistrationId(), authorizeRequest.getPrincipal(), request); } return (OAuth2AuthorizedClientManager) ReflectionTestUtils.getField(resolver, diff --git a/test/src/test/java/org/springframework/security/test/context/support/ReactorContextTestExecutionListenerTests.java b/test/src/test/java/org/springframework/security/test/context/support/ReactorContextTestExecutionListenerTests.java index 915f0997fc..cb5f960882 100644 --- a/test/src/test/java/org/springframework/security/test/context/support/ReactorContextTestExecutionListenerTests.java +++ b/test/src/test/java/org/springframework/security/test/context/support/ReactorContextTestExecutionListenerTests.java @@ -112,7 +112,7 @@ public class ReactorContextTestExecutionListenerTests { this.listener.beforeTestMethod(this.testContext); Mono authentication = Mono.just("any") - .flatMap(s -> ReactiveSecurityContextHolder.getContext().map(SecurityContext::getAuthentication)) + .flatMap((s) -> ReactiveSecurityContextHolder.getContext().map(SecurityContext::getAuthentication)) .subscriberContext(ReactiveSecurityContextHolder.withAuthentication(expectedAuthentication)); StepVerifier.create(authentication).expectNext(expectedAuthentication).verifyComplete(); @@ -129,7 +129,7 @@ public class ReactorContextTestExecutionListenerTests { this.listener.beforeTestMethod(this.testContext); Mono authentication = Mono.just("any") - .flatMap(s -> ReactiveSecurityContextHolder.getContext().map(SecurityContext::getAuthentication)) + .flatMap((s) -> ReactiveSecurityContextHolder.getContext().map(SecurityContext::getAuthentication)) .subscriberContext(ReactiveSecurityContextHolder.clearContext()); StepVerifier.create(authentication).verifyComplete(); @@ -155,7 +155,7 @@ public class ReactorContextTestExecutionListenerTests { public void afterTestMethodWhenDifferentHookIsRegistered() throws Exception { Object obj = new Object(); - Hooks.onLastOperator("CUSTOM_HOOK", p -> Mono.just(obj)); + Hooks.onLastOperator("CUSTOM_HOOK", (p) -> Mono.just(obj)); this.listener.afterTestMethod(this.testContext); Object result = Mono.subscriberContext().block(); diff --git a/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurerOpaqueTokenTests.java b/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurerOpaqueTokenTests.java index 5b30f0fc69..022a7a7ba0 100644 --- a/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurerOpaqueTokenTests.java +++ b/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurerOpaqueTokenTests.java @@ -51,7 +51,7 @@ public class SecurityMockServerConfigurerOpaqueTokenTests extends AbstractMockSe private WebTestClient client = WebTestClient.bindToController(this.securityContextController) .webFilter(new SecurityContextServerWebExchangeWebFilter()) - .argumentResolvers(resolvers -> resolvers + .argumentResolvers((resolvers) -> resolvers .addCustomResolver(new CurrentSecurityContextArgumentResolver(new ReactiveAdapterRegistry()))) .apply(SecurityMockServerConfigurers.springSecurity()).configureClient() .defaultHeader(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).build(); @@ -85,7 +85,7 @@ public class SecurityMockServerConfigurerOpaqueTokenTests extends AbstractMockSe String sub = new String("my-subject"); this.client .mutateWith(SecurityMockServerConfigurers.mockOpaqueToken() - .attributes(attributes -> attributes.put(OAuth2IntrospectionClaimNames.SUBJECT, sub))) + .attributes((attributes) -> attributes.put(OAuth2IntrospectionClaimNames.SUBJECT, sub))) .get().exchange().expectStatus().isOk(); SecurityContext context = this.securityContextController.removeSecurityContext(); @@ -108,11 +108,12 @@ public class SecurityMockServerConfigurerOpaqueTokenTests extends AbstractMockSe @Test public void mockOpaqueTokenWhenPrincipalSpecifiedThenLastCalledTakesPrecedence() { - OAuth2AuthenticatedPrincipal principal = TestOAuth2AuthenticatedPrincipals.active(a -> a.put("scope", "user")); + OAuth2AuthenticatedPrincipal principal = TestOAuth2AuthenticatedPrincipals + .active((a) -> a.put("scope", "user")); this.client .mutateWith(SecurityMockServerConfigurers.mockOpaqueToken() - .attributes(a -> a.put(OAuth2IntrospectionClaimNames.SUBJECT, "foo")).principal(principal)) + .attributes((a) -> a.put(OAuth2IntrospectionClaimNames.SUBJECT, "foo")).principal(principal)) .get().exchange().expectStatus().isOk(); SecurityContext context = this.securityContextController.removeSecurityContext(); @@ -124,7 +125,7 @@ public class SecurityMockServerConfigurerOpaqueTokenTests extends AbstractMockSe this.client .mutateWith(SecurityMockServerConfigurers.mockOpaqueToken().principal(principal) - .attributes(a -> a.put(OAuth2IntrospectionClaimNames.SUBJECT, "bar"))) + .attributes((a) -> a.put(OAuth2IntrospectionClaimNames.SUBJECT, "bar"))) .get().exchange().expectStatus().isOk(); context = this.securityContextController.removeSecurityContext(); diff --git a/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersClassAnnotatedTests.java b/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersClassAnnotatedTests.java index 8699062b6f..433f8b3483 100644 --- a/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersClassAnnotatedTests.java +++ b/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersClassAnnotatedTests.java @@ -50,7 +50,7 @@ public class SecurityMockServerConfigurersClassAnnotatedTests extends AbstractMo @Test public void wheMockUserWhenClassAnnotatedThenSuccess() { this.client.get().exchange().expectStatus().isOk().expectBody(String.class) - .consumeWith(response -> assertThat(response.getResponseBody()).contains("\"username\":\"user\"")); + .consumeWith((response) -> assertThat(response.getResponseBody()).contains("\"username\":\"user\"")); Authentication authentication = TestSecurityContextHolder.getContext().getAuthentication(); this.controller.assertPrincipalIsEqualTo(authentication); @@ -60,7 +60,7 @@ public class SecurityMockServerConfigurersClassAnnotatedTests extends AbstractMo @WithMockUser("method-user") public void withMockUserWhenClassAndMethodAnnotationThenMethodOverrides() { this.client.get().exchange().expectStatus().isOk().expectBody(String.class).consumeWith( - response -> assertThat(response.getResponseBody()).contains("\"username\":\"method-user\"")); + (response) -> assertThat(response.getResponseBody()).contains("\"username\":\"method-user\"")); Authentication authentication = TestSecurityContextHolder.getContext().getAuthentication(); this.controller.assertPrincipalIsEqualTo(authentication); @@ -70,7 +70,7 @@ public class SecurityMockServerConfigurersClassAnnotatedTests extends AbstractMo public void withMockUserWhenMutateWithThenMustateWithOverrides() { this.client.mutateWith(SecurityMockServerConfigurers.mockUser("mutateWith-mockUser")).get().exchange() .expectStatus().isOk().expectBody(String.class) - .consumeWith(response -> assertThat(response.getResponseBody()) + .consumeWith((response) -> assertThat(response.getResponseBody()) .contains("\"username\":\"mutateWith-mockUser\"")); Principal principal = this.controller.removePrincipal(); diff --git a/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersJwtTests.java b/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersJwtTests.java index f8b091f4b3..f11b965214 100644 --- a/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersJwtTests.java +++ b/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersJwtTests.java @@ -55,7 +55,7 @@ public class SecurityMockServerConfigurersJwtTests extends AbstractMockServerCon WebTestClient client = WebTestClient.bindToController(this.securityContextController) .webFilter(new SecurityContextServerWebExchangeWebFilter()) - .argumentResolvers(resolvers -> resolvers + .argumentResolvers((resolvers) -> resolvers .addCustomResolver(new CurrentSecurityContextArgumentResolver(new ReactiveAdapterRegistry()))) .apply(SecurityMockServerConfigurers.springSecurity()).configureClient() .defaultHeader(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).build(); @@ -76,7 +76,7 @@ public class SecurityMockServerConfigurersJwtTests extends AbstractMockServerCon @Test public void mockJwtWhenProvidingBuilderConsumerThenProducesJwtAuthentication() { String name = new String("user"); - this.client.mutateWith(SecurityMockServerConfigurers.mockJwt().jwt(jwt -> jwt.subject(name))).get().exchange() + this.client.mutateWith(SecurityMockServerConfigurers.mockJwt().jwt((jwt) -> jwt.subject(name))).get().exchange() .expectStatus().isOk(); SecurityContext context = this.securityContextController.removeSecurityContext(); @@ -88,7 +88,7 @@ public class SecurityMockServerConfigurersJwtTests extends AbstractMockServerCon @Test public void mockJwtWhenProvidingCustomAuthoritiesThenProducesJwtAuthentication() { this.client.mutateWith(SecurityMockServerConfigurers.mockJwt() - .jwt(jwt -> jwt.claim("scope", "ignored authorities")).authorities(this.authority1, this.authority2)) + .jwt((jwt) -> jwt.claim("scope", "ignored authorities")).authorities(this.authority1, this.authority2)) .get().exchange().expectStatus().isOk(); SecurityContext context = this.securityContextController.removeSecurityContext(); @@ -100,7 +100,7 @@ public class SecurityMockServerConfigurersJwtTests extends AbstractMockServerCon public void mockJwtWhenProvidingScopedAuthoritiesThenProducesJwtAuthentication() { this.client .mutateWith( - SecurityMockServerConfigurers.mockJwt().jwt(jwt -> jwt.claim("scope", "scoped authorities"))) + SecurityMockServerConfigurers.mockJwt().jwt((jwt) -> jwt.claim("scope", "scoped authorities"))) .get().exchange().expectStatus().isOk(); SecurityContext context = this.securityContextController.removeSecurityContext(); @@ -112,8 +112,8 @@ public class SecurityMockServerConfigurersJwtTests extends AbstractMockServerCon public void mockJwtWhenProvidingGrantedAuthoritiesThenProducesJwtAuthentication() { this.client .mutateWith( - SecurityMockServerConfigurers.mockJwt().jwt(jwt -> jwt.claim("scope", "ignored authorities")) - .authorities(jwt -> Arrays.asList(this.authority1))) + SecurityMockServerConfigurers.mockJwt().jwt((jwt) -> jwt.claim("scope", "ignored authorities")) + .authorities((jwt) -> Arrays.asList(this.authority1))) .get().exchange().expectStatus().isOk(); SecurityContext context = this.securityContextController.removeSecurityContext(); diff --git a/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersOAuth2ClientTests.java b/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersOAuth2ClientTests.java index ae7b45cd82..2bdaf7367c 100644 --- a/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersOAuth2ClientTests.java +++ b/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersOAuth2ClientTests.java @@ -66,7 +66,7 @@ public class SecurityMockServerConfigurersOAuth2ClientTests extends AbstractMock @Before public void setup() { this.client = WebTestClient.bindToController(this.controller) - .argumentResolvers(c -> c.addCustomResolver(new OAuth2AuthorizedClientArgumentResolver( + .argumentResolvers((c) -> c.addCustomResolver(new OAuth2AuthorizedClientArgumentResolver( this.clientRegistrationRepository, this.authorizedClientRepository))) .webFilter(new SecurityContextServerWebExchangeWebFilter()) .apply(SecurityMockServerConfigurers.springSecurity()).configureClient() @@ -114,7 +114,7 @@ public class SecurityMockServerConfigurersOAuth2ClientTests extends AbstractMock this.client .mutateWith(SecurityMockServerConfigurers.mockOAuth2Client("registration-id") - .clientRegistration(c -> c.clientId("client-id"))) + .clientRegistration((c) -> c.clientId("client-id"))) .get().uri("/client").exchange().expectStatus().isOk(); OAuth2AuthorizedClient client = this.controller.authorizedClient; diff --git a/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersOAuth2LoginTests.java b/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersOAuth2LoginTests.java index d967c49cbf..8028d88803 100644 --- a/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersOAuth2LoginTests.java +++ b/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersOAuth2LoginTests.java @@ -61,7 +61,7 @@ public class SecurityMockServerConfigurersOAuth2LoginTests extends AbstractMockS @Before public void setup() { this.client = WebTestClient.bindToController(this.controller) - .argumentResolvers(c -> c.addCustomResolver(new OAuth2AuthorizedClientArgumentResolver( + .argumentResolvers((c) -> c.addCustomResolver(new OAuth2AuthorizedClientArgumentResolver( this.clientRegistrationRepository, this.authorizedClientRepository))) .webFilter(new SecurityContextServerWebExchangeWebFilter()) .apply(SecurityMockServerConfigurers.springSecurity()).configureClient() @@ -110,7 +110,7 @@ public class SecurityMockServerConfigurersOAuth2LoginTests extends AbstractMockS public void oauth2LoginWhenAttributeSpecifiedThenUserHasAttribute() { this.client .mutateWith(SecurityMockServerConfigurers.mockOAuth2Login() - .attributes(a -> a.put("iss", "https://idp.example.org"))) + .attributes((a) -> a.put("iss", "https://idp.example.org"))) .get().uri("/token").exchange().expectStatus().isOk(); OAuth2AuthenticationToken token = this.controller.token; @@ -140,14 +140,15 @@ public class SecurityMockServerConfigurersOAuth2LoginTests extends AbstractMockS OAuth2User oauth2User = new DefaultOAuth2User(AuthorityUtils.createAuthorityList("SCOPE_read"), Collections.singletonMap("sub", "subject"), "sub"); - this.client.mutateWith(SecurityMockServerConfigurers.mockOAuth2Login().attributes(a -> a.put("subject", "foo")) - .oauth2User(oauth2User)).get().uri("/token").exchange().expectStatus().isOk(); + this.client.mutateWith(SecurityMockServerConfigurers.mockOAuth2Login() + .attributes((a) -> a.put("subject", "foo")).oauth2User(oauth2User)).get().uri("/token").exchange() + .expectStatus().isOk(); OAuth2AuthenticationToken token = this.controller.token; assertThat(token.getPrincipal().getAttributes()).containsEntry("sub", "subject"); this.client.mutateWith(SecurityMockServerConfigurers.mockOAuth2Login().oauth2User(oauth2User) - .attributes(a -> a.put("sub", "bar"))).get().uri("/token").exchange().expectStatus().isOk(); + .attributes((a) -> a.put("sub", "bar"))).get().uri("/token").exchange().expectStatus().isOk(); token = this.controller.token; assertThat(token.getPrincipal().getAttributes()).containsEntry("sub", "bar"); diff --git a/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersOidcLoginTests.java b/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersOidcLoginTests.java index 8c6c9c5cce..8f7927893f 100644 --- a/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersOidcLoginTests.java +++ b/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersOidcLoginTests.java @@ -62,7 +62,7 @@ public class SecurityMockServerConfigurersOidcLoginTests extends AbstractMockSer @Before public void setup() { this.client = WebTestClient.bindToController(this.controller) - .argumentResolvers(c -> c.addCustomResolver(new OAuth2AuthorizedClientArgumentResolver( + .argumentResolvers((c) -> c.addCustomResolver(new OAuth2AuthorizedClientArgumentResolver( this.clientRegistrationRepository, this.authorizedClientRepository))) .webFilter(new SecurityContextServerWebExchangeWebFilter()) .apply(SecurityMockServerConfigurers.springSecurity()).configureClient() @@ -111,8 +111,8 @@ public class SecurityMockServerConfigurersOidcLoginTests extends AbstractMockSer @Test public void oidcLoginWhenIdTokenSpecifiedThenUserHasClaims() { this.client - .mutateWith( - SecurityMockServerConfigurers.mockOidcLogin().idToken(i -> i.issuer("https://idp.example.org"))) + .mutateWith(SecurityMockServerConfigurers.mockOidcLogin() + .idToken((i) -> i.issuer("https://idp.example.org"))) .get().uri("/token").exchange().expectStatus().isOk(); OAuth2AuthenticationToken token = this.controller.token; @@ -121,7 +121,8 @@ public class SecurityMockServerConfigurersOidcLoginTests extends AbstractMockSer @Test public void oidcLoginWhenUserInfoSpecifiedThenUserHasClaims() throws Exception { - this.client.mutateWith(SecurityMockServerConfigurers.mockOidcLogin().userInfoToken(u -> u.email("email@email"))) + this.client + .mutateWith(SecurityMockServerConfigurers.mockOidcLogin().userInfoToken((u) -> u.email("email@email"))) .get().uri("/token").exchange().expectStatus().isOk(); OAuth2AuthenticationToken token = this.controller.token; @@ -153,18 +154,16 @@ public class SecurityMockServerConfigurersOidcLoginTests extends AbstractMockSer OidcUser oidcUser = new DefaultOidcUser(AuthorityUtils.createAuthorityList("SCOPE_read"), TestOidcIdTokens.idToken().build()); - this.client - .mutateWith( - SecurityMockServerConfigurers.mockOidcLogin().idToken(i -> i.subject("foo")).oidcUser(oidcUser)) - .get().uri("/token").exchange().expectStatus().isOk(); + this.client.mutateWith( + SecurityMockServerConfigurers.mockOidcLogin().idToken((i) -> i.subject("foo")).oidcUser(oidcUser)).get() + .uri("/token").exchange().expectStatus().isOk(); OAuth2AuthenticationToken token = this.controller.token; assertThat(token.getPrincipal().getAttributes()).containsEntry("sub", "subject"); - this.client - .mutateWith( - SecurityMockServerConfigurers.mockOidcLogin().oidcUser(oidcUser).idToken(i -> i.subject("bar"))) - .get().uri("/token").exchange().expectStatus().isOk(); + this.client.mutateWith( + SecurityMockServerConfigurers.mockOidcLogin().oidcUser(oidcUser).idToken((i) -> i.subject("bar"))).get() + .uri("/token").exchange().expectStatus().isOk(); token = this.controller.token; assertThat(token.getPrincipal().getAttributes()).containsEntry("sub", "bar"); diff --git a/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersTests.java b/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersTests.java index 555d96f2f6..fd5ccb3699 100644 --- a/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersTests.java +++ b/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersTests.java @@ -123,7 +123,7 @@ public class SecurityMockServerConfigurersTests extends AbstractMockServerConfig @Test public void csrfWhenMutateWithThenDisablesCsrf() { this.client.post().exchange().expectStatus().isEqualTo(HttpStatus.FORBIDDEN).expectBody() - .consumeWith(b -> assertThat(new String(b.getResponseBody())).contains("CSRF")); + .consumeWith((b) -> assertThat(new String(b.getResponseBody())).contains("CSRF")); this.client.mutateWith(SecurityMockServerConfigurers.csrf()).post().exchange().expectStatus().isOk(); diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuildersFormLoginTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuildersFormLoginTests.java index 30c39490e2..0337afee88 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuildersFormLoginTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuildersFormLoginTests.java @@ -101,7 +101,7 @@ public class SecurityMockMvcRequestBuildersFormLoginTests { @Test public void postProcessorsAreMergedDuringMockMvcPerform() throws Exception { RequestPostProcessor postProcessor = mock(RequestPostProcessor.class); - given(postProcessor.postProcessRequest(any())).willAnswer(i -> i.getArgument(0)); + given(postProcessor.postProcessRequest(any())).willAnswer((i) -> i.getArgument(0)); MockMvc mockMvc = MockMvcBuilders.standaloneSetup(new Object()) .defaultRequest(MockMvcRequestBuilders.get("/").with(postProcessor)).build(); diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuildersFormLogoutTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuildersFormLogoutTests.java index a966ad52af..438f3d19c3 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuildersFormLogoutTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuildersFormLogoutTests.java @@ -94,7 +94,7 @@ public class SecurityMockMvcRequestBuildersFormLogoutTests { @Test public void postProcessorsAreMergedDuringMockMvcPerform() throws Exception { RequestPostProcessor postProcessor = mock(RequestPostProcessor.class); - given(postProcessor.postProcessRequest(any())).willAnswer(i -> i.getArgument(0)); + given(postProcessor.postProcessRequest(any())).willAnswer((i) -> i.getArgument(0)); MockMvc mockMvc = MockMvcBuilders.standaloneSetup(new Object()) .defaultRequest(MockMvcRequestBuilders.get("/").with(postProcessor)).build(); diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsDigestTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsDigestTests.java index 0cf9b63b6f..51a9687d6e 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsDigestTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsDigestTests.java @@ -61,7 +61,7 @@ public class SecurityMockMvcRequestPostProcessorsDigestTests { this.entryPoint.setRealmName("Spring Security"); this.filter = new DigestAuthenticationFilter(); this.filter.setUserDetailsService( - username -> new User(username, this.password, AuthorityUtils.createAuthorityList("ROLE_USER"))); + (username) -> new User(username, this.password, AuthorityUtils.createAuthorityList("ROLE_USER"))); this.filter.setAuthenticationEntryPoint(this.entryPoint); this.filter.afterPropertiesSet(); } diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsJwtTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsJwtTests.java index 954ce278cc..dfa8792001 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsJwtTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsJwtTests.java @@ -110,7 +110,7 @@ public class SecurityMockMvcRequestPostProcessorsJwtTests { @Test public void jwtWhenProvidingBuilderConsumerThenProducesJwtAuthentication() { String name = new String("user"); - jwt().jwt(jwt -> jwt.subject(name)).postProcessRequest(this.request); + jwt().jwt((jwt) -> jwt.subject(name)).postProcessRequest(this.request); verify(this.repository).saveContext(this.contextCaptor.capture(), eq(this.request), any(HttpServletResponse.class)); @@ -122,7 +122,7 @@ public class SecurityMockMvcRequestPostProcessorsJwtTests { @Test public void jwtWhenProvidingCustomAuthoritiesThenProducesJwtAuthentication() { - jwt().jwt(jwt -> jwt.claim("scope", "ignored authorities")).authorities(this.authority1, this.authority2) + jwt().jwt((jwt) -> jwt.claim("scope", "ignored authorities")).authorities(this.authority1, this.authority2) .postProcessRequest(this.request); verify(this.repository).saveContext(this.contextCaptor.capture(), eq(this.request), @@ -134,7 +134,7 @@ public class SecurityMockMvcRequestPostProcessorsJwtTests { @Test public void jwtWhenProvidingScopedAuthoritiesThenProducesJwtAuthentication() { - jwt().jwt(jwt -> jwt.claim("scope", "scoped authorities")).postProcessRequest(this.request); + jwt().jwt((jwt) -> jwt.claim("scope", "scoped authorities")).postProcessRequest(this.request); verify(this.repository).saveContext(this.contextCaptor.capture(), eq(this.request), any(HttpServletResponse.class)); @@ -145,8 +145,8 @@ public class SecurityMockMvcRequestPostProcessorsJwtTests { @Test public void jwtWhenProvidingGrantedAuthoritiesThenProducesJwtAuthentication() { - jwt().jwt(jwt -> jwt.claim("scope", "ignored authorities")).authorities(jwt -> Arrays.asList(this.authority1)) - .postProcessRequest(this.request); + jwt().jwt((jwt) -> jwt.claim("scope", "ignored authorities")) + .authorities((jwt) -> Arrays.asList(this.authority1)).postProcessRequest(this.request); verify(this.repository).saveContext(this.contextCaptor.capture(), eq(this.request), any(HttpServletResponse.class)); diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsOAuth2ClientTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsOAuth2ClientTests.java index 5bdedc8277..7e17a95223 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsOAuth2ClientTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsOAuth2ClientTests.java @@ -120,7 +120,7 @@ public class SecurityMockMvcRequestPostProcessorsOAuth2ClientTests { public void oauth2ClientWhenClientRegistrationConsumerThenUses() throws Exception { this.mvc.perform(get("/client-id") - .with(oauth2Client("registration-id").clientRegistration(c -> c.clientId("client-id")))) + .with(oauth2Client("registration-id").clientRegistration((c) -> c.clientId("client-id")))) .andExpect(content().string("client-id")); } @@ -160,7 +160,7 @@ public class SecurityMockMvcRequestPostProcessorsOAuth2ClientTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authz -> authz + .authorizeRequests((authz) -> authz .anyRequest().permitAll() ) .oauth2Client(); diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsOAuth2LoginTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsOAuth2LoginTests.java index 360a90088b..d92b97c398 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsOAuth2LoginTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsOAuth2LoginTests.java @@ -109,7 +109,7 @@ public class SecurityMockMvcRequestPostProcessorsOAuth2LoginTests { @Test public void oauth2LoginWhenAttributeSpecifiedThenUserHasAttribute() throws Exception { this.mvc.perform( - get("/attributes/iss").with(oauth2Login().attributes(a -> a.put("iss", "https://idp.example.org")))) + get("/attributes/iss").with(oauth2Login().attributes((a) -> a.put("iss", "https://idp.example.org")))) .andExpect(content().string("https://idp.example.org")); } @@ -139,11 +139,11 @@ public class SecurityMockMvcRequestPostProcessorsOAuth2LoginTests { OAuth2User oauth2User = new DefaultOAuth2User(AuthorityUtils.createAuthorityList("SCOPE_read"), Collections.singletonMap("username", "user"), "username"); - this.mvc.perform( - get("/attributes/sub").with(oauth2Login().attributes(a -> a.put("sub", "bar")).oauth2User(oauth2User))) + this.mvc.perform(get("/attributes/sub") + .with(oauth2Login().attributes((a) -> a.put("sub", "bar")).oauth2User(oauth2User))) .andExpect(status().isOk()).andExpect(content().string("no-attribute")); - this.mvc.perform( - get("/attributes/sub").with(oauth2Login().oauth2User(oauth2User).attributes(a -> a.put("sub", "bar")))) + this.mvc.perform(get("/attributes/sub") + .with(oauth2Login().oauth2User(oauth2User).attributes((a) -> a.put("sub", "bar")))) .andExpect(content().string("bar")); } @@ -155,7 +155,7 @@ public class SecurityMockMvcRequestPostProcessorsOAuth2LoginTests { protected void configure(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests(authorize -> authorize + .authorizeRequests((authorize) -> authorize .mvcMatchers("/admin/**").hasAuthority("SCOPE_admin") .anyRequest().hasAuthority("SCOPE_read") ).oauth2Login(); diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsOidcLoginTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsOidcLoginTests.java index fb26a1bb5b..7de780a095 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsOidcLoginTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsOidcLoginTests.java @@ -113,13 +113,13 @@ public class SecurityMockMvcRequestPostProcessorsOidcLoginTests { @Test public void oidcLoginWhenIdTokenSpecifiedThenUserHasClaims() throws Exception { - this.mvc.perform(get("/id-token/iss").with(oidcLogin().idToken(i -> i.issuer("https://idp.example.org")))) + this.mvc.perform(get("/id-token/iss").with(oidcLogin().idToken((i) -> i.issuer("https://idp.example.org")))) .andExpect(content().string("https://idp.example.org")); } @Test public void oidcLoginWhenUserInfoSpecifiedThenUserHasClaims() throws Exception { - this.mvc.perform(get("/user-info/email").with(oidcLogin().userInfoToken(u -> u.email("email@email")))) + this.mvc.perform(get("/user-info/email").with(oidcLogin().userInfoToken((u) -> u.email("email@email")))) .andExpect(content().string("email@email")); } @@ -144,9 +144,9 @@ public class SecurityMockMvcRequestPostProcessorsOidcLoginTests { OidcUser oidcUser = new DefaultOidcUser(AuthorityUtils.createAuthorityList("SCOPE_read"), TestOidcIdTokens.idToken().build()); - this.mvc.perform(get("/id-token/sub").with(oidcLogin().idToken(i -> i.subject("foo")).oidcUser(oidcUser))) + this.mvc.perform(get("/id-token/sub").with(oidcLogin().idToken((i) -> i.subject("foo")).oidcUser(oidcUser))) .andExpect(status().isOk()).andExpect(content().string("subject")); - this.mvc.perform(get("/id-token/sub").with(oidcLogin().oidcUser(oidcUser).idToken(i -> i.subject("bar")))) + this.mvc.perform(get("/id-token/sub").with(oidcLogin().oidcUser(oidcUser).idToken((i) -> i.subject("bar")))) .andExpect(content().string("bar")); } diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsOpaqueTokenTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsOpaqueTokenTests.java index 4acdb63396..46f9b54f37 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsOpaqueTokenTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsOpaqueTokenTests.java @@ -90,7 +90,7 @@ public class SecurityMockMvcRequestPostProcessorsOpaqueTokenTests { @Test public void opaqueTokenWhenAttributeSpecifiedThenUserHasAttribute() throws Exception { this.mvc.perform( - get("/opaque-token/iss").with(opaqueToken().attributes(a -> a.put("iss", "https://idp.example.org")))) + get("/opaque-token/iss").with(opaqueToken().attributes((a) -> a.put("iss", "https://idp.example.org")))) .andExpect(content().string("https://idp.example.org")); } @@ -107,13 +107,14 @@ public class SecurityMockMvcRequestPostProcessorsOpaqueTokenTests { // gh-7800 @Test public void opaqueTokenWhenPrincipalSpecifiedThenLastCalledTakesPrecedence() throws Exception { - OAuth2AuthenticatedPrincipal principal = TestOAuth2AuthenticatedPrincipals.active(a -> a.put("scope", "user")); + OAuth2AuthenticatedPrincipal principal = TestOAuth2AuthenticatedPrincipals + .active((a) -> a.put("scope", "user")); - this.mvc.perform( - get("/opaque-token/sub").with(opaqueToken().attributes(a -> a.put("sub", "foo")).principal(principal))) + this.mvc.perform(get("/opaque-token/sub") + .with(opaqueToken().attributes((a) -> a.put("sub", "foo")).principal(principal))) .andExpect(status().isOk()).andExpect(content().string((String) principal.getAttribute("sub"))); - this.mvc.perform( - get("/opaque-token/sub").with(opaqueToken().principal(principal).attributes(a -> a.put("sub", "bar")))) + this.mvc.perform(get("/opaque-token/sub") + .with(opaqueToken().principal(principal).attributes((a) -> a.put("sub", "bar")))) .andExpect(content().string("bar")); } diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultMatchersTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultMatchersTests.java index 57bf66d878..c789869b03 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultMatchersTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultMatchersTests.java @@ -66,14 +66,14 @@ public class SecurityMockMvcResultMatchersTests { @Test public void withAuthenticationWhenMatchesThenSuccess() throws Exception { - this.mockMvc.perform(formLogin()).andExpect(authenticated() - .withAuthentication(auth -> assertThat(auth).isInstanceOf(UsernamePasswordAuthenticationToken.class))); + this.mockMvc.perform(formLogin()).andExpect(authenticated().withAuthentication( + (auth) -> assertThat(auth).isInstanceOf(UsernamePasswordAuthenticationToken.class))); } @Test(expected = AssertionError.class) public void withAuthenticationWhenNotMatchesThenFails() throws Exception { this.mockMvc.perform(formLogin()).andExpect( - authenticated().withAuthentication(auth -> assertThat(auth.getName()).isEqualTo("notmatch"))); + authenticated().withAuthentication((auth) -> assertThat(auth.getName()).isEqualTo("notmatch"))); } // SEC-2719 diff --git a/web/src/main/java/org/springframework/security/web/access/ExceptionTranslationFilter.java b/web/src/main/java/org/springframework/security/web/access/ExceptionTranslationFilter.java index 526a237bc7..2ff4908806 100644 --- a/web/src/main/java/org/springframework/security/web/access/ExceptionTranslationFilter.java +++ b/web/src/main/java/org/springframework/security/web/access/ExceptionTranslationFilter.java @@ -233,7 +233,7 @@ public class ExceptionTranslationFilter extends GenericFilterBean { protected void initExtractorMap() { super.initExtractorMap(); - registerExtractor(ServletException.class, throwable -> { + registerExtractor(ServletException.class, (throwable) -> { ThrowableAnalyzer.verifyThrowableHierarchy(throwable, ServletException.class); return ((ServletException) throwable).getRootCause(); }); diff --git a/web/src/main/java/org/springframework/security/web/authentication/AuthenticationFilter.java b/web/src/main/java/org/springframework/security/web/authentication/AuthenticationFilter.java index 24e6e015e3..25f0f1e0b9 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/AuthenticationFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/AuthenticationFilter.java @@ -77,7 +77,7 @@ public class AuthenticationFilter extends OncePerRequestFilter { public AuthenticationFilter(AuthenticationManager authenticationManager, AuthenticationConverter authenticationConverter) { - this((AuthenticationManagerResolver) r -> authenticationManager, authenticationConverter); + this((AuthenticationManagerResolver) (r) -> authenticationManager, authenticationConverter); } public AuthenticationFilter(AuthenticationManagerResolver authenticationManagerResolver, diff --git a/web/src/main/java/org/springframework/security/web/authentication/logout/CookieClearingLogoutHandler.java b/web/src/main/java/org/springframework/security/web/authentication/logout/CookieClearingLogoutHandler.java index 8633644620..70272a7893 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/logout/CookieClearingLogoutHandler.java +++ b/web/src/main/java/org/springframework/security/web/authentication/logout/CookieClearingLogoutHandler.java @@ -73,7 +73,7 @@ public final class CookieClearingLogoutHandler implements LogoutHandler { @Override public void logout(HttpServletRequest request, HttpServletResponse response, Authentication authentication) { - this.cookiesToClear.forEach(f -> response.addCookie(f.apply(request))); + this.cookiesToClear.forEach((f) -> response.addCookie(f.apply(request))); } } diff --git a/web/src/main/java/org/springframework/security/web/authentication/ui/DefaultLoginPageGeneratingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/ui/DefaultLoginPageGeneratingFilter.java index 5783719463..ba90274987 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/ui/DefaultLoginPageGeneratingFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/ui/DefaultLoginPageGeneratingFilter.java @@ -87,7 +87,7 @@ public class DefaultLoginPageGeneratingFilter extends GenericFilterBean { private Map saml2AuthenticationUrlToProviderName; - private Function> resolveHiddenInputs = request -> Collections.emptyMap(); + private Function> resolveHiddenInputs = (request) -> Collections.emptyMap(); public DefaultLoginPageGeneratingFilter() { } diff --git a/web/src/main/java/org/springframework/security/web/authentication/ui/DefaultLogoutPageGeneratingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/ui/DefaultLogoutPageGeneratingFilter.java index e8b9e9c666..7dae48a336 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/ui/DefaultLogoutPageGeneratingFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/ui/DefaultLogoutPageGeneratingFilter.java @@ -41,7 +41,7 @@ public class DefaultLogoutPageGeneratingFilter extends OncePerRequestFilter { private RequestMatcher matcher = new AntPathRequestMatcher("/logout", "GET"); - private Function> resolveHiddenInputs = request -> Collections.emptyMap(); + private Function> resolveHiddenInputs = (request) -> Collections.emptyMap(); @Override protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) diff --git a/web/src/main/java/org/springframework/security/web/firewall/StrictHttpFirewall.java b/web/src/main/java/org/springframework/security/web/firewall/StrictHttpFirewall.java index 4b63eb9b43..f8893c0c55 100644 --- a/web/src/main/java/org/springframework/security/web/firewall/StrictHttpFirewall.java +++ b/web/src/main/java/org/springframework/security/web/firewall/StrictHttpFirewall.java @@ -112,13 +112,13 @@ public class StrictHttpFirewall implements HttpFirewall { private Set allowedHttpMethods = createDefaultAllowedHttpMethods(); - private Predicate allowedHostnames = hostname -> true; + private Predicate allowedHostnames = (hostname) -> true; private static final Pattern ASSIGNED_AND_NOT_ISO_CONTROL_PATTERN = Pattern .compile("[\\p{IsAssigned}&&[^\\p{IsControl}]]*"); - private static final Predicate ASSIGNED_AND_NOT_ISO_CONTROL_PREDICATE = s -> ASSIGNED_AND_NOT_ISO_CONTROL_PATTERN - .matcher(s).matches(); + private static final Predicate ASSIGNED_AND_NOT_ISO_CONTROL_PREDICATE = ( + s) -> ASSIGNED_AND_NOT_ISO_CONTROL_PATTERN.matcher(s).matches(); private Predicate allowedHeaderNames = ASSIGNED_AND_NOT_ISO_CONTROL_PREDICATE; @@ -126,7 +126,7 @@ public class StrictHttpFirewall implements HttpFirewall { private Predicate allowedParameterNames = ASSIGNED_AND_NOT_ISO_CONTROL_PREDICATE; - private Predicate allowedParameterValues = value -> true; + private Predicate allowedParameterValues = (value) -> true; public StrictHttpFirewall() { urlBlocklistsAddAll(FORBIDDEN_SEMICOLON); diff --git a/web/src/main/java/org/springframework/security/web/header/writers/CompositeHeaderWriter.java b/web/src/main/java/org/springframework/security/web/header/writers/CompositeHeaderWriter.java index 6b9ea6cf39..4f2b9f4185 100644 --- a/web/src/main/java/org/springframework/security/web/header/writers/CompositeHeaderWriter.java +++ b/web/src/main/java/org/springframework/security/web/header/writers/CompositeHeaderWriter.java @@ -46,7 +46,7 @@ public class CompositeHeaderWriter implements HeaderWriter { @Override public void writeHeaders(HttpServletRequest request, HttpServletResponse response) { - this.headerWriters.forEach(headerWriter -> headerWriter.writeHeaders(request, response)); + this.headerWriters.forEach((headerWriter) -> headerWriter.writeHeaders(request, response)); } } diff --git a/web/src/main/java/org/springframework/security/web/http/SecurityHeaders.java b/web/src/main/java/org/springframework/security/web/http/SecurityHeaders.java index 55c7c486c2..a7d399e275 100644 --- a/web/src/main/java/org/springframework/security/web/http/SecurityHeaders.java +++ b/web/src/main/java/org/springframework/security/web/http/SecurityHeaders.java @@ -37,7 +37,7 @@ public final class SecurityHeaders { */ public static Consumer bearerToken(String bearerTokenValue) { Assert.hasText(bearerTokenValue, "bearerTokenValue cannot be null"); - return headers -> headers.set(HttpHeaders.AUTHORIZATION, "Bearer " + bearerTokenValue); + return (headers) -> headers.set(HttpHeaders.AUTHORIZATION, "Bearer " + bearerTokenValue); } private SecurityHeaders() { diff --git a/web/src/main/java/org/springframework/security/web/reactive/result/method/annotation/AuthenticationPrincipalArgumentResolver.java b/web/src/main/java/org/springframework/security/web/reactive/result/method/annotation/AuthenticationPrincipalArgumentResolver.java index 7f3f87c51f..edc2ee76be 100644 --- a/web/src/main/java/org/springframework/security/web/reactive/result/method/annotation/AuthenticationPrincipalArgumentResolver.java +++ b/web/src/main/java/org/springframework/security/web/reactive/result/method/annotation/AuthenticationPrincipalArgumentResolver.java @@ -72,7 +72,7 @@ public class AuthenticationPrincipalArgumentResolver extends HandlerMethodArgume public Mono resolveArgument(MethodParameter parameter, BindingContext bindingContext, ServerWebExchange exchange) { ReactiveAdapter adapter = getAdapterRegistry().getAdapter(parameter.getParameterType()); - return ReactiveSecurityContextHolder.getContext().map(SecurityContext::getAuthentication).flatMap(a -> { + return ReactiveSecurityContextHolder.getContext().map(SecurityContext::getAuthentication).flatMap((a) -> { Object p = resolvePrincipal(parameter, a.getPrincipal()); Mono principal = Mono.justOrEmpty(p); return adapter == null ? principal : Mono.just(adapter.fromPublisher(principal)); diff --git a/web/src/main/java/org/springframework/security/web/reactive/result/method/annotation/CurrentSecurityContextArgumentResolver.java b/web/src/main/java/org/springframework/security/web/reactive/result/method/annotation/CurrentSecurityContextArgumentResolver.java index d29c505e4a..af4a52ed49 100644 --- a/web/src/main/java/org/springframework/security/web/reactive/result/method/annotation/CurrentSecurityContextArgumentResolver.java +++ b/web/src/main/java/org/springframework/security/web/reactive/result/method/annotation/CurrentSecurityContextArgumentResolver.java @@ -84,7 +84,7 @@ public class CurrentSecurityContextArgumentResolver extends HandlerMethodArgumen if (reactiveSecurityContext == null) { return null; } - return reactiveSecurityContext.flatMap(a -> { + return reactiveSecurityContext.flatMap((a) -> { Object p = resolveSecurityContext(parameter, a); Mono o = Mono.justOrEmpty(p); return adapter == null ? o : Mono.just(adapter.fromPublisher(o)); diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java b/web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java index 29ab2383a4..5b8b1aacd9 100644 --- a/web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java +++ b/web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java @@ -170,7 +170,7 @@ public class DefaultSavedRequest implements SavedRequest { } private void addHeader(String name, String value) { - List values = this.headers.computeIfAbsent(name, k -> new ArrayList<>()); + List values = this.headers.computeIfAbsent(name, (k) -> new ArrayList<>()); values.add(value); } diff --git a/web/src/main/java/org/springframework/security/web/server/DelegatingServerAuthenticationEntryPoint.java b/web/src/main/java/org/springframework/security/web/server/DelegatingServerAuthenticationEntryPoint.java index 35f6856662..633a996302 100644 --- a/web/src/main/java/org/springframework/security/web/server/DelegatingServerAuthenticationEntryPoint.java +++ b/web/src/main/java/org/springframework/security/web/server/DelegatingServerAuthenticationEntryPoint.java @@ -60,16 +60,16 @@ public class DelegatingServerAuthenticationEntryPoint implements ServerAuthentic @Override public Mono commence(ServerWebExchange exchange, AuthenticationException ex) { - return Flux.fromIterable(this.entryPoints).filterWhen(entry -> isMatch(exchange, entry)).next() - .map(entry -> entry.getEntryPoint()).doOnNext(it -> { + return Flux.fromIterable(this.entryPoints).filterWhen((entry) -> isMatch(exchange, entry)).next() + .map((entry) -> entry.getEntryPoint()).doOnNext((it) -> { if (logger.isDebugEnabled()) { logger.debug("Match found! Executing " + it); } - }).switchIfEmpty(Mono.just(this.defaultEntryPoint).doOnNext(it -> { + }).switchIfEmpty(Mono.just(this.defaultEntryPoint).doOnNext((it) -> { if (logger.isDebugEnabled()) { logger.debug("No match found. Using default entry point " + this.defaultEntryPoint); } - })).flatMap(entryPoint -> entryPoint.commence(exchange, ex)); + })).flatMap((entryPoint) -> entryPoint.commence(exchange, ex)); } private Mono isMatch(ServerWebExchange exchange, DelegateEntry entry) { @@ -77,7 +77,7 @@ public class DelegatingServerAuthenticationEntryPoint implements ServerAuthentic if (logger.isDebugEnabled()) { logger.debug("Trying to match using " + matcher); } - return matcher.matches(exchange).map(result -> result.isMatch()); + return matcher.matches(exchange).map((result) -> result.isMatch()); } /** diff --git a/web/src/main/java/org/springframework/security/web/server/MatcherSecurityWebFilterChain.java b/web/src/main/java/org/springframework/security/web/server/MatcherSecurityWebFilterChain.java index 081e0c865e..ad3cbd328b 100644 --- a/web/src/main/java/org/springframework/security/web/server/MatcherSecurityWebFilterChain.java +++ b/web/src/main/java/org/springframework/security/web/server/MatcherSecurityWebFilterChain.java @@ -48,7 +48,7 @@ public class MatcherSecurityWebFilterChain implements SecurityWebFilterChain { @Override public Mono matches(ServerWebExchange exchange) { - return this.matcher.matches(exchange).map(m -> m.isMatch()); + return this.matcher.matches(exchange).map((m) -> m.isMatch()); } @Override diff --git a/web/src/main/java/org/springframework/security/web/server/ServerFormLoginAuthenticationConverter.java b/web/src/main/java/org/springframework/security/web/server/ServerFormLoginAuthenticationConverter.java index f5ed89c7b1..9d538ad0aa 100644 --- a/web/src/main/java/org/springframework/security/web/server/ServerFormLoginAuthenticationConverter.java +++ b/web/src/main/java/org/springframework/security/web/server/ServerFormLoginAuthenticationConverter.java @@ -46,7 +46,7 @@ public class ServerFormLoginAuthenticationConverter implements Function apply(ServerWebExchange exchange) { - return exchange.getFormData().map(data -> createAuthentication(data)); + return exchange.getFormData().map((data) -> createAuthentication(data)); } private UsernamePasswordAuthenticationToken createAuthentication(MultiValueMap data) { diff --git a/web/src/main/java/org/springframework/security/web/server/WebFilterChainProxy.java b/web/src/main/java/org/springframework/security/web/server/WebFilterChainProxy.java index 26e98e7b99..0e03b36497 100644 --- a/web/src/main/java/org/springframework/security/web/server/WebFilterChainProxy.java +++ b/web/src/main/java/org/springframework/security/web/server/WebFilterChainProxy.java @@ -49,12 +49,12 @@ public class WebFilterChainProxy implements WebFilter { @Override public Mono filter(ServerWebExchange exchange, WebFilterChain chain) { return Flux.fromIterable(this.filters) - .filterWhen(securityWebFilterChain -> securityWebFilterChain.matches(exchange)).next() + .filterWhen((securityWebFilterChain) -> securityWebFilterChain.matches(exchange)).next() .switchIfEmpty(chain.filter(exchange).then(Mono.empty())) - .flatMap(securityWebFilterChain -> securityWebFilterChain.getWebFilters().collectList()) - .map(filters -> new FilteringWebHandler(webHandler -> chain.filter(webHandler), filters)) - .map(handler -> new DefaultWebFilterChain(handler)) - .flatMap(securedChain -> securedChain.filter(exchange)); + .flatMap((securityWebFilterChain) -> securityWebFilterChain.getWebFilters().collectList()) + .map((filters) -> new FilteringWebHandler((webHandler) -> chain.filter(webHandler), filters)) + .map((handler) -> new DefaultWebFilterChain(handler)) + .flatMap((securedChain) -> securedChain.filter(exchange)); } } diff --git a/web/src/main/java/org/springframework/security/web/server/authentication/AnonymousAuthenticationWebFilter.java b/web/src/main/java/org/springframework/security/web/server/authentication/AnonymousAuthenticationWebFilter.java index efc927d835..131cf14796 100644 --- a/web/src/main/java/org/springframework/security/web/server/authentication/AnonymousAuthenticationWebFilter.java +++ b/web/src/main/java/org/springframework/security/web/server/authentication/AnonymousAuthenticationWebFilter.java @@ -86,7 +86,7 @@ public class AnonymousAuthenticationWebFilter implements WebFilter { return chain.filter(exchange) .subscriberContext(ReactiveSecurityContextHolder.withSecurityContext(Mono.just(securityContext))) .then(Mono.empty()); - })).flatMap(securityContext -> { + })).flatMap((securityContext) -> { if (logger.isDebugEnabled()) { logger.debug("SecurityContext contains anonymous token: '" + securityContext.getAuthentication() + "'"); } diff --git a/web/src/main/java/org/springframework/security/web/server/authentication/AuthenticationConverterServerWebExchangeMatcher.java b/web/src/main/java/org/springframework/security/web/server/authentication/AuthenticationConverterServerWebExchangeMatcher.java index 951eb75b69..8b60a584e7 100644 --- a/web/src/main/java/org/springframework/security/web/server/authentication/AuthenticationConverterServerWebExchangeMatcher.java +++ b/web/src/main/java/org/springframework/security/web/server/authentication/AuthenticationConverterServerWebExchangeMatcher.java @@ -43,8 +43,8 @@ public final class AuthenticationConverterServerWebExchangeMatcher implements Se @Override public Mono matches(ServerWebExchange exchange) { - return this.serverAuthenticationConverter.convert(exchange).flatMap(a -> MatchResult.match()) - .onErrorResume(e -> MatchResult.notMatch()).switchIfEmpty(MatchResult.notMatch()); + return this.serverAuthenticationConverter.convert(exchange).flatMap((a) -> MatchResult.match()) + .onErrorResume((e) -> MatchResult.notMatch()).switchIfEmpty(MatchResult.notMatch()); } } diff --git a/web/src/main/java/org/springframework/security/web/server/authentication/AuthenticationWebFilter.java b/web/src/main/java/org/springframework/security/web/server/authentication/AuthenticationWebFilter.java index 602ddbe090..b7d51de9d2 100644 --- a/web/src/main/java/org/springframework/security/web/server/authentication/AuthenticationWebFilter.java +++ b/web/src/main/java/org/springframework/security/web/server/authentication/AuthenticationWebFilter.java @@ -91,7 +91,7 @@ public class AuthenticationWebFilter implements WebFilter { */ public AuthenticationWebFilter(ReactiveAuthenticationManager authenticationManager) { Assert.notNull(authenticationManager, "authenticationManager cannot be null"); - this.authenticationManagerResolver = request -> Mono.just(authenticationManager); + this.authenticationManagerResolver = (request) -> Mono.just(authenticationManager); } /** @@ -107,22 +107,22 @@ public class AuthenticationWebFilter implements WebFilter { @Override public Mono filter(ServerWebExchange exchange, WebFilterChain chain) { - return this.requiresAuthenticationMatcher.matches(exchange).filter(matchResult -> matchResult.isMatch()) - .flatMap(matchResult -> this.authenticationConverter.convert(exchange)) + return this.requiresAuthenticationMatcher.matches(exchange).filter((matchResult) -> matchResult.isMatch()) + .flatMap((matchResult) -> this.authenticationConverter.convert(exchange)) .switchIfEmpty(chain.filter(exchange).then(Mono.empty())) - .flatMap(token -> authenticate(exchange, chain, token)) - .onErrorResume(AuthenticationException.class, e -> this.authenticationFailureHandler + .flatMap((token) -> authenticate(exchange, chain, token)) + .onErrorResume(AuthenticationException.class, (e) -> this.authenticationFailureHandler .onAuthenticationFailure(new WebFilterExchange(exchange, chain), e)); } private Mono authenticate(ServerWebExchange exchange, WebFilterChain chain, Authentication token) { return this.authenticationManagerResolver.resolve(exchange) - .flatMap(authenticationManager -> authenticationManager.authenticate(token)) + .flatMap((authenticationManager) -> authenticationManager.authenticate(token)) .switchIfEmpty(Mono.defer( () -> Mono.error(new IllegalStateException("No provider found for " + token.getClass())))) - .flatMap(authentication -> onAuthenticationSuccess(authentication, + .flatMap((authentication) -> onAuthenticationSuccess(authentication, new WebFilterExchange(exchange, chain))) - .doOnError(AuthenticationException.class, e -> { + .doOnError(AuthenticationException.class, (e) -> { if (logger.isDebugEnabled()) { logger.debug("Authentication failed: " + e.getMessage()); } diff --git a/web/src/main/java/org/springframework/security/web/server/authentication/DelegatingServerAuthenticationSuccessHandler.java b/web/src/main/java/org/springframework/security/web/server/authentication/DelegatingServerAuthenticationSuccessHandler.java index bbda2025bd..edd81bcaf4 100644 --- a/web/src/main/java/org/springframework/security/web/server/authentication/DelegatingServerAuthenticationSuccessHandler.java +++ b/web/src/main/java/org/springframework/security/web/server/authentication/DelegatingServerAuthenticationSuccessHandler.java @@ -45,7 +45,7 @@ public class DelegatingServerAuthenticationSuccessHandler implements ServerAuthe @Override public Mono onAuthenticationSuccess(WebFilterExchange exchange, Authentication authentication) { return Flux.fromIterable(this.delegates) - .concatMap(delegate -> delegate.onAuthenticationSuccess(exchange, authentication)).then(); + .concatMap((delegate) -> delegate.onAuthenticationSuccess(exchange, authentication)).then(); } } diff --git a/web/src/main/java/org/springframework/security/web/server/authentication/ReactivePreAuthenticatedAuthenticationManager.java b/web/src/main/java/org/springframework/security/web/server/authentication/ReactivePreAuthenticatedAuthenticationManager.java index 8252c65ba2..d21ff1363f 100644 --- a/web/src/main/java/org/springframework/security/web/server/authentication/ReactivePreAuthenticatedAuthenticationManager.java +++ b/web/src/main/java/org/springframework/security/web/server/authentication/ReactivePreAuthenticatedAuthenticationManager.java @@ -61,7 +61,7 @@ public class ReactivePreAuthenticatedAuthenticationManager implements ReactiveAu return Mono.just(authentication).filter(this::supports).map(Authentication::getName) .flatMap(this.userDetailsService::findByUsername) .switchIfEmpty(Mono.error(() -> new UsernameNotFoundException("User not found"))) - .doOnNext(this.userDetailsChecker::check).map(ud -> { + .doOnNext(this.userDetailsChecker::check).map((ud) -> { PreAuthenticatedAuthenticationToken result = new PreAuthenticatedAuthenticationToken(ud, authentication.getCredentials(), ud.getAuthorities()); result.setDetails(authentication.getDetails()); diff --git a/web/src/main/java/org/springframework/security/web/server/authentication/RedirectServerAuthenticationSuccessHandler.java b/web/src/main/java/org/springframework/security/web/server/authentication/RedirectServerAuthenticationSuccessHandler.java index 0f479ef470..8ef9e8635f 100644 --- a/web/src/main/java/org/springframework/security/web/server/authentication/RedirectServerAuthenticationSuccessHandler.java +++ b/web/src/main/java/org/springframework/security/web/server/authentication/RedirectServerAuthenticationSuccessHandler.java @@ -73,7 +73,7 @@ public class RedirectServerAuthenticationSuccessHandler implements ServerAuthent public Mono onAuthenticationSuccess(WebFilterExchange webFilterExchange, Authentication authentication) { ServerWebExchange exchange = webFilterExchange.getExchange(); return this.requestCache.getRedirectUri(exchange).defaultIfEmpty(this.location) - .flatMap(location -> this.redirectStrategy.sendRedirect(exchange, location)); + .flatMap((location) -> this.redirectStrategy.sendRedirect(exchange, location)); } /** diff --git a/web/src/main/java/org/springframework/security/web/server/authentication/SwitchUserWebFilter.java b/web/src/main/java/org/springframework/security/web/server/authentication/SwitchUserWebFilter.java index e06fbaada5..38f59f48f2 100644 --- a/web/src/main/java/org/springframework/security/web/server/authentication/SwitchUserWebFilter.java +++ b/web/src/main/java/org/springframework/security/web/server/authentication/SwitchUserWebFilter.java @@ -168,8 +168,8 @@ public class SwitchUserWebFilter implements WebFilter { return switchUser(webFilterExchange).switchIfEmpty(Mono.defer(() -> exitSwitchUser(webFilterExchange))) .switchIfEmpty(Mono.defer(() -> chain.filter(exchange).then(Mono.empty()))) - .flatMap(authentication -> onAuthenticationSuccess(authentication, webFilterExchange)) - .onErrorResume(SwitchUserAuthenticationException.class, exception -> Mono.empty()); + .flatMap((authentication) -> onAuthenticationSuccess(authentication, webFilterExchange)) + .onErrorResume(SwitchUserAuthenticationException.class, (exception) -> Mono.empty()); } /** @@ -183,11 +183,11 @@ public class SwitchUserWebFilter implements WebFilter { protected Mono switchUser(WebFilterExchange webFilterExchange) { return this.switchUserMatcher.matches(webFilterExchange.getExchange()) .filter(ServerWebExchangeMatcher.MatchResult::isMatch) - .flatMap(matchResult -> ReactiveSecurityContextHolder.getContext()) - .map(SecurityContext::getAuthentication).flatMap(currentAuthentication -> { + .flatMap((matchResult) -> ReactiveSecurityContextHolder.getContext()) + .map(SecurityContext::getAuthentication).flatMap((currentAuthentication) -> { final String username = getUsername(webFilterExchange.getExchange()); return attemptSwitchUser(currentAuthentication, username); - }).onErrorResume(AuthenticationException.class, e -> onAuthenticationFailure(e, webFilterExchange) + }).onErrorResume(AuthenticationException.class, (e) -> onAuthenticationFailure(e, webFilterExchange) .then(Mono.error(new SwitchUserAuthenticationException(e)))); } @@ -202,7 +202,7 @@ public class SwitchUserWebFilter implements WebFilter { protected Mono exitSwitchUser(WebFilterExchange webFilterExchange) { return this.exitUserMatcher.matches(webFilterExchange.getExchange()) .filter(ServerWebExchangeMatcher.MatchResult::isMatch) - .flatMap(matchResult -> ReactiveSecurityContextHolder.getContext() + .flatMap((matchResult) -> ReactiveSecurityContextHolder.getContext() .map(SecurityContext::getAuthentication) .switchIfEmpty(Mono.error(this::noCurrentUserException))) .map(this::attemptExitUser); @@ -228,7 +228,7 @@ public class SwitchUserWebFilter implements WebFilter { return this.userDetailsService.findByUsername(userName) .switchIfEmpty(Mono.error(this::noTargetAuthenticationException)) .doOnNext(this.userDetailsChecker::check) - .map(userDetails -> createSwitchUserToken(userDetails, currentAuthentication)); + .map((userDetails) -> createSwitchUserToken(userDetails, currentAuthentication)); } @NonNull @@ -255,7 +255,7 @@ public class SwitchUserWebFilter implements WebFilter { return Mono.justOrEmpty(this.failureHandler).switchIfEmpty(Mono.defer(() -> { this.logger.error("Switch User failed", exception); return Mono.error(exception); - })).flatMap(failureHandler -> failureHandler.onAuthenticationFailure(webFilterExchange, exception)); + })).flatMap((failureHandler) -> failureHandler.onAuthenticationFailure(webFilterExchange, exception)); } private Authentication createSwitchUserToken(UserDetails targetUser, Authentication currentAuthentication) { diff --git a/web/src/main/java/org/springframework/security/web/server/authentication/logout/DelegatingServerLogoutHandler.java b/web/src/main/java/org/springframework/security/web/server/authentication/logout/DelegatingServerLogoutHandler.java index d8e2fd6f81..c05e29d585 100644 --- a/web/src/main/java/org/springframework/security/web/server/authentication/logout/DelegatingServerLogoutHandler.java +++ b/web/src/main/java/org/springframework/security/web/server/authentication/logout/DelegatingServerLogoutHandler.java @@ -50,7 +50,7 @@ public class DelegatingServerLogoutHandler implements ServerLogoutHandler { @Override public Mono logout(WebFilterExchange exchange, Authentication authentication) { - return Flux.fromIterable(this.delegates).concatMap(delegate -> delegate.logout(exchange, authentication)) + return Flux.fromIterable(this.delegates).concatMap((delegate) -> delegate.logout(exchange, authentication)) .then(); } diff --git a/web/src/main/java/org/springframework/security/web/server/authentication/logout/LogoutWebFilter.java b/web/src/main/java/org/springframework/security/web/server/authentication/logout/LogoutWebFilter.java index 70d8976db8..a27b42d657 100644 --- a/web/src/main/java/org/springframework/security/web/server/authentication/logout/LogoutWebFilter.java +++ b/web/src/main/java/org/springframework/security/web/server/authentication/logout/LogoutWebFilter.java @@ -57,9 +57,9 @@ public class LogoutWebFilter implements WebFilter { @Override public Mono filter(ServerWebExchange exchange, WebFilterChain chain) { - return this.requiresLogout.matches(exchange).filter(result -> result.isMatch()) - .switchIfEmpty(chain.filter(exchange).then(Mono.empty())).map(result -> exchange) - .flatMap(this::flatMapAuthentication).flatMap(authentication -> { + return this.requiresLogout.matches(exchange).filter((result) -> result.isMatch()) + .switchIfEmpty(chain.filter(exchange).then(Mono.empty())).map((result) -> exchange) + .flatMap(this::flatMapAuthentication).flatMap((authentication) -> { WebFilterExchange webFilterExchange = new WebFilterExchange(exchange, chain); return logout(webFilterExchange, authentication); }); diff --git a/web/src/main/java/org/springframework/security/web/server/authorization/AuthorizationWebFilter.java b/web/src/main/java/org/springframework/security/web/server/authorization/AuthorizationWebFilter.java index b9f6e93050..7c167f8265 100644 --- a/web/src/main/java/org/springframework/security/web/server/authorization/AuthorizationWebFilter.java +++ b/web/src/main/java/org/springframework/security/web/server/authorization/AuthorizationWebFilter.java @@ -45,13 +45,14 @@ public class AuthorizationWebFilter implements WebFilter { @Override public Mono filter(ServerWebExchange exchange, WebFilterChain chain) { - return ReactiveSecurityContextHolder.getContext().filter(c -> c.getAuthentication() != null) + return ReactiveSecurityContextHolder.getContext().filter((c) -> c.getAuthentication() != null) .map(SecurityContext::getAuthentication) - .as(authentication -> this.authorizationManager.verify(authentication, exchange)).doOnSuccess(it -> { + .as((authentication) -> this.authorizationManager.verify(authentication, exchange)) + .doOnSuccess((it) -> { if (logger.isDebugEnabled()) { logger.debug("Authorization successful"); } - }).doOnError(AccessDeniedException.class, e -> { + }).doOnError(AccessDeniedException.class, (e) -> { if (logger.isDebugEnabled()) { logger.debug("Authorization failed: " + e.getMessage()); } diff --git a/web/src/main/java/org/springframework/security/web/server/authorization/DelegatingReactiveAuthorizationManager.java b/web/src/main/java/org/springframework/security/web/server/authorization/DelegatingReactiveAuthorizationManager.java index ccde3d0ac2..a7074b36f8 100644 --- a/web/src/main/java/org/springframework/security/web/server/authorization/DelegatingReactiveAuthorizationManager.java +++ b/web/src/main/java/org/springframework/security/web/server/authorization/DelegatingReactiveAuthorizationManager.java @@ -49,8 +49,8 @@ public final class DelegatingReactiveAuthorizationManager implements ReactiveAut @Override public Mono check(Mono authentication, ServerWebExchange exchange) { - return Flux.fromIterable(this.mappings).concatMap(mapping -> mapping.getMatcher().matches(exchange) - .filter(MatchResult::isMatch).map(MatchResult::getVariables).flatMap(variables -> { + return Flux.fromIterable(this.mappings).concatMap((mapping) -> mapping.getMatcher().matches(exchange) + .filter(MatchResult::isMatch).map(MatchResult::getVariables).flatMap((variables) -> { if (logger.isDebugEnabled()) { logger.debug( "Checking authorization on '" + exchange.getRequest().getPath().pathWithinApplication() diff --git a/web/src/main/java/org/springframework/security/web/server/authorization/ExceptionTranslationWebFilter.java b/web/src/main/java/org/springframework/security/web/server/authorization/ExceptionTranslationWebFilter.java index de894d1524..3c1103270f 100644 --- a/web/src/main/java/org/springframework/security/web/server/authorization/ExceptionTranslationWebFilter.java +++ b/web/src/main/java/org/springframework/security/web/server/authorization/ExceptionTranslationWebFilter.java @@ -42,8 +42,8 @@ public class ExceptionTranslationWebFilter implements WebFilter { @Override public Mono filter(ServerWebExchange exchange, WebFilterChain chain) { return chain.filter(exchange).onErrorResume(AccessDeniedException.class, - denied -> exchange.getPrincipal().switchIfEmpty(commenceAuthentication(exchange, denied)) - .flatMap(principal -> this.accessDeniedHandler.handle(exchange, denied))); + (denied) -> exchange.getPrincipal().switchIfEmpty(commenceAuthentication(exchange, denied)) + .flatMap((principal) -> this.accessDeniedHandler.handle(exchange, denied))); } /** diff --git a/web/src/main/java/org/springframework/security/web/server/authorization/HttpStatusServerAccessDeniedHandler.java b/web/src/main/java/org/springframework/security/web/server/authorization/HttpStatusServerAccessDeniedHandler.java index 6aef6e1c17..2e47dace44 100644 --- a/web/src/main/java/org/springframework/security/web/server/authorization/HttpStatusServerAccessDeniedHandler.java +++ b/web/src/main/java/org/springframework/security/web/server/authorization/HttpStatusServerAccessDeniedHandler.java @@ -50,12 +50,12 @@ public class HttpStatusServerAccessDeniedHandler implements ServerAccessDeniedHa @Override public Mono handle(ServerWebExchange exchange, AccessDeniedException ex) { - return Mono.defer(() -> Mono.just(exchange.getResponse())).flatMap(response -> { + return Mono.defer(() -> Mono.just(exchange.getResponse())).flatMap((response) -> { response.setStatusCode(this.httpStatus); response.getHeaders().setContentType(MediaType.TEXT_PLAIN); DataBufferFactory dataBufferFactory = response.bufferFactory(); DataBuffer buffer = dataBufferFactory.wrap(ex.getMessage().getBytes(Charset.defaultCharset())); - return response.writeWith(Mono.just(buffer)).doOnError(error -> DataBufferUtils.release(buffer)); + return response.writeWith(Mono.just(buffer)).doOnError((error) -> DataBufferUtils.release(buffer)); }); } diff --git a/web/src/main/java/org/springframework/security/web/server/authorization/ServerWebExchangeDelegatingServerAccessDeniedHandler.java b/web/src/main/java/org/springframework/security/web/server/authorization/ServerWebExchangeDelegatingServerAccessDeniedHandler.java index 38961c513d..9c7100da90 100644 --- a/web/src/main/java/org/springframework/security/web/server/authorization/ServerWebExchangeDelegatingServerAccessDeniedHandler.java +++ b/web/src/main/java/org/springframework/security/web/server/authorization/ServerWebExchangeDelegatingServerAccessDeniedHandler.java @@ -69,9 +69,9 @@ public class ServerWebExchangeDelegatingServerAccessDeniedHandler implements Ser @Override public Mono handle(ServerWebExchange exchange, AccessDeniedException denied) { - return Flux.fromIterable(this.handlers).filterWhen(entry -> isMatch(exchange, entry)).next() + return Flux.fromIterable(this.handlers).filterWhen((entry) -> isMatch(exchange, entry)).next() .map(DelegateEntry::getAccessDeniedHandler).defaultIfEmpty(this.defaultHandler) - .flatMap(handler -> handler.handle(exchange, denied)); + .flatMap((handler) -> handler.handle(exchange, denied)); } /** diff --git a/web/src/main/java/org/springframework/security/web/server/context/ReactorContextWebFilter.java b/web/src/main/java/org/springframework/security/web/server/context/ReactorContextWebFilter.java index f243e0dc22..724e884fff 100644 --- a/web/src/main/java/org/springframework/security/web/server/context/ReactorContextWebFilter.java +++ b/web/src/main/java/org/springframework/security/web/server/context/ReactorContextWebFilter.java @@ -45,7 +45,7 @@ public class ReactorContextWebFilter implements WebFilter { @Override public Mono filter(ServerWebExchange exchange, WebFilterChain chain) { return chain.filter(exchange) - .subscriberContext(c -> c.hasKey(SecurityContext.class) ? c : withSecurityContext(c, exchange)); + .subscriberContext((c) -> c.hasKey(SecurityContext.class) ? c : withSecurityContext(c, exchange)); } private Context withSecurityContext(Context mainContext, ServerWebExchange exchange) { diff --git a/web/src/main/java/org/springframework/security/web/server/context/SecurityContextServerWebExchange.java b/web/src/main/java/org/springframework/security/web/server/context/SecurityContextServerWebExchange.java index 02a165b79d..c4bd23556d 100644 --- a/web/src/main/java/org/springframework/security/web/server/context/SecurityContextServerWebExchange.java +++ b/web/src/main/java/org/springframework/security/web/server/context/SecurityContextServerWebExchange.java @@ -44,7 +44,7 @@ public class SecurityContextServerWebExchange extends ServerWebExchangeDecorator @Override @SuppressWarnings("unchecked") public Mono getPrincipal() { - return this.context.map(c -> (T) c.getAuthentication()); + return this.context.map((c) -> (T) c.getAuthentication()); } } diff --git a/web/src/main/java/org/springframework/security/web/server/context/WebSessionServerSecurityContextRepository.java b/web/src/main/java/org/springframework/security/web/server/context/WebSessionServerSecurityContextRepository.java index 75e126df5b..3058a82e1e 100644 --- a/web/src/main/java/org/springframework/security/web/server/context/WebSessionServerSecurityContextRepository.java +++ b/web/src/main/java/org/springframework/security/web/server/context/WebSessionServerSecurityContextRepository.java @@ -56,7 +56,7 @@ public class WebSessionServerSecurityContextRepository implements ServerSecurity @Override public Mono save(ServerWebExchange exchange, SecurityContext context) { - return exchange.getSession().doOnNext(session -> { + return exchange.getSession().doOnNext((session) -> { if (context == null) { session.getAttributes().remove(this.springSecurityContextAttrName); if (logger.isDebugEnabled()) { @@ -69,12 +69,12 @@ public class WebSessionServerSecurityContextRepository implements ServerSecurity logger.debug("Saved SecurityContext '" + context + "' in WebSession: '" + session + "'"); } } - }).flatMap(session -> session.changeSessionId()); + }).flatMap((session) -> session.changeSessionId()); } @Override public Mono load(ServerWebExchange exchange) { - return exchange.getSession().flatMap(session -> { + return exchange.getSession().flatMap((session) -> { SecurityContext context = (SecurityContext) session.getAttribute(this.springSecurityContextAttrName); if (logger.isDebugEnabled()) { if (context == null) { diff --git a/web/src/main/java/org/springframework/security/web/server/csrf/CsrfWebFilter.java b/web/src/main/java/org/springframework/security/web/server/csrf/CsrfWebFilter.java index 8bdab6fa1f..87655dee60 100644 --- a/web/src/main/java/org/springframework/security/web/server/csrf/CsrfWebFilter.java +++ b/web/src/main/java/org/springframework/security/web/server/csrf/CsrfWebFilter.java @@ -116,11 +116,11 @@ public class CsrfWebFilter implements WebFilter { return chain.filter(exchange).then(Mono.empty()); } - return this.requireCsrfProtectionMatcher.matches(exchange).filter(matchResult -> matchResult.isMatch()) - .filter(matchResult -> !exchange.getAttributes().containsKey(CsrfToken.class.getName())) - .flatMap(m -> validateToken(exchange)).flatMap(m -> continueFilterChain(exchange, chain)) + return this.requireCsrfProtectionMatcher.matches(exchange).filter((matchResult) -> matchResult.isMatch()) + .filter((matchResult) -> !exchange.getAttributes().containsKey(CsrfToken.class.getName())) + .flatMap((m) -> validateToken(exchange)).flatMap((m) -> continueFilterChain(exchange, chain)) .switchIfEmpty(continueFilterChain(exchange, chain).then(Mono.empty())) - .onErrorResume(CsrfException.class, e -> this.accessDeniedHandler.handle(exchange, e)); + .onErrorResume(CsrfException.class, (e) -> this.accessDeniedHandler.handle(exchange, e)); } public static void skipExchange(ServerWebExchange exchange) { @@ -131,15 +131,15 @@ public class CsrfWebFilter implements WebFilter { return this.csrfTokenRepository.loadToken(exchange) .switchIfEmpty(Mono .defer(() -> Mono.error(new CsrfException("CSRF Token has been associated to this client")))) - .filterWhen(expected -> containsValidCsrfToken(exchange, expected)) + .filterWhen((expected) -> containsValidCsrfToken(exchange, expected)) .switchIfEmpty(Mono.defer(() -> Mono.error(new CsrfException("Invalid CSRF Token")))).then(); } private Mono containsValidCsrfToken(ServerWebExchange exchange, CsrfToken expected) { - return exchange.getFormData().flatMap(data -> Mono.justOrEmpty(data.getFirst(expected.getParameterName()))) + return exchange.getFormData().flatMap((data) -> Mono.justOrEmpty(data.getFirst(expected.getParameterName()))) .switchIfEmpty(Mono.justOrEmpty(exchange.getRequest().getHeaders().getFirst(expected.getHeaderName()))) .switchIfEmpty(tokenFromMultipartData(exchange, expected)) - .map(actual -> actual.equals(expected.getToken())); + .map((actual) -> actual.equals(expected.getToken())); } private Mono tokenFromMultipartData(ServerWebExchange exchange, CsrfToken expected) { @@ -152,7 +152,7 @@ public class CsrfWebFilter implements WebFilter { if (!contentType.includes(MediaType.MULTIPART_FORM_DATA)) { return Mono.empty(); } - return exchange.getMultipartData().map(d -> d.getFirst(expected.getParameterName())).cast(FormFieldPart.class) + return exchange.getMultipartData().map((d) -> d.getFirst(expected.getParameterName())).cast(FormFieldPart.class) .map(FormFieldPart::value); } @@ -170,7 +170,7 @@ public class CsrfWebFilter implements WebFilter { private Mono generateToken(ServerWebExchange exchange) { return this.csrfTokenRepository.generateToken(exchange) - .delayUntil(token -> this.csrfTokenRepository.saveToken(exchange, token)); + .delayUntil((token) -> this.csrfTokenRepository.saveToken(exchange, token)); } private static class DefaultRequireCsrfProtectionMatcher implements ServerWebExchangeMatcher { @@ -180,8 +180,8 @@ public class CsrfWebFilter implements WebFilter { @Override public Mono matches(ServerWebExchange exchange) { - return Mono.just(exchange.getRequest()).flatMap(r -> Mono.justOrEmpty(r.getMethod())) - .filter(m -> ALLOWED_METHODS.contains(m)).flatMap(m -> MatchResult.notMatch()) + return Mono.just(exchange.getRequest()).flatMap((r) -> Mono.justOrEmpty(r.getMethod())) + .filter((m) -> ALLOWED_METHODS.contains(m)).flatMap((m) -> MatchResult.notMatch()) .switchIfEmpty(MatchResult.match()); } diff --git a/web/src/main/java/org/springframework/security/web/server/csrf/WebSessionServerCsrfTokenRepository.java b/web/src/main/java/org/springframework/security/web/server/csrf/WebSessionServerCsrfTokenRepository.java index 4951acc3bf..57002cf9db 100644 --- a/web/src/main/java/org/springframework/security/web/server/csrf/WebSessionServerCsrfTokenRepository.java +++ b/web/src/main/java/org/springframework/security/web/server/csrf/WebSessionServerCsrfTokenRepository.java @@ -58,8 +58,8 @@ public class WebSessionServerCsrfTokenRepository implements ServerCsrfTokenRepos @Override public Mono saveToken(ServerWebExchange exchange, CsrfToken token) { - return exchange.getSession().doOnNext(session -> putToken(session.getAttributes(), token)) - .flatMap(session -> session.changeSessionId()); + return exchange.getSession().doOnNext((session) -> putToken(session.getAttributes(), token)) + .flatMap((session) -> session.changeSessionId()); } private void putToken(Map attributes, CsrfToken token) { @@ -73,8 +73,8 @@ public class WebSessionServerCsrfTokenRepository implements ServerCsrfTokenRepos @Override public Mono loadToken(ServerWebExchange exchange) { - return exchange.getSession().filter(s -> s.getAttributes().containsKey(this.sessionAttributeName)) - .map(s -> s.getAttribute(this.sessionAttributeName)); + return exchange.getSession().filter((s) -> s.getAttributes().containsKey(this.sessionAttributeName)) + .map((s) -> s.getAttribute(this.sessionAttributeName)); } /** diff --git a/web/src/main/java/org/springframework/security/web/server/header/CompositeServerHttpHeadersWriter.java b/web/src/main/java/org/springframework/security/web/server/header/CompositeServerHttpHeadersWriter.java index d811daec39..57b8533754 100644 --- a/web/src/main/java/org/springframework/security/web/server/header/CompositeServerHttpHeadersWriter.java +++ b/web/src/main/java/org/springframework/security/web/server/header/CompositeServerHttpHeadersWriter.java @@ -44,7 +44,7 @@ public class CompositeServerHttpHeadersWriter implements ServerHttpHeadersWriter @Override public Mono writeHttpHeaders(ServerWebExchange exchange) { - return Flux.fromIterable(this.writers).concatMap(w -> w.writeHttpHeaders(exchange)).then(); + return Flux.fromIterable(this.writers).concatMap((w) -> w.writeHttpHeaders(exchange)).then(); } } diff --git a/web/src/main/java/org/springframework/security/web/server/savedrequest/CookieServerRequestCache.java b/web/src/main/java/org/springframework/security/web/server/savedrequest/CookieServerRequestCache.java index 7f74da047f..d9135feb3d 100644 --- a/web/src/main/java/org/springframework/security/web/server/savedrequest/CookieServerRequestCache.java +++ b/web/src/main/java/org/springframework/security/web/server/savedrequest/CookieServerRequestCache.java @@ -71,8 +71,8 @@ public class CookieServerRequestCache implements ServerRequestCache { @Override public Mono saveRequest(ServerWebExchange exchange) { - return this.saveRequestMatcher.matches(exchange).filter(m -> m.isMatch()).map(m -> exchange.getResponse()) - .map(ServerHttpResponse::getCookies).doOnNext(cookies -> { + return this.saveRequestMatcher.matches(exchange).filter((m) -> m.isMatch()).map((m) -> exchange.getResponse()) + .map(ServerHttpResponse::getCookies).doOnNext((cookies) -> { ResponseCookie redirectUriCookie = createRedirectUriCookie(exchange.getRequest()); cookies.add(REDIRECT_URI_COOKIE_NAME, redirectUriCookie); if (logger.isDebugEnabled()) { @@ -86,13 +86,13 @@ public class CookieServerRequestCache implements ServerRequestCache { MultiValueMap cookieMap = exchange.getRequest().getCookies(); return Mono.justOrEmpty(cookieMap.getFirst(REDIRECT_URI_COOKIE_NAME)).map(HttpCookie::getValue) .map(CookieServerRequestCache::decodeCookie) - .onErrorResume(IllegalArgumentException.class, e -> Mono.empty()).map(URI::create); + .onErrorResume(IllegalArgumentException.class, (e) -> Mono.empty()).map(URI::create); } @Override public Mono removeMatchingRequest(ServerWebExchange exchange) { return Mono.just(exchange.getResponse()).map(ServerHttpResponse::getCookies).doOnNext( - cookies -> cookies.add(REDIRECT_URI_COOKIE_NAME, invalidateRedirectUriCookie(exchange.getRequest()))) + (cookies) -> cookies.add(REDIRECT_URI_COOKIE_NAME, invalidateRedirectUriCookie(exchange.getRequest()))) .thenReturn(exchange.getRequest()); } diff --git a/web/src/main/java/org/springframework/security/web/server/savedrequest/ServerRequestCacheWebFilter.java b/web/src/main/java/org/springframework/security/web/server/savedrequest/ServerRequestCacheWebFilter.java index 846b17fa40..a79dd0448a 100644 --- a/web/src/main/java/org/springframework/security/web/server/savedrequest/ServerRequestCacheWebFilter.java +++ b/web/src/main/java/org/springframework/security/web/server/savedrequest/ServerRequestCacheWebFilter.java @@ -35,8 +35,8 @@ public class ServerRequestCacheWebFilter implements WebFilter { @Override public Mono filter(ServerWebExchange exchange, WebFilterChain chain) { - return this.requestCache.removeMatchingRequest(exchange).map(r -> exchange.mutate().request(r).build()) - .defaultIfEmpty(exchange).flatMap(e -> chain.filter(e)); + return this.requestCache.removeMatchingRequest(exchange).map((r) -> exchange.mutate().request(r).build()) + .defaultIfEmpty(exchange).flatMap((e) -> chain.filter(e)); } public void setRequestCache(ServerRequestCache requestCache) { diff --git a/web/src/main/java/org/springframework/security/web/server/savedrequest/WebSessionServerRequestCache.java b/web/src/main/java/org/springframework/security/web/server/savedrequest/WebSessionServerRequestCache.java index d30a128cc3..533e960ed0 100644 --- a/web/src/main/java/org/springframework/security/web/server/savedrequest/WebSessionServerRequestCache.java +++ b/web/src/main/java/org/springframework/security/web/server/savedrequest/WebSessionServerRequestCache.java @@ -69,7 +69,7 @@ public class WebSessionServerRequestCache implements ServerRequestCache { @Override public Mono saveRequest(ServerWebExchange exchange) { return this.saveRequestMatcher.matches(exchange).filter(MatchResult::isMatch) - .flatMap(m -> exchange.getSession()).map(WebSession::getAttributes).doOnNext(attrs -> { + .flatMap((m) -> exchange.getSession()).map(WebSession::getAttributes).doOnNext((attrs) -> { String requestPath = pathInApplication(exchange.getRequest()); attrs.put(this.sessionAttrName, requestPath); if (logger.isDebugEnabled()) { @@ -81,13 +81,13 @@ public class WebSessionServerRequestCache implements ServerRequestCache { @Override public Mono getRedirectUri(ServerWebExchange exchange) { return exchange.getSession() - .flatMap(session -> Mono.justOrEmpty(session.getAttribute(this.sessionAttrName))) + .flatMap((session) -> Mono.justOrEmpty(session.getAttribute(this.sessionAttrName))) .map(URI::create); } @Override public Mono removeMatchingRequest(ServerWebExchange exchange) { - return exchange.getSession().map(WebSession::getAttributes).filter(attributes -> { + return exchange.getSession().map(WebSession::getAttributes).filter((attributes) -> { String requestPath = pathInApplication(exchange.getRequest()); boolean removed = attributes.remove(this.sessionAttrName, requestPath); if (removed) { @@ -96,7 +96,7 @@ public class WebSessionServerRequestCache implements ServerRequestCache { } } return removed; - }).map(attributes -> exchange.getRequest()); + }).map((attributes) -> exchange.getRequest()); } private static String pathInApplication(ServerHttpRequest request) { diff --git a/web/src/main/java/org/springframework/security/web/server/transport/HttpsRedirectWebFilter.java b/web/src/main/java/org/springframework/security/web/server/transport/HttpsRedirectWebFilter.java index 94ba6af9f6..da69b1b028 100644 --- a/web/src/main/java/org/springframework/security/web/server/transport/HttpsRedirectWebFilter.java +++ b/web/src/main/java/org/springframework/security/web/server/transport/HttpsRedirectWebFilter.java @@ -57,9 +57,9 @@ public final class HttpsRedirectWebFilter implements WebFilter { @Override public Mono filter(ServerWebExchange exchange, WebFilterChain chain) { return Mono.just(exchange).filter(this::isInsecure).flatMap(this.requiresHttpsRedirectMatcher::matches) - .filter(matchResult -> matchResult.isMatch()).switchIfEmpty(chain.filter(exchange).then(Mono.empty())) - .map(matchResult -> createRedirectUri(exchange)) - .flatMap(uri -> this.redirectStrategy.sendRedirect(exchange, uri)); + .filter((matchResult) -> matchResult.isMatch()).switchIfEmpty(chain.filter(exchange).then(Mono.empty())) + .map((matchResult) -> createRedirectUri(exchange)) + .flatMap((uri) -> this.redirectStrategy.sendRedirect(exchange, uri)); } /** diff --git a/web/src/main/java/org/springframework/security/web/server/ui/LoginPageGeneratingWebFilter.java b/web/src/main/java/org/springframework/security/web/server/ui/LoginPageGeneratingWebFilter.java index 82acde159f..7f56d33c98 100644 --- a/web/src/main/java/org/springframework/security/web/server/ui/LoginPageGeneratingWebFilter.java +++ b/web/src/main/java/org/springframework/security/web/server/ui/LoginPageGeneratingWebFilter.java @@ -64,7 +64,7 @@ public class LoginPageGeneratingWebFilter implements WebFilter { @Override public Mono filter(ServerWebExchange exchange, WebFilterChain chain) { return this.matcher.matches(exchange).filter(ServerWebExchangeMatcher.MatchResult::isMatch) - .switchIfEmpty(chain.filter(exchange).then(Mono.empty())).flatMap(matchResult -> render(exchange)); + .switchIfEmpty(chain.filter(exchange).then(Mono.empty())).flatMap((matchResult) -> render(exchange)); } private Mono render(ServerWebExchange exchange) { @@ -77,7 +77,7 @@ public class LoginPageGeneratingWebFilter implements WebFilter { private Mono createBuffer(ServerWebExchange exchange) { Mono token = exchange.getAttributeOrDefault(CsrfToken.class.getName(), Mono.empty()); - return token.map(LoginPageGeneratingWebFilter::csrfToken).defaultIfEmpty("").map(csrfTokenHtmlInput -> { + return token.map(LoginPageGeneratingWebFilter::csrfToken).defaultIfEmpty("").map((csrfTokenHtmlInput) -> { byte[] bytes = createPage(exchange, csrfTokenHtmlInput); DataBufferFactory bufferFactory = exchange.getResponse().bufferFactory(); return bufferFactory.wrap(bytes); diff --git a/web/src/main/java/org/springframework/security/web/server/ui/LogoutPageGeneratingWebFilter.java b/web/src/main/java/org/springframework/security/web/server/ui/LogoutPageGeneratingWebFilter.java index 4b51f239aa..b32c5af1b2 100644 --- a/web/src/main/java/org/springframework/security/web/server/ui/LogoutPageGeneratingWebFilter.java +++ b/web/src/main/java/org/springframework/security/web/server/ui/LogoutPageGeneratingWebFilter.java @@ -46,7 +46,7 @@ public class LogoutPageGeneratingWebFilter implements WebFilter { @Override public Mono filter(ServerWebExchange exchange, WebFilterChain chain) { return this.matcher.matches(exchange).filter(ServerWebExchangeMatcher.MatchResult::isMatch) - .switchIfEmpty(chain.filter(exchange).then(Mono.empty())).flatMap(matchResult -> render(exchange)); + .switchIfEmpty(chain.filter(exchange).then(Mono.empty())).flatMap((matchResult) -> render(exchange)); } private Mono render(ServerWebExchange exchange) { @@ -54,12 +54,12 @@ public class LogoutPageGeneratingWebFilter implements WebFilter { result.setStatusCode(HttpStatus.OK); result.getHeaders().setContentType(MediaType.TEXT_HTML); return result.writeWith(createBuffer(exchange)); - // .doOnError( error -> DataBufferUtils.release(buffer)); + // .doOnError( (error) -> DataBufferUtils.release(buffer)); } private Mono createBuffer(ServerWebExchange exchange) { Mono token = exchange.getAttributeOrDefault(CsrfToken.class.getName(), Mono.empty()); - return token.map(LogoutPageGeneratingWebFilter::csrfToken).defaultIfEmpty("").map(csrfTokenHtmlInput -> { + return token.map(LogoutPageGeneratingWebFilter::csrfToken).defaultIfEmpty("").map((csrfTokenHtmlInput) -> { byte[] bytes = createPage(csrfTokenHtmlInput); DataBufferFactory bufferFactory = exchange.getResponse().bufferFactory(); return bufferFactory.wrap(bytes); diff --git a/web/src/main/java/org/springframework/security/web/server/util/matcher/AndServerWebExchangeMatcher.java b/web/src/main/java/org/springframework/security/web/server/util/matcher/AndServerWebExchangeMatcher.java index 42b80444a9..d5f7ae92ec 100644 --- a/web/src/main/java/org/springframework/security/web/server/util/matcher/AndServerWebExchangeMatcher.java +++ b/web/src/main/java/org/springframework/security/web/server/util/matcher/AndServerWebExchangeMatcher.java @@ -56,14 +56,14 @@ public class AndServerWebExchangeMatcher implements ServerWebExchangeMatcher { public Mono matches(ServerWebExchange exchange) { return Mono.defer(() -> { Map variables = new HashMap<>(); - return Flux.fromIterable(this.matchers).doOnNext(it -> { + return Flux.fromIterable(this.matchers).doOnNext((it) -> { if (logger.isDebugEnabled()) { logger.debug("Trying to match using " + it); } - }).flatMap(matcher -> matcher.matches(exchange)) - .doOnNext(matchResult -> variables.putAll(matchResult.getVariables())).all(MatchResult::isMatch) - .flatMap(allMatch -> allMatch ? MatchResult.match(variables) : MatchResult.notMatch()) - .doOnNext(it -> { + }).flatMap((matcher) -> matcher.matches(exchange)) + .doOnNext((matchResult) -> variables.putAll(matchResult.getVariables())).all(MatchResult::isMatch) + .flatMap((allMatch) -> allMatch ? MatchResult.match(variables) : MatchResult.notMatch()) + .doOnNext((it) -> { if (logger.isDebugEnabled()) { logger.debug(it.isMatch() ? "All requestMatchers returned true" : "Did not match"); } diff --git a/web/src/main/java/org/springframework/security/web/server/util/matcher/NegatedServerWebExchangeMatcher.java b/web/src/main/java/org/springframework/security/web/server/util/matcher/NegatedServerWebExchangeMatcher.java index 5c06881d39..e0b3b17993 100644 --- a/web/src/main/java/org/springframework/security/web/server/util/matcher/NegatedServerWebExchangeMatcher.java +++ b/web/src/main/java/org/springframework/security/web/server/util/matcher/NegatedServerWebExchangeMatcher.java @@ -44,8 +44,8 @@ public class NegatedServerWebExchangeMatcher implements ServerWebExchangeMatcher @Override public Mono matches(ServerWebExchange exchange) { - return this.matcher.matches(exchange).flatMap(m -> m.isMatch() ? MatchResult.notMatch() : MatchResult.match()) - .doOnNext(it -> { + return this.matcher.matches(exchange).flatMap((m) -> m.isMatch() ? MatchResult.notMatch() : MatchResult.match()) + .doOnNext((it) -> { if (logger.isDebugEnabled()) { logger.debug("matches = " + it.isMatch()); } diff --git a/web/src/main/java/org/springframework/security/web/server/util/matcher/OrServerWebExchangeMatcher.java b/web/src/main/java/org/springframework/security/web/server/util/matcher/OrServerWebExchangeMatcher.java index b6b015ab12..5ceb1b1788 100644 --- a/web/src/main/java/org/springframework/security/web/server/util/matcher/OrServerWebExchangeMatcher.java +++ b/web/src/main/java/org/springframework/security/web/server/util/matcher/OrServerWebExchangeMatcher.java @@ -52,12 +52,12 @@ public class OrServerWebExchangeMatcher implements ServerWebExchangeMatcher { @Override public Mono matches(ServerWebExchange exchange) { - return Flux.fromIterable(this.matchers).doOnNext(it -> { + return Flux.fromIterable(this.matchers).doOnNext((it) -> { if (logger.isDebugEnabled()) { logger.debug("Trying to match using " + it); } - }).flatMap(m -> m.matches(exchange)).filter(MatchResult::isMatch).next().switchIfEmpty(MatchResult.notMatch()) - .doOnNext(it -> { + }).flatMap((m) -> m.matches(exchange)).filter(MatchResult::isMatch).next().switchIfEmpty(MatchResult.notMatch()) + .doOnNext((it) -> { if (logger.isDebugEnabled()) { logger.debug(it.isMatch() ? "matched" : "No matches found"); } diff --git a/web/src/main/java/org/springframework/security/web/server/util/matcher/PathPatternParserServerWebExchangeMatcher.java b/web/src/main/java/org/springframework/security/web/server/util/matcher/PathPatternParserServerWebExchangeMatcher.java index 0dae293172..0e0a3dbbcf 100644 --- a/web/src/main/java/org/springframework/security/web/server/util/matcher/PathPatternParserServerWebExchangeMatcher.java +++ b/web/src/main/java/org/springframework/security/web/server/util/matcher/PathPatternParserServerWebExchangeMatcher.java @@ -73,7 +73,7 @@ public final class PathPatternParserServerWebExchangeMatcher implements ServerWe ServerHttpRequest request = exchange.getRequest(); PathContainer path = request.getPath().pathWithinApplication(); if (this.method != null && !this.method.equals(request.getMethod())) { - return MatchResult.notMatch().doOnNext(result -> { + return MatchResult.notMatch().doOnNext((result) -> { if (logger.isDebugEnabled()) { logger.debug("Request '" + request.getMethod() + " " + path + "' doesn't match '" + this.method + " " + this.pattern.getPatternString() + "'"); @@ -82,7 +82,7 @@ public final class PathPatternParserServerWebExchangeMatcher implements ServerWe } boolean match = this.pattern.matches(path); if (!match) { - return MatchResult.notMatch().doOnNext(result -> { + return MatchResult.notMatch().doOnNext((result) -> { if (logger.isDebugEnabled()) { logger.debug("Request '" + request.getMethod() + " " + path + "' doesn't match '" + this.method + " " + this.pattern.getPatternString() + "'"); diff --git a/web/src/main/java/org/springframework/security/web/session/ConcurrentSessionFilter.java b/web/src/main/java/org/springframework/security/web/session/ConcurrentSessionFilter.java index 2847a4e9ec..8bdc2af005 100644 --- a/web/src/main/java/org/springframework/security/web/session/ConcurrentSessionFilter.java +++ b/web/src/main/java/org/springframework/security/web/session/ConcurrentSessionFilter.java @@ -97,7 +97,7 @@ public class ConcurrentSessionFilter extends GenericFilterBean { () -> expiredUrl + " isn't a valid redirect URL"); this.expiredUrl = expiredUrl; this.sessionRegistry = sessionRegistry; - this.sessionInformationExpiredStrategy = event -> { + this.sessionInformationExpiredStrategy = (event) -> { HttpServletRequest request = event.getRequest(); HttpServletResponse response = event.getResponse(); SessionInformation info = event.getSessionInformation(); diff --git a/web/src/main/java/org/springframework/security/web/util/ThrowableAnalyzer.java b/web/src/main/java/org/springframework/security/web/util/ThrowableAnalyzer.java index 12c8324fe6..73207cdcb1 100755 --- a/web/src/main/java/org/springframework/security/web/util/ThrowableAnalyzer.java +++ b/web/src/main/java/org/springframework/security/web/util/ThrowableAnalyzer.java @@ -41,14 +41,14 @@ public class ThrowableAnalyzer { * * @see Throwable#getCause() */ - public static final ThrowableCauseExtractor DEFAULT_EXTRACTOR = throwable -> throwable.getCause(); + public static final ThrowableCauseExtractor DEFAULT_EXTRACTOR = (throwable) -> throwable.getCause(); /** * Default extractor for {@link InvocationTargetException} instances. * * @see InvocationTargetException#getTargetException() */ - public static final ThrowableCauseExtractor INVOCATIONTARGET_EXTRACTOR = throwable -> { + public static final ThrowableCauseExtractor INVOCATIONTARGET_EXTRACTOR = (throwable) -> { verifyThrowableHierarchy(throwable, InvocationTargetException.class); return ((InvocationTargetException) throwable).getTargetException(); }; diff --git a/web/src/test/java/org/springframework/security/web/FilterChainProxyTests.java b/web/src/test/java/org/springframework/security/web/FilterChainProxyTests.java index ca3702bede..56a21a1dc8 100644 --- a/web/src/test/java/org/springframework/security/web/FilterChainProxyTests.java +++ b/web/src/test/java/org/springframework/security/web/FilterChainProxyTests.java @@ -74,7 +74,7 @@ public class FilterChainProxyTests { public void setup() throws Exception { this.matcher = mock(RequestMatcher.class); this.filter = mock(Filter.class); - willAnswer((Answer) inv -> { + willAnswer((Answer) (inv) -> { Object[] args = inv.getArguments(); FilterChain fc = (FilterChain) args[2]; HttpServletRequestWrapper extraWrapper = new HttpServletRequestWrapper((HttpServletRequest) args[0]); @@ -191,7 +191,7 @@ public class FilterChainProxyTests { @Test public void doFilterClearsSecurityContextHolder() throws Exception { given(this.matcher.matches(any(HttpServletRequest.class))).willReturn(true); - willAnswer((Answer) inv -> { + willAnswer((Answer) (inv) -> { SecurityContextHolder.getContext() .setAuthentication(new TestingAuthenticationToken("username", "password")); return null; @@ -206,7 +206,7 @@ public class FilterChainProxyTests { @Test public void doFilterClearsSecurityContextHolderWithException() throws Exception { given(this.matcher.matches(any(HttpServletRequest.class))).willReturn(true); - willAnswer((Answer) inv -> { + willAnswer((Answer) (inv) -> { SecurityContextHolder.getContext() .setAuthentication(new TestingAuthenticationToken("username", "password")); throw new ServletException("oops"); @@ -228,10 +228,10 @@ public class FilterChainProxyTests { public void doFilterClearsSecurityContextHolderOnceOnForwards() throws Exception { final FilterChain innerChain = mock(FilterChain.class); given(this.matcher.matches(any(HttpServletRequest.class))).willReturn(true); - willAnswer((Answer) inv -> { + willAnswer((Answer) (inv) -> { TestingAuthenticationToken expected = new TestingAuthenticationToken("username", "password"); SecurityContextHolder.getContext().setAuthentication(expected); - willAnswer((Answer) inv1 -> { + willAnswer((Answer) (inv1) -> { innerChain.doFilter(this.request, this.response); return null; }).given(this.filter).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class), diff --git a/web/src/test/java/org/springframework/security/web/access/expression/WebExpressionVoterTests.java b/web/src/test/java/org/springframework/security/web/access/expression/WebExpressionVoterTests.java index 6b1c930623..fdca0484e6 100644 --- a/web/src/test/java/org/springframework/security/web/access/expression/WebExpressionVoterTests.java +++ b/web/src/test/java/org/springframework/security/web/access/expression/WebExpressionVoterTests.java @@ -72,7 +72,7 @@ public class WebExpressionVoterTests { Expression ex = mock(Expression.class); EvaluationContextPostProcessor postProcessor = mock(EvaluationContextPostProcessor.class); given(postProcessor.postProcess(any(EvaluationContext.class), any(FilterInvocation.class))) - .willAnswer(invocation -> invocation.getArgument(0)); + .willAnswer((invocation) -> invocation.getArgument(0)); WebExpressionConfigAttribute weca = new WebExpressionConfigAttribute(ex, postProcessor); EvaluationContext ctx = mock(EvaluationContext.class); SecurityExpressionHandler eh = mock(SecurityExpressionHandler.class); diff --git a/web/src/test/java/org/springframework/security/web/authentication/UsernamePasswordAuthenticationFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/UsernamePasswordAuthenticationFilterTests.java index 4f53e17eca..157e42fb12 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/UsernamePasswordAuthenticationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/UsernamePasswordAuthenticationFilterTests.java @@ -153,7 +153,7 @@ public class UsernamePasswordAuthenticationFilterTests { private AuthenticationManager createAuthenticationManager() { AuthenticationManager am = mock(AuthenticationManager.class); given(am.authenticate(any(Authentication.class))) - .willAnswer((Answer) invocation -> (Authentication) invocation.getArguments()[0]); + .willAnswer((Answer) (invocation) -> (Authentication) invocation.getArguments()[0]); return am; } diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilterTests.java index 82813d3e29..ec318a9f33 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilterTests.java @@ -423,7 +423,7 @@ public class AbstractPreAuthenticatedProcessingFilterTests { } else { given(am.authenticate(any(Authentication.class))) - .willAnswer((Answer) invocation -> (Authentication) invocation.getArguments()[0]); + .willAnswer((Answer) (invocation) -> (Authentication) invocation.getArguments()[0]); } filter.setAuthenticationManager(am); diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationProviderTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationProviderTests.java index db62065c8c..cac4b9c717 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationProviderTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationProviderTests.java @@ -116,7 +116,7 @@ public class PreAuthenticatedAuthenticationProviderTests { private AuthenticationUserDetailsService getPreAuthenticatedUserDetailsService( final UserDetails aUserDetails) { - return token -> { + return (token) -> { if (aUserDetails != null && aUserDetails.getUsername().equals(token.getName())) { return aUserDetails; } diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/RequestAttributeAuthenticationFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/RequestAttributeAuthenticationFilterTests.java index 647770f200..d5e8c7778f 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/preauth/RequestAttributeAuthenticationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/RequestAttributeAuthenticationFilterTests.java @@ -151,7 +151,7 @@ public class RequestAttributeAuthenticationFilterTests { private AuthenticationManager createAuthenticationManager() { AuthenticationManager am = mock(AuthenticationManager.class); given(am.authenticate(any(Authentication.class))) - .willAnswer((Answer) invocation -> (Authentication) invocation.getArguments()[0]); + .willAnswer((Answer) (invocation) -> (Authentication) invocation.getArguments()[0]); return am; } diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/header/RequestHeaderAuthenticationFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/header/RequestHeaderAuthenticationFilterTests.java index aa65e72045..feff5b00fb 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/preauth/header/RequestHeaderAuthenticationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/header/RequestHeaderAuthenticationFilterTests.java @@ -152,7 +152,7 @@ public class RequestHeaderAuthenticationFilterTests { private AuthenticationManager createAuthenticationManager() { AuthenticationManager am = mock(AuthenticationManager.class); given(am.authenticate(any(Authentication.class))) - .willAnswer((Answer) invocation -> (Authentication) invocation.getArguments()[0]); + .willAnswer((Answer) (invocation) -> (Authentication) invocation.getArguments()[0]); return am; } diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedProcessingFilterTests.java index 9c17ee1824..54a3ade07f 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedProcessingFilterTests.java @@ -55,7 +55,7 @@ public class WebSpherePreAuthenticatedProcessingFilterTests { AuthenticationManager am = mock(AuthenticationManager.class); given(am.authenticate(any(Authentication.class))) - .willAnswer((Answer) invocation -> (Authentication) invocation.getArguments()[0]); + .willAnswer((Answer) (invocation) -> (Authentication) invocation.getArguments()[0]); filter.setAuthenticationManager(am); WebSpherePreAuthenticatedWebAuthenticationDetailsSource ads = new WebSpherePreAuthenticatedWebAuthenticationDetailsSource( diff --git a/web/src/test/java/org/springframework/security/web/authentication/ui/DefaultLogoutPageGeneratingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/ui/DefaultLogoutPageGeneratingFilterTests.java index ea25312591..f8c1de66a8 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/ui/DefaultLogoutPageGeneratingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/ui/DefaultLogoutPageGeneratingFilterTests.java @@ -56,7 +56,7 @@ public class DefaultLogoutPageGeneratingFilterTests { @Test public void doFilterWhenHiddenInputsSetThenHiddenInputsRendered() throws Exception { - this.filter.setResolveHiddenInputs(r -> Collections.singletonMap("_csrf", "csrf-token-1")); + this.filter.setResolveHiddenInputs((r) -> Collections.singletonMap("_csrf", "csrf-token-1")); MockMvc mockMvc = MockMvcBuilders.standaloneSetup(new Object()).addFilters(this.filter).build(); mockMvc.perform(get("/logout")).andExpect( diff --git a/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilterTests.java index cc5ae3a032..f3bef133b8 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilterTests.java @@ -121,7 +121,7 @@ public class DigestAuthenticationFilterTests { SecurityContextHolder.clearContext(); // Create User Details Service - UserDetailsService uds = username -> new User("rod,ok", "koala", + UserDetailsService uds = (username) -> new User("rod,ok", "koala", AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO")); DigestAuthenticationEntryPoint ep = new DigestAuthenticationEntryPoint(); diff --git a/web/src/test/java/org/springframework/security/web/firewall/StrictHttpFirewallTests.java b/web/src/test/java/org/springframework/security/web/firewall/StrictHttpFirewallTests.java index 17bf759c9c..9146827284 100644 --- a/web/src/test/java/org/springframework/security/web/firewall/StrictHttpFirewallTests.java +++ b/web/src/test/java/org/springframework/security/web/firewall/StrictHttpFirewallTests.java @@ -581,7 +581,7 @@ public class StrictHttpFirewallTests { @Test public void getFirewalledRequestWhenTrustedDomainThenNoException() { this.request.addHeader("Host", "example.org"); - this.firewall.setAllowedHostnames(hostname -> hostname.equals("example.org")); + this.firewall.setAllowedHostnames((hostname) -> hostname.equals("example.org")); assertThatCode(() -> this.firewall.getFirewalledRequest(this.request)).doesNotThrowAnyException(); } @@ -589,14 +589,14 @@ public class StrictHttpFirewallTests { @Test(expected = RequestRejectedException.class) public void getFirewalledRequestWhenUntrustedDomainThenException() { this.request.addHeader("Host", "example.org"); - this.firewall.setAllowedHostnames(hostname -> hostname.equals("myexample.org")); + this.firewall.setAllowedHostnames((hostname) -> hostname.equals("myexample.org")); this.firewall.getFirewalledRequest(this.request); } @Test(expected = RequestRejectedException.class) public void getFirewalledRequestGetHeaderWhenNotAllowedHeaderNameThenException() { - this.firewall.setAllowedHeaderNames(name -> !name.equals("bad name")); + this.firewall.setAllowedHeaderNames((name) -> !name.equals("bad name")); HttpServletRequest request = this.firewall.getFirewalledRequest(this.request); request.getHeader("bad name"); @@ -605,7 +605,7 @@ public class StrictHttpFirewallTests { @Test(expected = RequestRejectedException.class) public void getFirewalledRequestGetHeaderWhenNotAllowedHeaderValueThenException() { this.request.addHeader("good name", "bad value"); - this.firewall.setAllowedHeaderValues(value -> !value.equals("bad value")); + this.firewall.setAllowedHeaderValues((value) -> !value.equals("bad value")); HttpServletRequest request = this.firewall.getFirewalledRequest(this.request); request.getHeader("good name"); @@ -717,7 +717,7 @@ public class StrictHttpFirewallTests { @Test(expected = RequestRejectedException.class) public void getFirewalledRequestGetParameterValuesWhenNotAllowedInParameterValueThenException() { - this.firewall.setAllowedParameterValues(value -> !value.equals("bad value")); + this.firewall.setAllowedParameterValues((value) -> !value.equals("bad value")); this.request.addParameter("Something", "bad value"); @@ -727,7 +727,7 @@ public class StrictHttpFirewallTests { @Test(expected = RequestRejectedException.class) public void getFirewalledRequestGetParameterValuesWhenNotAllowedInParameterNameThenException() { - this.firewall.setAllowedParameterNames(value -> !value.equals("bad name")); + this.firewall.setAllowedParameterNames((value) -> !value.equals("bad name")); this.request.addParameter("bad name", "good value"); diff --git a/web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTests.java b/web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTests.java index 12027b2e58..2d6d4e3da5 100644 --- a/web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTests.java @@ -82,7 +82,7 @@ public class JaasApiIntegrationFilterTests { this.authenticatedSubject.getPrincipals().add(() -> "principal"); this.authenticatedSubject.getPrivateCredentials().add("password"); this.authenticatedSubject.getPublicCredentials().add("username"); - this.callbackHandler = callbacks -> { + this.callbackHandler = (callbacks) -> { for (Callback callback : callbacks) { if (callback instanceof NameCallback) { ((NameCallback) callback).setName("user"); diff --git a/web/src/test/java/org/springframework/security/web/method/ResolvableMethod.java b/web/src/test/java/org/springframework/security/web/method/ResolvableMethod.java index eebbc02be4..933d2efaad 100644 --- a/web/src/test/java/org/springframework/security/web/method/ResolvableMethod.java +++ b/web/src/test/java/org/springframework/security/web/method/ResolvableMethod.java @@ -119,7 +119,7 @@ import org.springframework.web.bind.annotation.ValueConstants; * * 
  *
- * ResolvableMethod.on(TestController.class).mockCall(o -> o.handle(null)).method();
+ * ResolvableMethod.on(TestController.class).mockCall((o) -> o.handle(null)).method();
  *
* * @author Rossen Stoyanchev @@ -318,7 +318,7 @@ public final class ResolvableMethod { * Filter on methods with the given name. */ public Builder named(String methodName) { - addFilter("methodName=" + methodName, m -> m.getName().equals(methodName)); + addFilter("methodName=" + methodName, (m) -> m.getName().equals(methodName)); return this; } @@ -339,8 +339,8 @@ public final class ResolvableMethod { @SafeVarargs public final Builder annotPresent(Class... annotationTypes) { String message = "annotationPresent=" + Arrays.toString(annotationTypes); - addFilter(message, candidate -> Arrays.stream(annotationTypes) - .allMatch(annotType -> AnnotatedElementUtils.findMergedAnnotation(candidate, annotType) != null)); + addFilter(message, (candidate) -> Arrays.stream(annotationTypes) + .allMatch((annotType) -> AnnotatedElementUtils.findMergedAnnotation(candidate, annotType) != null)); return this; } @@ -350,10 +350,10 @@ public final class ResolvableMethod { @SafeVarargs public final Builder annotNotPresent(Class... annotationTypes) { String message = "annotationNotPresent=" + Arrays.toString(annotationTypes); - addFilter(message, candidate -> { + addFilter(message, (candidate) -> { if (annotationTypes.length != 0) { return Arrays.stream(annotationTypes).noneMatch( - annotType -> AnnotatedElementUtils.findMergedAnnotation(candidate, annotType) != null); + (annotType) -> AnnotatedElementUtils.findMergedAnnotation(candidate, annotType) != null); } else { return candidate.getAnnotations().length == 0; @@ -388,7 +388,7 @@ public final class ResolvableMethod { public Builder returning(ResolvableType returnType) { String expected = returnType.toString(); String message = "returnType=" + expected; - addFilter(message, m -> expected.equals(ResolvableType.forMethodReturnType(m).toString())); + addFilter(message, (m) -> expected.equals(ResolvableType.forMethodReturnType(m).toString())); return this; } @@ -409,7 +409,7 @@ public final class ResolvableMethod { } private boolean isMatch(Method method) { - return this.filters.stream().allMatch(p -> p.test(method)); + return this.filters.stream().allMatch((p) -> p.test(method)); } private String formatMethods(Set methods) { @@ -567,7 +567,7 @@ public final class ResolvableMethod { */ @SafeVarargs public final ArgResolver annotPresent(Class... annotationTypes) { - this.filters.add(param -> Arrays.stream(annotationTypes).allMatch(param::hasParameterAnnotation)); + this.filters.add((param) -> Arrays.stream(annotationTypes).allMatch(param::hasParameterAnnotation)); return this; } @@ -577,7 +577,7 @@ public final class ResolvableMethod { */ @SafeVarargs public final ArgResolver annotNotPresent(Class... annotationTypes) { - this.filters.add(param -> (annotationTypes.length != 0) + this.filters.add((param) -> (annotationTypes.length != 0) ? Arrays.stream(annotationTypes).noneMatch(param::hasParameterAnnotation) : param.getParameterAnnotations().length == 0); return this; @@ -604,7 +604,7 @@ public final class ResolvableMethod { * @param type the expected type */ public MethodParameter arg(ResolvableType type) { - this.filters.add(p -> type.toString().equals(ResolvableType.forMethodParameter(p).toString())); + this.filters.add((p) -> type.toString().equals(ResolvableType.forMethodParameter(p).toString())); return arg(); } @@ -624,7 +624,7 @@ public final class ResolvableMethod { for (int i = 0; i < ResolvableMethod.this.method.getParameterCount(); i++) { MethodParameter param = new SynthesizingMethodParameter(ResolvableMethod.this.method, i); param.initParameterNameDiscovery(nameDiscoverer); - if (this.filters.stream().allMatch(p -> p.test(param))) { + if (this.filters.stream().allMatch((p) -> p.test(param))) { matches.add(param); } } diff --git a/web/src/test/java/org/springframework/security/web/savedrequest/CookieRequestCacheTests.java b/web/src/test/java/org/springframework/security/web/savedrequest/CookieRequestCacheTests.java index 5a3e85327f..b6a8596640 100644 --- a/web/src/test/java/org/springframework/security/web/savedrequest/CookieRequestCacheTests.java +++ b/web/src/test/java/org/springframework/security/web/savedrequest/CookieRequestCacheTests.java @@ -73,7 +73,7 @@ public class CookieRequestCacheTests { @Test public void getMatchingRequestWhenRequestMatcherDefinedThenReturnsCorrectSubsetOfCachedRequests() { CookieRequestCache cookieRequestCache = new CookieRequestCache(); - cookieRequestCache.setRequestMatcher(request -> request.getRequestURI().equals("/expected-destination")); + cookieRequestCache.setRequestMatcher((request) -> request.getRequestURI().equals("/expected-destination")); MockHttpServletRequest request = new MockHttpServletRequest("GET", "/destination"); MockHttpServletResponse response = new MockHttpServletResponse(); diff --git a/web/src/test/java/org/springframework/security/web/savedrequest/HttpSessionRequestCacheTests.java b/web/src/test/java/org/springframework/security/web/savedrequest/HttpSessionRequestCacheTests.java index 4f201474cd..d352f5242a 100644 --- a/web/src/test/java/org/springframework/security/web/savedrequest/HttpSessionRequestCacheTests.java +++ b/web/src/test/java/org/springframework/security/web/savedrequest/HttpSessionRequestCacheTests.java @@ -59,7 +59,7 @@ public class HttpSessionRequestCacheTests { @Test public void requestMatcherDefinesCorrectSubsetOfCachedRequests() { HttpSessionRequestCache cache = new HttpSessionRequestCache(); - cache.setRequestMatcher(request -> request.getMethod().equals("GET")); + cache.setRequestMatcher((request) -> request.getMethod().equals("GET")); MockHttpServletRequest request = new MockHttpServletRequest("POST", "/destination"); MockHttpServletResponse response = new MockHttpServletResponse(); diff --git a/web/src/test/java/org/springframework/security/web/server/WebFilterChainProxyTests.java b/web/src/test/java/org/springframework/security/web/server/WebFilterChainProxyTests.java index 45a66d8387..a0b4bf8b3a 100644 --- a/web/src/test/java/org/springframework/security/web/server/WebFilterChainProxyTests.java +++ b/web/src/test/java/org/springframework/security/web/server/WebFilterChainProxyTests.java @@ -41,7 +41,7 @@ public class WebFilterChainProxyTests { @Test public void filterWhenNoMatchThenContinuesChainAnd404() { List filters = Arrays.asList(new Http200WebFilter()); - ServerWebExchangeMatcher notMatch = exchange -> MatchResult.notMatch(); + ServerWebExchangeMatcher notMatch = (exchange) -> MatchResult.notMatch(); MatcherSecurityWebFilterChain chain = new MatcherSecurityWebFilterChain(notMatch, filters); WebFilterChainProxy filter = new WebFilterChainProxy(chain); diff --git a/web/src/test/java/org/springframework/security/web/server/authentication/AuthenticationWebFilterTests.java b/web/src/test/java/org/springframework/security/web/server/authentication/AuthenticationWebFilterTests.java index 6e381d1220..4c935b969d 100644 --- a/web/src/test/java/org/springframework/security/web/server/authentication/AuthenticationWebFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/server/authentication/AuthenticationWebFilterTests.java @@ -87,7 +87,7 @@ public class AuthenticationWebFilterTests { WebTestClient client = WebTestClientBuilder.bindToWebFilters(this.filter).build(); EntityExchangeResult result = client.get().uri("/").exchange().expectStatus().isOk() - .expectBody(String.class).consumeWith(b -> assertThat(b.getResponseBody()).isEqualTo("ok")) + .expectBody(String.class).consumeWith((b) -> assertThat(b.getResponseBody()).isEqualTo("ok")) .returnResult(); verifyZeroInteractions(this.authenticationManager); @@ -101,7 +101,7 @@ public class AuthenticationWebFilterTests { WebTestClient client = WebTestClientBuilder.bindToWebFilters(this.filter).build(); EntityExchangeResult result = client.get().uri("/").exchange().expectStatus().isOk() - .expectBody(String.class).consumeWith(b -> assertThat(b.getResponseBody()).isEqualTo("ok")) + .expectBody(String.class).consumeWith((b) -> assertThat(b.getResponseBody()).isEqualTo("ok")) .returnResult(); verifyZeroInteractions(this.authenticationManagerResolver); @@ -117,8 +117,8 @@ public class AuthenticationWebFilterTests { WebTestClient client = WebTestClientBuilder.bindToWebFilters(this.filter).build(); EntityExchangeResult result = client.get().uri("/") - .headers(headers -> headers.setBasicAuth("test", "this")).exchange().expectStatus().isOk() - .expectBody(String.class).consumeWith(b -> assertThat(b.getResponseBody()).isEqualTo("ok")) + .headers((headers) -> headers.setBasicAuth("test", "this")).exchange().expectStatus().isOk() + .expectBody(String.class).consumeWith((b) -> assertThat(b.getResponseBody()).isEqualTo("ok")) .returnResult(); assertThat(result.getResponseCookies()).isEmpty(); @@ -135,8 +135,8 @@ public class AuthenticationWebFilterTests { WebTestClient client = WebTestClientBuilder.bindToWebFilters(this.filter).build(); EntityExchangeResult result = client.get().uri("/") - .headers(headers -> headers.setBasicAuth("test", "this")).exchange().expectStatus().isOk() - .expectBody(String.class).consumeWith(b -> assertThat(b.getResponseBody()).isEqualTo("ok")) + .headers((headers) -> headers.setBasicAuth("test", "this")).exchange().expectStatus().isOk() + .expectBody(String.class).consumeWith((b) -> assertThat(b.getResponseBody()).isEqualTo("ok")) .returnResult(); assertThat(result.getResponseCookies()).isEmpty(); @@ -151,7 +151,7 @@ public class AuthenticationWebFilterTests { WebTestClient client = WebTestClientBuilder.bindToWebFilters(this.filter).build(); EntityExchangeResult result = client.get().uri("/") - .headers(headers -> headers.setBasicAuth("test", "this")).exchange().expectStatus().isUnauthorized() + .headers((headers) -> headers.setBasicAuth("test", "this")).exchange().expectStatus().isUnauthorized() .expectHeader().valueMatches("WWW-Authenticate", "Basic realm=\"Realm\"").expectBody().isEmpty(); assertThat(result.getResponseCookies()).isEmpty(); @@ -168,7 +168,7 @@ public class AuthenticationWebFilterTests { WebTestClient client = WebTestClientBuilder.bindToWebFilters(this.filter).build(); EntityExchangeResult result = client.get().uri("/") - .headers(headers -> headers.setBasicAuth("test", "this")).exchange().expectStatus().isUnauthorized() + .headers((headers) -> headers.setBasicAuth("test", "this")).exchange().expectStatus().isUnauthorized() .expectHeader().valueMatches("WWW-Authenticate", "Basic realm=\"Realm\"").expectBody().isEmpty(); assertThat(result.getResponseCookies()).isEmpty(); @@ -181,7 +181,7 @@ public class AuthenticationWebFilterTests { WebTestClient client = WebTestClientBuilder.bindToWebFilters(this.filter).build(); client.get().uri("/").exchange().expectStatus().isOk().expectBody(String.class) - .consumeWith(b -> assertThat(b.getResponseBody()).isEqualTo("ok")).returnResult(); + .consumeWith((b) -> assertThat(b.getResponseBody()).isEqualTo("ok")).returnResult(); verify(this.securityContextRepository, never()).save(any(), any()); verifyZeroInteractions(this.authenticationManager, this.successHandler, this.failureHandler); @@ -205,7 +205,7 @@ public class AuthenticationWebFilterTests { given(this.authenticationConverter.convert(any())).willReturn(authentication); given(this.authenticationManager.authenticate(any())).willReturn(authentication); given(this.successHandler.onAuthenticationSuccess(any(), any())).willReturn(Mono.empty()); - given(this.securityContextRepository.save(any(), any())).willAnswer(a -> Mono.just(a.getArguments()[0])); + given(this.securityContextRepository.save(any(), any())).willAnswer((a) -> Mono.just(a.getArguments()[0])); WebTestClient client = WebTestClientBuilder.bindToWebFilters(this.filter).build(); @@ -232,13 +232,13 @@ public class AuthenticationWebFilterTests { @Test public void filterWhenNotMatchAndConvertAndAuthenticationSuccessThenContinues() { - this.filter.setRequiresAuthenticationMatcher(e -> ServerWebExchangeMatcher.MatchResult.notMatch()); + this.filter.setRequiresAuthenticationMatcher((e) -> ServerWebExchangeMatcher.MatchResult.notMatch()); WebTestClient client = WebTestClientBuilder.bindToWebFilters(this.filter).build(); EntityExchangeResult result = client.get().uri("/") - .headers(headers -> headers.setBasicAuth("test", "this")).exchange().expectStatus().isOk() - .expectBody(String.class).consumeWith(b -> assertThat(b.getResponseBody()).isEqualTo("ok")) + .headers((headers) -> headers.setBasicAuth("test", "this")).exchange().expectStatus().isOk() + .expectBody(String.class).consumeWith((b) -> assertThat(b.getResponseBody()).isEqualTo("ok")) .returnResult(); assertThat(result.getResponseCookies()).isEmpty(); diff --git a/web/src/test/java/org/springframework/security/web/server/authentication/DelegatingServerAuthenticationSuccessHandlerTests.java b/web/src/test/java/org/springframework/security/web/server/authentication/DelegatingServerAuthenticationSuccessHandlerTests.java index 4ced5bd408..179ae25eba 100644 --- a/web/src/test/java/org/springframework/security/web/server/authentication/DelegatingServerAuthenticationSuccessHandlerTests.java +++ b/web/src/test/java/org/springframework/security/web/server/authentication/DelegatingServerAuthenticationSuccessHandlerTests.java @@ -106,7 +106,7 @@ public class DelegatingServerAuthenticationSuccessHandlerTests { AtomicBoolean slowDone = new AtomicBoolean(); CountDownLatch latch = new CountDownLatch(1); ServerAuthenticationSuccessHandler slow = (exchange, authentication) -> Mono.delay(Duration.ofMillis(100)) - .doOnSuccess(__ -> slowDone.set(true)).then(); + .doOnSuccess((__) -> slowDone.set(true)).then(); ServerAuthenticationSuccessHandler second = (exchange, authentication) -> Mono.fromRunnable(() -> { latch.countDown(); assertThat(slowDone.get()).describedAs("ServerAuthenticationSuccessHandler should be executed sequentially") diff --git a/web/src/test/java/org/springframework/security/web/server/authentication/RedirectServerAuthenticationFailureHandlerTests.java b/web/src/test/java/org/springframework/security/web/server/authentication/RedirectServerAuthenticationFailureHandlerTests.java index 84b295f9ad..25cba86938 100644 --- a/web/src/test/java/org/springframework/security/web/server/authentication/RedirectServerAuthenticationFailureHandlerTests.java +++ b/web/src/test/java/org/springframework/security/web/server/authentication/RedirectServerAuthenticationFailureHandlerTests.java @@ -99,7 +99,7 @@ public class RedirectServerAuthenticationFailureHandlerTests { private WebFilterExchange createExchange() { return new WebFilterExchange(MockServerWebExchange.from(MockServerHttpRequest.get("/").build()), - new DefaultWebFilterChain(e -> Mono.empty())); + new DefaultWebFilterChain((e) -> Mono.empty())); } } diff --git a/web/src/test/java/org/springframework/security/web/server/authentication/SwitchUserWebFilterTests.java b/web/src/test/java/org/springframework/security/web/server/authentication/SwitchUserWebFilterTests.java index 2f7296860c..ae7e5531fb 100644 --- a/web/src/test/java/org/springframework/security/web/server/authentication/SwitchUserWebFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/server/authentication/SwitchUserWebFilterTests.java @@ -149,10 +149,10 @@ public class SwitchUserWebFilterTests { assertThat(switchUserAuthentication.getAuthorities()).anyMatch(SwitchUserGrantedAuthority.class::isInstance); assertThat(switchUserAuthentication.getAuthorities()) .anyMatch((a) -> a.getAuthority().contains(SwitchUserWebFilter.ROLE_PREVIOUS_ADMINISTRATOR)); - assertThat( - switchUserAuthentication.getAuthorities().stream().filter(a -> a instanceof SwitchUserGrantedAuthority) - .map(a -> ((SwitchUserGrantedAuthority) a).getSource()).map(Principal::getName)) - .contains(originalAuthentication.getName()); + assertThat(switchUserAuthentication.getAuthorities().stream() + .filter((a) -> a instanceof SwitchUserGrantedAuthority) + .map((a) -> ((SwitchUserGrantedAuthority) a).getSource()).map(Principal::getName)) + .contains(originalAuthentication.getName()); } @Test @@ -192,8 +192,8 @@ public class SwitchUserWebFilterTests { assertThat(secondSwitchUserAuthentication.getName()).isEqualTo(targetUsername); assertThat(secondSwitchUserAuthentication.getAuthorities().stream() - .filter(a -> a instanceof SwitchUserGrantedAuthority) - .map(a -> ((SwitchUserGrantedAuthority) a).getSource()).map(Principal::getName).findFirst() + .filter((a) -> a instanceof SwitchUserGrantedAuthority) + .map((a) -> ((SwitchUserGrantedAuthority) a).getSource()).map(Principal::getName).findFirst() .orElse(null)).isEqualTo(originalAuthentication.getName()); } diff --git a/web/src/test/java/org/springframework/security/web/server/authentication/logout/DelegatingServerLogoutHandlerTests.java b/web/src/test/java/org/springframework/security/web/server/authentication/logout/DelegatingServerLogoutHandlerTests.java index e531624c8e..9414b01363 100644 --- a/web/src/test/java/org/springframework/security/web/server/authentication/logout/DelegatingServerLogoutHandlerTests.java +++ b/web/src/test/java/org/springframework/security/web/server/authentication/logout/DelegatingServerLogoutHandlerTests.java @@ -112,7 +112,7 @@ public class DelegatingServerLogoutHandlerTests { AtomicBoolean slowDone = new AtomicBoolean(); CountDownLatch latch = new CountDownLatch(1); ServerLogoutHandler slow = (exchange, authentication) -> Mono.delay(Duration.ofMillis(100)) - .doOnSuccess(__ -> slowDone.set(true)).then(); + .doOnSuccess((__) -> slowDone.set(true)).then(); ServerLogoutHandler second = (exchange, authentication) -> Mono.fromRunnable(() -> { latch.countDown(); assertThat(slowDone.get()).describedAs("ServerLogoutHandler should be executed sequentially").isTrue(); diff --git a/web/src/test/java/org/springframework/security/web/server/authentication/logout/LogoutWebFilterTests.java b/web/src/test/java/org/springframework/security/web/server/authentication/logout/LogoutWebFilterTests.java index 69e63942f2..4439a68961 100644 --- a/web/src/test/java/org/springframework/security/web/server/authentication/logout/LogoutWebFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/server/authentication/logout/LogoutWebFilterTests.java @@ -68,7 +68,7 @@ public class LogoutWebFilterTests { .setLogoutHandler(new DelegatingServerLogoutHandler(this.handler1, this.handler2, this.handler3)); assertThat(getLogoutHandler()).isNotNull().isExactlyInstanceOf(DelegatingServerLogoutHandler.class) - .extracting(delegatingLogoutHandler -> ((Collection) ReflectionTestUtils + .extracting((delegatingLogoutHandler) -> ((Collection) ReflectionTestUtils .getField(delegatingLogoutHandler, DelegatingServerLogoutHandler.class, "delegates")).stream() .map(ServerLogoutHandler::getClass).collect(Collectors.toList())) .isEqualTo(Arrays.asList(this.handler1.getClass(), this.handler2.getClass(), this.handler3.getClass())); diff --git a/web/src/test/java/org/springframework/security/web/server/authorization/AuthorizationWebFilterTests.java b/web/src/test/java/org/springframework/security/web/server/authorization/AuthorizationWebFilterTests.java index a35a1d5215..0bcbcb5edc 100644 --- a/web/src/test/java/org/springframework/security/web/server/authorization/AuthorizationWebFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/server/authorization/AuthorizationWebFilterTests.java @@ -66,7 +66,7 @@ public class AuthorizationWebFilterTests { public void filterWhenNoAuthenticationThenThrowsAccessDenied() { given(this.chain.filter(this.exchange)).willReturn(this.chainResult.mono()); AuthorizationWebFilter filter = new AuthorizationWebFilter( - (a, e) -> a.flatMap(auth -> Mono.error(new AccessDeniedException("Denied")))); + (a, e) -> a.flatMap((auth) -> Mono.error(new AccessDeniedException("Denied")))); Mono result = filter.filter(this.exchange, this.chain).subscriberContext( ReactiveSecurityContextHolder.withSecurityContext(Mono.just(new SecurityContextImpl()))); @@ -123,7 +123,7 @@ public class AuthorizationWebFilterTests { PublisherProbe context = PublisherProbe.empty(); given(this.chain.filter(this.exchange)).willReturn(this.chainResult.mono()); AuthorizationWebFilter filter = new AuthorizationWebFilter((a, e) -> a - .map(auth -> new AuthorizationDecision(true)).defaultIfEmpty(new AuthorizationDecision(true))); + .map((auth) -> new AuthorizationDecision(true)).defaultIfEmpty(new AuthorizationDecision(true))); Mono result = filter.filter(this.exchange, this.chain) .subscriberContext(ReactiveSecurityContextHolder.withSecurityContext(context.mono())); diff --git a/web/src/test/java/org/springframework/security/web/server/context/ReactorContextWebFilterTests.java b/web/src/test/java/org/springframework/security/web/server/context/ReactorContextWebFilterTests.java index 0f3024dd7f..f74e15e195 100644 --- a/web/src/test/java/org/springframework/security/web/server/context/ReactorContextWebFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/server/context/ReactorContextWebFilterTests.java @@ -100,7 +100,7 @@ public class ReactorContextWebFilterTests { given(this.repository.load(any())).willReturn(Mono.just(context)); this.handler = WebTestHandler.bindToWebFilters(this.filter, (e, c) -> ReactiveSecurityContextHolder.getContext().map(SecurityContext::getAuthentication) - .doOnSuccess(p -> assertThat(p).isSameAs(this.principal)).flatMap(p -> c.filter(e))); + .doOnSuccess((p) -> assertThat(p).isSameAs(this.principal)).flatMap((p) -> c.filter(e))); WebTestHandler.WebHandlerResult result = this.handler.exchange(this.exchange); @@ -113,7 +113,7 @@ public class ReactorContextWebFilterTests { String contextKey = "main"; WebFilter mainContextWebFilter = (e, c) -> c.filter(e).subscriberContext(Context.of(contextKey, true)); - WebFilterChain chain = new DefaultWebFilterChain(e -> Mono.empty(), mainContextWebFilter, this.filter); + WebFilterChain chain = new DefaultWebFilterChain((e) -> Mono.empty(), mainContextWebFilter, this.filter); Mono filter = chain.filter(MockServerWebExchange.from(this.exchange.build())); StepVerifier.create(filter).expectAccessibleContext().hasKey(contextKey).then().verifyComplete(); } diff --git a/web/src/test/java/org/springframework/security/web/server/context/SecurityContextServerWebExchangeWebFilterTests.java b/web/src/test/java/org/springframework/security/web/server/context/SecurityContextServerWebExchangeWebFilterTests.java index c81b62f70c..63cb704adc 100644 --- a/web/src/test/java/org/springframework/security/web/server/context/SecurityContextServerWebExchangeWebFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/server/context/SecurityContextServerWebExchangeWebFilterTests.java @@ -45,11 +45,11 @@ public class SecurityContextServerWebExchangeWebFilterTests { @Test public void filterWhenExistingContextAndPrincipalNotNullThenContextPopulated() { Mono result = this.filter - .filter(this.exchange, new DefaultWebFilterChain(e -> e.getPrincipal() - .doOnSuccess(contextPrincipal -> assertThat(contextPrincipal).isEqualTo(this.principal)) - .flatMap(contextPrincipal -> Mono.subscriberContext()) - .doOnSuccess(context -> assertThat(context.get("foo")).isEqualTo("bar")).then())) - .subscriberContext(context -> context.put("foo", "bar")) + .filter(this.exchange, new DefaultWebFilterChain((e) -> e.getPrincipal() + .doOnSuccess((contextPrincipal) -> assertThat(contextPrincipal).isEqualTo(this.principal)) + .flatMap((contextPrincipal) -> Mono.subscriberContext()) + .doOnSuccess((context) -> assertThat(context.get("foo")).isEqualTo("bar")).then())) + .subscriberContext((context) -> context.put("foo", "bar")) .subscriberContext(ReactiveSecurityContextHolder.withAuthentication(this.principal)); StepVerifier.create(result).verifyComplete(); @@ -59,8 +59,9 @@ public class SecurityContextServerWebExchangeWebFilterTests { public void filterWhenPrincipalNotNullThenContextPopulated() { Mono result = this.filter .filter(this.exchange, - new DefaultWebFilterChain(e -> e.getPrincipal() - .doOnSuccess(contextPrincipal -> assertThat(contextPrincipal).isEqualTo(this.principal)) + new DefaultWebFilterChain((e) -> e.getPrincipal() + .doOnSuccess( + (contextPrincipal) -> assertThat(contextPrincipal).isEqualTo(this.principal)) .then())) .subscriberContext(ReactiveSecurityContextHolder.withAuthentication(this.principal)); @@ -71,8 +72,9 @@ public class SecurityContextServerWebExchangeWebFilterTests { public void filterWhenPrincipalNullThenContextEmpty() { Authentication defaultAuthentication = new TestingAuthenticationToken("anonymouse", "anonymous", "TEST"); Mono result = this.filter.filter(this.exchange, - new DefaultWebFilterChain(e -> e.getPrincipal().defaultIfEmpty(defaultAuthentication) - .doOnSuccess(contextPrincipal -> assertThat(contextPrincipal).isEqualTo(defaultAuthentication)) + new DefaultWebFilterChain((e) -> e.getPrincipal().defaultIfEmpty(defaultAuthentication) + .doOnSuccess( + (contextPrincipal) -> assertThat(contextPrincipal).isEqualTo(defaultAuthentication)) .then())); StepVerifier.create(result).verifyComplete(); } diff --git a/web/src/test/java/org/springframework/security/web/server/csrf/WebSessionServerCsrfTokenRepositoryTests.java b/web/src/test/java/org/springframework/security/web/server/csrf/WebSessionServerCsrfTokenRepositoryTests.java index 12065047cd..ba2cd59a9e 100644 --- a/web/src/test/java/org/springframework/security/web/server/csrf/WebSessionServerCsrfTokenRepositoryTests.java +++ b/web/src/test/java/org/springframework/security/web/server/csrf/WebSessionServerCsrfTokenRepositoryTests.java @@ -59,7 +59,7 @@ public class WebSessionServerCsrfTokenRepositoryTests { @Test public void saveTokenWhenDefaultThenAddsToSession() { Mono result = this.repository.generateToken(this.exchange) - .delayUntil(t -> this.repository.saveToken(this.exchange, t)); + .delayUntil((t) -> this.repository.saveToken(this.exchange, t)); result.block(); WebSession session = this.exchange.getSession().block(); diff --git a/web/src/test/java/org/springframework/security/web/server/header/CompositeServerHttpHeadersWriterTests.java b/web/src/test/java/org/springframework/security/web/server/header/CompositeServerHttpHeadersWriterTests.java index f2f33daf80..9a72024092 100644 --- a/web/src/test/java/org/springframework/security/web/server/header/CompositeServerHttpHeadersWriterTests.java +++ b/web/src/test/java/org/springframework/security/web/server/header/CompositeServerHttpHeadersWriterTests.java @@ -99,9 +99,9 @@ public class CompositeServerHttpHeadersWriterTests { public void writeHttpHeadersSequential() throws Exception { AtomicBoolean slowDone = new AtomicBoolean(); CountDownLatch latch = new CountDownLatch(1); - ServerHttpHeadersWriter slow = exchange -> Mono.delay(Duration.ofMillis(100)) - .doOnSuccess(__ -> slowDone.set(true)).then(); - ServerHttpHeadersWriter second = exchange -> Mono.fromRunnable(() -> { + ServerHttpHeadersWriter slow = (exchange) -> Mono.delay(Duration.ofMillis(100)) + .doOnSuccess((__) -> slowDone.set(true)).then(); + ServerHttpHeadersWriter second = (exchange) -> Mono.fromRunnable(() -> { latch.countDown(); assertThat(slowDone.get()).describedAs("ServerLogoutHandler should be executed sequentially").isTrue(); }); diff --git a/web/src/test/java/org/springframework/security/web/server/savedrequest/CookieServerRequestCacheTests.java b/web/src/test/java/org/springframework/security/web/server/savedrequest/CookieServerRequestCacheTests.java index d9295ab015..7bd21e0963 100644 --- a/web/src/test/java/org/springframework/security/web/server/savedrequest/CookieServerRequestCacheTests.java +++ b/web/src/test/java/org/springframework/security/web/server/savedrequest/CookieServerRequestCacheTests.java @@ -91,7 +91,7 @@ public class CookieServerRequestCacheTests { @Test public void saveRequestWhenPostRequestAndCustomMatcherThenRequestUriInCookie() { - this.cache.setSaveRequestMatcher(e -> ServerWebExchangeMatcher.MatchResult.match()); + this.cache.setSaveRequestMatcher((e) -> ServerWebExchangeMatcher.MatchResult.match()); MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.post("/secured/")); this.cache.saveRequest(exchange).block(); diff --git a/web/src/test/java/org/springframework/security/web/server/savedrequest/WebSessionServerRequestCacheTests.java b/web/src/test/java/org/springframework/security/web/server/savedrequest/WebSessionServerRequestCacheTests.java index d3b4267df5..4f1c45a04b 100644 --- a/web/src/test/java/org/springframework/security/web/server/savedrequest/WebSessionServerRequestCacheTests.java +++ b/web/src/test/java/org/springframework/security/web/server/savedrequest/WebSessionServerRequestCacheTests.java @@ -79,7 +79,7 @@ public class WebSessionServerRequestCacheTests { @Test public void saveRequestGetRequestWhenPostAndCustomMatcherThenFound() { - this.cache.setSaveRequestMatcher(e -> ServerWebExchangeMatcher.MatchResult.match()); + this.cache.setSaveRequestMatcher((e) -> ServerWebExchangeMatcher.MatchResult.match()); MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.post("/secured/")); this.cache.saveRequest(exchange).block(); diff --git a/web/src/test/java/org/springframework/security/web/server/ui/LoginPageGeneratingWebFilterTests.java b/web/src/test/java/org/springframework/security/web/server/ui/LoginPageGeneratingWebFilterTests.java index 2735794b47..6bedbadcc9 100644 --- a/web/src/test/java/org/springframework/security/web/server/ui/LoginPageGeneratingWebFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/server/ui/LoginPageGeneratingWebFilterTests.java @@ -34,7 +34,7 @@ public class LoginPageGeneratingWebFilterTests { MockServerWebExchange exchange = MockServerWebExchange .from(MockServerHttpRequest.get("/test/login").contextPath("/test")); - filter.filter(exchange, e -> Mono.empty()).block(); + filter.filter(exchange, (e) -> Mono.empty()).block(); assertThat(exchange.getResponse().getBodyAsString().block()).contains("action=\"/test/login\""); } @@ -46,7 +46,7 @@ public class LoginPageGeneratingWebFilterTests { MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/login")); - filter.filter(exchange, e -> Mono.empty()).block(); + filter.filter(exchange, (e) -> Mono.empty()).block(); assertThat(exchange.getResponse().getBodyAsString().block()).contains("action=\"/login\""); }