From d3c42a7a4f15f35ac81d05b4e7641151df24aea7 Mon Sep 17 00:00:00 2001 From: Joe Grandja <10884212+jgrandja@users.noreply.github.com> Date: Wed, 4 Feb 2026 16:01:53 -0500 Subject: [PATCH] Polish OAuth2ConfigurerUtils --- .../authorization/OAuth2ConfigurerUtils.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2ConfigurerUtils.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2ConfigurerUtils.java index f2082c686c..69152224c6 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2ConfigurerUtils.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2ConfigurerUtils.java @@ -19,8 +19,6 @@ package org.springframework.security.config.annotation.web.configurers.oauth2.se import com.nimbusds.jose.jwk.source.JWKSource; import com.nimbusds.jose.proc.SecurityContext; -import org.springframework.beans.factory.NoSuchBeanDefinitionException; -import org.springframework.beans.factory.NoUniqueBeanDefinitionException; import org.springframework.context.ApplicationContext; import org.springframework.core.ResolvableType; import org.springframework.security.config.annotation.web.builders.HttpSecurity; @@ -203,20 +201,7 @@ final class OAuth2ConfigurerUtils { } static T getBean(HttpSecurity httpSecurity, Class type) { - return httpSecurity.getSharedObject(ApplicationContext.class).getBean(type); - } - - @SuppressWarnings("unchecked") - static T getBean(HttpSecurity httpSecurity, ResolvableType type) { - ApplicationContext context = httpSecurity.getSharedObject(ApplicationContext.class); - String[] names = context.getBeanNamesForType(type); - if (names.length == 1) { - return (T) context.getBean(names[0]); - } - if (names.length > 1) { - throw new NoUniqueBeanDefinitionException(type, names); - } - throw new NoSuchBeanDefinitionException(type); + return httpSecurity.getSharedObject(ApplicationContext.class).getBeanProvider(type).getObject(); } static T getOptionalBean(HttpSecurity httpSecurity, Class type) {