SpringCloud/spring-cloud-consul
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove RelaxedPropertyResolver

Browse Source
This commit is contained in:
Spencer Gibb
2015-09-25 10:49:20 -06:00
parent f38b19ba75
commit 45ec84bb50
1 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-cloud-consul-sample/src/main/java/org/springframework/cloud/consul/sample/SampleConsulApplication.java
View File

@@ -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")