New unit test format

spring-cloud/spring-cloud-consul/README.md

@@ -0,0 +1,3 @@
+
+### Relevant Articles:
+- [A Quick Guide to Spring Cloud Consul](http://www.baeldung.com/spring-cloud-consul)

spring-cloud/spring-cloud-consul/pom.xml

@@ -0,0 +1,42 @@
+<?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>
+    <groupId>org.baeldung</groupId>
+    <artifactId>spring-cloud-consul</artifactId>
+    <name>spring-cloud-consul</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung.spring.cloud</groupId>
+        <artifactId>spring-cloud</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-consul-all</artifactId>
+            <version>${spring-cloud-starter-consul.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-consul-config</artifactId>
+            <version>${spring-cloud-starter-consul.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <version>${spring-boot-starter-test.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <spring-cloud-starter-consul.version>1.3.0.RELEASE</spring-cloud-starter-consul.version>
+        <spring-boot-starter-test.version>1.5.10.RELEASE</spring-boot-starter-test.version>
+    </properties>
+
+</project>

spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/discovery/DiscoveryClientApplication.java

@@ -0,0 +1,16 @@
+package com.baeldung.spring.cloud.consul.discovery;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+
+@SpringBootApplication
+@EnableDiscoveryClient
+public class DiscoveryClientApplication {
+
+    public static void main(String[] args) {
+        new SpringApplicationBuilder(DiscoveryClientApplication.class).web(true)
+            .run(args);
+    }
+
+}

spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/discovery/DiscoveryClientController.java

@@ -0,0 +1,50 @@
+package com.baeldung.spring.cloud.consul.discovery;
+
+import java.net.URI;
+import java.util.Optional;
+
+import javax.naming.ServiceUnavailableException;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.client.discovery.DiscoveryClient;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestClientException;
+import org.springframework.web.client.RestTemplate;
+
+@RestController
+public class DiscoveryClientController {
+
+    @Autowired
+    private DiscoveryClient discoveryClient;
+
+    private final RestTemplate restTemplate = new RestTemplate();
+
+    @GetMapping("/discoveryClient")
+    public String discoveryPing() throws RestClientException, ServiceUnavailableException {
+        URI service = serviceUrl().map(s -> s.resolve("/ping"))
+            .orElseThrow(ServiceUnavailableException::new);
+        return restTemplate.getForEntity(service, String.class)
+            .getBody();
+    }
+
+    @GetMapping("/ping")
+    public String ping() {
+        return "pong";
+    }
+
+    @GetMapping("/my-health-check")
+    public ResponseEntity<String> myCustomCheck() {
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    public Optional<URI> serviceUrl() {
+        return discoveryClient.getInstances("myApp")
+            .stream()
+            .findFirst()
+            .map(si -> si.getUri());
+    }
+
+}

spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/health/ServiceDiscoveryApplication.java

@@ -0,0 +1,14 @@
+package com.baeldung.spring.cloud.consul.health;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+
+@SpringBootApplication
+public class ServiceDiscoveryApplication {
+
+    public static void main(String[] args) {
+        new SpringApplicationBuilder(ServiceDiscoveryApplication.class).web(true)
+            .run(args);
+    }
+
+}

spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/health/ServiceDiscoveryController.java

@@ -0,0 +1,22 @@
+package com.baeldung.spring.cloud.consul.health;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class ServiceDiscoveryController {
+
+    @GetMapping("/ping")
+    public String ping() {
+        return "pong";
+    }
+
+    @GetMapping("/my-health-check")
+    public ResponseEntity<String> myCustomCheck() {
+        String message = "Testing my healh check function";
+        return new ResponseEntity<>(message, HttpStatus.FORBIDDEN);
+    }
+
+}

spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/DistributedPropertiesApplication.java

@@ -0,0 +1,16 @@
+package com.baeldung.spring.cloud.consul.properties;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.web.bind.annotation.RestController;
+
+@SpringBootApplication
+@RestController
+public class DistributedPropertiesApplication {
+
+    public static void main(String[] args) {
+        new SpringApplicationBuilder(DistributedPropertiesApplication.class).web(true)
+            .run(args);
+    }
+
+}

spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/DistributedPropertiesController.java

@@ -0,0 +1,27 @@
+package com.baeldung.spring.cloud.consul.properties;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class DistributedPropertiesController {
+
+    @Value("${my.prop}")
+    String value;
+
+    @Autowired
+    private MyProperties properties;
+
+    @GetMapping("/getConfigFromValue")
+    public String getConfigFromValue() {
+        return value;
+    }
+
+    @GetMapping("/getConfigFromProperty")
+    public String getConfigFromProperty() {
+        return properties.getProp();
+    }
+
+}

spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/MyProperties.java

@@ -0,0 +1,22 @@
+package com.baeldung.spring.cloud.consul.properties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.context.annotation.Configuration;
+
+@RefreshScope
+@Configuration
+@ConfigurationProperties("my")
+public class MyProperties {
+
+    private String prop;
+
+    public String getProp() {
+        return prop;
+    }
+
+    public void setProp(String prop) {
+        this.prop = prop;
+    }
+
+}

spring-cloud/spring-cloud-consul/src/main/resources/application.yml

@@ -0,0 +1,14 @@
+spring:
+  application:
+    name: myApp
+  cloud:
+    consul:
+      host: localhost
+      port: 8500
+      discovery:
+        healthCheckPath: /my-health-check
+        healthCheckInterval: 20s
+        enabled: true
+        instanceId: ${spring.application.name}:${random.value}
+server:
+  port: 0

spring-cloud/spring-cloud-consul/src/main/resources/bootstrap.yml

@@ -0,0 +1,9 @@
+spring:
+  application:
+    name: myApp
+  cloud:
+    consul:
+      host: localhost
+      port: 8500
+      config:
+        enabled: true

spring-cloud/spring-cloud-consul/src/main/resources/logback.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>

spring-cloud/spring-cloud-consul/src/test/java/com/baeldung/spring/cloud/consul/SpringContextLiveTest.java

@@ -0,0 +1,28 @@
+package com.baeldung.spring.cloud.consul;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.spring.cloud.consul.discovery.DiscoveryClientApplication;
+import com.baeldung.spring.cloud.consul.health.ServiceDiscoveryApplication;
+import com.baeldung.spring.cloud.consul.properties.DistributedPropertiesApplication;
+
+
+/**
+ * 
+ * This Live test requires:
+ * * a Consul instance running on port 8500
+ * * Consul configured with particular properties (e.g. 'my.prop')
+ *
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = { DiscoveryClientApplication.class, ServiceDiscoveryApplication.class,
+		DistributedPropertiesApplication.class })
+public class SpringContextLiveTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}