From 93db8a6e522a33e655ab4c5378201d39568e5da9 Mon Sep 17 00:00:00 2001 From: Viktoriya Kutsarova Date: Thu, 7 Mar 2019 17:17:22 +0100 Subject: [PATCH 1/2] Update ambiguous documentation about ConfigurationProperties Fixes gh-15753 --- .../src/main/asciidoc/spring-boot-features.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index d0c3b0abf931..6f90d6ad6278 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -1009,9 +1009,9 @@ name of the bean is used. The bean name in the example above is `acme-com.example.AcmeProperties`. ==== -Even if the preceding configuration creates a regular bean for `AcmeProperties`, we +The preceding configuration creates a regular bean for `AcmeProperties`. We recommend that `@ConfigurationProperties` only deal with the environment and, in -particular, does not inject other beans from the context. Having said that, the +particular, does not inject other beans from the context. Keep in mind that the `@EnableConfigurationProperties` annotation is _also_ automatically applied to your project so that any _existing_ bean annotated with `@ConfigurationProperties` is configured from the `Environment`. You could shortcut `MyConfiguration` by making sure From c0ba88cc51b60def1c0c379f12ce65550daa5562 Mon Sep 17 00:00:00 2001 From: Viktoriya Kutsarova Date: Fri, 8 Mar 2019 11:49:27 +0100 Subject: [PATCH 2/2] Update documentation for creating a bean for environment properties Fixes gh-15753 --- .../src/main/asciidoc/spring-boot-features.adoc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index 6f90d6ad6278..20e7768304b7 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -1014,8 +1014,9 @@ recommend that `@ConfigurationProperties` only deal with the environment and, in particular, does not inject other beans from the context. Keep in mind that the `@EnableConfigurationProperties` annotation is _also_ automatically applied to your project so that any _existing_ bean annotated with `@ConfigurationProperties` is -configured from the `Environment`. You could shortcut `MyConfiguration` by making sure -`AcmeProperties` is already a bean, as shown in the following example: +configured from the `Environment`. Instead of annotating `MyConfiguration` with +`@EnableConfigurationProperties(AcmeProperties.class)`, you could make `AcmeProperties` +a bean, as shown in the following example: [source,java,indent=0] ----