From de692f92cf604463bbea00844bb6445733854307 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Mon, 7 Nov 2022 16:10:57 +0100 Subject: [PATCH] Revert WebClientEurekaHttpClient changes. --- .../http/WebClientEurekaHttpClient.java | 25 +++++++++---------- ...ava => AbstractEurekaHttpClientTests.java} | 2 +- ...=> RestTemplateEurekaHttpClientTests.java} | 2 +- ...va => WebClientEurekaHttpClientTests.java} | 2 +- 4 files changed, 15 insertions(+), 16 deletions(-) rename spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/{AbstractEurekaHttpClientTest.java => AbstractEurekaHttpClientTests.java} (98%) rename spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/{RestTemplateEurekaHttpClientTest.java => RestTemplateEurekaHttpClientTests.java} (96%) rename spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/{WebClientEurekaHttpClientTest.java => WebClientEurekaHttpClientTests.java} (97%) diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/WebClientEurekaHttpClient.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/WebClientEurekaHttpClient.java index f3d9a67db..303cd8713 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/WebClientEurekaHttpClient.java +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/WebClientEurekaHttpClient.java @@ -28,7 +28,6 @@ import com.netflix.discovery.shared.transport.EurekaHttpClient; import com.netflix.discovery.shared.transport.EurekaHttpResponse; import com.netflix.discovery.shared.transport.EurekaHttpResponse.EurekaHttpResponseBuilder; import com.netflix.discovery.util.StringUtil; -import reactor.core.publisher.Mono; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; @@ -55,14 +54,14 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient { public EurekaHttpResponse register(InstanceInfo info) { return webClient.post().uri("apps/" + info.getAppName(), Void.class).body(BodyInserters.fromValue(info)) .header(HttpHeaders.ACCEPT_ENCODING, "gzip") - .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE).exchangeToMono(Mono::just) - .map(this::eurekaHttpResponse).block(); + .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE).exchange() + .map(response -> eurekaHttpResponse(response)).block(); } @Override public EurekaHttpResponse cancel(String appName, String id) { - return webClient.delete().uri("apps/" + appName + '/' + id, Void.class).exchangeToMono(Mono::just) - .map(this::eurekaHttpResponse).block(); + return webClient.delete().uri("apps/" + appName + '/' + id, Void.class).exchange() + .map(response -> eurekaHttpResponse(response)).block(); } @Override @@ -74,7 +73,7 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient { ClientResponse response = webClient.put().uri(urlPath, InstanceInfo.class) .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) - .header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).exchangeToMono(Mono::just).block(); + .header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).exchange().block(); EurekaHttpResponseBuilder builder = anEurekaHttpResponse(statusCodeValueOf(response), InstanceInfo.class).headers(headersOf(response)); @@ -96,8 +95,8 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient { + info.getLastDirtyTimestamp().toString(); return webClient.put().uri(urlPath, Void.class) - .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE).exchangeToMono(Mono::just) - .map(this::eurekaHttpResponse).block(); + .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE).exchange() + .map(response -> eurekaHttpResponse(response)).block(); } @Override @@ -106,8 +105,8 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient { + info.getLastDirtyTimestamp().toString(); return webClient.delete().uri(urlPath, Void.class) - .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE).exchangeToMono(Mono::just) - .map(this::eurekaHttpResponse).block(); + .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE).exchange() + .map(response -> eurekaHttpResponse(response)).block(); } @Override @@ -124,7 +123,7 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient { ClientResponse response = webClient.get().uri(url, Applications.class) .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) - .header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).exchangeToMono(Mono::just).block(); + .header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).exchange().block(); int statusCode = statusCodeValueOf(response); @@ -153,7 +152,7 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient { public EurekaHttpResponse getApplication(String appName) { ClientResponse response = webClient.get().uri("apps/" + appName, Application.class) - .header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).exchangeToMono(Mono::just).block(); + .header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).exchange().block(); int statusCode = statusCodeValueOf(response); Application body = response.toEntity(Application.class).block().getBody(); @@ -175,7 +174,7 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient { private EurekaHttpResponse getInstanceInternal(String urlPath) { ClientResponse response = webClient.get().uri(urlPath, InstanceInfo.class) - .header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).exchangeToMono(Mono::just).block(); + .header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).exchange().block(); int statusCode = statusCodeValueOf(response); InstanceInfo body = response.toEntity(InstanceInfo.class).block().getBody(); diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/AbstractEurekaHttpClientTest.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/AbstractEurekaHttpClientTests.java similarity index 98% rename from spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/AbstractEurekaHttpClientTest.java rename to spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/AbstractEurekaHttpClientTests.java index a48a6b218..1c842e82e 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/AbstractEurekaHttpClientTest.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/AbstractEurekaHttpClientTests.java @@ -28,7 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Haytham Mohamed **/ -abstract class AbstractEurekaHttpClientTest { +abstract class AbstractEurekaHttpClientTests { protected EurekaHttpClient eurekaHttpClient; diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/RestTemplateEurekaHttpClientTest.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/RestTemplateEurekaHttpClientTests.java similarity index 96% rename from spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/RestTemplateEurekaHttpClientTest.java rename to spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/RestTemplateEurekaHttpClientTests.java index f5249e833..b9a7b5f5b 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/RestTemplateEurekaHttpClientTest.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/RestTemplateEurekaHttpClientTests.java @@ -36,7 +36,7 @@ import org.springframework.test.annotation.DirtiesContext; "eureka.client.register-with-eureka=false", "logging.level.org.springframework=INFO" }, webEnvironment = WebEnvironment.RANDOM_PORT) @DirtiesContext -class RestTemplateEurekaHttpClientTest extends AbstractEurekaHttpClientTest { +class RestTemplateEurekaHttpClientTests extends AbstractEurekaHttpClientTests { @Autowired private InetUtils inetUtils; diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/WebClientEurekaHttpClientTest.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/WebClientEurekaHttpClientTests.java similarity index 97% rename from spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/WebClientEurekaHttpClientTest.java rename to spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/WebClientEurekaHttpClientTests.java index 1728b1e42..3dd7030cf 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/WebClientEurekaHttpClientTest.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/WebClientEurekaHttpClientTests.java @@ -37,7 +37,7 @@ import org.springframework.web.reactive.function.client.WebClient; "eureka.client.fetch-registry=false", "eureka.client.register-with-eureka=false" }, webEnvironment = WebEnvironment.RANDOM_PORT) @DirtiesContext -class WebClientEurekaHttpClientTest extends AbstractEurekaHttpClientTest { +class WebClientEurekaHttpClientTests extends AbstractEurekaHttpClientTests { @Autowired private InetUtils inetUtils;