Adds shortcut support for between predicate.

See gh-230

spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/predicate/BetweenRoutePredicateFactory.java

@@ -20,11 +20,16 @@ package org.springframework.cloud.gateway.handler.predicate;
 import java.time.Instant;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
+import java.util.Arrays;
+import java.util.List;
 import java.util.function.Predicate;
 
 import org.springframework.util.Assert;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.server.ServerWebExchange;
 
+import javax.validation.constraints.NotEmpty;
+
 /**
  * @author Spencer Gibb
  */
@@ -37,6 +42,11 @@ public class BetweenRoutePredicateFactory extends AbstractRoutePredicateFactory<
 		super(Config.class);
 	}
 
+	@Override
+	public List<String> shortcutFieldOrder() {
+		return Arrays.asList(DATETIME1_KEY, DATETIME2_KEY);
+	}
+
 	@Override
 	public Predicate<ServerWebExchange> apply(Config config) {
 		//TODO: figure out boot conversion
@@ -52,8 +62,11 @@ public class BetweenRoutePredicateFactory extends AbstractRoutePredicateFactory<
 		};
 	}
 
+	@Validated
 	public static class Config {
+		@NotEmpty
 		private String datetime1;
+		@NotEmpty
 		private String datetime2;
 
 		public String getDatetime1() {

spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/handler/predicate/BetweenRoutePredicateFactoryIntegrationTests.java

@@ -0,0 +1,89 @@
+/*
+ * Copyright 2013-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.springframework.cloud.gateway.handler.predicate;
+
+import java.time.ZonedDateTime;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.gateway.handler.RoutePredicateHandlerMapping;
+import org.springframework.cloud.gateway.route.RouteLocator;
+import org.springframework.cloud.gateway.route.builder.RouteLocatorBuilder;
+import org.springframework.cloud.gateway.test.BaseWebClientTests;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Import;
+import org.springframework.http.HttpHeaders;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = RANDOM_PORT)
+@DirtiesContext
+public class BetweenRoutePredicateFactoryIntegrationTests extends BaseWebClientTests {
+
+	@Test
+	public void betweenPredicateWithValidDates() {
+		testClient.get()
+				.uri("/get")
+				.header(HttpHeaders.HOST, "www.betweenvalid.org")
+				.exchange()
+				.expectStatus().isOk()
+				.expectHeader().valueEquals(HANDLER_MAPPER_HEADER,
+                            RoutePredicateHandlerMapping.class.getSimpleName())
+				.expectHeader().valueEquals(ROUTE_ID_HEADER, "test_between_valid");
+	}
+
+	@Test
+	public void notBetweenPredicateWorks() {
+		testClient.get()
+				.uri("/get")
+				.header(HttpHeaders.HOST, "www.notbetween.org")
+				.exchange()
+				.expectStatus().isOk()
+				.expectHeader().valueEquals(HANDLER_MAPPER_HEADER,
+						RoutePredicateHandlerMapping.class.getSimpleName())
+				// should NOT be not_between_test because Between dates are in the past
+				.expectHeader().valueEquals(ROUTE_ID_HEADER, "default_path_to_httpbin");
+	}
+
+	@EnableAutoConfiguration
+	@SpringBootConfiguration
+	@Import(DefaultTestConfig.class)
+	public static class TestConfig {
+
+		@Value("${test.uri}")
+		String uri;
+
+		@Bean
+		public RouteLocator testRouteLocator(RouteLocatorBuilder builder) {
+			return builder.routes()
+					.route("test_between_valid", r -> r.host("**.betweenvalid.org")
+							.and().between(ZonedDateTime.now().minusDays(1), ZonedDateTime.now().plusDays(1))
+							.filters(f -> f.prefixPath("/httpbin"))
+							.uri(uri))
+					.build();
+		}
+	}
+
+}

spring-cloud-gateway-core/src/test/resources/application.yml

@@ -110,6 +110,13 @@ spring:
         - Method=GET
         - Host=**.method.org
 
+      # =====================================
+      - id: not_between_test
+        uri: ${test.uri}
+        predicates:
+        - Host=**.notbetween.org
+        - Between=1000-03-13T10:39:37.518-04:00[America/New_York],1002-03-13T10:39:37.518-04:00[America/New_York]
+
       # =====================================
       - id: redirect_to_test
         uri: ${test.uri}