Remove Unnecessary ObjectProvider<RoleHierarchy> roleHierarchy parameter
Closes gh-18921
This commit is contained in:
+1
-3
@@ -18,11 +18,9 @@ package org.springframework.security.config.annotation.authorization;
|
|||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.springframework.beans.factory.ObjectProvider;
|
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.ImportAware;
|
import org.springframework.context.annotation.ImportAware;
|
||||||
import org.springframework.core.type.AnnotationMetadata;
|
import org.springframework.core.type.AnnotationMetadata;
|
||||||
import org.springframework.security.access.hierarchicalroles.RoleHierarchy;
|
|
||||||
import org.springframework.security.authorization.AuthorizationManagerFactories;
|
import org.springframework.security.authorization.AuthorizationManagerFactories;
|
||||||
import org.springframework.security.authorization.DefaultAuthorizationManagerFactory;
|
import org.springframework.security.authorization.DefaultAuthorizationManagerFactory;
|
||||||
|
|
||||||
@@ -39,7 +37,7 @@ class AuthorizationManagerFactoryConfiguration implements ImportAware {
|
|||||||
private String[] authorities;
|
private String[] authorities;
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
DefaultAuthorizationManagerFactory authorizationManagerFactory(ObjectProvider<RoleHierarchy> roleHierarchy) {
|
DefaultAuthorizationManagerFactory authorizationManagerFactory() {
|
||||||
AuthorizationManagerFactories.AdditionalRequiredFactorsBuilder<Object> builder = AuthorizationManagerFactories
|
AuthorizationManagerFactories.AdditionalRequiredFactorsBuilder<Object> builder = AuthorizationManagerFactories
|
||||||
.multiFactor()
|
.multiFactor()
|
||||||
.requireFactors(this.authorities);
|
.requireFactors(this.authorities);
|
||||||
|
|||||||
Reference in New Issue
Block a user