Remove redundant check from ResponseErrorHandler::handleError

`handleError()` is called only if `hasError()` returns true.

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>

Author: quaff

auto-configurations/common/spring-ai-autoconfigure-retry/src/main/java/org/springframework/ai/retry/autoconfigure/SpringAiRetryAutoConfiguration.java

@@ -17,6 +17,7 @@
 package org.springframework.ai.retry.autoconfigure;
 
 import java.io.IOException;
+import java.net.URI;
 import java.nio.charset.StandardCharsets;
 
 import org.slf4j.Logger;
@@ -30,6 +31,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
+import org.springframework.http.HttpMethod;
 import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.lang.NonNull;
 import org.springframework.retry.RetryCallback;
@@ -38,6 +40,7 @@
 import org.springframework.retry.support.RetryTemplate;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StreamUtils;
+import org.springframework.util.StringUtils;
 import org.springframework.web.client.ResponseErrorHandler;
 
 /**
@@ -47,6 +50,7 @@
  *
  * @author Christian Tzolov
  * @author SriVarshan P
+ * @author Yanming Zhou
  */
 @AutoConfiguration
 @ConditionalOnClass(RetryUtils.class)
@@ -88,12 +92,9 @@ public boolean hasError(@NonNull ClientHttpResponse response) throws IOException
 
 			@Override
 			public void handleError(@NonNull ClientHttpResponse response) throws IOException {
-				if (!response.getStatusCode().isError()) {
-					return;
-				}
 
 				String error = StreamUtils.copyToString(response.getBody(), StandardCharsets.UTF_8);
-				if (error == null || error.isEmpty()) {
+				if (!StringUtils.hasLength(error)) {
 					error = "No response body available";
 				}
 

spring-ai-retry/src/main/java/org/springframework/ai/retry/RetryUtils.java

@@ -41,6 +41,7 @@
  *
  * @author Christian Tzolov
  * @author Soby Chacko
+ * @author Yanming Zhou
  * @since 0.8.1
  */
 public abstract class RetryUtils {
@@ -60,20 +61,18 @@ public void handleError(URI url, HttpMethod method, @NonNull ClientHttpResponse
 		@Override
 		@SuppressWarnings("removal")
 		public void handleError(@NonNull ClientHttpResponse response) throws IOException {
-			if (response.getStatusCode().isError()) {
-				String error = StreamUtils.copyToString(response.getBody(), StandardCharsets.UTF_8);
-				String message = String.format("%s - %s", response.getStatusCode().value(), error);
-				/**
-				 * Thrown on 4xx client errors, such as 401 - Incorrect API key provided,
-				 * 401 - You must be a member of an organization to use the API, 429 -
-				 * Rate limit reached for requests, 429 - You exceeded your current quota
-				 * , please check your plan and billing details.
-				 */
-				if (response.getStatusCode().is4xxClientError()) {
-					throw new NonTransientAiException(message);
-				}
-				throw new TransientAiException(message);
+			String error = StreamUtils.copyToString(response.getBody(), StandardCharsets.UTF_8);
+			String message = String.format("%s - %s", response.getStatusCode().value(), error);
+			/**
+			 * Thrown on 4xx client errors, such as 401 - Incorrect API key provided, 401
+			 * - You must be a member of an organization to use the API, 429 - Rate limit
+			 * reached for requests, 429 - You exceeded your current quota , please check
+			 * your plan and billing details.
+			 */
+			if (response.getStatusCode().is4xxClientError()) {
+				throw new NonTransientAiException(message);
 			}
+			throw new TransientAiException(message);
 		}
 	};