From 6f8ce3deb503c953f0dd8366189bf51ba2c94716 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 7 Mar 2022 20:55:41 +0100 Subject: [PATCH] Avoid use of instance supplier for core infrastructure bean Closes gh-30021 --- .../EnableConfigurationPropertiesRegistrar.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesRegistrar.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesRegistrar.java index 49aa20d1aa..cd9c18058e 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesRegistrar.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesRegistrar.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -63,9 +63,9 @@ class EnableConfigurationPropertiesRegistrar implements ImportBeanDefinitionRegi static void registerMethodValidationExcludeFilter(BeanDefinitionRegistry registry) { if (!registry.containsBeanDefinition(METHOD_VALIDATION_EXCLUDE_FILTER_BEAN_NAME)) { BeanDefinition definition = BeanDefinitionBuilder - .genericBeanDefinition(MethodValidationExcludeFilter.class, - () -> MethodValidationExcludeFilter.byAnnotation(ConfigurationProperties.class)) - .setRole(BeanDefinition.ROLE_INFRASTRUCTURE).getBeanDefinition(); + .rootBeanDefinition(MethodValidationExcludeFilter.class, "byAnnotation") + .addConstructorArgValue(ConfigurationProperties.class).setRole(BeanDefinition.ROLE_INFRASTRUCTURE) + .getBeanDefinition(); registry.registerBeanDefinition(METHOD_VALIDATION_EXCLUDE_FILTER_BEAN_NAME, definition); } }