Merge branch 'nest'

Author: spencergibb

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

@@ -115,6 +115,10 @@ public BooleanSpec not(Function<PredicateSpec, BooleanSpec> fn) {
 			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 BooleanSpec asyncPredicate(AsyncPredicate<ServerWebExchange> predicate) {
 
 	}
 
+	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);
+		}
+
+	}
+
 }

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

@@ -94,6 +94,18 @@ public void andNotWorksWithParameter() {
 			.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 @@ String andnotquery(@RequestParam(name = "myquery", defaultValue = "notsupplied")
 			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 @@ RouteLocator testRouteLocator(RouteLocatorBuilder builder) {
 							.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();
 		}