From 0d0ff508429db126bdd46f5b3c086fe931d7f8e9 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Mon, 28 Feb 2022 16:48:31 +0100 Subject: [PATCH] Use raw types in ResponseData. (#685) --- .../openfeign/loadbalancer/LoadBalancerUtils.java | 4 +--- .../FeignBlockingLoadBalancerClientTests.java | 10 ++++++---- .../RetryableFeignBlockingLoadBalancerClientTests.java | 10 ++++++---- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/LoadBalancerUtils.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/LoadBalancerUtils.java index 829880f6..04df224f 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/LoadBalancerUtils.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/LoadBalancerUtils.java @@ -33,7 +33,6 @@ import org.springframework.cloud.client.loadbalancer.RequestData; import org.springframework.cloud.client.loadbalancer.ResponseData; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; -import org.springframework.http.HttpStatus; /** * @author Olga Maciaszek-Sharma @@ -73,8 +72,7 @@ final class LoadBalancerUtils { static ResponseData buildResponseData(Response response) { HttpHeaders responseHeaders = new HttpHeaders(); response.headers().forEach((key, value) -> responseHeaders.put(key, new ArrayList<>(value))); - return new ResponseData(HttpStatus.resolve(response.status()), responseHeaders, null, - buildRequestData(response.request())); + return new ResponseData(response.status(), responseHeaders, null, buildRequestData(response.request())); } static RequestData buildRequestData(Request request) { diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/loadbalancer/FeignBlockingLoadBalancerClientTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/loadbalancer/FeignBlockingLoadBalancerClientTests.java index 4218e994..56626cb0 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/loadbalancer/FeignBlockingLoadBalancerClientTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/loadbalancer/FeignBlockingLoadBalancerClientTests.java @@ -167,11 +167,13 @@ class FeignBlockingLoadBalancerClientTests { .get("anotherLoadBalancerLifecycle")).getCompleteLog().values(); assertThat(lifecycleLogRequests).extracting(lbRequest -> lbRequest.getContext().getHint()) .contains(callbackTestHint); - assertThat(lifecycleLogStartedRequests).extracting(lbRequest -> lbRequest.getContext().getHint()) - .contains(callbackTestHint); + assertThat(lifecycleLogStartedRequests).extracting(lbRequest -> lbRequest.getContext() + .getHint()) + .contains(callbackTestHint); assertThat(anotherLifecycleLogRequests) - .extracting(completionContext -> completionContext.getClientResponse().getHttpStatus()) - .contains(HttpStatus.OK); + .extracting(completionContext -> completionContext.getClientResponse() + .getHttpStatus()) + .contains(HttpStatus.OK.value()); } private String read(Response response) throws IOException { diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/loadbalancer/RetryableFeignBlockingLoadBalancerClientTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/loadbalancer/RetryableFeignBlockingLoadBalancerClientTests.java index b89262d5..028af053 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/loadbalancer/RetryableFeignBlockingLoadBalancerClientTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/loadbalancer/RetryableFeignBlockingLoadBalancerClientTests.java @@ -232,11 +232,13 @@ class RetryableFeignBlockingLoadBalancerClientTests { .get("anotherLoadBalancerLifecycle")).getCompleteLog().values(); assertThat(lifecycleLogRequests).extracting(lbRequest -> lbRequest.getContext().getHint()) .contains(callbackTestHint); - assertThat(lifecycleLogStartedRequests).extracting(lbRequest -> lbRequest.getContext().getHint()) - .contains(callbackTestHint); + assertThat(lifecycleLogStartedRequests).extracting(lbRequest -> lbRequest.getContext() + .getHint()) + .contains(callbackTestHint); assertThat(anotherLifecycleLogRequests) - .extracting(completionContext -> completionContext.getClientResponse().getHttpStatus()) - .contains(HttpStatus.OK); + .extracting(completionContext -> completionContext.getClientResponse() + .getHttpStatus()) + .contains(HttpStatus.OK.value()); } private Request testRequest() {