Skip to content

Commit d595098

Browse files
committed
Rename @TransientAuthentication to @transient
It is quite likely we will need to prevent certain Exceptions from being saved or from triggering a saved request. When we add support for this, we can now leverage @transient vs creating a new annotation. Issue: gh-5481
1 parent ed3ed5e commit d595098

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerTransientAuthenticationTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.springframework.security.config.test.SpringTestRule;
3030
import org.springframework.security.core.Authentication;
3131
import org.springframework.security.core.AuthenticationException;
32-
import org.springframework.security.core.TransientAuthentication;
32+
import org.springframework.security.core.Transient;
3333
import org.springframework.test.web.servlet.MockMvc;
3434
import org.springframework.test.web.servlet.MvcResult;
3535

@@ -104,7 +104,7 @@ public boolean supports(Class<?> authentication) {
104104
}
105105
}
106106

107-
@TransientAuthentication
107+
@Transient
108108
static class SomeTransientAuthentication extends AbstractAuthenticationToken {
109109
SomeTransientAuthentication() {
110110
super(null);

config/src/test/java/org/springframework/security/config/http/SessionManagementConfigTransientAuthenticationTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.springframework.security.config.test.SpringTestRule;
2525
import org.springframework.security.core.Authentication;
2626
import org.springframework.security.core.AuthenticationException;
27-
import org.springframework.security.core.TransientAuthentication;
27+
import org.springframework.security.core.Transient;
2828
import org.springframework.test.web.servlet.MockMvc;
2929
import org.springframework.test.web.servlet.MvcResult;
3030

@@ -75,7 +75,7 @@ public boolean supports(Class<?> authentication) {
7575
}
7676
}
7777

78-
@TransientAuthentication
78+
@Transient
7979
static class SomeTransientAuthentication extends AbstractAuthenticationToken {
8080
SomeTransientAuthentication() {
8181
super(null);

core/src/main/java/org/springframework/security/core/Transient.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@
3434
@Retention(RetentionPolicy.RUNTIME)
3535
@Inherited
3636
@Documented
37-
public @interface TransientAuthentication {
37+
public @interface Transient {
3838
}

oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/JwtAuthenticationToken.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import org.springframework.security.core.GrantedAuthority;
2222
import org.springframework.security.core.SpringSecurityCoreVersion;
23-
import org.springframework.security.core.TransientAuthentication;
23+
import org.springframework.security.core.Transient;
2424
import org.springframework.security.oauth2.jwt.Jwt;
2525

2626
/**
@@ -32,7 +32,7 @@
3232
* @see AbstractOAuth2TokenAuthenticationToken
3333
* @see Jwt
3434
*/
35-
@TransientAuthentication
35+
@Transient
3636
public class JwtAuthenticationToken extends AbstractOAuth2TokenAuthenticationToken<Jwt> {
3737
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
3838

web/src/main/java/org/springframework/security/web/context/HttpSessionSecurityContextRepository.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.springframework.security.authentication.AuthenticationTrustResolver;
3131
import org.springframework.security.authentication.AuthenticationTrustResolverImpl;
3232
import org.springframework.security.core.Authentication;
33-
import org.springframework.security.core.TransientAuthentication;
33+
import org.springframework.security.core.Transient;
3434
import org.springframework.security.core.context.SecurityContext;
3535
import org.springframework.security.core.context.SecurityContextHolder;
3636
import org.springframework.security.core.context.SecurityContextHolderStrategy;
@@ -445,7 +445,7 @@ private HttpSession createNewSessionIfAllowed(SecurityContext context) {
445445
}
446446

447447
private boolean isTransientAuthentication(Authentication authentication) {
448-
return AnnotationUtils.getAnnotation(authentication.getClass(), TransientAuthentication.class) != null;
448+
return AnnotationUtils.getAnnotation(authentication.getClass(), Transient.class) != null;
449449
}
450450

451451
/**

web/src/test/java/org/springframework/security/web/context/HttpSessionSecurityContextRepositoryTests.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import org.springframework.security.authentication.AnonymousAuthenticationToken;
3838
import org.springframework.security.authentication.AuthenticationTrustResolver;
3939
import org.springframework.security.authentication.TestingAuthenticationToken;
40-
import org.springframework.security.core.TransientAuthentication;
40+
import org.springframework.security.core.Transient;
4141
import org.springframework.security.core.authority.AuthorityUtils;
4242
import org.springframework.security.core.context.SecurityContext;
4343
import org.springframework.security.core.context.SecurityContextHolder;
@@ -674,7 +674,7 @@ public void saveContextWhenTransientAuthenticationWithCustomAnnotationThenSkippe
674674
assertThat(session).isNull();
675675
}
676676

677-
@TransientAuthentication
677+
@Transient
678678
private static class SomeTransientAuthentication extends AbstractAuthenticationToken {
679679
public SomeTransientAuthentication() {
680680
super(null);
@@ -697,7 +697,7 @@ private static class SomeTransientAuthenticationSubclass extends SomeTransientAu
697697

698698
@Target(ElementType.TYPE)
699699
@Retention(RetentionPolicy.RUNTIME)
700-
@TransientAuthentication
700+
@Transient
701701
public @interface TestTransientAuthentication {
702702
}
703703

0 commit comments

Comments
 (0)