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

spring-boot-modules/spring-boot-properties-3/src/main/resources/application.yml

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

spring-boot-modules/spring-boot-properties-3/src/test/java/com/baeldung/boot/properties/multidocument/StagingMultidocumentFilesIntegrationTest.java

@@ -17,14 +17,18 @@ public class StagingMultidocumentFilesIntegrationTest {
 
     @Value("${bael.property}")
     private String baelCustomProperty;
-    
+
+    @Value("${bael.stagingProperty}")
+    private String baelStagingProperty;
+
     @Value("${bael.root-level-property}")
     private String baelRootProperty;
 
     @Test
-    @Disabled("Fix and update https://www.baeldung.com/spring-boot-yaml-vs-properties article")
     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");
     }
 }