Merge pull request #3929 from graphql-java/dont-alllocate-NonNullableFieldValidator-all-the-time

dondonz · web-flow · commit abb2cddba093 · 2025-05-15T16:09:54.000+10:00
Stop creating NonNullableFieldValidator every for every object or list field
diff --git a/src/main/java/graphql/execution/Execution.java b/src/main/java/graphql/execution/Execution.java
@@ -189,7 +189,7 @@ private CompletableFuture<ExecutionResult> executeOperation(ExecutionContext exe
 
         ResultPath path = ResultPath.rootPath();
         ExecutionStepInfo executionStepInfo = newExecutionStepInfo().type(operationRootType).path(path).build();
-        NonNullableFieldValidator nonNullableFieldValidator = new NonNullableFieldValidator(executionContext, executionStepInfo);
+        NonNullableFieldValidator nonNullableFieldValidator = new NonNullableFieldValidator(executionContext);
 
         ExecutionStrategyParameters parameters = newParameters()
                 .executionStepInfo(executionStepInfo)
diff --git a/src/main/java/graphql/execution/ExecutionStrategy.java b/src/main/java/graphql/execution/ExecutionStrategy.java
@@ -605,10 +605,7 @@ private FieldValueInfo completeField(GraphQLFieldDefinition fieldDef, ExecutionC
                 instrumentationParams, executionContext.getInstrumentationState()
         ));
 
-        NonNullableFieldValidator nonNullableFieldValidator = new NonNullableFieldValidator(executionContext, executionStepInfo);
-
         ExecutionStrategyParameters newParameters = parameters.transform(executionStepInfo,
-                nonNullableFieldValidator,
                 fetchedValue.getLocalContext(),
                 fetchedValue.getFetchedValue());
 
@@ -767,13 +764,12 @@ protected FieldValueInfo completeValueForList(ExecutionContext executionContext,
 
             ExecutionStepInfo stepInfoForListElement = executionStepInfoFactory.newExecutionStepInfoForListElement(executionStepInfo, indexedPath);
 
-            NonNullableFieldValidator nonNullableFieldValidator = new NonNullableFieldValidator(executionContext, stepInfoForListElement);
-
             FetchedValue value = unboxPossibleDataFetcherResult(executionContext, parameters, item);
 
             ExecutionStrategyParameters newParameters = parameters.transform(stepInfoForListElement,
-                    nonNullableFieldValidator, indexedPath,
-                    value.getLocalContext(), value.getFetchedValue());
+                    indexedPath,
+                    value.getLocalContext(),
+                    value.getFetchedValue());
 
             fieldValueInfos.add(completeValue(executionContext, newParameters));
             index++;
@@ -910,10 +906,8 @@ protected Object completeValueForObject(ExecutionContext executionContext, Execu
         );
 
         ExecutionStepInfo newExecutionStepInfo = executionStepInfo.changeTypeWithPreservedNonNull(resolvedObjectType);
-        NonNullableFieldValidator nonNullableFieldValidator = new NonNullableFieldValidator(executionContext, newExecutionStepInfo);
 
         ExecutionStrategyParameters newParameters = parameters.transform(newExecutionStepInfo,
-                nonNullableFieldValidator,
                 subFields,
                 result);
 
diff --git a/src/main/java/graphql/execution/ExecutionStrategyParameters.java b/src/main/java/graphql/execution/ExecutionStrategyParameters.java
@@ -38,7 +38,7 @@ private ExecutionStrategyParameters(ExecutionStepInfo executionStepInfo,
         this.localContext = localContext;
         this.fields = assertNotNull(fields, () -> "fields is null");
         this.source = source;
-        this.nonNullableFieldValidator = nonNullableFieldValidator;
+        this.nonNullableFieldValidator = assertNotNull(nonNullableFieldValidator, () -> "requires a NonNullValidator");;
         this.path = path;
         this.currentField = currentField;
         this.parent = parent;
@@ -132,7 +132,6 @@ ExecutionStrategyParameters transform(MergedField currentField,
 
     @Internal
     ExecutionStrategyParameters transform(ExecutionStepInfo executionStepInfo,
-                                          NonNullableFieldValidator nonNullableFieldValidator,
                                           MergedSelectionSet fields,
                                           Object source) {
         return new ExecutionStrategyParameters(executionStepInfo,
@@ -148,7 +147,6 @@ ExecutionStrategyParameters transform(ExecutionStepInfo executionStepInfo,
 
     @Internal
     ExecutionStrategyParameters transform(ExecutionStepInfo executionStepInfo,
-                                          NonNullableFieldValidator nonNullableFieldValidator,
                                           ResultPath path,
                                           Object localContext,
                                           Object source) {
@@ -165,7 +163,6 @@ ExecutionStrategyParameters transform(ExecutionStepInfo executionStepInfo,
 
     @Internal
     ExecutionStrategyParameters transform(ExecutionStepInfo executionStepInfo,
-                                          NonNullableFieldValidator nonNullableFieldValidator,
                                           Object localContext,
                                           Object source) {
         return new ExecutionStrategyParameters(executionStepInfo,
diff --git a/src/main/java/graphql/execution/NonNullableFieldValidator.java b/src/main/java/graphql/execution/NonNullableFieldValidator.java
@@ -14,15 +14,13 @@
 public class NonNullableFieldValidator {
 
     private final ExecutionContext executionContext;
-    private final ExecutionStepInfo executionStepInfo;
 
-    public NonNullableFieldValidator(ExecutionContext executionContext, ExecutionStepInfo executionStepInfo) {
+    public NonNullableFieldValidator(ExecutionContext executionContext) {
         this.executionContext = executionContext;
-        this.executionStepInfo = executionStepInfo;
     }
 
     /**
-     * Called to check that a value is non null if the type requires it to be non null
+     * Called to check that a value is non-null if the type requires it to be non null
      *
      * @param parameters the execution strategy parameters
      * @param result the result to check
@@ -34,6 +32,7 @@ public NonNullableFieldValidator(ExecutionContext executionContext, ExecutionSte
      */
     public <T> T validate(ExecutionStrategyParameters parameters, T result) throws NonNullableFieldWasNullException {
         if (result == null) {
+            ExecutionStepInfo executionStepInfo = parameters.getExecutionStepInfo();
             if (executionStepInfo.isNonNullType()) {
                 // see https://spec.graphql.org/October2021/#sec-Errors-and-Non-Nullability
                 //
diff --git a/src/main/java/graphql/execution/SubscriptionExecutionStrategy.java b/src/main/java/graphql/execution/SubscriptionExecutionStrategy.java
@@ -106,7 +106,7 @@ private boolean keepOrdered(GraphQLContext graphQLContext) {
      */
 
     private CompletableFuture<Publisher<Object>> createSourceEventStream(ExecutionContext executionContext, ExecutionStrategyParameters parameters) {
-        ExecutionStrategyParameters newParameters = firstFieldOfSubscriptionSelection(parameters);
+        ExecutionStrategyParameters newParameters = firstFieldOfSubscriptionSelection(executionContext,parameters);
 
         CompletableFuture<FetchedValue> fieldFetched = Async.toCompletableFuture(fetchField(executionContext, newParameters));
         return fieldFetched.thenApply(fetchedValue -> {
@@ -139,7 +139,7 @@ private CompletableFuture<ExecutionResult> executeSubscriptionEvent(ExecutionCon
                 .root(eventPayload)
                 .resetErrors()
         );
-        ExecutionStrategyParameters newParameters = firstFieldOfSubscriptionSelection(parameters);
+        ExecutionStrategyParameters newParameters = firstFieldOfSubscriptionSelection(newExecutionContext, parameters);
         ExecutionStepInfo subscribedFieldStepInfo = createSubscribedFieldStepInfo(executionContext, newParameters);
 
         InstrumentationFieldParameters i13nFieldParameters = new InstrumentationFieldParameters(executionContext, () -> subscribedFieldStepInfo);
@@ -179,12 +179,14 @@ private String getRootFieldName(ExecutionStrategyParameters parameters) {
         return rootField.getResultKey();
     }
 
-    private ExecutionStrategyParameters firstFieldOfSubscriptionSelection(ExecutionStrategyParameters parameters) {
+    private ExecutionStrategyParameters firstFieldOfSubscriptionSelection(ExecutionContext executionContext, ExecutionStrategyParameters parameters) {
         MergedSelectionSet fields = parameters.getFields();
         MergedField firstField = fields.getSubField(fields.getKeys().get(0));
 
         ResultPath fieldPath = parameters.getPath().segment(mkNameForPath(firstField.getSingleField()));
-        return parameters.transform(firstField,fieldPath);
+        NonNullableFieldValidator nonNullableFieldValidator = new NonNullableFieldValidator(executionContext);
+        return parameters.transform(builder -> builder
+                .field(firstField).path(fieldPath).nonNullFieldValidator(nonNullableFieldValidator));
     }
 
     private ExecutionStepInfo createSubscribedFieldStepInfo(ExecutionContext executionContext, ExecutionStrategyParameters parameters) {
diff --git a/src/test/groovy/graphql/execution/AsyncExecutionStrategyTest.groovy b/src/test/groovy/graphql/execution/AsyncExecutionStrategyTest.groovy
@@ -117,6 +117,7 @@ abstract class AsyncExecutionStrategyTest extends Specification {
                 .newParameters()
                 .executionStepInfo(typeInfo)
                 .fields(mergedSelectionSet(['hello': mergedField([Field.newField('hello').build()]), 'hello2': mergedField([Field.newField('hello2').build()])]))
+                .nonNullFieldValidator(new NonNullableFieldValidator(executionContext))
                 .build()
 
         AsyncExecutionStrategy asyncExecutionStrategy = new AsyncExecutionStrategy()
@@ -160,6 +161,7 @@ abstract class AsyncExecutionStrategyTest extends Specification {
                 .newParameters()
                 .executionStepInfo(typeInfo)
                 .fields(mergedSelectionSet(['hello': mergedField([Field.newField('hello').build()]), 'hello2': mergedField([Field.newField('hello2').build()])]))
+                .nonNullFieldValidator(new NonNullableFieldValidator(executionContext))
                 .build()
 
         AsyncExecutionStrategy asyncExecutionStrategy = new AsyncExecutionStrategy()
@@ -205,6 +207,7 @@ abstract class AsyncExecutionStrategyTest extends Specification {
                 .newParameters()
                 .executionStepInfo(typeInfo)
                 .fields(mergedSelectionSet(['hello': mergedField([Field.newField('hello').build()]), 'hello2': mergedField([Field.newField('hello2').build()])]))
+                .nonNullFieldValidator(new NonNullableFieldValidator(executionContext))
                 .build()
 
         AsyncExecutionStrategy asyncExecutionStrategy = new AsyncExecutionStrategy()
@@ -249,6 +252,7 @@ abstract class AsyncExecutionStrategyTest extends Specification {
                 .newParameters()
                 .executionStepInfo(typeInfo)
                 .fields(mergedSelectionSet(['hello': mergedField([Field.newField('hello').build()]), 'hello2': mergedField([Field.newField('hello2').build()])]))
+                .nonNullFieldValidator(new NonNullableFieldValidator(executionContext))
                 .build()
 
         AsyncExecutionStrategy asyncExecutionStrategy = new AsyncExecutionStrategy()
@@ -312,6 +316,7 @@ abstract class AsyncExecutionStrategyTest extends Specification {
                 .newParameters()
                 .executionStepInfo(typeInfo)
                 .fields(mergedSelectionSet(['hello': mergedField([new Field('hello')]), 'hello2': mergedField([new Field('hello2')])]))
+                .nonNullFieldValidator(new NonNullableFieldValidator(executionContext))
                 .build()
 
         AsyncExecutionStrategy asyncExecutionStrategy = new AsyncExecutionStrategy()
diff --git a/src/test/groovy/graphql/execution/AsyncSerialExecutionStrategyTest.groovy b/src/test/groovy/graphql/execution/AsyncSerialExecutionStrategyTest.groovy
@@ -115,6 +115,7 @@ class AsyncSerialExecutionStrategyTest extends Specification {
                 .newParameters()
                 .executionStepInfo(typeInfo)
                 .fields(mergedSelectionSet(['hello': mergedField(new Field('hello')), 'hello2': mergedField(new Field('hello2')), 'hello3': mergedField(new Field('hello3'))]))
+                .nonNullFieldValidator(new NonNullableFieldValidator(executionContext))
                 .build()
 
         AsyncSerialExecutionStrategy strategy = new AsyncSerialExecutionStrategy()
@@ -163,6 +164,7 @@ class AsyncSerialExecutionStrategyTest extends Specification {
                 .newParameters()
                 .executionStepInfo(typeInfo)
                 .fields(mergedSelectionSet(['hello': mergedField(new Field('hello')), 'hello2': mergedField(new Field('hello2')), 'hello3': mergedField(new Field('hello3'))]))
+                .nonNullFieldValidator(new NonNullableFieldValidator(executionContext))
                 .build()
 
         AsyncSerialExecutionStrategy strategy = new AsyncSerialExecutionStrategy()
diff --git a/src/test/groovy/graphql/execution/ExecutionStrategyParametersTest.groovy b/src/test/groovy/graphql/execution/ExecutionStrategyParametersTest.groovy
@@ -12,10 +12,12 @@ class ExecutionStrategyParametersTest extends Specification {
 
     def "ExecutionParameters can be transformed"() {
         given:
+        def executionContext = Mock(ExecutionContext)
         def parameters = newParameters()
                 .executionStepInfo(newExecutionStepInfo().type(GraphQLString))
                 .source(new Object())
                 .localContext("localContext")
+                .nonNullFieldValidator(new NonNullableFieldValidator(executionContext))
                 .fields(mergedSelectionSet("a": []))
                 .build()
 
diff --git a/src/test/groovy/graphql/execution/ExecutionStrategyTest.groovy b/src/test/groovy/graphql/execution/ExecutionStrategyTest.groovy
diff --git a/src/test/groovy/graphql/execution/NonNullableFieldValidatorTest.groovy b/src/test/groovy/graphql/execution/NonNullableFieldValidatorTest.groovy
