remove dependency on s-c-config-client.

bump version to 1.0.0.BUILD-SNAPSHOT.
form java files
This commit is contained in:
Spencer Gibb
2015-03-19 19:35:09 -06:00
parent 5855752b99
commit c8a9d40547
38 changed files with 814 additions and 781 deletions

View File

@@ -17,6 +17,7 @@
package org.springframework.cloud.consul.sample;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -45,47 +46,47 @@ import org.springframework.web.bind.annotation.RestController;
@Slf4j
public class SampleApplication implements ApplicationListener<SimpleRemoteEvent> {
public static final String CLIENT_NAME = "testConsulApp";
public static final String CLIENT_NAME = "testConsulApp";
@Autowired
LoadBalancerClient loadBalancer;
@Autowired
LoadBalancerClient loadBalancer;
@Autowired
DiscoveryClient discoveryClient;
@Autowired
DiscoveryClient discoveryClient;
@Autowired
Environment env;
@Autowired
Environment env;
@Autowired(required = false)
RelaxedPropertyResolver resolver;
@Autowired(required = false)
RelaxedPropertyResolver resolver;
@RequestMapping("/me")
public ServiceInstance me() {
return discoveryClient.getLocalServiceInstance();
}
@RequestMapping("/me")
public ServiceInstance me() {
return discoveryClient.getLocalServiceInstance();
}
@RequestMapping("/")
public ServiceInstance lb() {
return loadBalancer.choose(CLIENT_NAME);
}
@RequestMapping("/")
public ServiceInstance lb() {
return loadBalancer.choose(CLIENT_NAME);
}
@RequestMapping("/myenv")
public String env(@RequestParam("prop") String prop) {
String property = new RelaxedPropertyResolver(env).getProperty(prop, "Not Found");
return property;
}
@RequestMapping("/myenv")
public String env(@RequestParam("prop") String prop) {
String property = new RelaxedPropertyResolver(env).getProperty(prop, "Not Found");
return property;
}
@Bean
public SubtypeModule sampleSubtypeModule() {
return new SubtypeModule(SimpleRemoteEvent.class);
}
@Bean
public SubtypeModule sampleSubtypeModule() {
return new SubtypeModule(SimpleRemoteEvent.class);
}
public static void main(String[] args) {
SpringApplication.run(SampleApplication.class, args);
}
public static void main(String[] args) {
SpringApplication.run(SampleApplication.class, args);
}
@Override
public void onApplicationEvent(SimpleRemoteEvent event) {
log.info("Received event: {}", event);
}
@Override
public void onApplicationEvent(SimpleRemoteEvent event) {
log.info("Received event: {}", event);
}
}

View File

@@ -2,9 +2,9 @@ server:
port: 8080
#TODO: figure out why I need this here and in bootstrap.yml
spring:
application:
name: testConsulApp
#spring:
# application:
# name: testConsulApp
ribbon:
ServerListRefreshInterval: 1000

View File

@@ -1,7 +1,3 @@
spring:
application:
name: testConsulApp
cloud:
config:
# TODO: refactor spring-cloud-config to use refresh, etc.. with out config client
enabled: false