From 3acab182902cf29eb3991a14676de1eb3cb5c5f6 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 11 Sep 2019 15:40:09 +0000 Subject: [PATCH] Sync docs from master to gh-pages --- reference/html/index.html | 9 +++++++-- reference/html/spring-cloud-commons.html | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/reference/html/index.html b/reference/html/index.html index 90898f5b..ce1165a7 100644 --- a/reference/html/index.html +++ b/reference/html/index.html @@ -557,11 +557,16 @@ will also be disabled since they are just a special case of /actuator/rest

@EnableDiscoveryClient

Spring Cloud Commons provides the @EnableDiscoveryClient annotation. -This looks for implementations of the DiscoveryClient interface with META-INF/spring.factories. -Implementations of the Discovery Client add a configuration class to spring.factories under the org.springframework.cloud.client.discovery.EnableDiscoveryClient key. +This looks for implementations of the DiscoveryClient and ReactiveDiscoveryClient interfaces with META-INF/spring.factories. +Implementations of the discovery client add a configuration class to spring.factories under the org.springframework.cloud.client.discovery.EnableDiscoveryClient key. Examples of DiscoveryClient implementations include Spring Cloud Netflix Eureka, Spring Cloud Consul Discovery, and Spring Cloud Zookeeper Discovery.

+

Spring Cloud will provide both the blocking and reactive service discovery clients by default. +You can disable the blocking and/or reactive clients easily by setting spring.cloud.discovery.blocking.enabled=false or spring.cloud.discovery.reactive.enabled=false. +To completely disable service discovery you just need to set spring.cloud.discovery.enabled=false.

+
+

By default, implementations of DiscoveryClient auto-register the local Spring Boot server with the remote discovery server. This behavior can be disabled by setting autoRegister=false in @EnableDiscoveryClient.

diff --git a/reference/html/spring-cloud-commons.html b/reference/html/spring-cloud-commons.html index 90898f5b..ce1165a7 100644 --- a/reference/html/spring-cloud-commons.html +++ b/reference/html/spring-cloud-commons.html @@ -557,11 +557,16 @@ will also be disabled since they are just a special case of /actuator/rest

@EnableDiscoveryClient

Spring Cloud Commons provides the @EnableDiscoveryClient annotation. -This looks for implementations of the DiscoveryClient interface with META-INF/spring.factories. -Implementations of the Discovery Client add a configuration class to spring.factories under the org.springframework.cloud.client.discovery.EnableDiscoveryClient key. +This looks for implementations of the DiscoveryClient and ReactiveDiscoveryClient interfaces with META-INF/spring.factories. +Implementations of the discovery client add a configuration class to spring.factories under the org.springframework.cloud.client.discovery.EnableDiscoveryClient key. Examples of DiscoveryClient implementations include Spring Cloud Netflix Eureka, Spring Cloud Consul Discovery, and Spring Cloud Zookeeper Discovery.

+

Spring Cloud will provide both the blocking and reactive service discovery clients by default. +You can disable the blocking and/or reactive clients easily by setting spring.cloud.discovery.blocking.enabled=false or spring.cloud.discovery.reactive.enabled=false. +To completely disable service discovery you just need to set spring.cloud.discovery.enabled=false.

+
+

By default, implementations of DiscoveryClient auto-register the local Spring Boot server with the remote discovery server. This behavior can be disabled by setting autoRegister=false in @EnableDiscoveryClient.