change getIfAvailable

Author: ngocnhan-tran1996

config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfiguration.java

@@ -27,7 +27,6 @@
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.SmartInitializingSingleton;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanDefinition;

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

@@ -168,7 +168,7 @@ private SecurityExpressionHandler<FilterInvocation> getExpressionHandler(H http)
 		if (context != null) {
 			context.getBeanProvider(RoleHierarchy.class).ifUnique(defaultHandler::setRoleHierarchy);
 			context.getBeanProvider(GrantedAuthorityDefaults.class)
-				.ifUnique(grantedAuthorityDefaults -> defaultHandler
+				.ifUnique((grantedAuthorityDefaults) -> defaultHandler
 					.setDefaultRolePrefix(grantedAuthorityDefaults.getRolePrefix()));
 			context.getBeanProvider(PermissionEvaluator.class).ifUnique(defaultHandler::setPermissionEvaluator);
 		}

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

@@ -94,7 +94,7 @@ public void configure(H http) {
 		ApplicationContext context = http.getSharedObject(ApplicationContext.class);
 		if (context != null) {
 			context.getBeanProvider(GrantedAuthorityDefaults.class)
-				.ifUnique(grantedAuthorityDefaults -> this.securityContextRequestFilter
+				.ifUnique((grantedAuthorityDefaults) -> this.securityContextRequestFilter
 					.setRolePrefix(grantedAuthorityDefaults.getRolePrefix()));
 			this.securityContextRequestFilter.setSecurityContextHolderStrategy(getSecurityContextHolderStrategy());
 		}

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

@@ -337,7 +337,7 @@ private <C> C getBeanOrNull(Class<C> clazz) {
 		if (this.context == null) {
 			return null;
 		}
-		return this.context.getBeanProvider(clazz).getIfUnique();
+		return this.context.getBeanProvider(clazz).getIfAvailable();
 	}
 
 	/**

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

@@ -174,7 +174,7 @@ private <C> C getBeanOrNull(Class<C> clazz) {
 		if (this.context == null) {
 			return null;
 		}
-		return this.context.getBeanProvider(clazz).getIfUnique();
+		return this.context.getBeanProvider(clazz).getIfAvailable();
 	}
 
 }

config/src/main/java/org/springframework/security/config/http/GrantedAuthorityDefaultsParserUtils.java

@@ -51,7 +51,7 @@ abstract static class AbstractGrantedAuthorityDefaultsBeanFactory implements App
 		@Override
 		public final void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 			applicationContext.getBeanProvider(GrantedAuthorityDefaults.class)
-				.ifUnique(grantedAuthorityDefaults -> this.rolePrefix = grantedAuthorityDefaults.getRolePrefix());
+				.ifUnique((grantedAuthorityDefaults) -> this.rolePrefix = grantedAuthorityDefaults.getRolePrefix());
 		}
 
 		abstract Object getBean();

config/src/main/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParser.java

@@ -485,7 +485,7 @@ abstract static class AbstractGrantedAuthorityDefaultsBeanFactory implements App
 		@Override
 		public final void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 			applicationContext.getBeanProvider(GrantedAuthorityDefaults.class)
-				.ifUnique(grantedAuthorityDefaults -> this.rolePrefix = grantedAuthorityDefaults.getRolePrefix());
+				.ifUnique((grantedAuthorityDefaults) -> this.rolePrefix = grantedAuthorityDefaults.getRolePrefix());
 		}
 
 	}

config/src/main/java/org/springframework/security/config/method/MethodSecurityBeanDefinitionParser.java

@@ -309,7 +309,7 @@ public Class<?> getObjectType() {
 		@Override
 		public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 			applicationContext.getBeanProvider(GrantedAuthorityDefaults.class)
-				.ifUnique(grantedAuthorityDefaults -> this.expressionHandler
+				.ifUnique((grantedAuthorityDefaults) -> this.expressionHandler
 					.setDefaultRolePrefix(grantedAuthorityDefaults.getRolePrefix()));
 		}
 
@@ -345,7 +345,7 @@ public Class<?> getObjectType() {
 		@Override
 		public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 			applicationContext.getBeanProvider(GrantedAuthorityDefaults.class)
-				.ifUnique(grantedAuthorityDefaults -> this.manager
+				.ifUnique((grantedAuthorityDefaults) -> this.manager
 					.setRolePrefix(grantedAuthorityDefaults.getRolePrefix()));
 		}
 

config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java

@@ -285,7 +285,6 @@
  * @author Parikshit Dutta
  * @author Ankur Pathak
  * @author Alexey Nesterov
- * @author Ngoc Nhan
  * @since 5.0
  */
 public class ServerHttpSecurity {
@@ -1735,22 +1734,26 @@ private <T> T getBean(Class<T> beanClass) {
 	}
 
 	private <T> T getBeanOrDefault(Class<T> beanClass, T defaultInstance) {
-		if (this.context == null) {
+		T bean = getBeanOrNull(beanClass);
+		if (bean == null) {
 			return defaultInstance;
 		}
-		return this.context.getBeanProvider(beanClass).getIfUnique(() -> defaultInstance);
+		return bean;
 	}
 
 	private <T> T getBeanOrNull(Class<T> beanClass) {
 		return getBeanOrNull(ResolvableType.forClass(beanClass));
 	}
 
-	@SuppressWarnings("unchecked")
 	private <T> T getBeanOrNull(ResolvableType type) {
 		if (this.context == null) {
 			return null;
 		}
-		return (T) this.context.getBeanProvider(type).getIfUnique();
+		String[] names = this.context.getBeanNamesForType(type);
+		if (names.length == 1) {
+			return (T) this.context.getBean(names[0]);
+		}
+		return null;
 	}
 
 	private <T> T getBeanOrNull(String beanName, Class<T> requiredClass) {