remove bus temporarily as it is broken with the changes to spring-cloud-bus

This commit is contained in:
Spencer Gibb
2015-09-22 09:41:46 -06:00
parent 95096cb1c4
commit 23e7fa67cb
3 changed files with 9 additions and 12 deletions

View File

@@ -30,10 +30,10 @@
<module>spring-cloud-consul-core</module>
<module>spring-cloud-consul-config</module>
<module>spring-cloud-consul-discovery</module>
<module>spring-cloud-consul-bus</module>
<!--<module>spring-cloud-consul-bus</module>-->
<module>spring-cloud-consul-sample</module>
<module>spring-cloud-starter-consul</module>
<module>spring-cloud-starter-consul-bus</module>
<!--<module>spring-cloud-starter-consul-bus</module>-->
<module>spring-cloud-starter-consul-config</module>
<module>spring-cloud-starter-consul-discovery</module>
<module>spring-cloud-starter-consul-all</module>

View File

@@ -28,15 +28,12 @@ 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.bus.jackson.SubtypeModule;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
import org.springframework.cloud.consul.bus.SimpleRemoteEvent;
import org.springframework.cloud.netflix.feign.EnableFeignClients;
import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.context.ApplicationListener;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
@@ -55,7 +52,7 @@ import org.springframework.web.bind.annotation.RestController;
@EnableConfigurationProperties
@EnableFeignClients
@Slf4j
public class SampleConsulApplication implements ApplicationListener<SimpleRemoteEvent> {
public class SampleConsulApplication /*implements ApplicationListener<SimpleRemoteEvent>*/ {
@Autowired
private LoadBalancerClient loadBalancer;
@@ -117,10 +114,10 @@ public class SampleConsulApplication implements ApplicationListener<SimpleRemote
return sampleClient.choose();
}
@Bean
/*@Bean
public SubtypeModule sampleSubtypeModule() {
return new SubtypeModule(SimpleRemoteEvent.class);
}
}*/
@Bean
public SampleProperties sampleProperties() {
@@ -131,10 +128,10 @@ public class SampleConsulApplication implements ApplicationListener<SimpleRemote
SpringApplication.run(SampleConsulApplication.class, args);
}
@Override
/*@Override
public void onApplicationEvent(SimpleRemoteEvent event) {
log.info("Received event: {}", event);
}
}*/
@FeignClient("testConsulApp")
public interface SampleClient {

View File

@@ -20,10 +20,10 @@
<main.basedir>${basedir}/../..</main.basedir>
</properties>
<dependencies>
<dependency>
<!--<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-consul-bus</artifactId>
</dependency>
</dependency>-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-consul-config</artifactId>