SpringCloud/spring-cloud-gateway
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing merge

Browse Source
This commit is contained in:
Ryan Baxter
2025-03-14 10:43:16 -04:00
parent c8249ed8bb
commit f22b40a504
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/filter/BeforeFilterFunctionsTests.java
View File

@@ -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());

7
spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/HttpClientProperties.java
View File

@@ -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;