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

Updates to use WHAT_WG uri parser type.

Browse Source 
See https://github.com/spring-projects/spring-framework/issues/33639
This commit is contained in:
spencergibb
2024-10-11 13:53:46 -04:00
parent cf5171b56d
commit 766e3e0b5b
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/handler/RoutePredicateHandlerMappingIntegrationTests.java
View File

@@ -34,6 +34,7 @@ import org.springframework.test.util.TestSocketUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.util.DefaultUriBuilderFactory;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
@@ -56,8 +57,10 @@ public class RoutePredicateHandlerMappingIntegrationTests extends BaseWebClientT
@Test
public void requestsToManagementPortReturn404() {
String baseUrl = "http://localhost:" + managementPort;
testClient.mutate()
.baseUrl("http://localhost:" + managementPort)
.uriBuilderFactory(new DefaultUriBuilderFactory(baseUrl))
.baseUrl(baseUrl)
.build()
.get()
.uri("/get")
@@ -69,8 +72,10 @@ public class RoutePredicateHandlerMappingIntegrationTests extends BaseWebClientT
@Test
public void requestsToManagementPortAndHostHeaderReturn404() {
String host = "example.com:8888";
String baseUrl = "http://localhost:" + managementPort;
testClient.mutate()
.baseUrl("http://localhost:" + managementPort)
.uriBuilderFactory(new DefaultUriBuilderFactory(baseUrl))
.baseUrl(baseUrl)
.build()
.get()
.uri("/get")

9
spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/test/BaseWebClientTests.java
View File

@@ -42,6 +42,8 @@ import org.springframework.http.client.reactive.ReactorClientHttpConnector;
import org.springframework.test.web.reactive.server.WebTestClient;
import org.springframework.web.reactive.function.client.WebClient;
import org.springframework.web.server.ServerWebExchange;
import org.springframework.web.util.DefaultUriBuilderFactory;
import org.springframework.web.util.UriComponentsBuilder;
import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.GATEWAY_HANDLER_MAPPER_ATTR;
import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.GATEWAY_ROUTE_ATTR;
@@ -76,7 +78,12 @@ public class BaseWebClientTests {
protected void setup(ClientHttpConnector httpConnector, String baseUri) {
this.baseUri = baseUri;
this.webClient = WebClient.builder().clientConnector(httpConnector).baseUrl(this.baseUri).build();
this.testClient = WebTestClient.bindToServer(httpConnector).baseUrl(this.baseUri).build();
DefaultUriBuilderFactory uriBuilderFactory = new DefaultUriBuilderFactory(this.baseUri);
uriBuilderFactory.setParserType(UriComponentsBuilder.ParserType.WHAT_WG);
this.testClient = WebTestClient.bindToServer(httpConnector)
.uriBuilderFactory(uriBuilderFactory)
.baseUrl(this.baseUri)
.build();
}
@Configuration(proxyBeanMethods = false)