Fix NullAway errors in OperationValidator after OperationDefinition nullability changes

dondonz · claude · dondonz · commit e8ebbf6d0f4f · 2026-02-21T17:17:33.000+11:00
Handle nullable returns from OperationDefinition.getName() and
getSelectionSet() in OperationValidator to fix NullAway compilation errors
introduced by the merge with master's validation-refactor.

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/src/main/java/graphql/validation/OperationValidator.java b/src/main/java/graphql/validation/OperationValidator.java
@@ -1011,7 +1011,11 @@ private void collectUsedFragmentsInDefinition(Set<String> result, String fragmen
 
     // --- OverlappingFieldsCanBeMerged ---
     private void validateOverlappingFieldsCanBeMerged(OperationDefinition operationDefinition) {
-        overlappingFieldsImpl(operationDefinition.getSelectionSet(), validationContext.getOutputType());
+        SelectionSet selectionSet = operationDefinition.getSelectionSet();
+        if (selectionSet == null) {
+            return;
+        }
+        overlappingFieldsImpl(selectionSet, validationContext.getOutputType());
     }
 
     private void overlappingFieldsImpl(SelectionSet selectionSet, @Nullable GraphQLOutputType graphQLOutputType) {
@@ -1557,7 +1561,7 @@ private void validateUniqueOperationNames(OperationDefinition operationDefinitio
             return;
         }
         if (operationNames.contains(name)) {
-            String message = i18n(DuplicateOperationName, "UniqueOperationNames.oneOperation", operationDefinition.getName());
+            String message = i18n(DuplicateOperationName, "UniqueOperationNames.oneOperation", name);
             addError(DuplicateOperationName, operationDefinition.getSourceLocation(), message);
         } else {
             operationNames.add(name);
@@ -1646,14 +1650,19 @@ private void validateSubscriptionUniqueRootField(OperationDefinition operationDe
                     .objectType(subscriptionType)
                     .graphQLContext(validationContext.getGraphQLContext())
                     .build();
-            MergedSelectionSet fields = fieldCollector.collectFields(collectorParameters, operationDef.getSelectionSet());
+            SelectionSet selectionSet = operationDef.getSelectionSet();
+            if (selectionSet == null) {
+                return;
+            }
+            String opName = operationDef.getName() != null ? operationDef.getName() : "";
+            MergedSelectionSet fields = fieldCollector.collectFields(collectorParameters, selectionSet);
             if (fields.size() > 1) {
-                String message = i18n(SubscriptionMultipleRootFields, "SubscriptionUniqueRootField.multipleRootFields", operationDef.getName());
+                String message = i18n(SubscriptionMultipleRootFields, "SubscriptionUniqueRootField.multipleRootFields", opName);
                 addError(SubscriptionMultipleRootFields, operationDef.getSourceLocation(), message);
             } else {
                 MergedField mergedField = fields.getSubFieldsList().get(0);
                 if (isIntrospectionField(mergedField)) {
-                    String message = i18n(SubscriptionIntrospectionRootField, "SubscriptionIntrospectionRootField.introspectionRootField", operationDef.getName(), mergedField.getName());
+                    String message = i18n(SubscriptionIntrospectionRootField, "SubscriptionIntrospectionRootField.introspectionRootField", opName, mergedField.getName());
                     addError(SubscriptionIntrospectionRootField, mergedField.getSingleField().getSourceLocation(), message);
                 }
             }
