Remove optional @EnableDiscoveryClient (#355)

* Remove optional @EnableDiscoveryClient.  Fixes #353.

docs/src/main/asciidoc/spring-cloud-consul.adoc

@@ -42,7 +42,6 @@ Example Consul client:
 [source,java,indent=0]
 ----
 @SpringBootApplication
-@EnableDiscoveryClient
 @RestController
 public class Application {
 
@@ -73,7 +72,7 @@ CAUTION: If you use <<spring-cloud-consul-config,Spring Cloud Consul Config>>, t
 
 The default service name, instance id and port, taken from the `Environment`, are `${spring.application.name}`, the Spring Context ID and `${server.port}` respectively.
 
-`@EnableDiscoveryClient` make the app into both a Consul "service" (i.e. it registers itself) and a "client" (i.e. it can query Consul to locate other services).
+To disable the Consul Discovery Client you can set `spring.cloud.consul.discovery.enabled` to `false`.
 
 === HTTP Health Check
 
@@ -322,7 +321,6 @@ The `clusterConfig` and `appConfig` sections must match, so it's useful to put t
 .Turbine.java
 ----
 @EnableTurbine
-@EnableDiscoveryClient
 @SpringBootApplication
 public class Turbine {
     public static void main(String[] args) {

spring-cloud-consul-discovery/src/main/resources/META-INF/spring.factories

@@ -2,10 +2,7 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 org.springframework.cloud.consul.discovery.RibbonConsulAutoConfiguration,\
 org.springframework.cloud.consul.discovery.configclient.ConsulConfigServerAutoConfiguration,\
 org.springframework.cloud.consul.serviceregistry.ConsulAutoServiceRegistrationAutoConfiguration,\
-org.springframework.cloud.consul.serviceregistry.ConsulServiceRegistryAutoConfiguration
-
-# Discovery Client Configuration
-org.springframework.cloud.client.discovery.EnableDiscoveryClient=\
+org.springframework.cloud.consul.serviceregistry.ConsulServiceRegistryAutoConfiguration,\
 org.springframework.cloud.consul.discovery.ConsulDiscoveryClientConfiguration
 
 

spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientAclTests.java

@@ -72,7 +72,6 @@ public class ConsulDiscoveryClientAclTests {
 	}
 
 	@Configuration
-	@EnableDiscoveryClient
 	@EnableAutoConfiguration
 	@Import({ ConsulAutoConfiguration.class, ConsulDiscoveryClientConfiguration.class })
 	public static class MyTestConfig {

spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientCustomizedTests.java

@@ -101,7 +101,6 @@ public class ConsulDiscoveryClientCustomizedTests {
 	}
 
 	@Configuration
-	@EnableDiscoveryClient
 	@EnableAutoConfiguration
 	@Import({ ConsulAutoConfiguration.class, ConsulDiscoveryClientConfiguration.class })
 	public static class MyTestConfig {

spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientDefaultQueryTagTests.java

@@ -94,7 +94,6 @@ public class ConsulDiscoveryClientDefaultQueryTagTests {
 	}
 
 	@Configuration
-	@EnableDiscoveryClient
 	@EnableAutoConfiguration
 	@Import({ ConsulDiscoveryClientConfiguration.class })
 	protected static class TestConfig {

spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientLocalServiceInstanceTests.java

@@ -148,7 +148,6 @@ public class ConsulDiscoveryClientLocalServiceInstanceTests {
 	}
 
 	@Configuration
-	@EnableDiscoveryClient
 	@ImportAutoConfiguration({ ConsulDiscoveryClientConfiguration.class })
 	protected static class LocalServiceTestConfig {
 

spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientTests.java

@@ -114,7 +114,6 @@ public class ConsulDiscoveryClientTests {
 	}
 
 	@Configuration
-	@EnableDiscoveryClient
 	@EnableAutoConfiguration
 	@Import({ ConsulAutoConfiguration.class, ConsulDiscoveryClientConfiguration.class })
 	public static class MyTestConfig {

spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLifecycleCustomizedTests.java

@@ -77,7 +77,6 @@ public class ConsulLifecycleCustomizedTests {
 	}
 
 	@Configuration
-	@EnableDiscoveryClient
 	@EnableAutoConfiguration
 	public static class MyTestConfig {
 		@Bean

spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulServerListAclTests.java

@@ -64,7 +64,6 @@ public class ConsulServerListAclTests {
     }
 
     @Configuration
-    @EnableDiscoveryClient
     @EnableAutoConfiguration
     @Import({ConsulAutoConfiguration.class, ConsulDiscoveryClientConfiguration.class})
     public static class TestConfig {

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

@@ -46,7 +46,6 @@ import org.springframework.web.client.RestTemplate;
  */
 @Configuration
 @EnableAutoConfiguration
-@EnableDiscoveryClient
 @RestController
 @EnableConfigurationProperties
 @EnableFeignClients