diff --git a/oauth2/jwt-jose/src/main/java/org/springframework/security/jwt/Jwt.java b/oauth2/jwt-jose/src/main/java/org/springframework/security/jwt/Jwt.java index b72eb9b7fe..b1c24dc6e6 100644 --- a/oauth2/jwt-jose/src/main/java/org/springframework/security/jwt/Jwt.java +++ b/oauth2/jwt-jose/src/main/java/org/springframework/security/jwt/Jwt.java @@ -15,7 +15,7 @@ */ package org.springframework.security.jwt; -import org.springframework.security.oauth2.core.AbstractToken; +import org.springframework.security.oauth2.core.SecurityToken; import org.springframework.util.Assert; import java.time.Instant; @@ -24,7 +24,7 @@ import java.util.LinkedHashMap; import java.util.Map; /** - * An implementation of an {@link AbstractToken} representing a JSON Web Token (JWT). + * An implementation of a {@link SecurityToken} representing a JSON Web Token (JWT). * *

* JWTs represent a set of "Claims" as a JSON object that is encoded in a @@ -34,13 +34,13 @@ import java.util.Map; * * @author Joe Grandja * @since 5.0 - * @see AbstractToken + * @see SecurityToken * @see JwtClaimAccessor * @see JSON Web Token (JWT) * @see JSON Web Signature (JWS) * @see JSON Web Encryption (JWE) */ -public class Jwt extends AbstractToken implements JwtClaimAccessor { +public class Jwt extends SecurityToken implements JwtClaimAccessor { private final Map headers; private final Map claims; diff --git a/oauth2/jwt-jose/src/main/java/org/springframework/security/jwt/nimbus/NimbusJwtDecoderJwkSupport.java b/oauth2/jwt-jose/src/main/java/org/springframework/security/jwt/nimbus/NimbusJwtDecoderJwkSupport.java index 11265bc78d..086abf12c8 100644 --- a/oauth2/jwt-jose/src/main/java/org/springframework/security/jwt/nimbus/NimbusJwtDecoderJwkSupport.java +++ b/oauth2/jwt-jose/src/main/java/org/springframework/security/jwt/nimbus/NimbusJwtDecoderJwkSupport.java @@ -96,7 +96,7 @@ public class NimbusJwtDecoderJwkSupport implements JwtDecoder { if (jwtClaimsSet.getIssueTime() != null) { issuedAt = jwtClaimsSet.getIssueTime().toInstant(); } else { - // issuedAt is required in AbstractToken so let's default to expiresAt - 1 second + // issuedAt is required in SecurityToken so let's default to expiresAt - 1 second issuedAt = Instant.from(expiresAt).minusSeconds(1); } diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/AccessToken.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/AccessToken.java index 98a054fe48..06685ff321 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/AccessToken.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/AccessToken.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Set; /** - * An implementation of an {@link AbstractToken} representing an OAuth 2.0 Access Token. + * An implementation of a {@link SecurityToken} representing an OAuth 2.0 Access Token. * *

* An access token is a credential that represents an authorization @@ -35,7 +35,7 @@ import java.util.Set; * @since 5.0 * @see Section 1.4 Access Token */ -public class AccessToken extends AbstractToken { +public class AccessToken extends SecurityToken { private final TokenType tokenType; private final Set scopes; private final Map additionalParameters; diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/AbstractToken.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/SecurityToken.java similarity index 93% rename from oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/AbstractToken.java rename to oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/SecurityToken.java index 8adf73fc3a..b319805b3b 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/AbstractToken.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/SecurityToken.java @@ -30,13 +30,13 @@ import java.time.Instant; * @author Joe Grandja * @since 5.0 */ -public abstract class AbstractToken implements Serializable { +public abstract class SecurityToken implements Serializable { private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private final String tokenValue; private final Instant issuedAt; private final Instant expiresAt; - protected AbstractToken(String tokenValue, Instant issuedAt, Instant expiresAt) { + protected SecurityToken(String tokenValue, Instant issuedAt, Instant expiresAt) { Assert.hasLength(tokenValue, "tokenValue cannot be empty"); Assert.notNull(issuedAt, "issuedAt cannot be null"); Assert.notNull(expiresAt, "expiresAt cannot be null"); @@ -66,7 +66,7 @@ public abstract class AbstractToken implements Serializable { return false; } - AbstractToken that = (AbstractToken) obj; + SecurityToken that = (SecurityToken) obj; if (!this.getTokenValue().equals(that.getTokenValue())) { return false; diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/IdToken.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/IdToken.java index 75e6c9a9e2..b2931f0b14 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/IdToken.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/oidc/core/IdToken.java @@ -15,7 +15,7 @@ */ package org.springframework.security.oauth2.oidc.core; -import org.springframework.security.oauth2.core.AbstractToken; +import org.springframework.security.oauth2.core.SecurityToken; import org.springframework.util.Assert; import java.time.Instant; @@ -24,7 +24,7 @@ import java.util.LinkedHashMap; import java.util.Map; /** - * An implementation of an {@link AbstractToken} representing an OpenID Connect Core 1.0 ID Token. + * An implementation of a {@link SecurityToken} representing an OpenID Connect Core 1.0 ID Token. * *

* The IdToken is a security token that contains "Claims" @@ -32,13 +32,13 @@ import java.util.Map; * * @author Joe Grandja * @since 5.0 - * @see AbstractToken + * @see SecurityToken * @see IdTokenClaimAccessor * @see StandardClaimAccessor * @see ID Token * @see Standard Claims */ -public class IdToken extends AbstractToken implements IdTokenClaimAccessor { +public class IdToken extends SecurityToken implements IdTokenClaimAccessor { private final Map claims; public IdToken(String tokenValue, Instant issuedAt, Instant expiresAt, Map claims) {