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

Merge branch 'nest'

Browse Source
This commit is contained in:
spencergibb
2024-09-27 15:41:52 -04:00
parent 2307cc71c8 67f95244be
commit bf493a3411
2 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/route/builder/BooleanSpec.java
View File

@@ -115,6 +115,10 @@ public class BooleanSpec extends UriSpec {
return fn.apply(new NotOpSpec(this.routeBuilder, this.builder, this.operator));
}
public BooleanSpec nested(Function<PredicateSpec, BooleanSpec> fn) {
return fn.apply(new NestedOpSpec(this.routeBuilder, this.builder, this.operator));
}
}
public static class NotOpSpec extends BooleanOpSpec {
@@ -131,4 +135,17 @@ public class BooleanSpec extends UriSpec {
}
public static class NestedOpSpec extends BooleanOpSpec {
NestedOpSpec(Route.AsyncBuilder routeBuilder, RouteLocatorBuilder.Builder builder, Operator operator) {
super(routeBuilder, builder, operator);
}
@Override
public BooleanSpec asyncPredicate(AsyncPredicate<ServerWebExchange> predicate) {
return super.asyncPredicate(predicate);
}
}
}

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

@@ -94,6 +94,18 @@ public class RoutePredicateHandlerMappingIntegrationTests extends BaseWebClientT
.isEqualTo("hasquery");
}
@Test
public void andNestedOrQuery1() {
testClient.get().uri("/andnestedquery?query1=hasquery1").exchange().expectBody(String.class)
.isEqualTo("hasquery1,notsupplied");
}
@Test
public void andNestedOrQuery2() {
testClient.get().uri("/andnestedquery?query2=hasquery2").exchange().expectBody(String.class)
.isEqualTo("notsupplied,hasquery2");
}
@EnableAutoConfiguration
@SpringBootConfiguration
@Import(DefaultTestConfig.class)
@@ -108,6 +120,12 @@ public class RoutePredicateHandlerMappingIntegrationTests extends BaseWebClientT
return myquery;
}
@GetMapping("/httpbin/andnestedquery")
String andnotquery(@RequestParam(name = "query1", defaultValue = "notsupplied") String query1,
@RequestParam(name = "query2", defaultValue = "notsupplied") String query2) {
return query1 + "," + query2;
}
@GetMapping("/httpbin/hasquery")
String hasquery() {
return "hasquery";
@@ -128,6 +146,8 @@ public class RoutePredicateHandlerMappingIntegrationTests extends BaseWebClientT
.query("myquery")
.filters(f -> f.setPath("/httpbin/hasquery"))
.uri(uri))
.route("and_nested_query1_or_query2", r -> r.path("/andnestedquery").and().nested(p -> p.query("query1").or().query("query2"))
.filters(f -> f.prefixPath("/httpbin")).uri(uri))
.build();
}