From 020837fa2f2feb4295a315ff285691a459ba54a9 Mon Sep 17 00:00:00 2001
From: sasam0320 <63002713+sasam0320@users.noreply.github.com>
Date: Wed, 13 May 2020 11:09:41 +0200
Subject: [PATCH] BAEL 3234 - Add missing code snippets from the Spring
 Properties article (#9280)

---
 .../main/resources/configForDbProperties.xml  | 19 +++++++++++++++++++
 .../main/resources/configForProperties.xml    |  3 ++-
 .../src/main/resources/database.properties    |  5 +++--
 ...plePropertiesXmlConfigIntegrationTest.java |  2 +-
 4 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 spring-boot-modules/spring-boot-properties/src/main/resources/configForDbProperties.xml

diff --git a/spring-boot-modules/spring-boot-properties/src/main/resources/configForDbProperties.xml b/spring-boot-modules/spring-boot-properties/src/main/resources/configForDbProperties.xml
new file mode 100644
index 0000000000..00fd5f0508
--- /dev/null
+++ b/spring-boot-modules/spring-boot-properties/src/main/resources/configForDbProperties.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="
+      http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
+      http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd
+      http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"
+>
+
+    <context:property-placeholder location="classpath:database.properties"/>
+
+
+    <bean id="dataSource" class="com.baeldung.configurationproperties.Database">
+        <property name="url" value="${jdbc.url}" />
+        <property name="username" value="${database.username}" />
+        <property name="password" value="${database.password}" />
+    </bean>
+
+</beans>
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-properties/src/main/resources/configForProperties.xml b/spring-boot-modules/spring-boot-properties/src/main/resources/configForProperties.xml
index 4468bb485f..bf4452da4a 100644
--- a/spring-boot-modules/spring-boot-properties/src/main/resources/configForProperties.xml
+++ b/spring-boot-modules/spring-boot-properties/src/main/resources/configForProperties.xml
@@ -7,7 +7,8 @@
       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"
 >
 
-    <context:property-placeholder location="classpath:foo.properties,classpath:bar.properties, classpath:database.properties"/>
+
+    <context:property-placeholder location="classpath:foo.properties,classpath:bar.properties,classpath:database.properties"/>
 
     <bean id="componentInXmlUsingProperties" class="com.baeldung.properties.core.ComponentInXmlUsingProperties">
         <constructor-arg value="${key.something}"/>
diff --git a/spring-boot-modules/spring-boot-properties/src/main/resources/database.properties b/spring-boot-modules/spring-boot-properties/src/main/resources/database.properties
index 6524ce6109..eb5703ca72 100644
--- a/spring-boot-modules/spring-boot-properties/src/main/resources/database.properties
+++ b/spring-boot-modules/spring-boot-properties/src/main/resources/database.properties
@@ -1,4 +1,5 @@
-database.url=jdbc:postgresql:/localhost:5432/instance
+
+jdbc.url=jdbc:postgresql:/localhost:5432
 database.username=foo
 database.password=bar
-jdbc.url=jdbc:postgresql:/localhost:5432
\ No newline at end of file
+
diff --git a/spring-boot-modules/spring-boot-properties/src/test/java/com/baeldung/properties/multiple/MultiplePropertiesXmlConfigIntegrationTest.java b/spring-boot-modules/spring-boot-properties/src/test/java/com/baeldung/properties/multiple/MultiplePropertiesXmlConfigIntegrationTest.java
index 6827ee1cf1..2150d4b3ec 100644
--- a/spring-boot-modules/spring-boot-properties/src/test/java/com/baeldung/properties/multiple/MultiplePropertiesXmlConfigIntegrationTest.java
+++ b/spring-boot-modules/spring-boot-properties/src/test/java/com/baeldung/properties/multiple/MultiplePropertiesXmlConfigIntegrationTest.java
@@ -6,7 +6,7 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@SpringJUnitConfig(locations = "classpath:configForProperties.xml")
+@SpringJUnitConfig(locations = {"classpath:configForProperties.xml", "classpath:configForDbProperties.xml"})
 public class MultiplePropertiesXmlConfigIntegrationTest {
 
     @Value("${key.something}") private String something;