From 5cb7a0d289f510bebde8f27329abf067629a34d0 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Tue, 8 Nov 2022 14:11:33 +0100 Subject: [PATCH] Remove deprecated elements in SC LoadBalancer. --- .../RetryLoadBalancerInterceptor.java | 14 ----------- ...torLoadBalancerExchangeFilterFunction.java | 23 ------------------- ...bleLoadBalancerExchangeFilterFunction.java | 23 ------------------- .../client/BlockingLoadBalancerClient.java | 10 -------- ...ealthCheckServiceInstanceListSupplier.java | 21 ----------------- .../HintBasedServiceInstanceListSupplier.java | 11 --------- ...ancerServiceInstanceCookieTransformer.java | 14 ++--------- ...ckySessionServiceInstanceListSupplier.java | 11 --------- .../support/LoadBalancerClientFactory.java | 9 -------- 9 files changed, 2 insertions(+), 134 deletions(-) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/RetryLoadBalancerInterceptor.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/RetryLoadBalancerInterceptor.java index a4949c0e..91a076a6 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/RetryLoadBalancerInterceptor.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/RetryLoadBalancerInterceptor.java @@ -57,20 +57,6 @@ public class RetryLoadBalancerInterceptor implements ClientHttpRequestIntercepto private final ReactiveLoadBalancer.Factory loadBalancerFactory; - /** - * @deprecated in favour of - * {@link RetryLoadBalancerInterceptor#RetryLoadBalancerInterceptor(LoadBalancerClient, LoadBalancerRequestFactory, LoadBalancedRetryFactory, ReactiveLoadBalancer.Factory)} - */ - @Deprecated - public RetryLoadBalancerInterceptor(LoadBalancerClient loadBalancer, LoadBalancerProperties properties, - LoadBalancerRequestFactory requestFactory, LoadBalancedRetryFactory lbRetryFactory, - ReactiveLoadBalancer.Factory loadBalancerFactory) { - this.loadBalancer = loadBalancer; - this.requestFactory = requestFactory; - this.lbRetryFactory = lbRetryFactory; - this.loadBalancerFactory = loadBalancerFactory; - } - public RetryLoadBalancerInterceptor(LoadBalancerClient loadBalancer, LoadBalancerRequestFactory requestFactory, LoadBalancedRetryFactory lbRetryFactory, ReactiveLoadBalancer.Factory loadBalancerFactory) { diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerExchangeFilterFunction.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerExchangeFilterFunction.java index 4afeedae..6c53d2e2 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerExchangeFilterFunction.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerExchangeFilterFunction.java @@ -63,29 +63,6 @@ public class ReactorLoadBalancerExchangeFilterFunction implements LoadBalancedEx private final List transformers; - /** - * @param loadBalancerFactory the loadbalancer factory - * @param properties the properties for SC LoadBalancer - * @deprecated Deprecated in favor of - * {@link #ReactorLoadBalancerExchangeFilterFunction(ReactiveLoadBalancer.Factory, LoadBalancerProperties, List)}. - */ - @Deprecated - public ReactorLoadBalancerExchangeFilterFunction(ReactiveLoadBalancer.Factory loadBalancerFactory, - LoadBalancerProperties properties) { - this(loadBalancerFactory, properties, Collections.emptyList()); - } - - /** - * @deprecated in favour of - * {@link ReactorLoadBalancerExchangeFilterFunction#ReactorLoadBalancerExchangeFilterFunction(ReactiveLoadBalancer.Factory, List)} - */ - @Deprecated - public ReactorLoadBalancerExchangeFilterFunction(ReactiveLoadBalancer.Factory loadBalancerFactory, - LoadBalancerProperties properties, List transformers) { - this.loadBalancerFactory = loadBalancerFactory; - this.transformers = transformers; - } - public ReactorLoadBalancerExchangeFilterFunction(ReactiveLoadBalancer.Factory loadBalancerFactory, List transformers) { this.loadBalancerFactory = loadBalancerFactory; diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/RetryableLoadBalancerExchangeFilterFunction.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/RetryableLoadBalancerExchangeFilterFunction.java index aab503c2..f23d34a2 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/RetryableLoadBalancerExchangeFilterFunction.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/RetryableLoadBalancerExchangeFilterFunction.java @@ -69,29 +69,6 @@ public class RetryableLoadBalancerExchangeFilterFunction implements LoadBalanced private final List transformers; - /** - * @deprecated Deprecated in favor of - * {@link #RetryableLoadBalancerExchangeFilterFunction(LoadBalancerRetryPolicy, ReactiveLoadBalancer.Factory, LoadBalancerProperties, List)}. - */ - @Deprecated - public RetryableLoadBalancerExchangeFilterFunction(LoadBalancerRetryPolicy retryPolicy, - ReactiveLoadBalancer.Factory loadBalancerFactory, LoadBalancerProperties properties) { - this(retryPolicy, loadBalancerFactory, properties, Collections.emptyList()); - } - - /** - * @deprecated in favour of - * {@link ReactorLoadBalancerExchangeFilterFunction#ReactorLoadBalancerExchangeFilterFunction(ReactiveLoadBalancer.Factory, List)} - */ - @Deprecated - public RetryableLoadBalancerExchangeFilterFunction(LoadBalancerRetryPolicy retryPolicy, - ReactiveLoadBalancer.Factory loadBalancerFactory, LoadBalancerProperties properties, - List transformers) { - this.retryPolicyFactory = s -> retryPolicy; - this.loadBalancerFactory = loadBalancerFactory; - this.transformers = transformers; - } - public RetryableLoadBalancerExchangeFilterFunction(LoadBalancerRetryPolicy.Factory retryPolicyFactory, ReactiveLoadBalancer.Factory loadBalancerFactory, List transformers) { diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClient.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClient.java index dc7567a7..e9d96ff2 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClient.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClient.java @@ -61,16 +61,6 @@ public class BlockingLoadBalancerClient implements LoadBalancerClient { private final ReactiveLoadBalancer.Factory loadBalancerClientFactory; - /** - * @deprecated in favour of - * {@link BlockingLoadBalancerClient#BlockingLoadBalancerClient(ReactiveLoadBalancer.Factory)} - */ - @Deprecated - public BlockingLoadBalancerClient(LoadBalancerClientFactory loadBalancerClientFactory, - LoadBalancerProperties properties) { - this.loadBalancerClientFactory = loadBalancerClientFactory; - } - public BlockingLoadBalancerClient(ReactiveLoadBalancer.Factory loadBalancerClientFactory) { this.loadBalancerClientFactory = loadBalancerClientFactory; } diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/HealthCheckServiceInstanceListSupplier.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/HealthCheckServiceInstanceListSupplier.java index c1e83287..d2086259 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/HealthCheckServiceInstanceListSupplier.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/HealthCheckServiceInstanceListSupplier.java @@ -60,27 +60,6 @@ public class HealthCheckServiceInstanceListSupplier extends DelegatingServiceIns private final BiFunction> aliveFunction; - /** - * @deprecated in favour of - * {@link HealthCheckServiceInstanceListSupplier#HealthCheckServiceInstanceListSupplier(ServiceInstanceListSupplier, ReactiveLoadBalancer.Factory, BiFunction)} - */ - @Deprecated - public HealthCheckServiceInstanceListSupplier(ServiceInstanceListSupplier delegate, - LoadBalancerProperties.HealthCheck healthCheck, - BiFunction> aliveFunction) { - super(delegate); - defaultHealthCheckPath = healthCheck.getPath().getOrDefault("default", "/actuator/health"); - this.aliveFunction = aliveFunction; - this.healthCheck = healthCheck; - Repeat aliveInstancesReplayRepeat = Repeat - .onlyIf(repeatContext -> this.healthCheck.getRefetchInstances()) - .fixedBackoff(healthCheck.getRefetchInstancesInterval()); - Flux> aliveInstancesFlux = Flux.defer(delegate).repeatWhen(aliveInstancesReplayRepeat) - .switchMap(serviceInstances -> healthCheckFlux(serviceInstances).map(alive -> List.copyOf(alive))); - aliveInstancesReplay = aliveInstancesFlux.delaySubscription(healthCheck.getInitialDelay()).replay(1) - .refCount(1); - } - public HealthCheckServiceInstanceListSupplier(ServiceInstanceListSupplier delegate, ReactiveLoadBalancer.Factory loadBalancerClientFactory, BiFunction> aliveFunction) { diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/HintBasedServiceInstanceListSupplier.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/HintBasedServiceInstanceListSupplier.java index c63d7d3d..c8a8ab2b 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/HintBasedServiceInstanceListSupplier.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/HintBasedServiceInstanceListSupplier.java @@ -41,17 +41,6 @@ public class HintBasedServiceInstanceListSupplier extends DelegatingServiceInsta private final LoadBalancerProperties properties; - /** - * @deprecated in favour of - * {@link HintBasedServiceInstanceListSupplier#HintBasedServiceInstanceListSupplier(ServiceInstanceListSupplier, ReactiveLoadBalancer.Factory)} - */ - @Deprecated - public HintBasedServiceInstanceListSupplier(ServiceInstanceListSupplier delegate, - LoadBalancerProperties properties) { - super(delegate); - this.properties = properties; - } - public HintBasedServiceInstanceListSupplier(ServiceInstanceListSupplier delegate, ReactiveLoadBalancer.Factory factory) { super(delegate); diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/LoadBalancerServiceInstanceCookieTransformer.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/LoadBalancerServiceInstanceCookieTransformer.java index 71d3985f..c9bfb766 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/LoadBalancerServiceInstanceCookieTransformer.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/LoadBalancerServiceInstanceCookieTransformer.java @@ -40,17 +40,6 @@ public class LoadBalancerServiceInstanceCookieTransformer implements LoadBalance private ReactiveLoadBalancer.Factory factory; - private LoadBalancerProperties.StickySession stickySessionProperties; - - /** - * @deprecated in favour of - * {@link LoadBalancerServiceInstanceCookieTransformer#LoadBalancerServiceInstanceCookieTransformer(ReactiveLoadBalancer.Factory)} - */ - @Deprecated - public LoadBalancerServiceInstanceCookieTransformer(LoadBalancerProperties.StickySession stickySessionProperties) { - this.stickySessionProperties = stickySessionProperties; - } - public LoadBalancerServiceInstanceCookieTransformer(ReactiveLoadBalancer.Factory factory) { this.factory = factory; } @@ -61,7 +50,8 @@ public class LoadBalancerServiceInstanceCookieTransformer implements LoadBalance return request; } LoadBalancerProperties.StickySession stickySession = factory != null - ? factory.getProperties(instance.getServiceId()).getStickySession() : stickySessionProperties; + ? factory.getProperties(instance.getServiceId()) + .getStickySession() : new LoadBalancerProperties.StickySession(); if (!stickySession.isAddServiceInstanceCookie()) { return request; } diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/RequestBasedStickySessionServiceInstanceListSupplier.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/RequestBasedStickySessionServiceInstanceListSupplier.java index c46009c5..bcd1cd92 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/RequestBasedStickySessionServiceInstanceListSupplier.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/RequestBasedStickySessionServiceInstanceListSupplier.java @@ -43,17 +43,6 @@ public class RequestBasedStickySessionServiceInstanceListSupplier extends Delega private final LoadBalancerProperties properties; - /** - * @deprecated in favour of - * {@link RequestBasedStickySessionServiceInstanceListSupplier#RequestBasedStickySessionServiceInstanceListSupplier(ServiceInstanceListSupplier, ReactiveLoadBalancer.Factory)} - */ - @Deprecated - public RequestBasedStickySessionServiceInstanceListSupplier(ServiceInstanceListSupplier delegate, - LoadBalancerProperties properties) { - super(delegate); - this.properties = properties; - } - public RequestBasedStickySessionServiceInstanceListSupplier(ServiceInstanceListSupplier delegate, ReactiveLoadBalancer.Factory loadBalancerClientFactory) { super(delegate); diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/support/LoadBalancerClientFactory.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/support/LoadBalancerClientFactory.java index e8b4db64..f7ed9e0c 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/support/LoadBalancerClientFactory.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/support/LoadBalancerClientFactory.java @@ -55,15 +55,6 @@ public class LoadBalancerClientFactory extends NamedContextFactory