From fa07416bd84e93f06f3a44ee5104b657cf911fa7 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 3 Mar 2023 17:56:02 -0500 Subject: [PATCH] Updates to new HttpStatusCode interface --- .../eureka/http/WebClientEurekaHttpClient.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) 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 6e130c487..5788c99f5 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 @@ -30,6 +30,7 @@ import reactor.core.publisher.Mono; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.reactive.function.BodyInserters; @@ -55,14 +56,14 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient { return webClient.post().uri("apps/" + info.getAppName()).body(BodyInserters.fromValue(info)) .header(HttpHeaders.ACCEPT_ENCODING, "gzip") .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE).retrieve() - .onStatus(HttpStatus::isError, this::ignoreError).toBodilessEntity().map(this::eurekaHttpResponse) + .onStatus(HttpStatusCode::isError, this::ignoreError).toBodilessEntity().map(this::eurekaHttpResponse) .block(); } @Override public EurekaHttpResponse cancel(String appName, String id) { return webClient.delete().uri("apps/" + appName + '/' + id).retrieve() - .onStatus(HttpStatus::isError, this::ignoreError).toBodilessEntity().map(this::eurekaHttpResponse) + .onStatus(HttpStatusCode::isError, this::ignoreError).toBodilessEntity().map(this::eurekaHttpResponse) .block(); } @@ -76,7 +77,7 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient { ResponseEntity response = webClient.put().uri(urlPath) .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) .header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).retrieve() - .onStatus(HttpStatus::isError, this::ignoreError).toEntity(InstanceInfo.class).block(); + .onStatus(HttpStatusCode::isError, this::ignoreError).toEntity(InstanceInfo.class).block(); EurekaHttpResponseBuilder builder = anEurekaHttpResponse(statusCodeValueOf(response), InstanceInfo.class).headers(headersOf(response)); @@ -98,7 +99,7 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient { + info.getLastDirtyTimestamp().toString(); return webClient.put().uri(urlPath).header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) - .retrieve().onStatus(HttpStatus::isError, this::ignoreError).toBodilessEntity() + .retrieve().onStatus(HttpStatusCode::isError, this::ignoreError).toBodilessEntity() .map(this::eurekaHttpResponse).block(); } @@ -108,7 +109,7 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient { + info.getLastDirtyTimestamp().toString(); return webClient.delete().uri(urlPath).header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) - .retrieve().onStatus(HttpStatus::isError, this::ignoreError).toBodilessEntity() + .retrieve().onStatus(HttpStatusCode::isError, this::ignoreError).toBodilessEntity() .map(this::eurekaHttpResponse).block(); } @@ -127,7 +128,7 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient { ResponseEntity response = webClient.get().uri(url) .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) .header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).retrieve() - .onStatus(HttpStatus::isError, this::ignoreError).toEntity(Applications.class).block(); + .onStatus(HttpStatusCode::isError, this::ignoreError).toEntity(Applications.class).block(); int statusCode = statusCodeValueOf(response); @@ -157,7 +158,7 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient { ResponseEntity response = webClient.get().uri("apps/" + appName) .header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).retrieve() - .onStatus(HttpStatus::isError, this::ignoreError).toEntity(Application.class).block(); + .onStatus(HttpStatusCode::isError, this::ignoreError).toEntity(Application.class).block(); int statusCode = statusCodeValueOf(response); Application body = response.getBody(); @@ -180,7 +181,7 @@ public class WebClientEurekaHttpClient implements EurekaHttpClient { private EurekaHttpResponse getInstanceInternal(String urlPath) { ResponseEntity response = webClient.get().uri(urlPath) .header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).retrieve() - .onStatus(HttpStatus::isError, this::ignoreError).toEntity(InstanceInfo.class).block(); + .onStatus(HttpStatusCode::isError, this::ignoreError).toEntity(InstanceInfo.class).block(); int statusCode = statusCodeValueOf(response); InstanceInfo body = response.getBody();