diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/AbstractOAuth2AuthorizationServerMetadata.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/AbstractOAuth2AuthorizationServerMetadata.java index 50cf3857..bef3f0d5 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/AbstractOAuth2AuthorizationServerMetadata.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/AbstractOAuth2AuthorizationServerMetadata.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.Map; import java.util.function.Consumer; -import org.springframework.security.oauth2.server.authorization.util.Version; +import org.springframework.security.oauth2.server.authorization.util.SpringAuthorizationServerVersion; import org.springframework.util.Assert; /** @@ -40,7 +40,7 @@ import org.springframework.util.Assert; * @see 4.2. OpenID Provider Configuration Response */ public abstract class AbstractOAuth2AuthorizationServerMetadata implements OAuth2AuthorizationServerMetadataClaimAccessor, Serializable { - private static final long serialVersionUID = Version.SERIAL_VERSION_UID; + private static final long serialVersionUID = SpringAuthorizationServerVersion.SERIAL_VERSION_UID; private final Map claims; protected AbstractOAuth2AuthorizationServerMetadata(Map claims) { diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2Authorization.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2Authorization.java index d8ee36da..83c1be5a 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2Authorization.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2Authorization.java @@ -30,7 +30,7 @@ import org.springframework.security.oauth2.core.OAuth2AccessToken; import org.springframework.security.oauth2.core.OAuth2RefreshToken; import org.springframework.security.oauth2.core.OAuth2Token; import org.springframework.security.oauth2.server.authorization.client.RegisteredClient; -import org.springframework.security.oauth2.server.authorization.util.Version; +import org.springframework.security.oauth2.server.authorization.util.SpringAuthorizationServerVersion; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; @@ -50,7 +50,7 @@ import org.springframework.util.StringUtils; * @see OAuth2RefreshToken */ public class OAuth2Authorization implements Serializable { - private static final long serialVersionUID = Version.SERIAL_VERSION_UID; + private static final long serialVersionUID = SpringAuthorizationServerVersion.SERIAL_VERSION_UID; /** * The name of the {@link #getAttribute(String) attribute} used for the authorized scope(s). @@ -238,7 +238,7 @@ public class OAuth2Authorization implements Serializable { * @since 0.1.0 */ public static class Token implements Serializable { - private static final long serialVersionUID = Version.SERIAL_VERSION_UID; + private static final long serialVersionUID = SpringAuthorizationServerVersion.SERIAL_VERSION_UID; protected static final String TOKEN_METADATA_NAMESPACE = "metadata.token."; /** @@ -375,7 +375,7 @@ public class OAuth2Authorization implements Serializable { * A builder for {@link OAuth2Authorization}. */ public static class Builder implements Serializable { - private static final long serialVersionUID = Version.SERIAL_VERSION_UID; + private static final long serialVersionUID = SpringAuthorizationServerVersion.SERIAL_VERSION_UID; private String id; private final String registeredClientId; private String principalName; diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationConsent.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationConsent.java index 59e05f47..84d341fd 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationConsent.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationConsent.java @@ -26,7 +26,7 @@ import org.springframework.lang.NonNull; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.oauth2.server.authorization.client.RegisteredClient; -import org.springframework.security.oauth2.server.authorization.util.Version; +import org.springframework.security.oauth2.server.authorization.util.SpringAuthorizationServerVersion; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; @@ -43,7 +43,7 @@ import org.springframework.util.CollectionUtils; * @since 0.1.2 */ public final class OAuth2AuthorizationConsent implements Serializable { - private static final long serialVersionUID = Version.SERIAL_VERSION_UID; + private static final long serialVersionUID = SpringAuthorizationServerVersion.SERIAL_VERSION_UID; private static final String AUTHORITIES_SCOPE_PREFIX = "SCOPE_"; private final String registeredClientId; @@ -152,7 +152,7 @@ public final class OAuth2AuthorizationConsent implements Serializable { * A builder for {@link OAuth2AuthorizationConsent}. */ public static final class Builder implements Serializable { - private static final long serialVersionUID = Version.SERIAL_VERSION_UID; + private static final long serialVersionUID = SpringAuthorizationServerVersion.SERIAL_VERSION_UID; private final String registeredClientId; private final String principalName; diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2TokenIntrospection.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2TokenIntrospection.java index dae48222..62b337a3 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2TokenIntrospection.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2TokenIntrospection.java @@ -29,7 +29,7 @@ import java.util.function.Consumer; import org.springframework.security.oauth2.core.OAuth2TokenIntrospectionClaimAccessor; import org.springframework.security.oauth2.core.OAuth2TokenIntrospectionClaimNames; -import org.springframework.security.oauth2.server.authorization.util.Version; +import org.springframework.security.oauth2.server.authorization.util.SpringAuthorizationServerVersion; import org.springframework.util.Assert; /** @@ -42,7 +42,7 @@ import org.springframework.util.Assert; * @see Section 2.2 Introspection Response */ public final class OAuth2TokenIntrospection implements OAuth2TokenIntrospectionClaimAccessor, Serializable { - private static final long serialVersionUID = Version.SERIAL_VERSION_UID; + private static final long serialVersionUID = SpringAuthorizationServerVersion.SERIAL_VERSION_UID; private final Map claims; private OAuth2TokenIntrospection(Map claims) { diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2TokenType.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2TokenType.java index 12d6636e..8c25c863 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2TokenType.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2TokenType.java @@ -17,7 +17,7 @@ package org.springframework.security.oauth2.server.authorization; import java.io.Serializable; -import org.springframework.security.oauth2.server.authorization.util.Version; +import org.springframework.security.oauth2.server.authorization.util.SpringAuthorizationServerVersion; import org.springframework.util.Assert; /** @@ -28,7 +28,7 @@ import org.springframework.util.Assert; * @see 4.1.2 OAuth Token Type Hints Registry */ public final class OAuth2TokenType implements Serializable { - private static final long serialVersionUID = Version.SERIAL_VERSION_UID; + private static final long serialVersionUID = SpringAuthorizationServerVersion.SERIAL_VERSION_UID; public static final OAuth2TokenType ACCESS_TOKEN = new OAuth2TokenType("access_token"); public static final OAuth2TokenType REFRESH_TOKEN = new OAuth2TokenType("refresh_token"); private final String value; diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AccessTokenAuthenticationToken.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AccessTokenAuthenticationToken.java index 5d342ae3..6767c828 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AccessTokenAuthenticationToken.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AccessTokenAuthenticationToken.java @@ -24,7 +24,7 @@ import org.springframework.security.core.Authentication; import org.springframework.security.oauth2.core.OAuth2AccessToken; import org.springframework.security.oauth2.core.OAuth2RefreshToken; import org.springframework.security.oauth2.server.authorization.client.RegisteredClient; -import org.springframework.security.oauth2.server.authorization.util.Version; +import org.springframework.security.oauth2.server.authorization.util.SpringAuthorizationServerVersion; import org.springframework.util.Assert; /** @@ -41,7 +41,7 @@ import org.springframework.util.Assert; * @see OAuth2ClientAuthenticationToken */ public class OAuth2AccessTokenAuthenticationToken extends AbstractAuthenticationToken { - private static final long serialVersionUID = Version.SERIAL_VERSION_UID; + private static final long serialVersionUID = SpringAuthorizationServerVersion.SERIAL_VERSION_UID; private final RegisteredClient registeredClient; private final Authentication clientPrincipal; private final OAuth2AccessToken accessToken; diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeRequestAuthenticationToken.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeRequestAuthenticationToken.java index c06c7519..71f3a630 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeRequestAuthenticationToken.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeRequestAuthenticationToken.java @@ -27,7 +27,7 @@ import org.springframework.lang.Nullable; import org.springframework.security.authentication.AbstractAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.oauth2.server.authorization.OAuth2AuthorizationCode; -import org.springframework.security.oauth2.server.authorization.util.Version; +import org.springframework.security.oauth2.server.authorization.util.SpringAuthorizationServerVersion; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; @@ -40,7 +40,7 @@ import org.springframework.util.CollectionUtils; * @see OAuth2AuthorizationCodeRequestAuthenticationProvider */ public final class OAuth2AuthorizationCodeRequestAuthenticationToken extends AbstractAuthenticationToken { - private static final long serialVersionUID = Version.SERIAL_VERSION_UID; + private static final long serialVersionUID = SpringAuthorizationServerVersion.SERIAL_VERSION_UID; private String authorizationUri; private String clientId; private Authentication principal; @@ -169,7 +169,7 @@ public final class OAuth2AuthorizationCodeRequestAuthenticationToken extends Abs * A builder for {@link OAuth2AuthorizationCodeRequestAuthenticationToken}. */ public static final class Builder implements Serializable { - private static final long serialVersionUID = Version.SERIAL_VERSION_UID; + private static final long serialVersionUID = SpringAuthorizationServerVersion.SERIAL_VERSION_UID; private String authorizationUri; private String clientId; private Authentication principal; diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationGrantAuthenticationToken.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationGrantAuthenticationToken.java index 6946f65d..659a85b5 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationGrantAuthenticationToken.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationGrantAuthenticationToken.java @@ -23,7 +23,7 @@ import org.springframework.lang.Nullable; import org.springframework.security.authentication.AbstractAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.oauth2.core.AuthorizationGrantType; -import org.springframework.security.oauth2.server.authorization.util.Version; +import org.springframework.security.oauth2.server.authorization.util.SpringAuthorizationServerVersion; import org.springframework.util.Assert; /** @@ -37,7 +37,7 @@ import org.springframework.util.Assert; * @see Section 1.3 Authorization Grant */ public class OAuth2AuthorizationGrantAuthenticationToken extends AbstractAuthenticationToken { - private static final long serialVersionUID = Version.SERIAL_VERSION_UID; + private static final long serialVersionUID = SpringAuthorizationServerVersion.SERIAL_VERSION_UID; private final AuthorizationGrantType authorizationGrantType; private final Authentication clientPrincipal; private final Map additionalParameters; diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientAuthenticationToken.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientAuthenticationToken.java index e8996ddf..561d7901 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientAuthenticationToken.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientAuthenticationToken.java @@ -24,7 +24,7 @@ import org.springframework.security.core.Authentication; import org.springframework.security.core.Transient; import org.springframework.security.oauth2.core.ClientAuthenticationMethod; import org.springframework.security.oauth2.server.authorization.client.RegisteredClient; -import org.springframework.security.oauth2.server.authorization.util.Version; +import org.springframework.security.oauth2.server.authorization.util.SpringAuthorizationServerVersion; import org.springframework.util.Assert; /** @@ -42,7 +42,7 @@ import org.springframework.util.Assert; */ @Transient public class OAuth2ClientAuthenticationToken extends AbstractAuthenticationToken { - private static final long serialVersionUID = Version.SERIAL_VERSION_UID; + private static final long serialVersionUID = SpringAuthorizationServerVersion.SERIAL_VERSION_UID; private final String clientId; private final RegisteredClient registeredClient; private final ClientAuthenticationMethod clientAuthenticationMethod; diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenIntrospectionAuthenticationToken.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenIntrospectionAuthenticationToken.java index 1ecfaf0f..c8692ccc 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenIntrospectionAuthenticationToken.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenIntrospectionAuthenticationToken.java @@ -23,7 +23,7 @@ import org.springframework.lang.Nullable; import org.springframework.security.authentication.AbstractAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.oauth2.server.authorization.OAuth2TokenIntrospection; -import org.springframework.security.oauth2.server.authorization.util.Version; +import org.springframework.security.oauth2.server.authorization.util.SpringAuthorizationServerVersion; import org.springframework.util.Assert; /** @@ -37,7 +37,7 @@ import org.springframework.util.Assert; * @see OAuth2TokenIntrospectionAuthenticationProvider */ public class OAuth2TokenIntrospectionAuthenticationToken extends AbstractAuthenticationToken { - private static final long serialVersionUID = Version.SERIAL_VERSION_UID; + private static final long serialVersionUID = SpringAuthorizationServerVersion.SERIAL_VERSION_UID; private final String token; private final Authentication clientPrincipal; private final String tokenTypeHint; diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenRevocationAuthenticationToken.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenRevocationAuthenticationToken.java index 14269184..cfa3e0d1 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenRevocationAuthenticationToken.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenRevocationAuthenticationToken.java @@ -21,7 +21,7 @@ import org.springframework.lang.Nullable; import org.springframework.security.authentication.AbstractAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.oauth2.core.OAuth2Token; -import org.springframework.security.oauth2.server.authorization.util.Version; +import org.springframework.security.oauth2.server.authorization.util.SpringAuthorizationServerVersion; import org.springframework.util.Assert; /** @@ -34,7 +34,7 @@ import org.springframework.util.Assert; * @see OAuth2TokenRevocationAuthenticationProvider */ public class OAuth2TokenRevocationAuthenticationToken extends AbstractAuthenticationToken { - private static final long serialVersionUID = Version.SERIAL_VERSION_UID; + private static final long serialVersionUID = SpringAuthorizationServerVersion.SERIAL_VERSION_UID; private final String token; private final Authentication clientPrincipal; private final String tokenTypeHint; diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/client/RegisteredClient.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/client/RegisteredClient.java index 9e6926d7..42df4c3c 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/client/RegisteredClient.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/client/RegisteredClient.java @@ -30,7 +30,7 @@ import org.springframework.security.oauth2.core.AuthorizationGrantType; import org.springframework.security.oauth2.core.ClientAuthenticationMethod; import org.springframework.security.oauth2.server.authorization.settings.ClientSettings; import org.springframework.security.oauth2.server.authorization.settings.TokenSettings; -import org.springframework.security.oauth2.server.authorization.util.Version; +import org.springframework.security.oauth2.server.authorization.util.SpringAuthorizationServerVersion; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; @@ -44,7 +44,7 @@ import org.springframework.util.StringUtils; * @since 0.0.1 */ public class RegisteredClient implements Serializable { - private static final long serialVersionUID = Version.SERIAL_VERSION_UID; + private static final long serialVersionUID = SpringAuthorizationServerVersion.SERIAL_VERSION_UID; private String id; private String clientId; private Instant clientIdIssuedAt; @@ -243,7 +243,7 @@ public class RegisteredClient implements Serializable { * A builder for {@link RegisteredClient}. */ public static class Builder implements Serializable { - private static final long serialVersionUID = Version.SERIAL_VERSION_UID; + private static final long serialVersionUID = SpringAuthorizationServerVersion.SERIAL_VERSION_UID; private String id; private String clientId; private Instant clientIdIssuedAt; diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/OidcClientRegistration.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/OidcClientRegistration.java index 23660ec7..21c1b721 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/OidcClientRegistration.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/OidcClientRegistration.java @@ -31,7 +31,7 @@ import org.springframework.security.oauth2.core.oidc.OidcIdToken; import org.springframework.security.oauth2.jose.jws.JwsAlgorithm; import org.springframework.security.oauth2.jose.jws.SignatureAlgorithm; import org.springframework.security.oauth2.jwt.Jwt; -import org.springframework.security.oauth2.server.authorization.util.Version; +import org.springframework.security.oauth2.server.authorization.util.SpringAuthorizationServerVersion; import org.springframework.util.Assert; /** @@ -48,7 +48,7 @@ import org.springframework.util.Assert; * @see 3.2. Client Registration Response */ public final class OidcClientRegistration implements OidcClientMetadataClaimAccessor, Serializable { - private static final long serialVersionUID = Version.SERIAL_VERSION_UID; + private static final long serialVersionUID = SpringAuthorizationServerVersion.SERIAL_VERSION_UID; private final Map claims; private OidcClientRegistration(Map claims) { diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcClientRegistrationAuthenticationToken.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcClientRegistrationAuthenticationToken.java index 7272406e..89cb02fe 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcClientRegistrationAuthenticationToken.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcClientRegistrationAuthenticationToken.java @@ -21,7 +21,7 @@ import org.springframework.lang.Nullable; import org.springframework.security.authentication.AbstractAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.oauth2.server.authorization.oidc.OidcClientRegistration; -import org.springframework.security.oauth2.server.authorization.util.Version; +import org.springframework.security.oauth2.server.authorization.util.SpringAuthorizationServerVersion; import org.springframework.util.Assert; /** @@ -35,7 +35,7 @@ import org.springframework.util.Assert; * @see OidcClientRegistrationAuthenticationProvider */ public class OidcClientRegistrationAuthenticationToken extends AbstractAuthenticationToken { - private static final long serialVersionUID = Version.SERIAL_VERSION_UID; + private static final long serialVersionUID = SpringAuthorizationServerVersion.SERIAL_VERSION_UID; private final Authentication principal; private final OidcClientRegistration clientRegistration; private final String clientId; diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcUserInfoAuthenticationToken.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcUserInfoAuthenticationToken.java index 6de606cb..debc6bcb 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcUserInfoAuthenticationToken.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcUserInfoAuthenticationToken.java @@ -20,7 +20,7 @@ import java.util.Collections; import org.springframework.security.authentication.AbstractAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.oauth2.core.oidc.OidcUserInfo; -import org.springframework.security.oauth2.server.authorization.util.Version; +import org.springframework.security.oauth2.server.authorization.util.SpringAuthorizationServerVersion; import org.springframework.util.Assert; /** @@ -33,7 +33,7 @@ import org.springframework.util.Assert; * @see OidcUserInfoAuthenticationProvider */ public class OidcUserInfoAuthenticationToken extends AbstractAuthenticationToken { - private static final long serialVersionUID = Version.SERIAL_VERSION_UID; + private static final long serialVersionUID = SpringAuthorizationServerVersion.SERIAL_VERSION_UID; private final Authentication principal; private final OidcUserInfo userInfo; diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/AbstractSettings.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/AbstractSettings.java index e58f5953..5333b1d9 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/AbstractSettings.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/AbstractSettings.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.Objects; import java.util.function.Consumer; -import org.springframework.security.oauth2.server.authorization.util.Version; +import org.springframework.security.oauth2.server.authorization.util.SpringAuthorizationServerVersion; import org.springframework.util.Assert; /** @@ -32,7 +32,7 @@ import org.springframework.util.Assert; * @since 0.0.2 */ public abstract class AbstractSettings implements Serializable { - private static final long serialVersionUID = Version.SERIAL_VERSION_UID; + private static final long serialVersionUID = SpringAuthorizationServerVersion.SERIAL_VERSION_UID; private final Map settings; protected AbstractSettings(Map settings) { diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/OAuth2TokenFormat.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/OAuth2TokenFormat.java index 0a6b532c..d01bb429 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/OAuth2TokenFormat.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/OAuth2TokenFormat.java @@ -17,7 +17,7 @@ package org.springframework.security.oauth2.server.authorization.settings; import java.io.Serializable; -import org.springframework.security.oauth2.server.authorization.util.Version; +import org.springframework.security.oauth2.server.authorization.util.SpringAuthorizationServerVersion; import org.springframework.util.Assert; /** @@ -27,7 +27,7 @@ import org.springframework.util.Assert; * @since 0.2.3 */ public final class OAuth2TokenFormat implements Serializable { - private static final long serialVersionUID = Version.SERIAL_VERSION_UID; + private static final long serialVersionUID = SpringAuthorizationServerVersion.SERIAL_VERSION_UID; /** * Self-contained tokens use a protected, time-limited data structure that contains token metadata diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/util/Version.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/util/SpringAuthorizationServerVersion.java similarity index 82% rename from oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/util/Version.java rename to oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/util/SpringAuthorizationServerVersion.java index 9008476c..2be196d4 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/util/Version.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/util/SpringAuthorizationServerVersion.java @@ -16,18 +16,18 @@ package org.springframework.security.oauth2.server.authorization.util; /** - * Internal class used for serialization across Spring Security Authorization Server classes. + * Internal class used for serialization across Spring Authorization Server classes. * * @author Anoop Garlapati * @since 0.0.1 */ -public final class Version { +public final class SpringAuthorizationServerVersion { private static final int MAJOR = 0; private static final int MINOR = 4; private static final int PATCH = 0; /** - * Global Serialization value for Spring Security Authorization Server classes. + * Global Serialization value for Spring Authorization Server classes. */ public static final long SERIAL_VERSION_UID = getVersion().hashCode();