From 54f8a56f720e03043b157ccf9440f87590e9d6d3 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Tue, 9 Dec 2014 20:21:09 -0700
Subject: [PATCH] updates to get s-c-consul working again

---
 .../config/ConsulConfigBootstrapConfiguration.java  | 13 +++++++++++++
 .../consul/discovery/ConsulLoadBalancerClient.java  |  1 +
 spring-cloud-consul-sample/pom.xml                  |  5 -----
 .../src/test/resources/application.yml              |  5 -----
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigBootstrapConfiguration.java b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigBootstrapConfiguration.java
index ed037942..53553c3a 100644
--- a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigBootstrapConfiguration.java
+++ b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigBootstrapConfiguration.java
@@ -1,9 +1,12 @@
 package org.springframework.cloud.consul.config;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.config.client.ConfigClientProperties;
 import org.springframework.cloud.consul.ConsulAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.core.env.ConfigurableEnvironment;
 
 /**
  * @author Spencer Gibb
@@ -11,6 +14,16 @@ import org.springframework.context.annotation.Import;
 @Configuration
 @Import(ConsulAutoConfiguration.class)
 public class ConsulConfigBootstrapConfiguration {
+
+	@Autowired
+	private ConfigurableEnvironment environment;
+
+	@Bean
+	public ConfigClientProperties configClientProperties() {
+		ConfigClientProperties client = new ConfigClientProperties(environment);
+		return client;
+	}
+
     @Bean
     public ConsulPropertySourceLocator consulPropertySourceLocator() {
         return new ConsulPropertySourceLocator();
diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulLoadBalancerClient.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulLoadBalancerClient.java
index c666e187..8f90b579 100644
--- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulLoadBalancerClient.java
+++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulLoadBalancerClient.java
@@ -64,6 +64,7 @@ public class ConsulLoadBalancerClient implements LoadBalancerClient {
 
     @Override
     public URI reconstructURI(ServiceInstance instance, URI original) {
+        //TODO: move this pattern to a helper method
         URI uri = UriComponentsBuilder.fromUri(original)
                 .host(instance.getHost())
                 .port(instance.getPort())
diff --git a/spring-cloud-consul-sample/pom.xml b/spring-cloud-consul-sample/pom.xml
index 4486a97d..c3d481f0 100644
--- a/spring-cloud-consul-sample/pom.xml
+++ b/spring-cloud-consul-sample/pom.xml
@@ -33,11 +33,6 @@
             <artifactId>spring-boot-starter-web</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-consul-config</artifactId>
diff --git a/spring-cloud-consul-sample/src/test/resources/application.yml b/spring-cloud-consul-sample/src/test/resources/application.yml
index 201e73af..fcd62844 100644
--- a/spring-cloud-consul-sample/src/test/resources/application.yml
+++ b/spring-cloud-consul-sample/src/test/resources/application.yml
@@ -6,11 +6,6 @@ spring:
   application:
     name: testConsulApp
 
-security:
-  user:
-    name: user
-    password: password
-
 endpoints:
   health:
     sensitive: false