From 8f54420e95d5012319dae1a27193234722e126b2 Mon Sep 17 00:00:00 2001
From: Juan Moreno <earth001@users.noreply.github.com>
Date: Sat, 9 Mar 2019 00:50:03 -0300
Subject: [PATCH] Added sample code for BAEL-1122 (#6468)

---
 spring-all/pom.xml                            | 18 +++++++------
 .../spring/PropertiesWithJavaConfig.java      |  1 +
 .../main/resources/configForProperties.xml    |  2 +-
 ...lePropertiesJavaConfigIntegrationTest.java | 25 +++++++++++++++++++
 ...plePropertiesXmlConfigIntegrationTest.java | 21 ++++++++++++++++
 5 files changed, 59 insertions(+), 8 deletions(-)
 create mode 100644 spring-all/src/test/java/org/baeldung/properties/multiple/MultiplePropertiesJavaConfigIntegrationTest.java
 create mode 100644 spring-all/src/test/java/org/baeldung/properties/multiple/MultiplePropertiesXmlConfigIntegrationTest.java

diff --git a/spring-all/pom.xml b/spring-all/pom.xml
index 5872fbdac5..8c88efb970 100644
--- a/spring-all/pom.xml
+++ b/spring-all/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-all</artifactId>
     <version>0.1-SNAPSHOT</version>
@@ -47,12 +47,16 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-websocket</artifactId>
-    	</dependency>
-    	<dependency>
+        </dependency>
+        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-messaging</artifactId>
-    	</dependency>
- 
+        </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${annotation-api.version}</version>
+        </dependency>
         <!-- aspectj -->
         <dependency>
             <groupId>org.springframework</groupId>
@@ -227,13 +231,13 @@
             </properties>
         </profile>
     </profiles>
-    
+
     <properties>
         <start-class>org.baeldung.sample.App</start-class>
         <!-- Spring -->
         <org.springframework.version>5.0.6.RELEASE</org.springframework.version>
         <org.springframework.shell.version>1.2.0.RELEASE</org.springframework.shell.version>
-
+        <annotation-api.version>1.3.2</annotation-api.version>
         <!-- persistence -->
         <hibernate.version>5.2.5.Final</hibernate.version>
 
diff --git a/spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithJavaConfig.java b/spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithJavaConfig.java
index 08626bb4d2..6589143a94 100644
--- a/spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithJavaConfig.java
+++ b/spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithJavaConfig.java
@@ -7,6 +7,7 @@ import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 
 @Configuration
 @PropertySource("classpath:foo.properties")
+@PropertySource("classpath:bar.properties")
 public class PropertiesWithJavaConfig {
 
     public PropertiesWithJavaConfig() {
diff --git a/spring-all/src/main/resources/configForProperties.xml b/spring-all/src/main/resources/configForProperties.xml
index 0f766665eb..459aea3ec6 100644
--- a/spring-all/src/main/resources/configForProperties.xml
+++ b/spring-all/src/main/resources/configForProperties.xml
@@ -7,7 +7,7 @@
       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"
 >
 
-    <context:property-placeholder location="classpath:foo.properties"/>
+    <context:property-placeholder location="classpath:foo.properties,classpath:bar.properties"/>
 
     <bean id="componentInXmlUsingProperties" class="org.baeldung.properties.core.ComponentInXmlUsingProperties">
         <constructor-arg value="${key.something}"/>
diff --git a/spring-all/src/test/java/org/baeldung/properties/multiple/MultiplePropertiesJavaConfigIntegrationTest.java b/spring-all/src/test/java/org/baeldung/properties/multiple/MultiplePropertiesJavaConfigIntegrationTest.java
new file mode 100644
index 0000000000..9cb41c20f7
--- /dev/null
+++ b/spring-all/src/test/java/org/baeldung/properties/multiple/MultiplePropertiesJavaConfigIntegrationTest.java
@@ -0,0 +1,25 @@
+package org.baeldung.properties.multiple;
+
+import org.baeldung.properties.spring.PropertiesWithJavaConfig;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@SpringJUnitConfig(PropertiesWithJavaConfig.class)
+public class MultiplePropertiesJavaConfigIntegrationTest {
+
+    @Value("${key.something}")
+    private String something;
+
+    @Value("${key.something2}")
+    private String something2;
+
+
+    @Test
+    public void whenReadInjectedValues_thenGetCorrectValues() {
+        assertThat(something).isEqualTo("val");
+        assertThat(something2).isEqualTo("val2");
+    }
+}
diff --git a/spring-all/src/test/java/org/baeldung/properties/multiple/MultiplePropertiesXmlConfigIntegrationTest.java b/spring-all/src/test/java/org/baeldung/properties/multiple/MultiplePropertiesXmlConfigIntegrationTest.java
new file mode 100644
index 0000000000..b4f81f3541
--- /dev/null
+++ b/spring-all/src/test/java/org/baeldung/properties/multiple/MultiplePropertiesXmlConfigIntegrationTest.java
@@ -0,0 +1,21 @@
+package org.baeldung.properties.multiple;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@SpringJUnitConfig(locations = "classpath:configForProperties.xml")
+public class MultiplePropertiesXmlConfigIntegrationTest {
+
+    @Value("${key.something}") private String something;
+
+    @Value("${key.something2}") private String something2;
+
+    @Test
+    public void whenReadInjectedValues_thenGetCorrectValues() {
+        assertThat(something).isEqualTo("val");
+        assertThat(something2).isEqualTo("val2");
+    }
+}