Skip to content

Commit 4d564ff

Browse files
committed
Update AuthorizationManager references
Issue gh-9692
1 parent df6ebc7 commit 4d564ff

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

config/src/main/java/org/springframework/security/config/annotation/web/configurers/AuthorizeHttpRequestsConfigurer.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
import org.springframework.security.config.annotation.web.AbstractRequestMatcherRegistry;
3131
import org.springframework.security.config.annotation.web.HttpSecurityBuilder;
3232
import org.springframework.security.web.access.intercept.AuthorizationFilter;
33-
import org.springframework.security.web.access.intercept.DelegatingAuthorizationManager;
3433
import org.springframework.security.web.access.intercept.RequestAuthorizationContext;
34+
import org.springframework.security.web.access.intercept.RequestMatcherDelegatingAuthorizationManager;
3535
import org.springframework.security.web.servlet.util.matcher.MvcRequestMatcher;
3636
import org.springframework.security.web.util.matcher.RequestMatcher;
3737
import org.springframework.util.Assert;
@@ -89,7 +89,8 @@ private AuthorizationManagerRequestMatcherRegistry addMapping(List<? extends Req
8989
public final class AuthorizationManagerRequestMatcherRegistry
9090
extends AbstractRequestMatcherRegistry<AuthorizedUrl> {
9191

92-
private final DelegatingAuthorizationManager.Builder managerBuilder = DelegatingAuthorizationManager.builder();
92+
private final RequestMatcherDelegatingAuthorizationManager.Builder managerBuilder = RequestMatcherDelegatingAuthorizationManager
93+
.builder();
9394

9495
private List<RequestMatcher> unmappedMatchers;
9596

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
import org.springframework.security.core.authority.SimpleGrantedAuthority;
3232
import org.springframework.security.web.SecurityFilterChain;
3333
import org.springframework.security.web.access.intercept.AuthorizationFilter;
34-
import org.springframework.security.web.access.intercept.DelegatingAuthorizationManager;
3534
import org.springframework.security.web.access.intercept.RequestAuthorizationContext;
35+
import org.springframework.security.web.access.intercept.RequestMatcherDelegatingAuthorizationManager;
3636
import org.springframework.test.web.servlet.MockMvc;
3737
import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
3838
import org.springframework.web.bind.annotation.GetMapping;
@@ -105,7 +105,8 @@ public void configureMvcMatcherAccessAuthorizationManagerWhenNullThenException()
105105
@Test
106106
public void configureWhenObjectPostProcessorRegisteredThenInvokedOnAuthorizationManagerAndAuthorizationFilter() {
107107
this.spring.register(ObjectPostProcessorConfig.class).autowire();
108-
verify(ObjectPostProcessorConfig.objectPostProcessor).postProcess(any(DelegatingAuthorizationManager.class));
108+
verify(ObjectPostProcessorConfig.objectPostProcessor)
109+
.postProcess(any(RequestMatcherDelegatingAuthorizationManager.class));
109110
verify(ObjectPostProcessorConfig.objectPostProcessor).postProcess(any(AuthorizationFilter.class));
110111
}
111112

0 commit comments

Comments
 (0)