root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge branch '3.2.x' 

Closes gh-40471
This commit is contained in:
Moritz Halbritter 2024-04-22 14:34:48 +02:00
parent 954b06d583 4b61ae415b
commit 9184448054
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnProperty.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2021 the original author or authors. * Copyright 2012-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -117,6 +117,9 @@ public @interface ConditionalOnProperty {
* <p> * <p>
* Use the dashed notation to specify each property, that is all lower case with a "-" * Use the dashed notation to specify each property, that is all lower case with a "-"
* to separate words (e.g. {@code my-long-property}). * to separate words (e.g. {@code my-long-property}).
* <p>
* If multiple names are specified, all of the properties have to pass the test for
* the condition to match.
* @return the names * @return the names
*/ */
String[] name() default {}; String[] name() default {};

2
spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/features/developing-auto-configuration.adoc
View File

@ -120,6 +120,8 @@ Use the `prefix` and `name` attributes to specify the property that should be ch
By default, any property that exists and is not equal to `false` is matched. By default, any property that exists and is not equal to `false` is matched.
You can also create more advanced checks by using the `havingValue` and `matchIfMissing` attributes. You can also create more advanced checks by using the `havingValue` and `matchIfMissing` attributes.
If multiple names are given in the `name` attribute, all of the properties have to pass the test for the condition to match.
[[features.developing-auto-configuration.condition-annotations.resource-conditions]] [[features.developing-auto-configuration.condition-annotations.resource-conditions]]