Преглед на файлове

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
Rob Winch преди 7 години
родител
ревизия
d595098823

+ 2 - 2
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);

+ 2 - 2
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);

+ 1 - 1
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 {
 }

+ 2 - 2
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<Jwt> {
 	private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
 

+ 2 - 2
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;
 	}
 
 	/**

+ 3 - 3
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 {
 	}