From a18676686639d723969c23f9d00285cd871be4ef Mon Sep 17 00:00:00 2001
From: Olga Maciaszek-Sharma <omaciaszeksh@vmware.com>
Date: Mon, 5 Aug 2024 16:36:38 +0200
Subject: [PATCH] Adjust to changes in Framework.

---
 .../ClientHttpResponseStatusCodeException.java     | 11 ++++++-----
 .../ClientHttpResponseStatusCodeExceptionTest.java | 14 ++++++++------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/ClientHttpResponseStatusCodeException.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/ClientHttpResponseStatusCodeException.java
index fd83c895..166ffdf2 100644
--- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/ClientHttpResponseStatusCodeException.java
+++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/ClientHttpResponseStatusCodeException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,13 +21,14 @@ import java.io.IOException;
 import java.io.InputStream;
 
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.client.AbstractClientHttpResponse;
+import org.springframework.http.HttpStatusCode;
 import org.springframework.http.client.ClientHttpResponse;
 
 /**
  * {@link RetryableStatusCodeException} that captures a {@link ClientHttpResponse}.
  *
  * @author Ryan Baxter
+ * @author Olga Maciaszek-Sharma
  */
 public class ClientHttpResponseStatusCodeException extends RetryableStatusCodeException {
 
@@ -52,7 +53,7 @@ public class ClientHttpResponseStatusCodeException extends RetryableStatusCodeEx
 		return this.response;
 	}
 
-	static class ClientHttpResponseWrapper extends AbstractClientHttpResponse {
+	static class ClientHttpResponseWrapper implements ClientHttpResponse {
 
 		private ClientHttpResponse response;
 
@@ -64,8 +65,8 @@ public class ClientHttpResponseStatusCodeException extends RetryableStatusCodeEx
 		}
 
 		@Override
-		public int getRawStatusCode() throws IOException {
-			return this.response.getStatusCode().value();
+		public HttpStatusCode getStatusCode() throws IOException {
+			return this.response.getStatusCode();
 		}
 
 		@Override
diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/ClientHttpResponseStatusCodeExceptionTest.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/ClientHttpResponseStatusCodeExceptionTest.java
index a51f3330..06f5855b 100644
--- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/ClientHttpResponseStatusCodeExceptionTest.java
+++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/ClientHttpResponseStatusCodeExceptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.client.AbstractClientHttpResponse;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.HttpStatusCode;
 import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.util.StreamUtils;
 
@@ -33,6 +34,7 @@ import static org.assertj.core.api.BDDAssertions.then;
 
 /**
  * @author Ryan Baxter
+ * @author Olga Maciaszek-Sharma
  */
 @ExtendWith(MockitoExtension.class)
 public class ClientHttpResponseStatusCodeExceptionTest {
@@ -44,19 +46,19 @@ public class ClientHttpResponseStatusCodeExceptionTest {
 		ClientHttpResponseStatusCodeException exp = new ClientHttpResponseStatusCodeException("service", response,
 				response.getStatusText().getBytes());
 		ClientHttpResponse expResponse = exp.getResponse();
-		then(expResponse.getStatusCode().value()).isEqualTo(response.getRawStatusCode());
+		then(expResponse.getStatusCode()).isEqualTo(response.getStatusCode());
 		then(expResponse.getStatusText()).isEqualTo(response.getStatusText());
 		then(expResponse.getHeaders()).isEqualTo(response.getHeaders());
 		then(new String(StreamUtils.copyToByteArray(expResponse.getBody()))).isEqualTo(response.getStatusText());
 	}
 
-	static class MyClientHttpResponse extends AbstractClientHttpResponse {
+	static class MyClientHttpResponse implements ClientHttpResponse {
 
 		private boolean closed = false;
 
 		@Override
-		public int getRawStatusCode() {
-			return 200;
+		public HttpStatusCode getStatusCode() {
+			return HttpStatus.OK;
 		}
 
 		@Override