Merge branch 'master' of https://github.com/eugenp/tutorials into BAEL-3974

spring-boot-modules/spring-boot-properties/pom.xml

@@ -128,6 +128,7 @@
         <httpcore.version>4.4.11</httpcore.version>
         <resource.delimiter>@</resource.delimiter>
         <configuration-processor.version>2.2.4.RELEASE</configuration-processor.version>
+        <start-class>com.baeldung.buildproperties.Application</start-class>
     </properties>
 
 </project>

spring-boot-modules/spring-boot-properties/src/main/java/com/baeldung/configuration/processor/JdbcProperties.java

@@ -0,0 +1,21 @@
+package com.baeldung.configuration.processor;
+
+import org.springframework.boot.context.properties.*;
+import org.springframework.context.annotation.*;
+import org.springframework.beans.factory.annotation.*;
+
+@Configuration
+@ConfigurationProperties(prefix = "com.baeldung")
+public class JdbcProperties {
+
+    @Value("${jdbc.url:jdbc:postgresql:/localhost:5432}")
+    private String jdbcUrl;
+
+    public String getJdbcUrl() {
+        return jdbcUrl;
+    }
+
+    public void setJdbcUrl(String jdbcUrl) {
+        this.jdbcUrl = jdbcUrl;
+    }
+}

spring-boot-modules/spring-boot-properties/src/main/java/com/baeldung/configuration/processor/PropertyBeanInjection.java

@@ -6,16 +6,23 @@ import org.springframework.stereotype.*;
 @Component
 public class PropertyBeanInjection {
 
-    private final CustomProperties customProperties;
+    private CustomProperties customProperties;
 
-    PropertyBeanInjection(@Autowired CustomProperties customProperties) {
+    private JdbcProperties jdbcProperties;
+
+    PropertyBeanInjection(@Autowired CustomProperties customProperties, @Autowired JdbcProperties jdbcProperties) {
         this.customProperties = customProperties;
+        this.jdbcProperties = jdbcProperties;
     }
 
     String getUrl() {
         return customProperties.getUrl();
     }
 
+    String getJdbcUrl() {
+        return jdbcProperties.getJdbcUrl();
+    }
+
     int getTimeoutInMilliseconds() {
         return customProperties.getTimeoutInMilliSeconds();
     }

spring-boot-modules/spring-boot-properties/src/main/java/com/baeldung/configurationproperties/Database.java

@@ -0,0 +1,36 @@
+package com.baeldung.configurationproperties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+
+@ConfigurationProperties(prefix = "database")
+public class Database {
+
+    String url;
+    String username;
+    String password;
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+}

spring-boot-modules/spring-boot-properties/src/main/java/com/baeldung/configurationproperties/DatabaseConfig.java

@@ -0,0 +1,23 @@
+package com.baeldung.configurationproperties;
+
+import org.springframework.core.env.Environment;
+import org.springframework.beans.factory.annotation.*;
+import org.springframework.context.annotation.*;
+
+@Configuration
+public class DatabaseConfig {
+
+    @Autowired private Environment env;
+
+    @Bean(name="dataSource")
+    public Database dataSource() {
+
+        Database dataSource = new Database();
+        dataSource.setUrl(env.getProperty("jdbc.url"));
+        dataSource.setUsername(env.getProperty("database.username"));
+        dataSource.setPassword(env.getProperty("database.password"));
+
+        return dataSource;
+    }
+
+}

spring-boot-modules/spring-boot-properties/src/main/java/com/baeldung/configurationproperties/DatabaseConfigPropertiesApp.java

@@ -0,0 +1,13 @@
+package com.baeldung.configurationproperties;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
+
+@SpringBootApplication
+@ComponentScan(basePackageClasses = {Database.class,DatabaseConfig.class})
+public class DatabaseConfigPropertiesApp{
+
+    public static void main(String[]args) {SpringApplication.run(DatabaseConfigPropertiesApp.class,args);}
+
+}

spring-boot-modules/spring-boot-properties/src/main/java/com/baeldung/properties/spring/PropertyPlaceholderConfig.java

@@ -0,0 +1,23 @@
+package com.baeldung.properties.spring;
+
+import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.*;
+
+@Configuration
+public class PropertyPlaceholderConfig {
+
+    public PropertyPlaceholderConfig(){
+        super();
+    }
+
+    @Bean
+    public static PropertyPlaceholderConfigurer properties() {
+        PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
+        Resource[] resources = new ClassPathResource[]{ new ClassPathResource("foo.properties") };
+        ppc.setLocations( resources );
+        ppc.setIgnoreUnresolvablePlaceholders( true );
+        return ppc;
+    }
+}

spring-boot-modules/spring-boot-properties/src/main/java/com/baeldung/properties/spring/PropertySourcesPlaceholderConfig.java

@@ -0,0 +1,24 @@
+package com.baeldung.properties.spring;
+
+import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.*;
+
+@Configuration
+public class PropertySourcesPlaceholderConfig{
+
+    public PropertySourcesPlaceholderConfig(){
+        super();
+    }
+
+    @Bean
+    public static PropertySourcesPlaceholderConfigurer properties(){
+        PropertySourcesPlaceholderConfigurer pspc = new PropertySourcesPlaceholderConfigurer();
+        Resource[] resources = new ClassPathResource[]{ new ClassPathResource("foo.properties") };
+        pspc.setLocations(resources);
+        pspc.setIgnoreUnresolvablePlaceholders(true);
+        return pspc;
+    }
+
+}

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

@@ -3,6 +3,3 @@ spring.properties.refreshDelay=1000
 spring.config.location=file:extra.properties
 spring.main.allow-bean-definition-overriding=true
 
-database.url=jdbc:postgresql:/localhost:5432/instance
-database.username=foo
-database.password=bar

spring-boot-modules/spring-boot-properties/src/main/resources/configForProperties.xml

@@ -7,10 +7,14 @@
       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"/>
+    <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}"/>
     </bean>
 
+    <bean id="dataSource" class="com.baeldung.configurationproperties.Database">
+        <property name="url" value="${jdbc.url}" />
+    </bean>
+
 </beans>

spring-boot-modules/spring-boot-properties/src/main/resources/configForPropertyPlaceholderBeans.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.springframework.org/schema/beans"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd"
+>
+
+<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+    <property name="locations">
+        <list>
+            <value>classpath:foo.properties</value>
+        </list>
+    </property>
+    <property name="ignoreUnresolvablePlaceholders" value="true"/>
+</bean>
+
+<bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer">
+    <property name="locations">
+        <list>
+            <value>classpath:foo.properties</value>
+        </list>
+    </property>
+    <property name="ignoreUnresolvablePlaceholders" value="true"/>
+</bean>
+</beans>

spring-boot-modules/spring-boot-properties/src/main/resources/configuration-processor.properties

@@ -0,0 +1,3 @@
+com.baeldung.url=www.abc.test.com
+com.baeldung.jdbc.url=
+com.baeldung.timeout-in-milli-seconds=2000

spring-boot-modules/spring-boot-properties/src/main/resources/database.properties

@@ -0,0 +1,4 @@
+database.url=jdbc:postgresql:/localhost:5432/instance
+database.username=foo
+database.password=bar
+jdbc.url=jdbc:postgresql:/localhost:5432

spring-boot-modules/spring-boot-properties/src/main/resources/database.yml

@@ -0,0 +1,5 @@
+database:
+    url: jdbc:postresql:/localhost:5432/instance
+    username: foo
+    password: bar
+secret: foo

spring-boot-modules/spring-boot-properties/src/test/java/com/baeldung/configuration/processor/PropertyBeanInjectionUnitTest.java

@@ -15,6 +15,11 @@ class PropertyBeanInjectionUnitTest {
     @Autowired
     private PropertyBeanInjection propertyBeanInjection;
 
+    @Test
+    void checkThatJdbcPropertiesHaveTheCorrectValueFromPropertiesFile() {
+        Assertions.assertEquals("jdbc:postgresql:/localhost:5432", propertyBeanInjection.getJdbcUrl());
+    }
+
     @Test
     void checkThatCustomPropertiesHaveTheCorrectValueFromPropertiesFile() {
         Assertions.assertEquals("www.abc.test.com", propertyBeanInjection.getUrl());

spring-boot-modules/spring-boot-properties/src/test/java/com/baeldung/configurationproperties/ConfigPropertiesIntegrationTest.java

@@ -4,6 +4,7 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -13,13 +14,17 @@ import com.baeldung.properties.AdditionalProperties;
 import com.baeldung.properties.ConfigPropertiesDemoApplication;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = ConfigPropertiesDemoApplication.class)
+@SpringBootTest(classes = {ConfigPropertiesDemoApplication.class, DatabaseConfigPropertiesApp.class})
-@TestPropertySource("classpath:configprops-test.properties")
+@TestPropertySource(locations = {"classpath:configprops-test.properties", "classpath:database-test.properties"})
 public class ConfigPropertiesIntegrationTest {
 
     @Autowired
     private ConfigProperties properties;
 
+    @Autowired
+    @Qualifier("dataSource")
+    private Database databaseProperties;
+
     @Autowired
     private AdditionalProperties additionalProperties;
 
@@ -53,4 +58,11 @@ public class ConfigPropertiesIntegrationTest {
         Assert.assertTrue(additionalProperties.getUnit().equals("km"));
         Assert.assertTrue(additionalProperties.getMax() == 100);
     }
+
+    @Test
+    public void whenDatabasePropertyQueriedthenReturnsProperty() {
+        Assert.assertTrue(databaseProperties.getUrl().equals("jdbc:postgresql:/localhost:5432"));
+        Assert.assertTrue(databaseProperties.getUsername().equals("foo"));
+        Assert.assertTrue(databaseProperties.getPassword().equals("bar"));
+    }
 }

spring-boot-modules/spring-boot-properties/src/test/java/com/baeldung/properties/multiple/MultiplePlaceholdersJavaConfigIntegrationTest.java

@@ -0,0 +1,23 @@
+package com.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 com.baeldung.properties.spring.PropertyPlaceholderConfig;
+import com.baeldung.properties.spring.PropertySourcesPlaceholderConfig;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@SpringJUnitConfig({PropertyPlaceholderConfig.class, PropertySourcesPlaceholderConfig.class})
+public class MultiplePlaceholdersJavaConfigIntegrationTest {
+
+    @Value("${key.something}")
+    private String something;
+
+
+    @Test
+    public void whenReadInjectedValues_thenGetCorrectValues() {
+        assertThat(something).isEqualTo("val");
+    }
+}

spring-boot-modules/spring-boot-properties/src/test/java/com/baeldung/properties/multiple/MultiplePlaceholdersXmlConfigIntegrationTest.java

@@ -0,0 +1,25 @@
+package com.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:configForPropertyPlaceholderBeans.xml")
+public class MultiplePlaceholdersXmlConfigIntegrationTest {
+
+    @Value("${foo}")
+    private String something;
+
+    @Value("${key.something}")
+    private String something2;
+
+
+    @Test
+    public void whenReadInjectedValues_thenGetCorrectValues() {
+        assertThat(something).isEqualTo("bar");
+        assertThat(something2).isEqualTo("val");
+    }
+}

spring-boot-modules/spring-boot-properties/src/test/java/com/baeldung/properties/multiple/MultiplePropertiesXmlConfigIntegrationTest.java

@@ -13,9 +13,12 @@ public class MultiplePropertiesXmlConfigIntegrationTest {
 
     @Value("${key.something2}") private String something2;
 
+    @Value("${jdbc.url}") private String jdbcUrl;
+
     @Test
     public void whenReadInjectedValues_thenGetCorrectValues() {
         assertThat(something).isEqualTo("val");
         assertThat(something2).isEqualTo("val2");
+        assertThat(jdbcUrl).isEqualTo("jdbc:postgresql:/localhost:5432");
     }
 }

spring-boot-modules/spring-boot-properties/src/test/java/com/baeldung/test/IntegrationTestSuite.java

@@ -10,6 +10,8 @@ import com.baeldung.properties.basic.PropertiesWithXmlIntegrationTest;
 import com.baeldung.properties.external.ExternalPropertiesWithJavaIntegrationTest;
 import com.baeldung.properties.external.ExternalPropertiesWithMultipleXmlsIntegrationTest;
 import com.baeldung.properties.external.ExternalPropertiesWithXmlManualTest;
+import com.baeldung.properties.multiple.MultiplePropertiesXmlConfigIntegrationTest;
+import com.baeldung.properties.multiple.MultiplePlaceholdersXmlConfigIntegrationTest;
 
 @RunWith(Suite.class)
 @SuiteClasses({ //@formatter:off
@@ -17,8 +19,8 @@ import com.baeldung.properties.external.ExternalPropertiesWithXmlManualTest;
     ExternalPropertiesWithJavaIntegrationTest.class,
     ExternalPropertiesWithMultipleXmlsIntegrationTest.class,
     ExternalPropertiesWithXmlManualTest.class,
-    ExtendedPropertiesWithJavaIntegrationTest.class,
+    ExtendedPropertiesWithJavaIntegrationTest.class, MultiplePropertiesXmlConfigIntegrationTest.class,
-    PropertiesWithMultipleXmlsIntegrationTest.class,
+    PropertiesWithMultipleXmlsIntegrationTest.class, MultiplePlaceholdersXmlConfigIntegrationTest.class
 })// @formatter:on
 public final class IntegrationTestSuite {
     //

spring-boot-modules/spring-boot-properties/src/test/resources/configuration-processor.properties

@@ -1,2 +1,3 @@
 com.baeldung.url=www.abc.test.com
+com.baeldung.jdbc.url=
 com.baeldung.timeout-in-milli-seconds=2000

spring-boot-modules/spring-boot-properties/src/test/resources/database-test.properties

@@ -0,0 +1,3 @@
+jdbc.url=jdbc:postgresql:/localhost:5432
+database.username=foo
+database.password=bar