Spring/spring-graphql
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing contribution

Browse Source 
Closes gh-737
This commit is contained in:
rstoyanchev
2023-07-03 09:03:10 +01:00
parent ebb3ac69fa
commit e9f68948ec
4 changed files with 56 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,17 +0,0 @@
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());
}
}
}

40
spring-graphql/src/main/java/org/springframework/graphql/data/method/annotation/support/ArgumentValueValueExtractor.java Normal file
View File

@@ -0,0 +1,40 @@
/*
* Copyright 2002-2023 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
*
* https://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.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;
/**
* {@link ValueExtractor} that enables {@code @Valid} with {@link ArgumentValue},
* and helps to extract the value from it.
*
* @since 1.2.2
*/
@UnwrapByDefault
public final class ArgumentValueValueExtractor implements ValueExtractor<ArgumentValue<@ExtractedValue ?>> {
@Override
public void extractValues(ArgumentValue<?> argumentValue, ValueReceiver receiver) {
if (argumentValue.isPresent()) {
receiver.value(null, argumentValue.value());
}
}
}

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

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

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

@@ -26,6 +26,7 @@ import jakarta.validation.ConstraintViolation;
import jakarta.validation.ConstraintViolationException;
import jakarta.validation.Valid;
import jakarta.validation.Validation;
import jakarta.validation.Validator;
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
@@ -56,22 +57,21 @@ class ValidationHelperTests {
@Test
void shouldIgnoreMethodsWithoutAnnotations() {
BiConsumer<Object, Object[]> validator = createValidator(MyBean.class, "notValidatedMethod");
assertThat(validator).isNull();
assertThat(validateFunction(MyBean.class, "notValidatedMethod")).isNull();
}
@Test
void shouldRaiseValidationErrorForAnnotatedParams() {
MyBean bean = new MyBean();
BiConsumer<Object, Object[]> validator1 = createValidator(MyBean.class, "myValidMethod");
BiConsumer<Object, Object[]> validator1 = validateFunction(MyBean.class, "myValidMethod");
assertViolation(() -> validator1.accept(bean, new Object[] {null, 2}), "myValidMethod.arg0");
assertViolation(() -> validator1.accept(bean, new Object[] {"test", 12}), "myValidMethod.arg1");
BiConsumer<Object, Object[]> validator2 = createValidator(MyBean.class, "myValidatedParameterMethod");
BiConsumer<Object, Object[]> validator2 = validateFunction(MyBean.class, "myValidatedParameterMethod");
assertViolation(() -> validator2.accept(bean, new Object[] {new ConstrainedInput(100)}), "integerValue");
BiConsumer<Object, Object[]> validator3 = createValidator(MyBean.class, "myValidArgumentValue");
BiConsumer<Object, Object[]> validator3 = validateFunction(MyBean.class, "myValidArgumentValue");
assertViolation(() -> validator3.accept(bean, new Object[] {ArgumentValue.ofNullable("")}), "myValidArgumentValue.arg0");
}
@@ -79,31 +79,32 @@ class ValidationHelperTests {
void shouldRaiseValidationErrorForAnnotatedParamsWithGroups() {
MyValidationGroupsBean bean = new MyValidationGroupsBean();
BiConsumer<Object, Object[]> validator1 = createValidator(MyValidationGroupsBean.class, "myValidMethodWithGroup");
BiConsumer<Object, Object[]> validator1 = validateFunction(MyValidationGroupsBean.class, "myValidMethodWithGroup");
assertViolation(() -> validator1.accept(bean, new Object[] {null}), "myValidMethodWithGroup.arg0");
BiConsumer<Object, Object[]> validator2 = createValidator(MyValidationGroupsBean.class, "myValidMethodWithGroupOnType");
BiConsumer<Object, Object[]> validator2 = validateFunction(MyValidationGroupsBean.class, "myValidMethodWithGroupOnType");
assertViolation(() -> validator2.accept(bean, new Object[] {null}), "myValidMethodWithGroupOnType.arg0");
}
@Test
void shouldRecognizeMethodsThatRequireValidation() {
BiConsumer<Object, Object[]> validator1 = createValidator(RequiresValidationBean.class, "processConstrainedValue");
BiConsumer<Object, Object[]> validator1 = validateFunction(RequiresValidationBean.class, "processConstrainedValue");
assertThat(validator1).isNotNull();
BiConsumer<Object, Object[]> validator2 = createValidator(RequiresValidationBean.class, "processValidInput");
BiConsumer<Object, Object[]> validator2 = validateFunction(RequiresValidationBean.class, "processValidInput");
assertThat(validator2).isNotNull();
BiConsumer<Object, Object[]> validator3 = createValidator(RequiresValidationBean.class, "processValidatedInput");
BiConsumer<Object, Object[]> validator3 = validateFunction(RequiresValidationBean.class, "processValidatedInput");
assertThat(validator3).isNotNull();
BiConsumer<Object, Object[]> validator4 = createValidator(RequiresValidationBean.class, "processValue");
BiConsumer<Object, Object[]> validator4 = validateFunction(RequiresValidationBean.class, "processValue");
assertThat(validator4).isNull();
}
private BiConsumer<Object, Object[]> createValidator(Class<?> handlerType, String methodName) {
return ValidationHelper.create(Validation.buildDefaultValidatorFactory().getValidator())
.getValidationHelperFor(findHandlerMethod(handlerType, methodName));
private BiConsumer<Object, Object[]> validateFunction(Class<?> handlerType, String methodName) {
Validator validator = Validation.buildDefaultValidatorFactory().getValidator();
ValidationHelper helper = ValidationHelper.create(validator);
return helper.getValidationHelperFor(findHandlerMethod(handlerType, methodName));
}
private HandlerMethod findHandlerMethod(Class<?> handlerType, String methodName) {