Rename new class.
This commit is contained in:
@@ -58,7 +58,7 @@ class DefaultFeignLoadBalancerConfiguration {
|
||||
public Client feignRetryClient(BlockingLoadBalancerClient loadBalancerClient,
|
||||
List<LoadBalancedRetryFactory> loadBalancedRetryFactories) {
|
||||
AnnotationAwareOrderComparator.sort(loadBalancedRetryFactories);
|
||||
return new RetryableBlockingFeignLoadBalancerClient(
|
||||
return new RetryableFeignBlockingLoadBalancerClient(
|
||||
new Client.Default(null, null), loadBalancerClient,
|
||||
loadBalancedRetryFactories.get(0));
|
||||
}
|
||||
|
||||
@@ -69,7 +69,7 @@ class HttpClientFeignLoadBalancerConfiguration {
|
||||
List<LoadBalancedRetryFactory> loadBalancedRetryFactories) {
|
||||
AnnotationAwareOrderComparator.sort(loadBalancedRetryFactories);
|
||||
ApacheHttpClient delegate = new ApacheHttpClient(httpClient);
|
||||
return new RetryableBlockingFeignLoadBalancerClient(delegate, loadBalancerClient,
|
||||
return new RetryableFeignBlockingLoadBalancerClient(delegate, loadBalancerClient,
|
||||
loadBalancedRetryFactories.get(0));
|
||||
}
|
||||
|
||||
|
||||
@@ -68,7 +68,7 @@ class OkHttpFeignLoadBalancerConfiguration {
|
||||
List<LoadBalancedRetryFactory> loadBalancedRetryFactories) {
|
||||
AnnotationAwareOrderComparator.sort(loadBalancedRetryFactories);
|
||||
OkHttpClient delegate = new OkHttpClient(okHttpClient);
|
||||
return new RetryableBlockingFeignLoadBalancerClient(delegate, loadBalancerClient,
|
||||
return new RetryableFeignBlockingLoadBalancerClient(delegate, loadBalancerClient,
|
||||
loadBalancedRetryFactories.get(0));
|
||||
}
|
||||
|
||||
|
||||
@@ -54,7 +54,7 @@ import org.springframework.retry.support.RetryTemplate;
|
||||
* @author Olga Maciaszek-Sharma
|
||||
* @since 2.2.6
|
||||
*/
|
||||
public class RetryableBlockingFeignLoadBalancerClient implements Client {
|
||||
public class RetryableFeignBlockingLoadBalancerClient implements Client {
|
||||
|
||||
private static final Log LOG = LogFactory
|
||||
.getLog(FeignBlockingLoadBalancerClient.class);
|
||||
@@ -65,7 +65,7 @@ public class RetryableBlockingFeignLoadBalancerClient implements Client {
|
||||
|
||||
private final LoadBalancedRetryFactory loadBalancedRetryFactory;
|
||||
|
||||
public RetryableBlockingFeignLoadBalancerClient(Client delegate,
|
||||
public RetryableFeignBlockingLoadBalancerClient(Client delegate,
|
||||
BlockingLoadBalancerClient loadBalancerClient,
|
||||
LoadBalancedRetryFactory loadBalancedRetryFactory) {
|
||||
this.delegate = delegate;
|
||||
@@ -139,8 +139,8 @@ class FeignLoadBalancerAutoConfigurationTests {
|
||||
|
||||
private void assertLoadBalancedWithRetries(ConfigurableApplicationContext context,
|
||||
Class delegateClass) {
|
||||
Map<String, RetryableBlockingFeignLoadBalancerClient> retryableBeans = context
|
||||
.getBeansOfType(RetryableBlockingFeignLoadBalancerClient.class);
|
||||
Map<String, RetryableFeignBlockingLoadBalancerClient> retryableBeans = context
|
||||
.getBeansOfType(RetryableFeignBlockingLoadBalancerClient.class);
|
||||
assertThat(retryableBeans).hasSize(1);
|
||||
Map<String, FeignBlockingLoadBalancerClient> beans = context
|
||||
.getBeansOfType(FeignBlockingLoadBalancerClient.class);
|
||||
|
||||
@@ -52,17 +52,17 @@ import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/**
|
||||
* Tests for {@link RetryableBlockingFeignLoadBalancerClient}. Note: the underlying
|
||||
* Tests for {@link RetryableFeignBlockingLoadBalancerClient}. Note: the underlying
|
||||
* {@link BlockingLoadBalancerClient} is already extensively tested in the Spring Cloud
|
||||
* Commons project, so here we are only testing the interactions between
|
||||
* {@link RetryableBlockingFeignLoadBalancerClient} and its delegates.
|
||||
* {@link RetryableFeignBlockingLoadBalancerClient} and its delegates.
|
||||
*
|
||||
* @see <a href=
|
||||
* "https://github.com/spring-cloud/spring-cloud-commons/blob/master/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClientTests.java">BlockingLoadBalancerClientTests</a>
|
||||
* @author Olga Maciaszek-Sharma
|
||||
*/
|
||||
@ExtendWith(MockitoExtension.class)
|
||||
class RetryableBlockingFeignLoadBalancerClientTests {
|
||||
class RetryableFeignBlockingLoadBalancerClientTests {
|
||||
|
||||
private Client delegate = mock(Client.class);
|
||||
|
||||
@@ -73,7 +73,7 @@ class RetryableBlockingFeignLoadBalancerClientTests {
|
||||
|
||||
private LoadBalancerRetryProperties properties = new LoadBalancerRetryProperties();
|
||||
|
||||
private RetryableBlockingFeignLoadBalancerClient feignBlockingLoadBalancerClient = new RetryableBlockingFeignLoadBalancerClient(
|
||||
private RetryableFeignBlockingLoadBalancerClient feignBlockingLoadBalancerClient = new RetryableFeignBlockingLoadBalancerClient(
|
||||
delegate, loadBalancerClient, retryFactory);
|
||||
|
||||
private ServiceInstance serviceInstance = new DefaultServiceInstance("test-a", "test",
|
||||
Reference in New Issue
Block a user