Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.2.x' into 3.3.x

Browse Source 
Closes gh-42944
This commit is contained in:
Andy Wilkinson
2024-10-30 10:40:50 +00:00
parent 1ad5fb8638 1c61e59099
commit 53186655f9
2 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java
View File

@@ -506,7 +506,7 @@ class ConditionalOnMissingBeanTests {
static class ConditionalOnIgnoredSubclass {
@Bean
@ConditionalOnMissingBean(value = ExampleBean.class, ignored = CustomExampleBean.class)
@ConditionalOnMissingBean(ignored = CustomExampleBean.class)
ExampleBean exampleBean() {
return new ExampleBean("test");
}
@@ -517,7 +517,7 @@ class ConditionalOnMissingBeanTests {
static class ConditionalOnIgnoredSubclassByName {
@Bean
@ConditionalOnMissingBean(value = ExampleBean.class,
@ConditionalOnMissingBean(
ignoredType = "org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBeanTests$CustomExampleBean")
ExampleBean exampleBean() {
return new ExampleBean("test");
@@ -701,8 +701,7 @@ class ConditionalOnMissingBeanTests {
static class ParameterizedConditionWithValueConfig {
@Bean
@ConditionalOnMissingBean(value = CustomExampleBean.class,
parameterizedContainer = TestParameterizedContainer.class)
@ConditionalOnMissingBean(parameterizedContainer = TestParameterizedContainer.class)
CustomExampleBean conditionalCustomExampleBean() {
return new CustomExampleBean();
}