From f22b40a504bd4dbfe8d39d5ab952b2aa0507d609 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Fri, 14 Mar 2025 10:43:16 -0400 Subject: [PATCH] Fixing merge --- .../filter/BeforeFilterFunctionsTests.java | 19 ++++++++++--------- .../gateway/config/HttpClientProperties.java | 7 +++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/filter/BeforeFilterFunctionsTests.java b/spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/filter/BeforeFilterFunctionsTests.java index 8c37dee8..7393acae 100644 --- a/spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/filter/BeforeFilterFunctionsTests.java +++ b/spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/filter/BeforeFilterFunctionsTests.java @@ -30,10 +30,11 @@ import static org.assertj.core.api.Assertions.assertThat; * @author raccoonback */ class BeforeFilterFunctionsTests { + @Test void setPath() { MockHttpServletRequest servletRequest = MockMvcRequestBuilders.get("http://localhost/legacy/path") - .buildRequest(null); + .buildRequest(null); ServerRequest request = ServerRequest.create(servletRequest, Collections.emptyList()); @@ -45,7 +46,7 @@ class BeforeFilterFunctionsTests { @Test void setEncodedPath() { MockHttpServletRequest servletRequest = MockMvcRequestBuilders.get("http://localhost/legacy/path") - .buildRequest(null); + .buildRequest(null); ServerRequest request = ServerRequest.create(servletRequest, Collections.emptyList()); @@ -57,8 +58,8 @@ class BeforeFilterFunctionsTests { @Test void setPathWithParameters() { MockHttpServletRequest servletRequest = MockMvcRequestBuilders.get("http://localhost/legacy/path") - .queryParam("foo", "bar") - .buildRequest(null); + .queryParam("foo", "bar") + .buildRequest(null); ServerRequest request = ServerRequest.create(servletRequest, Collections.emptyList()); @@ -70,8 +71,8 @@ class BeforeFilterFunctionsTests { @Test void setPathWithEncodedParameters() { MockHttpServletRequest servletRequest = MockMvcRequestBuilders.get("http://localhost/legacy/path") - .queryParam("foo[]", "bar[]") - .buildRequest(null); + .queryParam("foo[]", "bar[]") + .buildRequest(null); ServerRequest request = ServerRequest.create(servletRequest, Collections.emptyList()); @@ -159,7 +160,7 @@ class BeforeFilterFunctionsTests { @Test void stripPrefixWithEncodedPath() { MockHttpServletRequest servletRequest = MockMvcRequestBuilders.get("http://localhost/depth1/depth2/depth3/é") - .buildRequest(null); + .buildRequest(null); ServerRequest request = ServerRequest.create(servletRequest, Collections.emptyList()); @@ -171,8 +172,8 @@ class BeforeFilterFunctionsTests { @Test void stripPrefixWithEncodedParameters() { MockHttpServletRequest servletRequest = MockMvcRequestBuilders.get("http://localhost/depth1/depth2/depth3") - .queryParam("baz[]", "qux[]") - .buildRequest(null); + .queryParam("baz[]", "qux[]") + .buildRequest(null); ServerRequest request = ServerRequest.create(servletRequest, Collections.emptyList()); diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/HttpClientProperties.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/HttpClientProperties.java index e8df7eaf..fef1d54c 100644 --- a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/HttpClientProperties.java +++ b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/HttpClientProperties.java @@ -209,8 +209,8 @@ public class HttpClientProperties { private boolean metrics = false; /** - * Configures the leasing strategy for the pool (fifo or lifo), defaults - * to FIFO which is Netty's default. + * Configures the leasing strategy for the pool (fifo or lifo), defaults to FIFO + * which is Netty's default. */ private LeasingStrategy leasingStrategy = LeasingStrategy.FIFO; @@ -332,8 +332,7 @@ public class HttpClientProperties { public static class Proxy { /** - * proxyType for proxy configuration of Netty HttpClient (http, socks4 or - * socks5). + * proxyType for proxy configuration of Netty HttpClient (http, socks4 or socks5). */ private ProxyProvider.Proxy type = ProxyProvider.Proxy.HTTP;