From 6b6f6dbbd566868399debe5c247c4c5487e823bb Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Thu, 11 Mar 2021 16:28:21 +0100 Subject: [PATCH] Move LoadBalancerServiceInstanceCookieTransformer to loadbalancer module. (#920) --- .../config/BlockingLoadBalancerClientAutoConfiguration.java | 2 +- .../core}/LoadBalancerServiceInstanceCookieTransformer.java | 5 ++++- .../LoadBalancerServiceInstanceCookieTransformerTests.java | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) rename {spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer => spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core}/LoadBalancerServiceInstanceCookieTransformer.java (88%) rename {spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer => spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core}/LoadBalancerServiceInstanceCookieTransformerTests.java (95%) diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfiguration.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfiguration.java index 427e3335..f9fad606 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfiguration.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfiguration.java @@ -27,10 +27,10 @@ import org.springframework.cloud.client.loadbalancer.AsyncLoadBalancerAutoConfig import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory; import org.springframework.cloud.client.loadbalancer.LoadBalancerClient; import org.springframework.cloud.client.loadbalancer.LoadBalancerProperties; -import org.springframework.cloud.client.loadbalancer.LoadBalancerServiceInstanceCookieTransformer; import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClients; import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient; import org.springframework.cloud.loadbalancer.blocking.retry.BlockingLoadBalancedRetryFactory; +import org.springframework.cloud.loadbalancer.core.LoadBalancerServiceInstanceCookieTransformer; import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerServiceInstanceCookieTransformer.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/LoadBalancerServiceInstanceCookieTransformer.java similarity index 88% rename from spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerServiceInstanceCookieTransformer.java rename to spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/LoadBalancerServiceInstanceCookieTransformer.java index e7c6757f..08bcbd43 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerServiceInstanceCookieTransformer.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/LoadBalancerServiceInstanceCookieTransformer.java @@ -14,12 +14,15 @@ * limitations under the License. */ -package org.springframework.cloud.client.loadbalancer; +package org.springframework.cloud.loadbalancer.core; import java.util.ArrayList; import java.util.List; import org.springframework.cloud.client.ServiceInstance; +import org.springframework.cloud.client.loadbalancer.LoadBalancerClient; +import org.springframework.cloud.client.loadbalancer.LoadBalancerProperties; +import org.springframework.cloud.client.loadbalancer.LoadBalancerRequestTransformer; import org.springframework.http.HttpCookie; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpRequest; diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancerServiceInstanceCookieTransformerTests.java b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/LoadBalancerServiceInstanceCookieTransformerTests.java similarity index 95% rename from spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancerServiceInstanceCookieTransformerTests.java rename to spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/LoadBalancerServiceInstanceCookieTransformerTests.java index f782626c..d4a647be 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancerServiceInstanceCookieTransformerTests.java +++ b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/LoadBalancerServiceInstanceCookieTransformerTests.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.springframework.cloud.client.loadbalancer; +package org.springframework.cloud.loadbalancer.core; import org.junit.jupiter.api.Test; import org.springframework.cloud.client.DefaultServiceInstance; import org.springframework.cloud.client.ServiceInstance; +import org.springframework.cloud.client.loadbalancer.LoadBalancerProperties; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpRequest; import org.springframework.mock.http.client.MockClientHttpRequest;