Support bean validation with ArgumentValue wrapper

See gh-737

Author: bduisenov

spring-graphql/src/main/java/org/springframework/graphql/data/method/annotation/support/ArgumentValueExtractor.java

@@ -0,0 +1,17 @@
+package org.springframework.graphql.data.method.annotation.support;
+
+import jakarta.validation.valueextraction.ExtractedValue;
+import jakarta.validation.valueextraction.UnwrapByDefault;
+import jakarta.validation.valueextraction.ValueExtractor;
+import org.springframework.graphql.data.ArgumentValue;
+
+@UnwrapByDefault
+public class ArgumentValueExtractor implements ValueExtractor<ArgumentValue<@ExtractedValue ?>> {
+
+ @Override
+ public void extractValues(ArgumentValue<?> originalValue, ValueReceiver receiver) {
+ if (originalValue.isPresent()) {
+ receiver.value(null, originalValue.value());
+ }
+ }
+}

spring-graphql/src/main/resources/META-INF/services/jakarta.validation.valueextraction.ValueExtractor

@@ -0,0 +1 @@
+org.springframework.graphql.data.method.annotation.support.ArgumentValueExtractor

spring-graphql/src/test/java/org/springframework/graphql/data/method/annotation/support/ValidationHelperTests.java

@@ -27,13 +27,15 @@
 import jakarta.validation.Valid;
 import jakarta.validation.Validation;
 import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import org.assertj.core.api.InstanceOfAssertFactories;
 import org.assertj.core.api.IterableAssert;
 import org.assertj.core.api.ThrowableAssert;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.BeanUtils;
+import org.springframework.graphql.data.ArgumentValue;
 import org.springframework.graphql.data.method.HandlerMethod;
 import org.springframework.validation.annotation.Validated;
 
@@ -68,6 +70,9 @@ void shouldRaiseValidationErrorForAnnotatedParams() {
 
 BiConsumer<Object, Object[]> validator2 = createValidator(MyBean.class, "myValidatedParameterMethod");
 assertViolation(() -> validator2.accept(bean, new Object[] {new ConstrainedInput(100)}), "integerValue");
+
+BiConsumer<Object, Object[]> validator3 = createValidator(MyBean.class, "myValidArgumentValue");
+assertViolation(() -> validator3.accept(bean, new Object[] {ArgumentValue.ofNullable("")}), "myValidArgumentValue.arg0");
 }
 
 @Test
@@ -154,6 +159,10 @@ public Object myValidMethod(@NotNull String arg0, @Max(10) int arg1) {
 public Object myValidatedParameterMethod(@Validated ConstrainedInput input) {
 return null;
 }
+
+public Object myValidArgumentValue(@Valid ArgumentValue<@NotBlank String> arg0) {
+return null;
+}
 }