Restoring predicate consistency by removing 'Validated' and adding 'Notnull'.

spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/handler/predicate/BeforeRoutePredicateFactory.java

@@ -21,6 +21,7 @@
 import java.util.List;
 import java.util.function.Predicate;
 
+import jakarta.validation.constraints.NotNull;
 import org.springframework.web.server.ServerWebExchange;
 
 /**
@@ -65,6 +66,7 @@ public String toString() {
 
 	public static class Config {
 
+		@NotNull
 		private ZonedDateTime datetime;
 
 		public ZonedDateTime getDatetime() {

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

@@ -24,7 +24,6 @@
 import jakarta.validation.constraints.NotNull;
 
 import org.springframework.util.Assert;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.server.ServerWebExchange;
 
 /**
@@ -75,7 +74,6 @@ public String toString() {
 		};
 	}
 
-	@Validated
 	public static class Config {
 
 		@NotNull

spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/handler/predicate/CookieRoutePredicateFactory.java

@@ -23,7 +23,6 @@
 import jakarta.validation.constraints.NotEmpty;
 
 import org.springframework.http.HttpCookie;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.server.ServerWebExchange;
 
 /**
@@ -79,7 +78,6 @@ public String toString() {
 		};
 	}
 
-	@Validated
 	public static class Config {
 
 		@NotEmpty

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

@@ -24,7 +24,6 @@
 import jakarta.validation.constraints.NotEmpty;
 
 import org.springframework.util.StringUtils;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.server.ServerWebExchange;
 
 /**
@@ -90,7 +89,6 @@ public String toString() {
 		};
 	}
 
-	@Validated
 	public static class Config {
 
 		@NotEmpty

spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/handler/predicate/HostRoutePredicateFactory.java

@@ -27,7 +27,6 @@
 import org.springframework.core.style.ToStringCreator;
 import org.springframework.util.AntPathMatcher;
 import org.springframework.util.PathMatcher;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.server.ServerWebExchange;
 
 /**
@@ -115,7 +114,6 @@ public String toString() {
 		};
 	}
 
-	@Validated
 	public static class Config {
 
 		private List<String> patterns = new ArrayList<>();

spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/handler/predicate/MethodRoutePredicateFactory.java

@@ -21,7 +21,6 @@
 import java.util.function.Predicate;
 
 import org.springframework.http.HttpMethod;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.server.ServerWebExchange;
 
 import static java.util.Arrays.stream;
@@ -67,7 +66,6 @@ public String toString() {
 		};
 	}
 
-	@Validated
 	public static class Config {
 
 		private HttpMethod[] methods;

spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/handler/predicate/PathRoutePredicateFactory.java

@@ -26,7 +26,6 @@
 
 import org.springframework.core.style.ToStringCreator;
 import org.springframework.http.server.PathContainer;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.util.pattern.PathPattern;
 import org.springframework.web.util.pattern.PathPattern.PathMatchInfo;
@@ -134,7 +133,6 @@ public String toString() {
 		};
 	}
 
-	@Validated
 	public static class Config {
 
 		private List<String> patterns = new ArrayList<>();

spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/handler/predicate/QueryRoutePredicateFactory.java

@@ -23,7 +23,6 @@
 import jakarta.validation.constraints.NotEmpty;
 
 import org.springframework.util.StringUtils;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.server.ServerWebExchange;
 
 /**
@@ -84,7 +83,6 @@ public String toString() {
 		};
 	}
 
-	@Validated
 	public static class Config {
 
 		@NotEmpty

spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/handler/predicate/RemoteAddrRoutePredicateFactory.java

@@ -31,7 +31,6 @@
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.cloud.gateway.support.ipresolver.RemoteAddressResolver;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.server.ServerWebExchange;
 
 import static org.springframework.cloud.gateway.support.ShortcutConfigurable.ShortcutType.GATHER_LIST;
@@ -117,7 +116,6 @@ private void addSource(List<IpSubnetFilterRule> sources, String source) {
 		sources.add(new IpSubnetFilterRule(ipAddress, cidrPrefix, IpFilterRuleType.ACCEPT));
 	}
 
-	@Validated
 	public static class Config {
 
 		@NotEmpty

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

@@ -18,8 +18,13 @@
 
 import java.time.ZonedDateTime;
 import java.util.HashMap;
+import java.util.Set;
 import java.util.function.Predicate;
 
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.cloud.gateway.handler.predicate.AfterRoutePredicateFactory.Config;
@@ -99,4 +104,29 @@ public void toStringFormat() {
 		assertThat(predicate.toString()).contains("After: " + config.getDatetime());
 	}
 
+	@Test
+	public void testConfig() {
+		try(ValidatorFactory factory = Validation.buildDefaultValidatorFactory()) {
+			Validator validator = factory.getValidator();
+
+			Config config = new Config();
+			config.setDatetime(ZonedDateTime.now());
+
+			assertThat(validator.validate(config).isEmpty()).isTrue();
+		}
+	}
+
+	@Test
+	public void testConfigNullField() {
+		try(ValidatorFactory factory = Validation.buildDefaultValidatorFactory()) {
+			Validator validator = factory.getValidator();
+
+			Config config = new Config();
+			Set<ConstraintViolation<Config>> validate = validator.validate(config);
+
+			assertThat(validate.isEmpty()).isFalse();
+			assertThat(validate.size()).isEqualTo(1);
+		}
+	}
+
 }

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

@@ -18,10 +18,17 @@
 
 import java.time.ZonedDateTime;
 import java.util.HashMap;
+import java.util.Set;
 import java.util.function.Predicate;
 
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
 import org.junit.jupiter.api.Test;
 
+import org.springframework.cloud.gateway.handler.predicate.BeforeRoutePredicateFactory.Config;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.cloud.gateway.handler.predicate.BeforeRoutePredicateFactory.DATETIME_KEY;
 import static org.springframework.cloud.gateway.handler.predicate.BetweenRoutePredicateFactoryTests.bindConfig;
@@ -85,17 +92,42 @@ private boolean runPredicate(String dateString) {
 
 		BeforeRoutePredicateFactory factory = new BeforeRoutePredicateFactory();
 
-		BeforeRoutePredicateFactory.Config config = bindConfig(map, factory);
+		Config config = bindConfig(map, factory);
 
 		return factory.apply(config).test(getExchange());
 	}
 
 	@Test
 	public void toStringFormat() {
-		BeforeRoutePredicateFactory.Config config = new BeforeRoutePredicateFactory.Config();
+		Config config = new Config();
 		config.setDatetime(ZonedDateTime.now());
 		Predicate predicate = new BeforeRoutePredicateFactory().apply(config);
 		assertThat(predicate.toString()).contains("Before: " + config.getDatetime());
 	}
 
+	@Test
+	public void testConfig() {
+		try(ValidatorFactory factory = Validation.buildDefaultValidatorFactory()) {
+			Validator validator = factory.getValidator();
+
+			Config config = new Config();
+			config.setDatetime(ZonedDateTime.now());
+
+			assertThat(validator.validate(config).isEmpty()).isTrue();
+		}
+	}
+
+	@Test
+	public void testConfigNullField() {
+		try(ValidatorFactory factory = Validation.buildDefaultValidatorFactory()) {
+			Validator validator = factory.getValidator();
+
+			Config config = new Config();
+			Set<ConstraintViolation<Config>> validate = validator.validate(config);
+
+			assertThat(validate.isEmpty()).isFalse();
+			assertThat(validate.size()).isEqualTo(1);
+		}
+	}
+
 }

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

@@ -19,11 +19,17 @@
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
+import java.util.Set;
 import java.util.function.Predicate;
 
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.convert.ApplicationConversionService;
+import org.springframework.cloud.gateway.handler.predicate.BetweenRoutePredicateFactory.Config;
 import org.springframework.cloud.gateway.support.ConfigurationService;
 import org.springframework.cloud.gateway.support.StringToZonedDateTimeConverter;
 import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
@@ -152,19 +158,45 @@ boolean runPredicate(String dateString1, String dateString2) {
 
 		BetweenRoutePredicateFactory factory = new BetweenRoutePredicateFactory();
 
-		BetweenRoutePredicateFactory.Config config = bindConfig(map, factory);
+		Config config = bindConfig(map, factory);
 
 		return factory.apply(config).test(getExchange());
 	}
 
 	@Test
 	public void toStringFormat() {
-		BetweenRoutePredicateFactory.Config config = new BetweenRoutePredicateFactory.Config();
+		Config config = new Config();
 		config.setDatetime1(ZonedDateTime.now());
 		config.setDatetime2(ZonedDateTime.now().plusHours(1));
 		Predicate predicate = new BetweenRoutePredicateFactory().apply(config);
 		assertThat(predicate.toString())
 			.contains("Between: " + config.getDatetime1() + " and " + config.getDatetime2());
 	}
 
+	@Test
+	public void testConfig() {
+		try(ValidatorFactory factory = Validation.buildDefaultValidatorFactory()) {
+			Validator validator = factory.getValidator();
+
+			Config config = new Config();
+			config.setDatetime1(ZonedDateTime.now());
+			config.setDatetime2(ZonedDateTime.now());
+
+			assertThat(validator.validate(config).isEmpty()).isTrue();
+		}
+	}
+
+	@Test
+	public void testConfigNullField() {
+		try(ValidatorFactory factory = Validation.buildDefaultValidatorFactory()) {
+			Validator validator = factory.getValidator();
+
+			Config config = new Config();
+			Set<ConstraintViolation<Config>> validate = validator.validate(config);
+
+			assertThat(validate.isEmpty()).isFalse();
+			assertThat(validate.size()).isEqualTo(2);
+		}
+	}
+
 }

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

@@ -16,8 +16,13 @@
 
 package org.springframework.cloud.gateway.handler.predicate;
 
+import java.util.Set;
 import java.util.function.Predicate;
 
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.cloud.gateway.handler.predicate.CookieRoutePredicateFactory.Config;
@@ -64,4 +69,30 @@ public void toStringFormat() {
 		assertThat(predicate.toString()).contains("Cookie: name=mycookie regexp=myregexp");
 	}
 
+	@Test
+	public void testConfig() {
+		try(ValidatorFactory factory = Validation.buildDefaultValidatorFactory()) {
+			Validator validator = factory.getValidator();
+
+			Config config = new Config();
+			config.setName("mycookie");
+			config.setRegexp("myregexp");
+
+			assertThat(validator.validate(config).isEmpty()).isTrue();
+		}
+	}
+
+	@Test
+	public void testConfigNullField() {
+		try(ValidatorFactory factory = Validation.buildDefaultValidatorFactory()) {
+			Validator validator = factory.getValidator();
+
+			Config config = new Config();
+			Set<ConstraintViolation<Config>> validate = validator.validate(config);
+
+			assertThat(validate.isEmpty()).isFalse();
+			assertThat(validate.size()).isEqualTo(2);
+		}
+	}
+
 }