diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerTransientAuthenticationTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerTransientAuthenticationTests.java index 673b59ee83..2430ded2d3 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerTransientAuthenticationTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerTransientAuthenticationTests.java @@ -29,7 +29,7 @@ import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.config.test.SpringTestRule; import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; -import org.springframework.security.core.TransientAuthentication; +import org.springframework.security.core.Transient; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MvcResult; @@ -104,7 +104,7 @@ public class SessionManagementConfigurerTransientAuthenticationTests { } } - @TransientAuthentication + @Transient static class SomeTransientAuthentication extends AbstractAuthenticationToken { SomeTransientAuthentication() { super(null); diff --git a/config/src/test/java/org/springframework/security/config/http/SessionManagementConfigTransientAuthenticationTests.java b/config/src/test/java/org/springframework/security/config/http/SessionManagementConfigTransientAuthenticationTests.java index 2bf529bb2d..17d19f274c 100644 --- a/config/src/test/java/org/springframework/security/config/http/SessionManagementConfigTransientAuthenticationTests.java +++ b/config/src/test/java/org/springframework/security/config/http/SessionManagementConfigTransientAuthenticationTests.java @@ -24,7 +24,7 @@ import org.springframework.security.authentication.AuthenticationProvider; import org.springframework.security.config.test.SpringTestRule; import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; -import org.springframework.security.core.TransientAuthentication; +import org.springframework.security.core.Transient; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MvcResult; @@ -75,7 +75,7 @@ public class SessionManagementConfigTransientAuthenticationTests { } } - @TransientAuthentication + @Transient static class SomeTransientAuthentication extends AbstractAuthenticationToken { SomeTransientAuthentication() { super(null); diff --git a/core/src/main/java/org/springframework/security/core/Transient.java b/core/src/main/java/org/springframework/security/core/Transient.java index 997ab1dcd4..785bacc5d6 100644 --- a/core/src/main/java/org/springframework/security/core/Transient.java +++ b/core/src/main/java/org/springframework/security/core/Transient.java @@ -34,5 +34,5 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) @Inherited @Documented -public @interface TransientAuthentication { +public @interface Transient { } diff --git a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/JwtAuthenticationToken.java b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/JwtAuthenticationToken.java index 8358125b42..85ee5ed2a8 100644 --- a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/JwtAuthenticationToken.java +++ b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/JwtAuthenticationToken.java @@ -20,7 +20,7 @@ import java.util.Map; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.SpringSecurityCoreVersion; -import org.springframework.security.core.TransientAuthentication; +import org.springframework.security.core.Transient; import org.springframework.security.oauth2.jwt.Jwt; /** @@ -32,7 +32,7 @@ import org.springframework.security.oauth2.jwt.Jwt; * @see AbstractOAuth2TokenAuthenticationToken * @see Jwt */ -@TransientAuthentication +@Transient public class JwtAuthenticationToken extends AbstractOAuth2TokenAuthenticationToken { private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; diff --git a/web/src/main/java/org/springframework/security/web/context/HttpSessionSecurityContextRepository.java b/web/src/main/java/org/springframework/security/web/context/HttpSessionSecurityContextRepository.java index c6deefe877..01f84c3063 100644 --- a/web/src/main/java/org/springframework/security/web/context/HttpSessionSecurityContextRepository.java +++ b/web/src/main/java/org/springframework/security/web/context/HttpSessionSecurityContextRepository.java @@ -30,7 +30,7 @@ import org.springframework.core.annotation.AnnotationUtils; import org.springframework.security.authentication.AuthenticationTrustResolver; import org.springframework.security.authentication.AuthenticationTrustResolverImpl; import org.springframework.security.core.Authentication; -import org.springframework.security.core.TransientAuthentication; +import org.springframework.security.core.Transient; import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextHolderStrategy; @@ -445,7 +445,7 @@ public class HttpSessionSecurityContextRepository implements SecurityContextRepo } private boolean isTransientAuthentication(Authentication authentication) { - return AnnotationUtils.getAnnotation(authentication.getClass(), TransientAuthentication.class) != null; + return AnnotationUtils.getAnnotation(authentication.getClass(), Transient.class) != null; } /** diff --git a/web/src/test/java/org/springframework/security/web/context/HttpSessionSecurityContextRepositoryTests.java b/web/src/test/java/org/springframework/security/web/context/HttpSessionSecurityContextRepositoryTests.java index 4a9b0845cf..56f4a78d31 100644 --- a/web/src/test/java/org/springframework/security/web/context/HttpSessionSecurityContextRepositoryTests.java +++ b/web/src/test/java/org/springframework/security/web/context/HttpSessionSecurityContextRepositoryTests.java @@ -37,7 +37,7 @@ import org.springframework.security.authentication.AbstractAuthenticationToken; import org.springframework.security.authentication.AnonymousAuthenticationToken; import org.springframework.security.authentication.AuthenticationTrustResolver; import org.springframework.security.authentication.TestingAuthenticationToken; -import org.springframework.security.core.TransientAuthentication; +import org.springframework.security.core.Transient; import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContextHolder; @@ -674,7 +674,7 @@ public class HttpSessionSecurityContextRepositoryTests { assertThat(session).isNull(); } - @TransientAuthentication + @Transient private static class SomeTransientAuthentication extends AbstractAuthenticationToken { public SomeTransientAuthentication() { super(null); @@ -697,7 +697,7 @@ public class HttpSessionSecurityContextRepositoryTests { @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) - @TransientAuthentication + @Transient public @interface TestTransientAuthentication { }