From d29127273676744c2f9a8e1b9dd401a0d0218573 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 17 Feb 2026 11:50:07 +0100 Subject: [PATCH] Use HandlerMethod-determined validation groups Closes gh-36336 --- .../web/reactive/result/method/InvocableHandlerMethod.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java index 9ed371ad0b4..9334b496bcd 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java @@ -55,7 +55,6 @@ import org.springframework.http.server.reactive.ServerHttpResponse; import org.springframework.lang.Contract; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.annotation.ValidationAnnotationUtils; import org.springframework.validation.method.MethodValidator; import org.springframework.web.method.HandlerMethod; import org.springframework.web.reactive.BindingContext; @@ -97,8 +96,6 @@ public class InvocableHandlerMethod extends HandlerMethod { private @Nullable MethodValidator methodValidator; - private Class[] validationGroups = EMPTY_GROUPS; - private @Nullable Scheduler invocationScheduler; @@ -165,8 +162,6 @@ public class InvocableHandlerMethod extends HandlerMethod { */ public void setMethodValidator(@Nullable MethodValidator methodValidator) { this.methodValidator = methodValidator; - this.validationGroups = (methodValidator != null ? - ValidationAnnotationUtils.determineValidationGroups(getBean(), getBridgedMethod()) : EMPTY_GROUPS); } /** @@ -193,7 +188,7 @@ public class InvocableHandlerMethod extends HandlerMethod { try { LocaleContextHolder.setLocaleContext(exchange.getLocaleContext()); this.methodValidator.applyArgumentValidation( - getBean(), getBridgedMethod(), getMethodParameters(), args, this.validationGroups); + getBean(), getBridgedMethod(), getMethodParameters(), args, getValidationGroups()); } finally { LocaleContextHolder.resetLocaleContext();