Optimize performance of method validation

Perform the check for whether validation for a HandlerMethod is needed
earlier and only once rather than in the constructor of
DataFetcherHandlerMethod.

Make the validation helper passed to DataFetcherHandlerMethod stateful,
so that validation groups are also determined once on startup.

See gh-571

Author: rstoyanchev

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * 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.
@@ -125,7 +125,7 @@ public class AnnotatedControllerConfigurer
 	private HandlerMethodArgumentResolverComposite argumentResolvers;
 
 	@Nullable
-	private HandlerMethodValidationHelper validationHelper;
+	private ValidationHelper validationHelper;
 
 
 	/**
@@ -176,8 +176,7 @@ public void afterPropertiesSet() {
 		this.argumentResolvers = initArgumentResolvers();
 
 		if (beanValidationPresent) {
-			this.validationHelper =
-					HandlerMethodValidationHelper.createIfValidatorAvailable(obtainApplicationContext());
+			this.validationHelper = ValidationHelper.createIfValidatorPresent(obtainApplicationContext());
 		}
 	}
 
@@ -228,7 +227,8 @@ public void configure(RuntimeWiring.Builder runtimeWiringBuilder) {
 		findHandlerMethods().forEach((info) -> {
 			DataFetcher<?> dataFetcher;
 			if (!info.isBatchMapping()) {
-				dataFetcher = new SchemaMappingDataFetcher(info, this.argumentResolvers, this.validationHelper, this.executor);
+				dataFetcher = new SchemaMappingDataFetcher(
+						info, this.argumentResolvers, this.validationHelper, this.executor);
 			}
 			else {
 				String dataLoaderKey = registerBatchLoader(info);
@@ -492,7 +492,7 @@ static class SchemaMappingDataFetcher implements DataFetcher<Object> {
 		private final HandlerMethodArgumentResolverComposite argumentResolvers;
 
 		@Nullable
-		private final HandlerMethodValidationHelper validatorHelper;
+		private final Consumer<Object[]> methodValidationHelper;
 
 		@Nullable
 		private final Executor executor;
@@ -501,12 +501,12 @@ static class SchemaMappingDataFetcher implements DataFetcher<Object> {
 
 		SchemaMappingDataFetcher(
 				MappingInfo info, HandlerMethodArgumentResolverComposite resolvers,
-				@Nullable HandlerMethodValidationHelper validatorHelper,
-				@Nullable Executor executor) {
+				@Nullable ValidationHelper validationHelper, @Nullable Executor executor) {
 
 			this.info = info;
 			this.argumentResolvers = resolvers;
-			this.validatorHelper = validatorHelper;
+			this.methodValidationHelper = (validationHelper != null ?
+					validationHelper.getValidationHelperFor(info.getHandlerMethod()) : null);
 			this.executor = executor;
 			this.subscription = this.info.getCoordinates().getTypeName().equalsIgnoreCase("Subscription");
 		}
@@ -524,7 +524,8 @@ public HandlerMethod getHandlerMethod() {
 		public Object get(DataFetchingEnvironment environment) throws Exception {
 
 			DataFetcherHandlerMethod handlerMethod = new DataFetcherHandlerMethod(
-					getHandlerMethod(), this.argumentResolvers, this.validatorHelper, this.executor, this.subscription);
+					getHandlerMethod(), this.argumentResolvers, this.methodValidationHelper,
+					this.executor, this.subscription);
 
 			return handlerMethod.invoke(environment);
 		}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * 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.
@@ -17,6 +17,7 @@
 
 import java.util.Arrays;
 import java.util.concurrent.Executor;
+import java.util.function.Consumer;
 
 import graphql.schema.DataFetchingEnvironment;
 import org.reactivestreams.Publisher;
@@ -49,8 +50,7 @@ public class DataFetcherHandlerMethod extends InvocableHandlerMethodSupport {
 
 	private final HandlerMethodArgumentResolverComposite resolvers;
 
-	@Nullable
-	private final HandlerMethodValidationHelper validator;
+	private final Consumer<Object[]> validationHelper;
 
 	private final ParameterNameDiscoverer parameterNameDiscoverer = new DefaultParameterNameDiscoverer();
 
@@ -61,17 +61,17 @@ public class DataFetcherHandlerMethod extends InvocableHandlerMethodSupport {
 	 * Constructor with a parent handler method.
 	 * @param handlerMethod the handler method
 	 * @param resolvers the argument resolvers
-	 * @param validator the input validator
+	 * @param validationHelper to apply bean validation with
 	 * @param subscription whether the field being fetched is of subscription type
 	 */
-	public DataFetcherHandlerMethod(HandlerMethod handlerMethod,
-			HandlerMethodArgumentResolverComposite resolvers, @Nullable HandlerMethodValidationHelper validator,
-			@Nullable Executor executor, boolean subscription) {
+	public DataFetcherHandlerMethod(
+			HandlerMethod handlerMethod, HandlerMethodArgumentResolverComposite resolvers,
+			@Nullable Consumer<Object[]> validationHelper, @Nullable Executor executor, boolean subscription) {
 
 		super(handlerMethod, executor);
 		Assert.isTrue(!resolvers.getResolvers().isEmpty(), "No argument resolvers");
 		this.resolvers = resolvers;
-		this.validator = (validator != null && validator.requiresValidation(handlerMethod) ? validator : null);
+		this.validationHelper = (validationHelper != null ? validationHelper : args -> {});
 		this.subscription = subscription;
 	}
 
@@ -83,15 +83,6 @@ public HandlerMethodArgumentResolverComposite getResolvers() {
 		return this.resolvers;
 	}
 
-	/**
-	 * Return the configured input validator.
-	 * @deprecated as of 1.1 without a replacement
-	 */
-	@Deprecated
-	@Nullable
-	public HandlerMethodValidationHelper getValidator() {
-		return this.validator;
-	}
 
 
 	/**
@@ -188,9 +179,7 @@ private Object[] getMethodArgumentValues(
 
 	@Nullable
 	private Object validateAndInvoke(Object[] args, DataFetchingEnvironment environment) {
-		if (this.validator != null) {
-			this.validator.validate(this, args);
-		}
+		this.validationHelper.accept(args);
 		return doInvoke(environment.getGraphQlContext(), args);
 	}