Merge branch 'master' of https://github.com/JonCook/tutorials

spring-cloud/spring-cloud-archaius/additional-sources-simple/pom.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    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>additional-sources-simple</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <name>additional-sources-simple</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung.spring.cloud</groupId>
+        <artifactId>spring-cloud-archaius</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+    </dependencies>
+</project>

spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/AdditionalSourcesSimpleApplication.java

@@ -0,0 +1,13 @@
+package com.baeldung.spring.cloud.archaius.additionalsources;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class AdditionalSourcesSimpleApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(AdditionalSourcesSimpleApplication.class, args);
+    }
+
+}

spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/config/ApplicationPropertiesConfigurations.java

@@ -0,0 +1,26 @@
+package com.baeldung.spring.cloud.archaius.additionalsources.config;
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.apache.commons.configuration.AbstractConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.ClassPathResource;
+
+import com.netflix.config.DynamicConfiguration;
+import com.netflix.config.FixedDelayPollingScheduler;
+import com.netflix.config.PolledConfigurationSource;
+import com.netflix.config.sources.URLConfigurationSource;
+
+@Configuration
+public class ApplicationPropertiesConfigurations {
+
+    @Bean
+    public AbstractConfiguration addApplicationPropertiesSource() throws IOException {
+        URL configPropertyURL = (new ClassPathResource("other-config.properties")).getURL();
+        PolledConfigurationSource source = new URLConfigurationSource(configPropertyURL);
+        return new DynamicConfiguration(source, new FixedDelayPollingScheduler());
+    }
+
+}

spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/controller/ConfigPropertiesController.java

@@ -0,0 +1,37 @@
+package com.baeldung.spring.cloud.archaius.additionalsources.controller;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.netflix.config.DynamicPropertyFactory;
+import com.netflix.config.DynamicStringProperty;
+
+@RestController
+public class ConfigPropertiesController {
+
+    private DynamicStringProperty propertyOneWithDynamic = DynamicPropertyFactory.getInstance()
+        .getStringProperty("baeldung.archaius.properties.one", "not found!");
+
+    private DynamicStringProperty propertyTwoWithDynamic = DynamicPropertyFactory.getInstance()
+        .getStringProperty("baeldung.archaius.properties.two", "not found!");
+
+    private DynamicStringProperty propertyThreeWithDynamic = DynamicPropertyFactory.getInstance()
+        .getStringProperty("baeldung.archaius.properties.three", "not found!");
+
+    private DynamicStringProperty propertyFourWithDynamic = DynamicPropertyFactory.getInstance()
+        .getStringProperty("baeldung.archaius.properties.four", "not found!");
+
+    @GetMapping("/properties-from-dynamic")
+    public Map<String, String> getPropertiesFromDynamic() {
+        Map<String, String> properties = new HashMap<>();
+        properties.put(propertyOneWithDynamic.getName(), propertyOneWithDynamic.get());
+        properties.put(propertyTwoWithDynamic.getName(), propertyTwoWithDynamic.get());
+        properties.put(propertyThreeWithDynamic.getName(), propertyThreeWithDynamic.get());
+        properties.put(propertyFourWithDynamic.getName(), propertyFourWithDynamic.get());
+        return properties;
+    }
+}

spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/resources/application.properties

@@ -0,0 +1,3 @@
+server.port=8082
+baeldung.archaius.properties.one=one FROM:application.properties
+baeldung.archaius.properties.two=two FROM:application.properties

spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/resources/config.properties

@@ -0,0 +1,2 @@
+baeldung.archaius.properties.one=one FROM:config.properties
+baeldung.archaius.properties.three=three FROM:config.properties

spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/resources/other-config.properties

@@ -0,0 +1,2 @@
+baeldung.archaius.properties.one=one FROM:other-config.properties
+baeldung.archaius.properties.four=four FROM:other-config.properties

spring-cloud/spring-cloud-archaius/additional-sources-simple/src/test/java/com/baeldung/spring/cloud/archaius/additionalsources/ArchaiusAdditionalSourcesLiveTest.java

@@ -0,0 +1,54 @@
+package com.baeldung.spring.cloud.archaius.additionalsources;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpMethod;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+public class ArchaiusAdditionalSourcesLiveTest {
+
+    private static final String BASE_URL = "http://localhost:8082";
+
+    private static final String DYNAMIC_PROPERTIES_URL = "/properties-from-dynamic";
+    private static final Map<String, String> EXPECTED_ARCHAIUS_PROPERTIES = createExpectedArchaiusProperties();
+
+    private static Map<String, String> createExpectedArchaiusProperties() {
+        Map<String, String> map = new HashMap<>();
+        map.put("baeldung.archaius.properties.one", "one FROM:other-config.properties");
+        map.put("baeldung.archaius.properties.two", "two FROM:application.properties");
+        map.put("baeldung.archaius.properties.three", "three FROM:config.properties");
+        map.put("baeldung.archaius.properties.four", "four FROM:other-config.properties");
+        return map;
+    }
+
+    @Autowired
+    ConfigurableApplicationContext context;
+
+    @Autowired
+    private TestRestTemplate template;
+
+    private <T> Map<T, T> exchangeAsMap(String uri, ParameterizedTypeReference<Map<T, T>> responseType) {
+        return template.exchange(uri, HttpMethod.GET, null, responseType)
+            .getBody();
+    }
+
+    @Test
+    public void givenNonDefaultConfigurationFilesSetup_whenRequestProperties_thenEndpointRetrievesValuesInFiles() {
+        Map<String, String> initialResponse = this.exchangeAsMap(BASE_URL + DYNAMIC_PROPERTIES_URL, new ParameterizedTypeReference<Map<String, String>>() {
+        });
+
+        assertThat(initialResponse).containsAllEntriesOf(EXPECTED_ARCHAIUS_PROPERTIES);
+    }
+}

spring-cloud/spring-cloud-archaius/additional-sources-simple/src/test/java/com/baeldung/spring/cloud/archaius/additionalsources/SpringContextIntegrationTest.java

@@ -0,0 +1,15 @@
+package com.baeldung.spring.cloud.archaius.additionalsources;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = AdditionalSourcesSimpleApplication.class)
+public class SpringContextIntegrationTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}

spring-cloud/spring-cloud-archaius/additional-sources-simple/src/test/java/com/baeldung/spring/cloud/archaius/additionalsources/SpringContextTest.java

@@ -0,0 +1,15 @@
+package com.baeldung.spring.cloud.archaius.additionalsources;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = AdditionalSourcesSimpleApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}