Merge branch '2.3.x'

Closes gh-22575
2020-07-27 09:59:22 +01:00 · 2020-07-27 09:59:22 +01:00 · 6b4114e4cf
parent 85ed16de13 979aef1f68
commit 6b4114e4cf
1 changed files with 4 additions and 0 deletions
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
@ -1141,6 +1141,10 @@ You cannot use constructor binding with beans that are created by the regular Sp

 TIP: If you have more than one constructor for your class you can also use `@ConstructorBinding` directly on the constructor that should be bound.

+NOTE: The use of `java.util.Optional` with `@ConfigurationProperties` is not recommended as it is primarily intended for use as a return type.
+As such, it is not well-suited to configuration property injection.
+For consistency with properties of other types, if you do declare an `Optional` property and it has no value, `null` rather than an empty `Optional` will be bound.
+


 [[boot-features-external-config-enabling]]