Merge pull request #10747 from rozagerardo/rozagerardo/JAVA-4892_fix-application.yml-vs-application.properties-tests

[JAVA-4892] Update Using application.yml vs application.properties in Spring Boot article
This commit is contained in:
kwoyke 2021-05-12 14:07:24 +02:00 committed by GitHub
commit d1719b0338
2 changed files with 8 additions and 3 deletions

View File

@ -15,6 +15,7 @@ spring:
username: SA username: SA
bael: bael:
property: stagingValue property: stagingValue
stagingProperty: stagingPropertyValue
--- ---
application: application:
servers: servers:

View File

@ -17,14 +17,18 @@ public class StagingMultidocumentFilesIntegrationTest {
@Value("${bael.property}") @Value("${bael.property}")
private String baelCustomProperty; private String baelCustomProperty;
@Value("${bael.stagingProperty}")
private String baelStagingProperty;
@Value("${bael.root-level-property}") @Value("${bael.root-level-property}")
private String baelRootProperty; private String baelRootProperty;
@Test @Test
@Disabled("Fix and update https://www.baeldung.com/spring-boot-yaml-vs-properties article")
public void givenProductionProfileActive_whenApplicationStarts_thenDefaultPropertiesUser() { public void givenProductionProfileActive_whenApplicationStarts_thenDefaultPropertiesUser() {
assertThat(baelCustomProperty).isEqualTo("stagingValue"); assertThat(baelStagingProperty).isEqualTo("stagingPropertyValue");
// application.properties is loaded after the application.yml file and overrides the values
assertThat(baelCustomProperty).isEqualTo("defaultValue");
assertThat(baelRootProperty).isEqualTo("defaultRootLevelValue"); assertThat(baelRootProperty).isEqualTo("defaultRootLevelValue");
} }
} }