From 45ec84bb5026a36b2c711b2364c1d45935a9b48f Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Fri, 25 Sep 2015 10:49:20 -0600
Subject: [PATCH] remove RelaxedPropertyResolver

---
 .../consul/sample/SampleConsulApplication.java    | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/spring-cloud-consul-sample/src/main/java/org/springframework/cloud/consul/sample/SampleConsulApplication.java b/spring-cloud-consul-sample/src/main/java/org/springframework/cloud/consul/sample/SampleConsulApplication.java
index 618bb967..58d596ab 100644
--- a/spring-cloud-consul-sample/src/main/java/org/springframework/cloud/consul/sample/SampleConsulApplication.java
+++ b/spring-cloud-consul-sample/src/main/java/org/springframework/cloud/consul/sample/SampleConsulApplication.java
@@ -18,15 +18,12 @@ package org.springframework.cloud.consul.sample;
 
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-
 import lombok.extern.slf4j.Slf4j;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.bind.RelaxedPropertyResolver;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
@@ -63,22 +60,12 @@ public class SampleConsulApplication /*implements ApplicationListener<SimpleRemo
 	@Autowired
 	private Environment env;
 
-	@Autowired(required = false)
-	private RelaxedPropertyResolver resolver;
-
 	@Autowired
 	private SampleClient sampleClient;
 
 	@Value("${spring.application.name:testConsulApp}")
 	private String appName;
 
-	@PostConstruct
-	public void init() {
-		if (resolver == null) {
-			resolver = new RelaxedPropertyResolver(env);
-		}
-	}
-
 	@RequestMapping("/me")
 	public ServiceInstance me() {
 		return discoveryClient.getLocalServiceInstance();
@@ -96,7 +83,7 @@ public class SampleConsulApplication /*implements ApplicationListener<SimpleRemo
 
 	@RequestMapping("/myenv")
 	public String env(@RequestParam("prop") String prop) {
-		return resolver.getProperty(prop, "Not Found");
+		return env.getProperty(prop, "Not Found");
 	}
 
 	@RequestMapping("/prop")