Merge remote-tracking branch 'origin/2.2.x'

# Conflicts:
#	docs/src/main/asciidoc/spring-cloud-commons.adoc
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/InterceptorRetryPolicy.java
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerAutoConfiguration.java
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/RetryLoadBalancerInterceptor.java
#	spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/AbstractLoadBalancerAutoConfigurationTests.java
#	spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/InterceptorRetryPolicyTest.java
#	spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfiguration.java
#	spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfigurationTests.java

Author: OlgaMaciaszek

docs/src/main/asciidoc/_configprops.adoc

@@ -36,6 +36,10 @@
 |spring.cloud.loadbalancer.health-check.path |  | 
 |spring.cloud.loadbalancer.hint |  | Allows setting the value of <code>hint</code> that is passed on to the LoadBalancer request and can subsequently be used in {@link ReactiveLoadBalancer} implementations.
 |spring.cloud.loadbalancer.retry.enabled | true | 
+|spring.cloud.loadbalancer.retry.max-retries-on-next-service-instance | 1 | Number of retries to be executed on the next <code>ServiceInstance</code>. A <code>ServiceInstance</code> is chosen before each retry call.
+|spring.cloud.loadbalancer.retry.max-retries-on-same-service-instance | 0 | Number of retries to be executed on the same <code>ServiceInstance</code>.
+|spring.cloud.loadbalancer.retry.retry-on-all-operations | false | Indicates retries should be attempted on operations other than {@link HttpMethod#GET}.
+|spring.cloud.loadbalancer.retry.retryable-status-codes |  | A {@link Set} of status codes that should trigger a retry.
 |spring.cloud.loadbalancer.ribbon.enabled | true | Causes `RibbonLoadBalancerClient` to be used by default.
 |spring.cloud.loadbalancer.service-discovery.timeout |  | String representation of Duration of the timeout for calls to service discovery.
 |spring.cloud.loadbalancer.zone |  | Spring Cloud LoadBalancer zone.

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

@@ -438,10 +438,16 @@ Then, `ReactiveLoadBalancer` is used underneath.
 A load-balanced `RestTemplate` can be configured to retry failed requests.
 By default, this logic is disabled.
 You can enable it by adding link:https://github.com/spring-projects/spring-retry[Spring Retry] to your application's classpath.
+
 If you would like to disable the retry logic with Spring Retry on the classpath, you can set `spring.cloud.loadbalancer.retry.enabled=false`.
 
-If you would like to implement a `BackOffPolicy` in your retries, you need to create a bean of type `LoadBalancedRetryFactory` and override the `createBackOffPolicy` method:
+If you would like to implement a `BackOffPolicy` in your retries, you need to create a bean of type `LoadBalancedRetryFactory` and override the `createBackOffPolicy()` method.
+
+You can set:
 
+- `spring.cloud.loadbalancer.retry.maxRetriesOnSameServiceInstance` - indicates how many times a request should be retried on the same `ServiceInstance` (counted separately for every selected instance)
+- `spring.cloud.loadbalancer.retry.maxRetriesOnNextServiceInstance` - indicates how many times a request should be retried a newly selected `ServiceInstance`
+- `spring.cloud.loadbalancer.retry.retryableStatusCodes` - the status codes on which to always retry a failed request.
 ====
 [source,java,indent=0]
 ----

spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/InterceptorRetryPolicy.java

@@ -28,13 +28,13 @@
  */
 public class InterceptorRetryPolicy implements RetryPolicy {
 
-	private HttpRequest request;
+	private final HttpRequest request;
 
-	private LoadBalancedRetryPolicy policy;
+	private final LoadBalancedRetryPolicy policy;
 
-	private ServiceInstanceChooser serviceInstanceChooser;
+	private final ServiceInstanceChooser serviceInstanceChooser;
 
-	private String serviceName;
+	private final String serviceName;
 
 	/**
 	 * Creates a new retry policy.
@@ -56,20 +56,20 @@ public boolean canRetry(RetryContext context) {
 		LoadBalancedRetryContext lbContext = (LoadBalancedRetryContext) context;
 		if (lbContext.getRetryCount() == 0 && lbContext.getServiceInstance() == null) {
 			// We haven't even tried to make the request yet so return true so we do
-			lbContext.setServiceInstance(this.serviceInstanceChooser.choose(this.serviceName));
+			lbContext.setServiceInstance(serviceInstanceChooser.choose(serviceName));
 			return true;
 		}
-		return this.policy.canRetryNextServer(lbContext);
+		return policy.canRetryNextServer(lbContext);
 	}
 
 	@Override
 	public RetryContext open(RetryContext parent) {
-		return new LoadBalancedRetryContext(parent, this.request);
+		return new LoadBalancedRetryContext(parent, request);
 	}
 
 	@Override
 	public void close(RetryContext context) {
-		this.policy.close((LoadBalancedRetryContext) context);
+		policy.close((LoadBalancedRetryContext) context);
 	}
 
 	@Override
@@ -79,7 +79,7 @@ public void registerThrowable(RetryContext context, Throwable throwable) {
 		// increases the retry count
 		lbContext.registerThrowable(throwable);
 		// let the policy know about the exception as well
-		this.policy.registerThrowable(lbContext, throwable);
+		policy.registerThrowable(lbContext, throwable);
 	}
 
 	@Override
@@ -93,25 +93,25 @@ public boolean equals(Object o) {
 
 		InterceptorRetryPolicy that = (InterceptorRetryPolicy) o;
 
-		if (!this.request.equals(that.request)) {
+		if (!request.equals(that.request)) {
 			return false;
 		}
-		if (!this.policy.equals(that.policy)) {
+		if (!policy.equals(that.policy)) {
 			return false;
 		}
-		if (!this.serviceInstanceChooser.equals(that.serviceInstanceChooser)) {
+		if (!serviceInstanceChooser.equals(that.serviceInstanceChooser)) {
 			return false;
 		}
-		return this.serviceName.equals(that.serviceName);
+		return serviceName.equals(that.serviceName);
 
 	}
 
 	@Override
 	public int hashCode() {
-		int result = this.request.hashCode();
-		result = 31 * result + this.policy.hashCode();
-		result = 31 * result + this.serviceInstanceChooser.hashCode();
-		result = 31 * result + this.serviceName.hashCode();
+		int result = request.hashCode();
+		result = 31 * result + policy.hashCode();
+		result = 31 * result + serviceInstanceChooser.hashCode();
+		result = 31 * result + serviceName.hashCode();
 		return result;
 	}
 

spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerAutoConfiguration.java

@@ -38,7 +38,7 @@
 import org.springframework.web.client.RestTemplate;
 
 /**
- * Auto-configuration for blocking (client-side load balancing).
+ * Auto-configuration for blocking client-side load balancing.
  *
  * @author Spencer Gibb
  * @author Dave Syer

spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerRetryProperties.java

@@ -16,7 +16,11 @@
 
 package org.springframework.cloud.client.loadbalancer;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.http.HttpMethod;
 
 /**
  * Configuration properties for the {@link LoadBalancerClient}.
@@ -28,6 +32,28 @@ public class LoadBalancerRetryProperties {
 
 	private boolean enabled = true;
 
+	/**
+	 * Indicates retries should be attempted on operations other than
+	 * {@link HttpMethod#GET}.
+	 */
+	private boolean retryOnAllOperations = false;
+
+	/**
+	 * Number of retries to be executed on the same <code>ServiceInstance</code>.
+	 */
+	private int maxRetriesOnSameServiceInstance = 0;
+
+	/**
+	 * Number of retries to be executed on the next <code>ServiceInstance</code>. A
+	 * <code>ServiceInstance</code> is chosen before each retry call.
+	 */
+	private int maxRetriesOnNextServiceInstance = 1;
+
+	/**
+	 * A {@link Set} of status codes that should trigger a retry.
+	 */
+	private Set<Integer> retryableStatusCodes = new HashSet<>();
+
 	/**
 	 * Returns true if the load balancer should retry failed requests.
 	 * @return True if the load balancer should retry failed requests; false otherwise.
@@ -44,4 +70,36 @@ public void setEnabled(boolean enabled) {
 		this.enabled = enabled;
 	}
 
+	public boolean isRetryOnAllOperations() {
+		return retryOnAllOperations;
+	}
+
+	public void setRetryOnAllOperations(boolean retryOnAllOperations) {
+		this.retryOnAllOperations = retryOnAllOperations;
+	}
+
+	public int getMaxRetriesOnSameServiceInstance() {
+		return maxRetriesOnSameServiceInstance;
+	}
+
+	public void setMaxRetriesOnSameServiceInstance(int maxRetriesOnSameServiceInstance) {
+		this.maxRetriesOnSameServiceInstance = maxRetriesOnSameServiceInstance;
+	}
+
+	public int getMaxRetriesOnNextServiceInstance() {
+		return maxRetriesOnNextServiceInstance;
+	}
+
+	public void setMaxRetriesOnNextServiceInstance(int maxRetriesOnNextServiceInstance) {
+		this.maxRetriesOnNextServiceInstance = maxRetriesOnNextServiceInstance;
+	}
+
+	public Set<Integer> getRetryableStatusCodes() {
+		return retryableStatusCodes;
+	}
+
+	public void setRetryableStatusCodes(Set<Integer> retryableStatusCodes) {
+		this.retryableStatusCodes = retryableStatusCodes;
+	}
+
 }

spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/InterceptorRetryPolicyTest.java

@@ -20,14 +20,14 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.http.HttpRequest;
 import org.springframework.retry.RetryContext;
 
 import static org.assertj.core.api.BDDAssertions.then;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -49,90 +49,89 @@ public class InterceptorRetryPolicyTest {
 
 	@Before
 	public void setup() {
-		this.request = mock(HttpRequest.class);
-		this.policy = mock(LoadBalancedRetryPolicy.class);
-		this.serviceInstanceChooser = mock(ServiceInstanceChooser.class);
-		this.serviceName = "foo";
+		request = mock(HttpRequest.class);
+		policy = mock(LoadBalancedRetryPolicy.class);
+		serviceInstanceChooser = mock(ServiceInstanceChooser.class);
+		serviceName = "foo";
 	}
 
 	@After
 	public void teardown() {
-		this.request = null;
-		this.policy = null;
-		this.serviceInstanceChooser = null;
-		this.serviceName = null;
+		request = null;
+		policy = null;
+		serviceInstanceChooser = null;
+		serviceName = null;
 	}
 
 	@Test
-	public void canRetryBeforeExecution() throws Exception {
-		InterceptorRetryPolicy interceptorRetryPolicy = new InterceptorRetryPolicy(this.request, this.policy,
-				this.serviceInstanceChooser, this.serviceName);
+	public void canRetryBeforeExecution() {
+		InterceptorRetryPolicy interceptorRetryPolicy = new InterceptorRetryPolicy(request, policy,
+				serviceInstanceChooser, serviceName);
 		LoadBalancedRetryContext context = mock(LoadBalancedRetryContext.class);
 		when(context.getRetryCount()).thenReturn(0);
 		ServiceInstance serviceInstance = mock(ServiceInstance.class);
-		when(this.serviceInstanceChooser.choose(eq(this.serviceName))).thenReturn(serviceInstance);
+		when(serviceInstanceChooser.choose(eq(serviceName))).thenReturn(serviceInstance);
 		then(interceptorRetryPolicy.canRetry(context)).isTrue();
 		verify(context, times(1)).setServiceInstance(eq(serviceInstance));
 
 	}
 
 	@Test
-	public void canRetryNextServer() throws Exception {
-		InterceptorRetryPolicy interceptorRetryPolicy = new InterceptorRetryPolicy(this.request, this.policy,
-				this.serviceInstanceChooser, this.serviceName);
+	public void canRetryNextServer() {
+		InterceptorRetryPolicy interceptorRetryPolicy = new InterceptorRetryPolicy(request, policy,
+				serviceInstanceChooser, serviceName);
 		LoadBalancedRetryContext context = mock(LoadBalancedRetryContext.class);
 		when(context.getRetryCount()).thenReturn(1);
-		when(this.policy.canRetryNextServer(eq(context))).thenReturn(true);
+		when(policy.canRetryNextServer(eq(context))).thenReturn(true);
 		then(interceptorRetryPolicy.canRetry(context)).isTrue();
 	}
 
 	@Test
-	public void cannotRetry() throws Exception {
-		InterceptorRetryPolicy interceptorRetryPolicy = new InterceptorRetryPolicy(this.request, this.policy,
-				this.serviceInstanceChooser, this.serviceName);
+	public void cannotRetry() {
+		InterceptorRetryPolicy interceptorRetryPolicy = new InterceptorRetryPolicy(request, policy,
+				serviceInstanceChooser, serviceName);
 		LoadBalancedRetryContext context = mock(LoadBalancedRetryContext.class);
 		when(context.getRetryCount()).thenReturn(1);
 		then(interceptorRetryPolicy.canRetry(context)).isFalse();
 	}
 
 	@Test
-	public void open() throws Exception {
-		InterceptorRetryPolicy interceptorRetryPolicy = new InterceptorRetryPolicy(this.request, this.policy,
-				this.serviceInstanceChooser, this.serviceName);
+	public void open() {
+		InterceptorRetryPolicy interceptorRetryPolicy = new InterceptorRetryPolicy(request, policy,
+				serviceInstanceChooser, serviceName);
 		RetryContext context = interceptorRetryPolicy.open(null);
 		then(context).isInstanceOf(LoadBalancedRetryContext.class);
 	}
 
 	@Test
-	public void close() throws Exception {
-		InterceptorRetryPolicy interceptorRetryPolicy = new InterceptorRetryPolicy(this.request, this.policy,
-				this.serviceInstanceChooser, this.serviceName);
+	public void close() {
+		InterceptorRetryPolicy interceptorRetryPolicy = new InterceptorRetryPolicy(request, policy,
+				serviceInstanceChooser, serviceName);
 		LoadBalancedRetryContext context = mock(LoadBalancedRetryContext.class);
 		interceptorRetryPolicy.close(context);
-		verify(this.policy, times(1)).close(eq(context));
+		verify(policy, times(1)).close(eq(context));
 	}
 
 	@Test
-	public void registerThrowable() throws Exception {
-		InterceptorRetryPolicy interceptorRetryPolicy = new InterceptorRetryPolicy(this.request, this.policy,
-				this.serviceInstanceChooser, this.serviceName);
+	public void registerThrowable() {
+		InterceptorRetryPolicy interceptorRetryPolicy = new InterceptorRetryPolicy(request, policy,
+				serviceInstanceChooser, serviceName);
 		LoadBalancedRetryContext context = mock(LoadBalancedRetryContext.class);
 		Throwable thrown = new Exception();
 		interceptorRetryPolicy.registerThrowable(context, thrown);
 		verify(context, times(1)).registerThrowable(eq(thrown));
-		verify(this.policy, times(1)).registerThrowable(eq(context), eq(thrown));
+		verify(policy, times(1)).registerThrowable(eq(context), eq(thrown));
 	}
 
 	@Test
-	public void equals() throws Exception {
-		InterceptorRetryPolicy interceptorRetryPolicy = new InterceptorRetryPolicy(this.request, this.policy,
-				this.serviceInstanceChooser, this.serviceName);
+	public void equals() {
+		InterceptorRetryPolicy interceptorRetryPolicy = new InterceptorRetryPolicy(request, policy,
+				serviceInstanceChooser, serviceName);
 		then(interceptorRetryPolicy.equals(null)).isFalse();
 		then(interceptorRetryPolicy.equals(new Object())).isFalse();
 		then(interceptorRetryPolicy.equals(interceptorRetryPolicy)).isTrue();
-		then(interceptorRetryPolicy.equals(
-				new InterceptorRetryPolicy(this.request, this.policy, this.serviceInstanceChooser, this.serviceName)))
-						.isTrue();
+		then(interceptorRetryPolicy
+				.equals(new InterceptorRetryPolicy(request, policy, serviceInstanceChooser, serviceName))).isTrue();
 	}
 
 }

spring-cloud-loadbalancer/pom.xml

@@ -77,6 +77,11 @@
 			<version>${evictor.version}</version>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.retry</groupId>
+			<artifactId>spring-retry</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>