From 6d17adaa497ff97bd4214657c7743964e8e8a612 Mon Sep 17 00:00:00 2001 From: verbitan Date: Wed, 29 Jul 2026 12:12:43 +0100 Subject: [PATCH 1/2] HV000271: Using @Valid on a container (java.util.List) is deprecated Signed-off-by: verbitan --- .../cloud/gateway/config/GatewayProperties.java | 3 +-- .../cloud/gateway/route/RouteDefinition.java | 6 ++---- .../gateway/server/mvc/config/GatewayMvcProperties.java | 3 +-- .../cloud/gateway/server/mvc/config/RouteProperties.java | 6 ++---- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/config/GatewayProperties.java b/spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/config/GatewayProperties.java index fd68bb11b..1132baba3 100644 --- a/spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/config/GatewayProperties.java +++ b/spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/config/GatewayProperties.java @@ -50,8 +50,7 @@ public class GatewayProperties { * List of Routes. */ @NotNull - @Valid - private List routes = new ArrayList<>(); + private List<@Valid RouteDefinition> routes = new ArrayList<>(); /** * List of filter definitions that are applied to every route. diff --git a/spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/route/RouteDefinition.java b/spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/route/RouteDefinition.java index 58a6c0401..a9220d560 100644 --- a/spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/route/RouteDefinition.java +++ b/spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/route/RouteDefinition.java @@ -43,11 +43,9 @@ public class RouteDefinition { private @Nullable String id; @NotEmpty - @Valid - private List predicates = new ArrayList<>(); + private List<@Valid PredicateDefinition> predicates = new ArrayList<>(); - @Valid - private List filters = new ArrayList<>(); + private List<@Valid FilterDefinition> filters = new ArrayList<>(); private @Nullable URI uri; diff --git a/spring-cloud-gateway-server-webmvc/src/main/java/org/springframework/cloud/gateway/server/mvc/config/GatewayMvcProperties.java b/spring-cloud-gateway-server-webmvc/src/main/java/org/springframework/cloud/gateway/server/mvc/config/GatewayMvcProperties.java index 6004166f4..bb0a3d96c 100644 --- a/spring-cloud-gateway-server-webmvc/src/main/java/org/springframework/cloud/gateway/server/mvc/config/GatewayMvcProperties.java +++ b/spring-cloud-gateway-server-webmvc/src/main/java/org/springframework/cloud/gateway/server/mvc/config/GatewayMvcProperties.java @@ -41,8 +41,7 @@ public class GatewayMvcProperties { * List of Routes. */ @NotNull - @Valid - private List routes = new ArrayList<>(); + private List<@Valid RouteProperties> routes = new ArrayList<>(); /** * Map of Routes. diff --git a/spring-cloud-gateway-server-webmvc/src/main/java/org/springframework/cloud/gateway/server/mvc/config/RouteProperties.java b/spring-cloud-gateway-server-webmvc/src/main/java/org/springframework/cloud/gateway/server/mvc/config/RouteProperties.java index a2157cf54..6309f1ef2 100644 --- a/spring-cloud-gateway-server-webmvc/src/main/java/org/springframework/cloud/gateway/server/mvc/config/RouteProperties.java +++ b/spring-cloud-gateway-server-webmvc/src/main/java/org/springframework/cloud/gateway/server/mvc/config/RouteProperties.java @@ -48,14 +48,12 @@ public class RouteProperties { * List of predicates for matching the Route. */ @NotEmpty - @Valid - private List predicates = new ArrayList<>(); + private List<@Valid PredicateProperties> predicates = new ArrayList<>(); /** * List of filters to be applied to the Route. */ - @Valid - private List filters = new ArrayList<>(); + private List<@Valid FilterProperties> filters = new ArrayList<>(); /** * The destination URI. From f373c97fc1e418e497958b985752c382184ea02b Mon Sep 17 00:00:00 2001 From: verbitan Date: Wed, 29 Jul 2026 15:51:54 +0100 Subject: [PATCH 2/2] Apply @Valid fix to GatewayMvcProperties.routesMap Signed-off-by: verbitan --- .../cloud/gateway/server/mvc/config/GatewayMvcProperties.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spring-cloud-gateway-server-webmvc/src/main/java/org/springframework/cloud/gateway/server/mvc/config/GatewayMvcProperties.java b/spring-cloud-gateway-server-webmvc/src/main/java/org/springframework/cloud/gateway/server/mvc/config/GatewayMvcProperties.java index bb0a3d96c..cdca66430 100644 --- a/spring-cloud-gateway-server-webmvc/src/main/java/org/springframework/cloud/gateway/server/mvc/config/GatewayMvcProperties.java +++ b/spring-cloud-gateway-server-webmvc/src/main/java/org/springframework/cloud/gateway/server/mvc/config/GatewayMvcProperties.java @@ -47,8 +47,7 @@ public class GatewayMvcProperties { * Map of Routes. */ @NotNull - @Valid - private LinkedHashMap routesMap = new LinkedHashMap<>(); + private LinkedHashMap routesMap = new LinkedHashMap<>(); /** * Mime-types that are streaming.