From bfc667b6d05deb015fc81903c3b60bd3986a5f45 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 28 Nov 2017 03:54:15 +0000 Subject: [PATCH] Sync docs from 2.0.x to gh-pages --- 2.0.x/multi/multi_spring-cloud-feign.html | 4 ++-- 2.0.x/single/spring-cloud-netflix.html | 4 ++-- 2.0.x/spring-cloud-netflix.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.0.x/multi/multi_spring-cloud-feign.html b/2.0.x/multi/multi_spring-cloud-feign.html index 3eefb163b..f8a535b04 100644 --- a/2.0.x/multi/multi_spring-cloud-feign.html +++ b/2.0.x/multi/multi_spring-cloud-feign.html @@ -95,7 +95,7 @@ a separate request interceptor.

private FooClient adminClient;
 
-    @Autowired
+    	@Autowired
 	public FooController(
 			Decoder decoder, Encoder encoder, Client client) {
 		this.fooClient = Feign.builder().client(client)
@@ -112,7 +112,7 @@ a separate request interceptor.
[Note]Note
In the above example FeignClientsConfiguration.class is the default configuration
 provided by Spring Cloud Netflix.
[Note]Note
PROD-SVC is the name of the service the Clients will be making requests to.
7.4 Feign Hystrix Support
If Hystrix is on the classpath and feign.hystrix.enabled=true, Feign will wrap all methods with a circuit breaker. Returning a com.netflix.hystrix.HystrixCommand is also available. This lets you use reactive patterns (with a call to .toObservable() or .observe() or asynchronous use (with a call to .queue()).
To disable Hystrix support on a per-client basis create a vanilla Feign.Builder with the "prototype" scope, e.g.:
@Configuration
 public class FooConfiguration {
-    @Bean
+    	@Bean
 	@Scope("prototype")
 	public Feign.Builder feignBuilder() {
 		return Feign.builder();
diff --git a/2.0.x/single/spring-cloud-netflix.html b/2.0.x/single/spring-cloud-netflix.html
index 51c226f75..bb290233e 100644
--- a/2.0.x/single/spring-cloud-netflix.html
+++ b/2.0.x/single/spring-cloud-netflix.html
@@ -611,7 +611,7 @@ a separate request interceptor.
private FooClient adminClient;
 
-    @Autowired
+    	@Autowired
 	public FooController(
 			Decoder decoder, Encoder encoder, Client client) {
 		this.fooClient = Feign.builder().client(client)
@@ -628,7 +628,7 @@ a separate request interceptor.
[Note]Note
In the above example FeignClientsConfiguration.class is the default configuration
 provided by Spring Cloud Netflix.
[Note]Note
PROD-SVC is the name of the service the Clients will be making requests to.
7.4 Feign Hystrix Support
If Hystrix is on the classpath and feign.hystrix.enabled=true, Feign will wrap all methods with a circuit breaker. Returning a com.netflix.hystrix.HystrixCommand is also available. This lets you use reactive patterns (with a call to .toObservable() or .observe() or asynchronous use (with a call to .queue()).
To disable Hystrix support on a per-client basis create a vanilla Feign.Builder with the "prototype" scope, e.g.:
@Configuration
 public class FooConfiguration {
-    @Bean
+    	@Bean
 	@Scope("prototype")
 	public Feign.Builder feignBuilder() {
 		return Feign.builder();
diff --git a/2.0.x/spring-cloud-netflix.xml b/2.0.x/spring-cloud-netflix.xml
index e4a8f8148..d1debbbe6 100644
--- a/2.0.x/spring-cloud-netflix.xml
+++ b/2.0.x/spring-cloud-netflix.xml
@@ -1143,7 +1143,7 @@ class FooController {
 
 	private FooClient adminClient;
 
-    @Autowired
+    	@Autowired
 	public FooController(
 			Decoder decoder, Encoder encoder, Client client) {
 		this.fooClient = Feign.builder().client(client)
@@ -1172,7 +1172,7 @@ provided by Spring Cloud Netflix.
 To disable Hystrix support on a per-client basis create a vanilla Feign.Builder with the "prototype" scope, e.g.:
 @Configuration
 public class FooConfiguration {
-    @Bean
+    	@Bean
 	@Scope("prototype")
 	public Feign.Builder feignBuilder() {
 		return Feign.builder();