From ad7e6cd14fe2c6745b53e76fe7b25df533dcfafd Mon Sep 17 00:00:00 2001
From: sgibb <sgibb@pivotal.io>
Date: Mon, 4 Dec 2023 12:11:15 -0500
Subject: [PATCH] Update BeforeFilterFunctions.preserveHostHeader() for
 compatibility

---
 .../gateway/server/mvc/filter/BeforeFilterFunctions.java      | 2 +-
 .../cloud/gateway/server/mvc/filter/FilterFunctions.java      | 2 +-
 .../cloud/gateway/server/mvc/ServerMvcIntegrationTests.java   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/BeforeFilterFunctions.java b/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/BeforeFilterFunctions.java
index 2617930d..cbfd7d1f 100644
--- a/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/BeforeFilterFunctions.java
+++ b/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/BeforeFilterFunctions.java
@@ -193,7 +193,7 @@ public abstract class BeforeFilterFunctions {
 		};
 	}
 
-	public static Function<ServerRequest, ServerRequest> preserveHost() {
+	public static Function<ServerRequest, ServerRequest> preserveHostHeader() {
 		return request -> {
 			request.attributes().put(MvcUtils.PRESERVE_HOST_HEADER_ATTRIBUTE, true);
 			return request;
diff --git a/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/FilterFunctions.java b/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/FilterFunctions.java
index 0021cd18..aa7fe93a 100644
--- a/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/FilterFunctions.java
+++ b/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/FilterFunctions.java
@@ -101,7 +101,7 @@ public interface FilterFunctions {
 
 	@Shortcut
 	static HandlerFilterFunction<ServerResponse, ServerResponse> preserveHost() {
-		return ofRequestProcessor(BeforeFilterFunctions.preserveHost());
+		return ofRequestProcessor(BeforeFilterFunctions.preserveHostHeader());
 	}
 
 	static HandlerFilterFunction<ServerResponse, ServerResponse> redirectTo(int status, URI uri) {
diff --git a/spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/ServerMvcIntegrationTests.java b/spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/ServerMvcIntegrationTests.java
index 14c491ad..9ab44c22 100644
--- a/spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/ServerMvcIntegrationTests.java
+++ b/spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/ServerMvcIntegrationTests.java
@@ -90,7 +90,7 @@ import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFu
 import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.fallbackHeaders;
 import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.mapRequestHeader;
 import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.modifyRequestBody;
-import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.preserveHost;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.preserveHostHeader;
 import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.removeRequestParameter;
 import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.requestHeaderSize;
 import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.requestHeaderToRequestUri;
@@ -737,7 +737,7 @@ public class ServerMvcIntegrationTests {
 			return route("testhostpredicate")
 					.route(host("{sub}.myjavadslhost.com").and(path("/anything/hostpredicate")), http())
 					.before(new HttpbinUriResolver())
-					.before(preserveHost())
+					.before(preserveHostHeader())
 					.after(addResponseHeader("X-SubDomain", "{sub}"))
 					.build();
 			// @formatter:on