Remove deprecated loadContext(request)

Closes gh-12048

Author: Steve Riesenberg

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

@@ -46,7 +46,7 @@ public DelegatingSecurityContextRepository(List<SecurityContextRepository> deleg
 
 	@Override
 	public SecurityContext loadContext(HttpRequestResponseHolder requestResponseHolder) {
-		return loadContext(requestResponseHolder.getRequest()).get();
+		return loadDeferredContext(requestResponseHolder.getRequest()).get();
 	}
 
 	@Override

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

@@ -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.

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

@@ -146,7 +146,7 @@ public void loadContextWhenNullResponse() {
 	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 void loadContextHttpServletRequestWhenSavedThenSavedContextReturned() {
 		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 void loadContextHttpServletRequestWhenNotAccessedThenHttpSessionNotAccess
 		HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.setSession(session);
-		repo.loadContext(request);
+		repo.loadDeferredContext(request);
 		verifyNoInteractions(session);
 	}
 

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

@@ -86,7 +86,7 @@ void containsContextWhenSavedThenTrue() {
 
 	@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 @@ void loadContextWhenCustomSecurityContextHolderStrategySetThenUsed() {
 		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);