From 6b6ac28430d7892e792248f9609efafe87d69d2c 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 See gh-16166 --- .../src/main/asciidoc/spring-boot-features.adoc | 9 +++++---- 1 file changed, 5 insertions(+), 4 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 47494bd6ea1..266a9b74f51 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 @@ -978,13 +978,14 @@ 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 -`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] ---- From f07de1bbe2a5f6c0caed5250f10235aa2c7c97a4 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 12 Mar 2019 11:12:45 +0100 Subject: [PATCH 2/2] Polish "Update ambiguous documentation about ConfigurationProperties" Closes gh-16166 --- .../src/main/asciidoc/spring-boot-features.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 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 266a9b74f51..a5b384bb247 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 @@ -978,9 +978,9 @@ name of the bean is used. The bean name in the example above is `acme-com.example.AcmeProperties`. ==== -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. Keep in mind that the +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. 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`. Instead of annotating `MyConfiguration` with