From f836897190f78f707f848efda06e5360b2074e00 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Mon, 18 Oct 2021 18:22:54 -0500 Subject: [PATCH] Checkstyle Fixes - Javadoc tag ordering - Private constructors before inner classes Issue gh-10394 --- .../security/cas/jackson2/AssertionImplMixin.java | 2 +- .../cas/jackson2/AttributePrincipalImplMixin.java | 2 +- .../cas/jackson2/CasAuthenticationTokenMixin.java | 2 +- .../springframework/security/config/Customizer.java | 2 +- .../GlobalAuthenticationConfigurerAdapter.java | 2 +- .../ObjectPostProcessorConfiguration.java | 4 ++-- .../Jsr250MethodSecurityConfiguration.java | 2 +- .../PrePostMethodSecurityConfiguration.java | 2 +- .../SecuredMethodSecurityConfiguration.java | 2 +- .../web/configuration/WebSecurityConfiguration.java | 4 ++-- .../configuration/WebSecurityConfigurerAdapter.java | 2 +- .../web/configurers/HeadersConfigurer.java | 2 +- .../oauth2/client/ImplicitGrantConfigurer.java | 8 ++++---- .../oauth2/client/OAuth2LoginConfigurer.java | 2 +- .../configuration/WebMvcSecurityConfiguration.java | 2 +- ...ractSecurityWebSocketMessageBrokerConfigurer.java | 2 +- .../jackson2/AnonymousAuthenticationTokenMixin.java | 2 +- .../jackson2/BadCredentialsExceptionMixin.java | 2 +- .../security/jackson2/CoreJackson2Module.java | 2 +- .../jackson2/RememberMeAuthenticationTokenMixin.java | 2 +- .../jackson2/SimpleGrantedAuthorityMixin.java | 2 +- .../security/jackson2/UnmodifiableListMixin.java | 2 +- .../security/jackson2/UnmodifiableSetMixin.java | 2 +- .../springframework/security/jackson2/UserMixin.java | 2 +- .../UsernamePasswordAuthenticationTokenMixin.java | 2 +- .../expression/MessageExpressionConfigAttribute.java | 2 +- .../NimbusAuthorizationCodeTokenResponseClient.java | 2 +- .../client/registration/ClientRegistration.java | 4 ++-- .../userinfo/CustomUserTypesOAuth2UserService.java | 12 ++++++------ .../oauth2/client/userinfo/OAuth2UserService.java | 4 ++-- .../client/userinfo/ReactiveOAuth2UserService.java | 4 ++-- .../client/web/AuthorizationRequestRepository.java | 6 +++--- .../OAuth2AuthorizedClientArgumentResolver.java | 6 +++--- ...OAuth2AuthorizedClientExchangeFilterFunction.java | 4 ++-- ...OAuth2AuthorizedClientExchangeFilterFunction.java | 4 ++-- ...icatedServerOAuth2AuthorizedClientRepository.java | 4 ++-- .../security/oauth2/core/ClaimAccessor.java | 3 +-- .../MapOAuth2AccessTokenResponseConverter.java | 2 +- .../OAuth2AccessTokenResponseMapConverter.java | 2 +- ...Auth2AccessTokenResponseHttpMessageConverter.java | 6 +++--- .../security/oauth2/jwt/JwtDecoderFactory.java | 4 ++-- .../oauth2/jwt/NimbusJwtDecoderJwkSupport.java | 2 +- .../oauth2/jwt/ReactiveJwtDecoderFactory.java | 4 ++-- .../OAuth2IntrospectionClaimAccessor.java | 2 +- .../introspection/OAuth2IntrospectionClaimNames.java | 2 +- .../security/openid/OpenID4JavaConsumer.java | 4 ++-- .../service/authentication/OpenSamlSigningUtils.java | 8 ++++---- .../authentication/OpenSamlVerificationUtils.java | 8 ++++---- .../logout/OpenSamlVerificationUtils.java | 8 ++++---- .../authentication/logout/OpenSamlSigningUtils.java | 8 ++++---- .../authentication/logout/OpenSamlSigningUtils.java | 8 ++++---- .../AuthenticationPrincipalArgumentResolver.java | 4 ++-- .../security/web/jackson2/CookieMixin.java | 2 +- .../security/web/jackson2/DefaultCsrfTokenMixin.java | 2 +- .../web/jackson2/DefaultSavedRequestMixin.java | 2 +- .../PreAuthenticatedAuthenticationTokenMixin.java | 2 +- .../security/web/jackson2/SavedCookieMixin.java | 2 +- .../web/jackson2/WebAuthenticationDetailsMixin.java | 2 +- .../server/jackson2/DefaultCsrfServerTokenMixin.java | 2 +- 59 files changed, 100 insertions(+), 101 deletions(-) diff --git a/cas/src/main/java/org/springframework/security/cas/jackson2/AssertionImplMixin.java b/cas/src/main/java/org/springframework/security/cas/jackson2/AssertionImplMixin.java index 5d922b44e6..f3d7de8c02 100644 --- a/cas/src/main/java/org/springframework/security/cas/jackson2/AssertionImplMixin.java +++ b/cas/src/main/java/org/springframework/security/cas/jackson2/AssertionImplMixin.java @@ -40,9 +40,9 @@ import org.jasig.cas.client.authentication.AttributePrincipal; * * * @author Jitendra Singh + * @since 4.2 * @see CasJackson2Module * @see org.springframework.security.jackson2.SecurityJackson2Modules - * @since 4.2 */ @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY) @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE, diff --git a/cas/src/main/java/org/springframework/security/cas/jackson2/AttributePrincipalImplMixin.java b/cas/src/main/java/org/springframework/security/cas/jackson2/AttributePrincipalImplMixin.java index 775850c3b4..0ec671fb55 100644 --- a/cas/src/main/java/org/springframework/security/cas/jackson2/AttributePrincipalImplMixin.java +++ b/cas/src/main/java/org/springframework/security/cas/jackson2/AttributePrincipalImplMixin.java @@ -37,9 +37,9 @@ import org.jasig.cas.client.proxy.ProxyRetriever; * * * @author Jitendra Singh + * @since 4.2 * @see CasJackson2Module * @see org.springframework.security.jackson2.SecurityJackson2Modules - * @since 4.2 */ @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY) @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE, diff --git a/cas/src/main/java/org/springframework/security/cas/jackson2/CasAuthenticationTokenMixin.java b/cas/src/main/java/org/springframework/security/cas/jackson2/CasAuthenticationTokenMixin.java index 98c9151e72..80e40a0dca 100644 --- a/cas/src/main/java/org/springframework/security/cas/jackson2/CasAuthenticationTokenMixin.java +++ b/cas/src/main/java/org/springframework/security/cas/jackson2/CasAuthenticationTokenMixin.java @@ -47,9 +47,9 @@ import org.springframework.security.core.userdetails.UserDetails; * * * @author Jitendra Singh + * @since 4.2 * @see CasJackson2Module * @see org.springframework.security.jackson2.SecurityJackson2Modules - * @since 4.2 */ @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY) @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, isGetterVisibility = JsonAutoDetect.Visibility.NONE, 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 fc68b127e0..fc28dac17e 100644 --- a/config/src/main/java/org/springframework/security/config/Customizer.java +++ b/config/src/main/java/org/springframework/security/config/Customizer.java @@ -19,8 +19,8 @@ package org.springframework.security.config; /** * Callback interface that accepts a single input argument and returns no result. * - * @author Eleftheria Stein * @param the type of the input to the operation + * @author Eleftheria Stein * @since 5.2 */ @FunctionalInterface diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/GlobalAuthenticationConfigurerAdapter.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/GlobalAuthenticationConfigurerAdapter.java index 20e4addef7..72821cf116 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/GlobalAuthenticationConfigurerAdapter.java +++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/GlobalAuthenticationConfigurerAdapter.java @@ -27,8 +27,8 @@ import org.springframework.security.config.annotation.authentication.builders.Au * {@link AuthenticationConfiguration} to configure the global * {@link AuthenticationManagerBuilder}. * - * @since 5.0 * @author Rob Winch + * @since 5.0 */ @Order(100) public abstract class GlobalAuthenticationConfigurerAdapter diff --git a/config/src/main/java/org/springframework/security/config/annotation/configuration/ObjectPostProcessorConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/configuration/ObjectPostProcessorConfiguration.java index cb1ffde00d..bb5147fb30 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/configuration/ObjectPostProcessorConfiguration.java +++ b/config/src/main/java/org/springframework/security/config/annotation/configuration/ObjectPostProcessorConfiguration.java @@ -30,10 +30,10 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe * class is not intended to be imported manually rather it is imported automatically when * using {@link EnableWebSecurity} or {@link EnableGlobalMethodSecurity}. * - * @see EnableWebSecurity - * @see EnableGlobalMethodSecurity * @author Rob Winch * @since 3.2 + * @see EnableWebSecurity + * @see EnableGlobalMethodSecurity */ @Configuration(proxyBeanMethods = false) @Role(BeanDefinition.ROLE_INFRASTRUCTURE) diff --git a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/Jsr250MethodSecurityConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/Jsr250MethodSecurityConfiguration.java index 9b3207116c..b144477a13 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/Jsr250MethodSecurityConfiguration.java +++ b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/Jsr250MethodSecurityConfiguration.java @@ -31,8 +31,8 @@ import org.springframework.security.config.core.GrantedAuthorityDefaults; * * @author Evgeniy Cheban * @author Josh Cummings - * @see EnableMethodSecurity * @since 5.6 + * @see EnableMethodSecurity */ @Configuration(proxyBeanMethods = false) @Role(BeanDefinition.ROLE_INFRASTRUCTURE) diff --git a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/PrePostMethodSecurityConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/PrePostMethodSecurityConfiguration.java index f271f1b3be..d6dba7069e 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/PrePostMethodSecurityConfiguration.java +++ b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/PrePostMethodSecurityConfiguration.java @@ -40,8 +40,8 @@ import org.springframework.security.config.core.GrantedAuthorityDefaults; * * @author Evgeniy Cheban * @author Josh Cummings - * @see EnableMethodSecurity * @since 5.6 + * @see EnableMethodSecurity */ @Configuration(proxyBeanMethods = false) @Role(BeanDefinition.ROLE_INFRASTRUCTURE) diff --git a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/SecuredMethodSecurityConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/SecuredMethodSecurityConfiguration.java index 5b7fc7358b..79a5b25f57 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/SecuredMethodSecurityConfiguration.java +++ b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/SecuredMethodSecurityConfiguration.java @@ -29,8 +29,8 @@ import org.springframework.security.authorization.method.AuthorizationManagerBef * * @author Evgeniy Cheban * @author Josh Cummings - * @see EnableMethodSecurity * @since 5.6 + * @see EnableMethodSecurity */ @Configuration(proxyBeanMethods = false) @Role(BeanDefinition.ROLE_INFRASTRUCTURE) diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfiguration.java index 454272e19b..45bf5e5f1e 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfiguration.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfiguration.java @@ -60,11 +60,11 @@ import org.springframework.util.Assert; * {@link WebSecurityConfigurer} and exposing it as a {@link Configuration}. This * configuration is imported when using {@link EnableWebSecurity}. * - * @see EnableWebSecurity - * @see WebSecurity * @author Rob Winch * @author Keesun Baik * @since 3.2 + * @see EnableWebSecurity + * @see WebSecurity */ @Configuration(proxyBeanMethods = false) public class WebSecurityConfiguration implements ImportAware, BeanClassLoaderAware { diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurerAdapter.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurerAdapter.java index 61609ede2a..1c76a0bc84 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurerAdapter.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurerAdapter.java @@ -87,8 +87,8 @@ import org.springframework.web.accept.HeaderContentNegotiationStrategy; * org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer = sample.MyClassThatExtendsAbstractHttpConfigurer, sample.OtherThatExtendsAbstractHttpConfigurer * * - * @see EnableWebSecurity * @author Rob Winch + * @see EnableWebSecurity */ @Order(100) public abstract class WebSecurityConfigurerAdapter implements WebSecurityConfigurer { diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurer.java index 1a76c76ecc..3eec2bf59e 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurer.java @@ -490,8 +490,8 @@ public class HeadersConfigurer> * @return the {@link FeaturePolicyConfig} for additional configuration * @throws IllegalArgumentException if policyDirectives is {@code null} or empty * @since 5.1 - * @see FeaturePolicyHeaderWriter * @deprecated Use {@link #permissionsPolicy(Customizer)} instead. + * @seeObjectPostProcessorConfiguration FeaturePolicyHeaderWriter */ @Deprecated public FeaturePolicyConfig featurePolicy(String policyDirectives) { diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/ImplicitGrantConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/ImplicitGrantConfigurer.java index 51d151c9ed..ac3888e6ee 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/ImplicitGrantConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/ImplicitGrantConfigurer.java @@ -49,15 +49,15 @@ import org.springframework.util.Assert; *
  • {@link ClientRegistrationRepository}
    • * * + * @author Joe Grandja + * @since 5.0 + * @see OAuth2AuthorizationRequestRedirectFilter + * @see ClientRegistrationRepository * @deprecated It is not recommended to use the implicit flow due to the inherent risks of * returning access tokens in an HTTP redirect without any confirmation that it has been * received by the client. See reference * OAuth 2.0 Implicit * Grant. - * @author Joe Grandja - * @since 5.0 - * @see OAuth2AuthorizationRequestRedirectFilter - * @see ClientRegistrationRepository */ @Deprecated public final class ImplicitGrantConfigurer> 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 9fdbb2b8c8..5bdb85f3eb 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 @@ -683,10 +683,10 @@ public final class OAuth2LoginConfigurer> /** * Sets a custom {@link OAuth2User} type and associates it to the provided client * {@link ClientRegistration#getRegistrationId() registration identifier}. - * @deprecated See {@link CustomUserTypesOAuth2UserService} for alternative usage. * @param customUserType a custom {@link OAuth2User} type * @param clientRegistrationId the client registration identifier * @return the {@link UserInfoEndpointConfig} for further configuration + * @deprecated See {@link CustomUserTypesOAuth2UserService} for alternative usage. */ @Deprecated public UserInfoEndpointConfig customUserType(Class customUserType, diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/servlet/configuration/WebMvcSecurityConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/web/servlet/configuration/WebMvcSecurityConfiguration.java index bbb4ea2980..735444bcdb 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/servlet/configuration/WebMvcSecurityConfiguration.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/servlet/configuration/WebMvcSecurityConfiguration.java @@ -37,9 +37,9 @@ import org.springframework.web.servlet.support.RequestDataValueProcessor; * {@link AuthenticationPrincipalArgumentResolver} as a * {@link HandlerMethodArgumentResolver}. * - * @deprecated This is applied internally using SpringWebMvcImportSelector * @author Rob Winch * @since 3.2 + * @deprecated This is applied internally using SpringWebMvcImportSelector */ @Deprecated @Configuration(proxyBeanMethods = false) diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurer.java index f201352f59..60139cd59a 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurer.java @@ -79,8 +79,8 @@ import org.springframework.web.socket.sockjs.transport.TransportHandlingSockJsSe * } * * - * @since 4.0 * @author Rob Winch + * @since 4.0 */ @Order(Ordered.HIGHEST_PRECEDENCE + 100) @Import(ObjectPostProcessorConfiguration.class) diff --git a/core/src/main/java/org/springframework/security/jackson2/AnonymousAuthenticationTokenMixin.java b/core/src/main/java/org/springframework/security/jackson2/AnonymousAuthenticationTokenMixin.java index 3d8aa80232..335767fb54 100644 --- a/core/src/main/java/org/springframework/security/jackson2/AnonymousAuthenticationTokenMixin.java +++ b/core/src/main/java/org/springframework/security/jackson2/AnonymousAuthenticationTokenMixin.java @@ -40,9 +40,9 @@ import org.springframework.security.core.GrantedAuthority; * Note: This class will save full class name into a property called @class * * @author Jitendra Singh + * @since 4.2 * @see CoreJackson2Module * @see SecurityJackson2Modules - * @since 4.2 */ @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY) @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, isGetterVisibility = JsonAutoDetect.Visibility.NONE, diff --git a/core/src/main/java/org/springframework/security/jackson2/BadCredentialsExceptionMixin.java b/core/src/main/java/org/springframework/security/jackson2/BadCredentialsExceptionMixin.java index 08287ae8dd..5471374b4d 100644 --- a/core/src/main/java/org/springframework/security/jackson2/BadCredentialsExceptionMixin.java +++ b/core/src/main/java/org/springframework/security/jackson2/BadCredentialsExceptionMixin.java @@ -36,8 +36,8 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; * called @class The cause and stackTrace are ignored in the serialization. * * @author Yannick Lombardi - * @see CoreJackson2Module * @since 5.0 + * @see CoreJackson2Module */ @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY) @JsonIgnoreProperties(ignoreUnknown = true, value = { "cause", "stackTrace" }) diff --git a/core/src/main/java/org/springframework/security/jackson2/CoreJackson2Module.java b/core/src/main/java/org/springframework/security/jackson2/CoreJackson2Module.java index 4621479ac4..1aa8eb0213 100644 --- a/core/src/main/java/org/springframework/security/jackson2/CoreJackson2Module.java +++ b/core/src/main/java/org/springframework/security/jackson2/CoreJackson2Module.java @@ -44,8 +44,8 @@ import org.springframework.security.core.userdetails.User; * of all security modules. * * @author Jitendra Singh. - * @see SecurityJackson2Modules * @since 4.2 + * @see SecurityJackson2Modules */ @SuppressWarnings("serial") public class CoreJackson2Module extends SimpleModule { diff --git a/core/src/main/java/org/springframework/security/jackson2/RememberMeAuthenticationTokenMixin.java b/core/src/main/java/org/springframework/security/jackson2/RememberMeAuthenticationTokenMixin.java index 24d82cc0a2..058027e13b 100644 --- a/core/src/main/java/org/springframework/security/jackson2/RememberMeAuthenticationTokenMixin.java +++ b/core/src/main/java/org/springframework/security/jackson2/RememberMeAuthenticationTokenMixin.java @@ -47,9 +47,9 @@ import org.springframework.security.core.GrantedAuthority; * called @class * * @author Jitendra Singh + * @since 4.2 * @see CoreJackson2Module * @see SecurityJackson2Modules - * @since 4.2 */ @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY) @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE, diff --git a/core/src/main/java/org/springframework/security/jackson2/SimpleGrantedAuthorityMixin.java b/core/src/main/java/org/springframework/security/jackson2/SimpleGrantedAuthorityMixin.java index 4c3beadcc5..d7b9474da5 100644 --- a/core/src/main/java/org/springframework/security/jackson2/SimpleGrantedAuthorityMixin.java +++ b/core/src/main/java/org/springframework/security/jackson2/SimpleGrantedAuthorityMixin.java @@ -32,9 +32,9 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; * * * @author Jitendra Singh + * @since 4.2 * @see CoreJackson2Module * @see SecurityJackson2Modules - * @since 4.2 */ @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY) @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.NONE, diff --git a/core/src/main/java/org/springframework/security/jackson2/UnmodifiableListMixin.java b/core/src/main/java/org/springframework/security/jackson2/UnmodifiableListMixin.java index 9483b79719..66e25dbc1d 100644 --- a/core/src/main/java/org/springframework/security/jackson2/UnmodifiableListMixin.java +++ b/core/src/main/java/org/springframework/security/jackson2/UnmodifiableListMixin.java @@ -32,10 +32,10 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; * * * @author Rob Winch + * @since 5.0.2 * @see UnmodifiableListDeserializer * @see CoreJackson2Module * @see SecurityJackson2Modules - * @since 5.0.2 */ @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY) @JsonDeserialize(using = UnmodifiableListDeserializer.class) diff --git a/core/src/main/java/org/springframework/security/jackson2/UnmodifiableSetMixin.java b/core/src/main/java/org/springframework/security/jackson2/UnmodifiableSetMixin.java index 2dba600d68..6022a55ee5 100644 --- a/core/src/main/java/org/springframework/security/jackson2/UnmodifiableSetMixin.java +++ b/core/src/main/java/org/springframework/security/jackson2/UnmodifiableSetMixin.java @@ -32,10 +32,10 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; * * * @author Jitendra Singh + * @since 4.2 * @see UnmodifiableSetDeserializer * @see CoreJackson2Module * @see SecurityJackson2Modules - * @since 4.2 */ @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY) @JsonDeserialize(using = UnmodifiableSetDeserializer.class) diff --git a/core/src/main/java/org/springframework/security/jackson2/UserMixin.java b/core/src/main/java/org/springframework/security/jackson2/UserMixin.java index 0cb7b3c332..356f17f5c2 100644 --- a/core/src/main/java/org/springframework/security/jackson2/UserMixin.java +++ b/core/src/main/java/org/springframework/security/jackson2/UserMixin.java @@ -37,10 +37,10 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; * * * @author Jitendra Singh + * @since 4.2 * @see UserDeserializer * @see CoreJackson2Module * @see SecurityJackson2Modules - * @since 4.2 */ @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY) @JsonDeserialize(using = UserDeserializer.class) diff --git a/core/src/main/java/org/springframework/security/jackson2/UsernamePasswordAuthenticationTokenMixin.java b/core/src/main/java/org/springframework/security/jackson2/UsernamePasswordAuthenticationTokenMixin.java index e2bc37e3f1..ae8d6a6f80 100644 --- a/core/src/main/java/org/springframework/security/jackson2/UsernamePasswordAuthenticationTokenMixin.java +++ b/core/src/main/java/org/springframework/security/jackson2/UsernamePasswordAuthenticationTokenMixin.java @@ -39,9 +39,9 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; * * * @author Jitendra Singh + * @since 4.2 * @see CoreJackson2Module * @see SecurityJackson2Modules - * @since 4.2 */ @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@class") @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE, diff --git a/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttribute.java b/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttribute.java index e663c4f06a..ffa96a22aa 100644 --- a/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttribute.java +++ b/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttribute.java @@ -29,9 +29,9 @@ import org.springframework.util.Assert; /** * Simple expression configuration attribute for use in {@link Message} authorizations. * - * @since 4.0 * @author Rob Winch * @author Daniel Bustamante Ospina + * @since 4.0 */ @SuppressWarnings("serial") class MessageExpressionConfigAttribute implements ConfigAttribute, EvaluationContextPostProcessor> { diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/endpoint/NimbusAuthorizationCodeTokenResponseClient.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/endpoint/NimbusAuthorizationCodeTokenResponseClient.java index 135f5a216f..e4b711bde6 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/endpoint/NimbusAuthorizationCodeTokenResponseClient.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/endpoint/NimbusAuthorizationCodeTokenResponseClient.java @@ -58,7 +58,6 @@ import org.springframework.util.CollectionUtils; * * @author Joe Grandja * @since 5.0 - * @deprecated Use {@link DefaultAuthorizationCodeTokenResponseClient} * @see OAuth2AccessTokenResponseClient * @see OAuth2AuthorizationCodeGrantRequest * @see OAuth2AccessTokenResponse @@ -71,6 +70,7 @@ import org.springframework.util.CollectionUtils; * @see Section 4.1.4 Access Token Response * (Authorization Code Grant) + * @deprecated Use {@link DefaultAuthorizationCodeTokenResponseClient} */ @Deprecated public class NimbusAuthorizationCodeTokenResponseClient 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 c5b373e5ee..f2e653a481 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 @@ -112,8 +112,8 @@ public final class ClientRegistration implements Serializable { /** * Returns the uri (or uri template) for the redirection endpoint. - * @deprecated Use {@link #getRedirectUri()} instead * @return the uri (or uri template) for the redirection endpoint + * @deprecated Use {@link #getRedirectUri()} instead */ @Deprecated public String getRedirectUriTemplate() { @@ -445,10 +445,10 @@ public final class ClientRegistration implements Serializable { /** * Sets the uri (or uri template) for the redirection endpoint. - * @deprecated Use {@link #redirectUri(String)} instead * @param redirectUriTemplate the uri (or uri template) for the redirection * endpoint * @return the {@link Builder} + * @deprecated Use {@link #redirectUri(String)} instead */ @Deprecated public Builder redirectUriTemplate(String redirectUriTemplate) { diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/userinfo/CustomUserTypesOAuth2UserService.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/userinfo/CustomUserTypesOAuth2UserService.java index d5b8d0ab85..eacca515a3 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/userinfo/CustomUserTypesOAuth2UserService.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/userinfo/CustomUserTypesOAuth2UserService.java @@ -42,18 +42,18 @@ import org.springframework.web.client.RestTemplate; * {@link OAuth2User} type(s) keyed by {@code String}, which represents the * {@link ClientRegistration#getRegistrationId() Registration Id} of the Client. * - * @deprecated It is recommended to use a delegation-based strategy of an - * {@link OAuth2UserService} to support custom {@link OAuth2User} types, as it provides - * much greater flexibility compared to this implementation. See the - * reference - * manual for details on how to implement. * @author Joe Grandja * @since 5.0 * @see OAuth2UserService * @see OAuth2UserRequest * @see OAuth2User * @see ClientRegistration + * @deprecated It is recommended to use a delegation-based strategy of an + * {@link OAuth2UserService} to support custom {@link OAuth2User} types, as it provides + * much greater flexibility compared to this implementation. See the + * reference + * manual for details on how to implement. */ @Deprecated public class CustomUserTypesOAuth2UserService implements OAuth2UserService { diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/userinfo/OAuth2UserService.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/userinfo/OAuth2UserService.java index 4f0efc2548..0cc63a0516 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/userinfo/OAuth2UserService.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/userinfo/OAuth2UserService.java @@ -27,13 +27,13 @@ import org.springframework.security.oauth2.core.user.OAuth2User; * {@link OAuth2UserRequest#getClientRegistration() Client} and returning an * {@link AuthenticatedPrincipal} in the form of an {@link OAuth2User}. * + * @param The type of OAuth 2.0 User Request + * @param The type of OAuth 2.0 User * @author Joe Grandja * @since 5.0 * @see OAuth2UserRequest * @see OAuth2User * @see AuthenticatedPrincipal - * @param The type of OAuth 2.0 User Request - * @param The type of OAuth 2.0 User */ @FunctionalInterface public interface OAuth2UserService { diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/userinfo/ReactiveOAuth2UserService.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/userinfo/ReactiveOAuth2UserService.java index 61e2a99bed..bfc1835ec8 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/userinfo/ReactiveOAuth2UserService.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/userinfo/ReactiveOAuth2UserService.java @@ -29,13 +29,13 @@ import org.springframework.security.oauth2.core.user.OAuth2User; * {@link OAuth2UserRequest#getClientRegistration() Client} and returning an * {@link AuthenticatedPrincipal} in the form of an {@link OAuth2User}. * + * @param The type of OAuth 2.0 User Request + * @param The type of OAuth 2.0 User * @author Rob Winch * @since 5.1 * @see OAuth2UserRequest * @see OAuth2User * @see AuthenticatedPrincipal - * @param The type of OAuth 2.0 User Request - * @param The type of OAuth 2.0 User */ @FunctionalInterface public interface ReactiveOAuth2UserService { diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/AuthorizationRequestRepository.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/AuthorizationRequestRepository.java index 4ccd7e5f46..90e47929f1 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/AuthorizationRequestRepository.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/AuthorizationRequestRepository.java @@ -59,12 +59,12 @@ public interface AuthorizationRequestRepository the type of the claim value * @return the claim value + * @since 5.2 */ @SuppressWarnings("unchecked") default T getClaim(String claim) { diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/MapOAuth2AccessTokenResponseConverter.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/MapOAuth2AccessTokenResponseConverter.java index 4554e7a2f1..c271b3721d 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/MapOAuth2AccessTokenResponseConverter.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/MapOAuth2AccessTokenResponseConverter.java @@ -25,10 +25,10 @@ import org.springframework.core.convert.converter.Converter; * A {@link Converter} that converts the provided OAuth 2.0 Access Token Response * parameters to an {@link OAuth2AccessTokenResponse}. * - * @deprecated Use {@link DefaultMapOAuth2AccessTokenResponseConverter} instead * @author Joe Grandja * @author Nikita Konev * @since 5.3 + * @deprecated Use {@link DefaultMapOAuth2AccessTokenResponseConverter} instead */ @Deprecated public final class MapOAuth2AccessTokenResponseConverter diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/OAuth2AccessTokenResponseMapConverter.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/OAuth2AccessTokenResponseMapConverter.java index 5219e2ec4d..e5af12f3e2 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/OAuth2AccessTokenResponseMapConverter.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/OAuth2AccessTokenResponseMapConverter.java @@ -25,10 +25,10 @@ import org.springframework.core.convert.converter.Converter; * A {@link Converter} that converts the provided {@link OAuth2AccessTokenResponse} to a * {@code Map} representation of the OAuth 2.0 Access Token Response parameters. * - * @deprecated Use {@link DefaultOAuth2AccessTokenResponseMapConverter} instead * @author Joe Grandja * @author Nikita Konev * @since 5.3 + * @deprecated Use {@link DefaultOAuth2AccessTokenResponseMapConverter} instead */ @Deprecated public final class OAuth2AccessTokenResponseMapConverter 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 4b5f157495..075ae6837e 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 @@ -133,9 +133,9 @@ public class OAuth2AccessTokenResponseHttpMessageConverter /** * Sets the {@link Converter} used for converting the OAuth 2.0 Access Token Response * parameters to an {@link OAuth2AccessTokenResponse}. - * @deprecated Use {@link #setAccessTokenResponseConverter(Converter)} instead * @param tokenResponseConverter the {@link Converter} used for converting to an * {@link OAuth2AccessTokenResponse} + * @deprecated Use {@link #setAccessTokenResponseConverter(Converter)} instead */ @Deprecated public final void setTokenResponseConverter( @@ -161,10 +161,10 @@ public class OAuth2AccessTokenResponseHttpMessageConverter * Sets the {@link Converter} used for converting the * {@link OAuth2AccessTokenResponse} to a {@code Map} representation of the OAuth 2.0 * Access Token Response parameters. - * @deprecated Use {@link #setAccessTokenResponseParametersConverter(Converter)} - * instead * @param tokenResponseParametersConverter the {@link Converter} used for converting * to a {@code Map} representation of the Access Token Response parameters + * @deprecated Use {@link #setAccessTokenResponseParametersConverter(Converter)} + * instead */ @Deprecated public final void setTokenResponseParametersConverter( diff --git a/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/JwtDecoderFactory.java b/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/JwtDecoderFactory.java index c1af8a909c..cb89eb26cd 100644 --- a/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/JwtDecoderFactory.java +++ b/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/JwtDecoderFactory.java @@ -20,11 +20,11 @@ package org.springframework.security.oauth2.jwt; * A factory for {@link JwtDecoder}(s). This factory should be supplied with a type that * provides contextual information used to create a specific {@code JwtDecoder}. * + * @param The type that provides contextual information used to create a specific + * {@code JwtDecoder}. * @author Joe Grandja * @since 5.2 * @see JwtDecoder - * @param The type that provides contextual information used to create a specific - * {@code JwtDecoder}. */ @FunctionalInterface public interface JwtDecoderFactory { diff --git a/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderJwkSupport.java b/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderJwkSupport.java index cb3e8a7b6f..9c84cf3699 100644 --- a/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderJwkSupport.java +++ b/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderJwkSupport.java @@ -35,7 +35,6 @@ import org.springframework.web.client.RestOperations; *

    * NOTE: This implementation uses the Nimbus JOSE + JWT SDK internally. * - * @deprecated Use {@link NimbusJwtDecoder} or {@link JwtDecoders} instead * @author Joe Grandja * @author Josh Cummings * @since 5.0 @@ -49,6 +48,7 @@ import org.springframework.web.client.RestOperations; * (JWK) * @see Nimbus * JOSE + JWT SDK + * @deprecated Use {@link NimbusJwtDecoder} or {@link JwtDecoders} instead */ @Deprecated public final class NimbusJwtDecoderJwkSupport implements JwtDecoder { diff --git a/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/ReactiveJwtDecoderFactory.java b/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/ReactiveJwtDecoderFactory.java index 7c6f9f0c08..0c71b94347 100644 --- a/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/ReactiveJwtDecoderFactory.java +++ b/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/ReactiveJwtDecoderFactory.java @@ -21,11 +21,11 @@ package org.springframework.security.oauth2.jwt; * type that provides contextual information used to create a specific * {@code ReactiveJwtDecoder}. * + * @param The type that provides contextual information used to create a specific + * {@code ReactiveJwtDecoder}. * @author Joe Grandja * @since 5.2 * @see ReactiveJwtDecoder - * @param The type that provides contextual information used to create a specific - * {@code ReactiveJwtDecoder}. */ @FunctionalInterface public interface ReactiveJwtDecoderFactory { diff --git a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/introspection/OAuth2IntrospectionClaimAccessor.java b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/introspection/OAuth2IntrospectionClaimAccessor.java index ca04d23849..cf1935ec80 100644 --- a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/introspection/OAuth2IntrospectionClaimAccessor.java +++ b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/introspection/OAuth2IntrospectionClaimAccessor.java @@ -25,7 +25,6 @@ import org.springframework.security.oauth2.core.OAuth2TokenIntrospectionClaimNam * A {@link ClaimAccessor} for the "claims" that may be contained in the * Introspection Response. * - * @deprecated Use {@link OAuth2TokenIntrospectionClaimAccessor} instead * @author David Kovac * @since 5.4 * @see ClaimAccessor @@ -33,6 +32,7 @@ import org.springframework.security.oauth2.core.OAuth2TokenIntrospectionClaimNam * @see OAuth2IntrospectionAuthenticatedPrincipal * @see Introspection Response + * @deprecated Use {@link OAuth2TokenIntrospectionClaimAccessor} instead */ @Deprecated public interface OAuth2IntrospectionClaimAccessor extends OAuth2TokenIntrospectionClaimAccessor { diff --git a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/introspection/OAuth2IntrospectionClaimNames.java b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/introspection/OAuth2IntrospectionClaimNames.java index 9e5c8227cd..b79642da3f 100644 --- a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/introspection/OAuth2IntrospectionClaimNames.java +++ b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/introspection/OAuth2IntrospectionClaimNames.java @@ -23,9 +23,9 @@ import org.springframework.security.oauth2.core.OAuth2TokenIntrospectionClaimNam * Introspection * Response. * - * @deprecated Use {@link OAuth2TokenIntrospectionClaimNames} instead * @author Josh Cummings * @since 5.2 + * @deprecated Use {@link OAuth2TokenIntrospectionClaimNames} instead */ @Deprecated public interface OAuth2IntrospectionClaimNames extends OAuth2TokenIntrospectionClaimNames { diff --git a/openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java b/openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java index 33e65240e8..1316b6bf87 100644 --- a/openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java @@ -43,12 +43,12 @@ import org.openid4java.message.ax.FetchResponse; import org.springframework.util.StringUtils; /** + * @author Ray Krueger + * @author Luke Taylor * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * encouraged to * migrate to OpenID Connect, which is * supported by spring-security-oauth2. - * @author Ray Krueger - * @author Luke Taylor */ @Deprecated @SuppressWarnings("unchecked") diff --git a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlSigningUtils.java b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlSigningUtils.java index a133ed449e..67910737c6 100644 --- a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlSigningUtils.java +++ b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlSigningUtils.java @@ -147,6 +147,10 @@ final class OpenSamlSigningUtils { return credentials; } + private OpenSamlSigningUtils() { + + } + static class QueryParametersPartial { final RelyingPartyRegistration registration; @@ -187,8 +191,4 @@ final class OpenSamlSigningUtils { } - private OpenSamlSigningUtils() { - - } - } diff --git a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlVerificationUtils.java b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlVerificationUtils.java index 8b3f56e192..5b8d029587 100644 --- a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlVerificationUtils.java +++ b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlVerificationUtils.java @@ -86,6 +86,10 @@ final class OpenSamlVerificationUtils { DefaultSecurityConfigurationBootstrap.buildBasicInlineKeyInfoCredentialResolver()); } + private OpenSamlVerificationUtils() { + + } + static class VerifierPartial { private final String id; @@ -216,8 +220,4 @@ final class OpenSamlVerificationUtils { } - private OpenSamlVerificationUtils() { - - } - } diff --git a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/logout/OpenSamlVerificationUtils.java b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/logout/OpenSamlVerificationUtils.java index 8bceb2f359..975f7a7525 100644 --- a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/logout/OpenSamlVerificationUtils.java +++ b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/logout/OpenSamlVerificationUtils.java @@ -70,6 +70,10 @@ final class OpenSamlVerificationUtils { return new VerifierPartial(object, registration); } + private OpenSamlVerificationUtils() { + + } + static class VerifierPartial { private final String id; @@ -237,8 +241,4 @@ final class OpenSamlVerificationUtils { } - private OpenSamlVerificationUtils() { - - } - } diff --git a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/authentication/logout/OpenSamlSigningUtils.java b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/authentication/logout/OpenSamlSigningUtils.java index 6d1daacd19..45b0023c2f 100644 --- a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/authentication/logout/OpenSamlSigningUtils.java +++ b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/authentication/logout/OpenSamlSigningUtils.java @@ -127,6 +127,10 @@ final class OpenSamlSigningUtils { return credentials; } + private OpenSamlSigningUtils() { + + } + static class QueryParametersPartial { final RelyingPartyRegistration registration; @@ -167,8 +171,4 @@ final class OpenSamlSigningUtils { } - private OpenSamlSigningUtils() { - - } - } diff --git a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/authentication/logout/OpenSamlSigningUtils.java b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/authentication/logout/OpenSamlSigningUtils.java index 2c6ee4d084..bc302da1e2 100644 --- a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/authentication/logout/OpenSamlSigningUtils.java +++ b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/authentication/logout/OpenSamlSigningUtils.java @@ -127,6 +127,10 @@ final class OpenSamlSigningUtils { return credentials; } + private OpenSamlSigningUtils() { + + } + static class QueryParametersPartial { final RelyingPartyRegistration registration; @@ -167,8 +171,4 @@ final class OpenSamlSigningUtils { } - private OpenSamlSigningUtils() { - - } - } diff --git a/web/src/main/java/org/springframework/security/web/bind/support/AuthenticationPrincipalArgumentResolver.java b/web/src/main/java/org/springframework/security/web/bind/support/AuthenticationPrincipalArgumentResolver.java index 2ff185989c..2a96939bea 100644 --- a/web/src/main/java/org/springframework/security/web/bind/support/AuthenticationPrincipalArgumentResolver.java +++ b/web/src/main/java/org/springframework/security/web/bind/support/AuthenticationPrincipalArgumentResolver.java @@ -78,11 +78,11 @@ import org.springframework.web.method.support.ModelAndViewContainer; * } * * + * @author Rob Winch + * @since 3.2 * @deprecated Use * {@link org.springframework.security.web.method.annotation.AuthenticationPrincipalArgumentResolver} * instead. - * @author Rob Winch - * @since 3.2 */ @Deprecated public final class AuthenticationPrincipalArgumentResolver implements HandlerMethodArgumentResolver { diff --git a/web/src/main/java/org/springframework/security/web/jackson2/CookieMixin.java b/web/src/main/java/org/springframework/security/web/jackson2/CookieMixin.java index 4fd1fd4a82..4d0c42c421 100644 --- a/web/src/main/java/org/springframework/security/web/jackson2/CookieMixin.java +++ b/web/src/main/java/org/springframework/security/web/jackson2/CookieMixin.java @@ -29,9 +29,9 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; * * * @author Jitendra Singh + * @since 4.2 * @see WebServletJackson2Module * @see org.springframework.security.jackson2.SecurityJackson2Modules - * @since 4.2 */ @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY) @JsonDeserialize(using = CookieDeserializer.class) diff --git a/web/src/main/java/org/springframework/security/web/jackson2/DefaultCsrfTokenMixin.java b/web/src/main/java/org/springframework/security/web/jackson2/DefaultCsrfTokenMixin.java index fb5d23f33c..84952d42b9 100644 --- a/web/src/main/java/org/springframework/security/web/jackson2/DefaultCsrfTokenMixin.java +++ b/web/src/main/java/org/springframework/security/web/jackson2/DefaultCsrfTokenMixin.java @@ -31,9 +31,9 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; * * * @author Jitendra Singh + * @since 4.2 * @see WebJackson2Module * @see org.springframework.security.jackson2.SecurityJackson2Modules - * @since 4.2 */ @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@class") @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/web/src/main/java/org/springframework/security/web/jackson2/DefaultSavedRequestMixin.java b/web/src/main/java/org/springframework/security/web/jackson2/DefaultSavedRequestMixin.java index 2c19ae4645..405ad59cdc 100644 --- a/web/src/main/java/org/springframework/security/web/jackson2/DefaultSavedRequestMixin.java +++ b/web/src/main/java/org/springframework/security/web/jackson2/DefaultSavedRequestMixin.java @@ -34,9 +34,9 @@ import org.springframework.security.web.savedrequest.DefaultSavedRequest; * * * @author Jitendra Singh + * @since 4.2 * @see WebServletJackson2Module * @see org.springframework.security.jackson2.SecurityJackson2Modules - * @since 4.2 */ @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY) @JsonDeserialize(builder = DefaultSavedRequest.Builder.class) diff --git a/web/src/main/java/org/springframework/security/web/jackson2/PreAuthenticatedAuthenticationTokenMixin.java b/web/src/main/java/org/springframework/security/web/jackson2/PreAuthenticatedAuthenticationTokenMixin.java index 24f7238a72..37e98eeb6d 100644 --- a/web/src/main/java/org/springframework/security/web/jackson2/PreAuthenticatedAuthenticationTokenMixin.java +++ b/web/src/main/java/org/springframework/security/web/jackson2/PreAuthenticatedAuthenticationTokenMixin.java @@ -42,9 +42,9 @@ import org.springframework.security.jackson2.SimpleGrantedAuthorityMixin; * * * @author Jitendra Singh + * @since 4.2 * @see Webackson2Module * @see SecurityJackson2Modules - * @since 4.2 */ @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@class") @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE, diff --git a/web/src/main/java/org/springframework/security/web/jackson2/SavedCookieMixin.java b/web/src/main/java/org/springframework/security/web/jackson2/SavedCookieMixin.java index bd480dca54..3859b3ae24 100644 --- a/web/src/main/java/org/springframework/security/web/jackson2/SavedCookieMixin.java +++ b/web/src/main/java/org/springframework/security/web/jackson2/SavedCookieMixin.java @@ -33,9 +33,9 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; * * * @author Jitendra Singh. + * @since 4.2 * @see WebServletJackson2Module * @see org.springframework.security.jackson2.SecurityJackson2Modules - * @since 4.2 */ @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY) @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE) diff --git a/web/src/main/java/org/springframework/security/web/jackson2/WebAuthenticationDetailsMixin.java b/web/src/main/java/org/springframework/security/web/jackson2/WebAuthenticationDetailsMixin.java index 822a297fa8..25982fa13e 100644 --- a/web/src/main/java/org/springframework/security/web/jackson2/WebAuthenticationDetailsMixin.java +++ b/web/src/main/java/org/springframework/security/web/jackson2/WebAuthenticationDetailsMixin.java @@ -32,9 +32,9 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; * * * @author Jitendra Singh + * @since 4.2 * @see WebServletJackson2Module * @see org.springframework.security.jackson2.SecurityJackson2Modules - * @since 4.2 */ @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY) @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/web/src/main/java/org/springframework/security/web/server/jackson2/DefaultCsrfServerTokenMixin.java b/web/src/main/java/org/springframework/security/web/server/jackson2/DefaultCsrfServerTokenMixin.java index 354480c60c..7db8eb440c 100644 --- a/web/src/main/java/org/springframework/security/web/server/jackson2/DefaultCsrfServerTokenMixin.java +++ b/web/src/main/java/org/springframework/security/web/server/jackson2/DefaultCsrfServerTokenMixin.java @@ -32,8 +32,8 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; * * * @author Boris Finkelshteyn - * @see WebServerJackson2Module * @since 5.1 + * @see WebServerJackson2Module */ @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@class") @JsonIgnoreProperties(ignoreUnknown = true)