Skip to content

Commit d3c42a7

Browse files
committed
Polish OAuth2ConfigurerUtils
1 parent e61c03f commit d3c42a7

1 file changed

Lines changed: 1 addition & 16 deletions

File tree

  • config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization

config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2ConfigurerUtils.java

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
import com.nimbusds.jose.jwk.source.JWKSource;
2020
import com.nimbusds.jose.proc.SecurityContext;
2121

22-
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
23-
import org.springframework.beans.factory.NoUniqueBeanDefinitionException;
2422
import org.springframework.context.ApplicationContext;
2523
import org.springframework.core.ResolvableType;
2624
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
@@ -203,20 +201,7 @@ static AuthorizationServerSettings getAuthorizationServerSettings(HttpSecurity h
203201
}
204202

205203
static <T> T getBean(HttpSecurity httpSecurity, Class<T> type) {
206-
return httpSecurity.getSharedObject(ApplicationContext.class).getBean(type);
207-
}
208-
209-
@SuppressWarnings("unchecked")
210-
static <T> T getBean(HttpSecurity httpSecurity, ResolvableType type) {
211-
ApplicationContext context = httpSecurity.getSharedObject(ApplicationContext.class);
212-
String[] names = context.getBeanNamesForType(type);
213-
if (names.length == 1) {
214-
return (T) context.getBean(names[0]);
215-
}
216-
if (names.length > 1) {
217-
throw new NoUniqueBeanDefinitionException(type, names);
218-
}
219-
throw new NoSuchBeanDefinitionException(type);
204+
return httpSecurity.getSharedObject(ApplicationContext.class).getBeanProvider(type).getObject();
220205
}
221206

222207
static <T> T getOptionalBean(HttpSecurity httpSecurity, Class<T> type) {

0 commit comments

Comments
 (0)