add client response attrs

Signed-off-by: jiangyuan <[email protected]>

Author: JoeCqupt

Diff for: spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/common/MvcUtils.java

@@ -63,6 +63,11 @@ public abstract class MvcUtils {
 	 */
 	public static final String CLIENT_RESPONSE_INPUT_STREAM_ATTR = qualify("cachedClientResponseBody");
 
+	/**
+	 * Client response key.
+	 */
+	public static final String CLIENT_RESPONSE_ATTR = qualify("cachedClientResponse");
+
 	/**
 	 * CircuitBreaker execution exception attribute name.
 	 */

Diff for: spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/RetryFilterFunctions.java

@@ -17,7 +17,6 @@
 package org.springframework.cloud.gateway.server.mvc.filter;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -34,6 +33,7 @@
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.HttpStatusCode;
+import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.retry.RetryContext;
 import org.springframework.retry.RetryPolicy;
 import org.springframework.retry.policy.CompositeRetryPolicy;
@@ -76,8 +76,7 @@ public static HandlerFilterFunction<ServerResponse, ServerResponse> retry(RetryC
 			if (config.isCacheBody()) {
 				MvcUtils.getOrCacheBody(request);
 			}
-			// test ci build
-			// reset(request);
+			reset(request);
 			ServerResponse serverResponse = next.handle(request);
 
 			if (isRetryableStatusCode(serverResponse.statusCode(), config)
@@ -90,10 +89,10 @@ && isRetryableMethod(request.method(), config)) {
 	}
 
 	private static void reset(ServerRequest request) throws IOException {
-		InputStream inputStream = MvcUtils.getAttribute(request, MvcUtils.CLIENT_RESPONSE_INPUT_STREAM_ATTR);
-		if (inputStream != null) {
-			inputStream.close();
-			MvcUtils.putAttribute(request, MvcUtils.CLIENT_RESPONSE_INPUT_STREAM_ATTR, null);
+		ClientHttpResponse clientHttpResponse = MvcUtils.getAttribute(request, MvcUtils.CLIENT_RESPONSE_ATTR);
+		if (clientHttpResponse != null) {
+			clientHttpResponse.close();
+			MvcUtils.putAttribute(request, MvcUtils.CLIENT_RESPONSE_ATTR, null);
 		}
 	}
 

Diff for: spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/handler/ClientHttpRequestFactoryProxyExchange.java

@@ -56,6 +56,7 @@ public ServerResponse exchange(Request request) {
 			InputStream body = clientHttpResponse.getBody();
 			// put the body input stream in a request attribute so filters can read it.
 			MvcUtils.putAttribute(request.getServerRequest(), MvcUtils.CLIENT_RESPONSE_INPUT_STREAM_ATTR, body);
+			MvcUtils.putAttribute(request.getServerRequest(), MvcUtils.CLIENT_RESPONSE_ATTR, clientHttpResponse);
 			ServerResponse serverResponse = GatewayServerResponse.status(clientHttpResponse.getStatusCode())
 				.build((req, httpServletResponse) -> {
 					try (clientHttpResponse) {

Diff for: spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/handler/RestClientProxyExchange.java

@@ -72,6 +72,7 @@ private ServerResponse doExchange(Request request, ClientHttpResponse clientResp
 		InputStream body = clientResponse.getBody();
 		// put the body input stream in a request attribute so filters can read it.
 		MvcUtils.putAttribute(request.getServerRequest(), MvcUtils.CLIENT_RESPONSE_INPUT_STREAM_ATTR, body);
+		MvcUtils.putAttribute(request.getServerRequest(), MvcUtils.CLIENT_RESPONSE_ATTR, clientResponse);
 		ServerResponse serverResponse = GatewayServerResponse.status(clientResponse.getStatusCode())
 			.build((req, httpServletResponse) -> {
 				try (clientResponse) {