Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated loadContext(request) 

Closes gh-12048
This commit is contained in:
Steve Riesenberg 2022-10-17 20:13:51 -05:00
parent 33b492df54
commit 8554e70c09
No known key found for this signature in database
GPG Key ID: 5F311AB48A55D521
4 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/main/java/org/springframework/security/web/context/DelegatingSecurityContextRepository.java
View File

@ -46,7 +46,7 @@ public final class DelegatingSecurityContextRepository implements SecurityContex
@Override
public SecurityContext loadContext(HttpRequestResponseHolder requestResponseHolder) {
return loadContext(requestResponseHolder.getRequest()).get();
return loadDeferredContext(requestResponseHolder.getRequest()).get();
}
@Override

17
web/src/main/java/org/springframework/security/web/context/SecurityContextRepository.java
View File

@ -68,23 +68,6 @@ public interface SecurityContextRepository {
@Deprecated
SecurityContext loadContext(HttpRequestResponseHolder requestResponseHolder);
/**
* Obtains the security context for the supplied request. For an unauthenticated user,
* an empty context implementation should be returned. This method should not return
* null.
* @param request the {@link HttpServletRequest} to load the {@link SecurityContext}
* from
* @return a {@link Supplier} that returns the {@link SecurityContext} which cannot be
* null.
* @since 5.7
* @deprecated Use
* {@link SecurityContextRepository#loadDeferredContext(HttpServletRequest)} instead
*/
@Deprecated
default Supplier<SecurityContext> loadContext(HttpServletRequest request) {
return loadDeferredContext(request);
}
/**
* Defers loading the {@link SecurityContext} using the {@link HttpServletRequest}
* until it is needed by the application.

6
web/src/test/java/org/springframework/security/web/context/HttpSessionSecurityContextRepositoryTests.java
View File

@ -146,7 +146,7 @@ public class HttpSessionSecurityContextRepositoryTests {
public void loadContextHttpServletRequestWhenNotSavedThenEmptyContextReturned() {
HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
MockHttpServletRequest request = new MockHttpServletRequest();
assertThat(repo.loadContext(request).get()).isEqualTo(SecurityContextHolder.createEmptyContext());
assertThat(repo.loadDeferredContext(request).get()).isEqualTo(SecurityContextHolder.createEmptyContext());
}
@Test
@ -156,7 +156,7 @@ public class HttpSessionSecurityContextRepositoryTests {
MockHttpServletResponse response = new MockHttpServletResponse();
HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
repo.saveContext(expectedContext, request, response);
assertThat(repo.loadContext(request).get()).isEqualTo(expectedContext);
assertThat(repo.loadDeferredContext(request).get()).isEqualTo(expectedContext);
}
@Test
@ -165,7 +165,7 @@ public class HttpSessionSecurityContextRepositoryTests {
HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
MockHttpServletRequest request = new MockHttpServletRequest();
request.setSession(session);
repo.loadContext(request);
repo.loadDeferredContext(request);
verifyNoInteractions(session);
}

4
web/src/test/java/org/springframework/security/web/context/RequestAttributeSecurityContextRepositoryTests.java
View File

@ -86,7 +86,7 @@ class RequestAttributeSecurityContextRepositoryTests {
@Test
void loadDeferredContextWhenNotPresentThenEmptyContext() {
Supplier<SecurityContext> deferredContext = this.repository.loadContext(this.request);
Supplier<SecurityContext> deferredContext = this.repository.loadDeferredContext(this.request);
assertThat(deferredContext.get()).isEqualTo(SecurityContextHolder.createEmptyContext());
}
@ -103,7 +103,7 @@ class RequestAttributeSecurityContextRepositoryTests {
given(securityContextHolderStrategy.createEmptyContext()).willReturn(new SecurityContextImpl());
this.repository.setSecurityContextHolderStrategy(securityContextHolderStrategy);
Supplier<SecurityContext> deferredContext = this.repository.loadContext(this.request);
Supplier<SecurityContext> deferredContext = this.repository.loadDeferredContext(this.request);
assertThat(deferredContext.get()).isNotNull();
verify(securityContextHolderStrategy).createEmptyContext();
verifyNoMoreInteractions(securityContextHolderStrategy);