From b13b14aee93c66e9c24ddc85cd42915a77d321bb Mon Sep 17 00:00:00 2001 From: sgibb Date: Mon, 4 Dec 2023 14:33:50 -0500 Subject: [PATCH] Renamed RewriteLocationResponseHeaderFilterFunctions.RewriteLocationResponseHeaderConfig.protocolsRegex --- .../gateway/server/mvc/filter/FilterFunctions.java | 8 ++++---- ...writeLocationResponseHeaderFilterFunctions.java | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) 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 678a6319..5a22ade6 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 @@ -164,10 +164,10 @@ public interface FilterFunctions { @Shortcut static HandlerFilterFunction rewriteLocationResponseHeader(String stripVersion, - String locationHeaderName, String hostValue, String protocols) { - return ofResponseProcessor(RewriteLocationResponseHeaderFilterFunctions - .rewriteLocationResponseHeader(config -> config.setStripVersion(stripVersion) - .setLocationHeaderName(locationHeaderName).setHostValue(hostValue).setProtocols(protocols))); + String locationHeaderName, String hostValue, String protocolsRegex) { + return ofResponseProcessor(RewriteLocationResponseHeaderFilterFunctions.rewriteLocationResponseHeader( + config -> config.setStripVersion(stripVersion).setLocationHeaderName(locationHeaderName) + .setHostValue(hostValue).setProtocolsRegex(protocolsRegex))); } @Shortcut diff --git a/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/RewriteLocationResponseHeaderFilterFunctions.java b/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/RewriteLocationResponseHeaderFilterFunctions.java index b9249346..95a8e319 100644 --- a/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/RewriteLocationResponseHeaderFilterFunctions.java +++ b/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/RewriteLocationResponseHeaderFilterFunctions.java @@ -164,7 +164,7 @@ public abstract class RewriteLocationResponseHeaderFilterFunctions { private String hostValue; - private String protocols = DEFAULT_PROTOCOLS; + private String protocolsRegex = DEFAULT_PROTOCOLS; private Pattern hostPortPattern = DEFAULT_HOST_PORT; @@ -202,14 +202,14 @@ public abstract class RewriteLocationResponseHeaderFilterFunctions { return this; } - public String getProtocols() { - return protocols; + public String getProtocolsRegex() { + return protocolsRegex; } - public RewriteLocationResponseHeaderConfig setProtocols(String protocols) { - this.protocols = protocols; - this.hostPortPattern = compileHostPortPattern(protocols); - this.hostPortVersionPattern = compileHostPortVersionPattern(protocols); + public RewriteLocationResponseHeaderConfig setProtocolsRegex(String protocolsRegex) { + this.protocolsRegex = protocolsRegex; + this.hostPortPattern = compileHostPortPattern(protocolsRegex); + this.hostPortVersionPattern = compileHostPortVersionPattern(protocolsRegex); return this; }