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

Updates HeaderRoutePredicateFactory to use getValuesAsList

Browse Source 
Fixes gh-3447
This commit is contained in:
ohprettyhak
2024-07-01 23:04:58 +09:00
committed by spencergibb
parent 3bb69ec39c
commit da77ec780a
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/handler/predicate/HeaderRoutePredicateFactory.java
View File

@@ -17,7 +17,6 @@
package org.springframework.cloud.gateway.handler.predicate;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.function.Predicate;
import java.util.regex.Pattern;
@@ -59,9 +58,7 @@ public class HeaderRoutePredicateFactory extends AbstractRoutePredicateFactory<H
return new GatewayPredicate() {
@Override
public boolean test(ServerWebExchange exchange) {
List<String> values = exchange.getRequest()
.getHeaders()
.getOrDefault(config.header, Collections.emptyList());
List<String> values = exchange.getRequest().getHeaders().getValuesAsList(config.header);
if (values.isEmpty()) {
return false;
}

14
spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/handler/predicate/HeaderRoutePredicateFactoryTests.java
View File

@@ -92,6 +92,14 @@ public class HeaderRoutePredicateFactoryTests extends BaseWebClientTests {
assertThat(predicate.toString()).contains("Header: myheader regexp=myregexp");
}
@Test
public void headerRouteHandlesCommaSeparatedValues() {
testClient.get().uri("/get").header("X-Example-Header", "value1, value2 ,exact_match,value3").exchange()
.expectStatus().isOk().expectHeader()
.valueEquals(HANDLER_MAPPER_HEADER, RoutePredicateHandlerMapping.class.getSimpleName()).expectHeader()
.valueEquals(ROUTE_ID_HEADER, "header_test_comma_separated");
}
@EnableAutoConfiguration
@SpringBootConfiguration
@Import(DefaultTestConfig.class)
@@ -103,8 +111,10 @@ public class HeaderRoutePredicateFactoryTests extends BaseWebClientTests {
@Bean
RouteLocator queryRouteLocator(RouteLocatorBuilder builder) {
return builder.routes()
.route("header_exists_dsl", r -> r.header("X-Foo").filters(f -> f.prefixPath("/httpbin")).uri(uri))
.build();
.route("header_exists_dsl", r -> r.header("X-Foo").filters(f -> f.prefixPath("/httpbin")).uri(uri))
.route("header_test_comma_separated", r -> r.header("X-Example-Header", "exact_match")
.filters(f -> f.prefixPath("/httpbin")).uri(uri))
.build();
}
}