Fix NullAway errors and adapt to master's naming conventions after rebase

andimarek · claude · andimarek · commit 97d10d2cf8f1 · 2026-03-23T07:44:43.000+10:00
- Add @nullable annotations for QueryComplexityLimits parameters - Replace shouldRunNonFragmentSpreadChecks() with shouldRunDocumentLevelRules() - Replace fragmentSpreadVisitDepth with fragmentRetraversalDepth Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
diff --git a/src/main/java/graphql/ParseAndValidate.java b/src/main/java/graphql/ParseAndValidate.java
@@ -12,6 +12,7 @@
 import graphql.validation.Validator;
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import java.util.List;
 import java.util.Locale;
@@ -133,7 +134,7 @@ public static List<ValidationError> validate(@NonNull GraphQLSchema graphQLSchem
      *
      * @return a result object that indicates how this operation went
      */
-    public static List<ValidationError> validate(@NonNull GraphQLSchema graphQLSchema, @NonNull Document parsedDocument, @NonNull Predicate<OperationValidationRule> rulePredicate, @NonNull Locale locale, QueryComplexityLimits limits) {
+    public static List<ValidationError> validate(@NonNull GraphQLSchema graphQLSchema, @NonNull Document parsedDocument, @NonNull Predicate<OperationValidationRule> rulePredicate, @NonNull Locale locale, @Nullable QueryComplexityLimits limits) {
         Validator validator = new Validator();
         return validator.validateDocument(graphQLSchema, parsedDocument, rulePredicate, locale, limits);
     }
diff --git a/src/main/java/graphql/introspection/GoodFaithIntrospection.java b/src/main/java/graphql/introspection/GoodFaithIntrospection.java
@@ -125,7 +125,7 @@ public static boolean containsIntrospectionFields(Document document) {
      *
      * @return complexity limits with good faith bounds applied
      */
-    public static QueryComplexityLimits goodFaithLimits(QueryComplexityLimits existing) {
+    public static QueryComplexityLimits goodFaithLimits(@Nullable QueryComplexityLimits existing) {
         if (existing == null) {
             existing = QueryComplexityLimits.getDefaultLimits();
         }
diff --git a/src/main/java/graphql/validation/OperationValidator.java b/src/main/java/graphql/validation/OperationValidator.java
@@ -624,7 +624,7 @@ private void checkGoodFaithIntrospection(Field field) {
         // Check query-level introspection fields (__schema, __type).
         // Only counted at the structural level (not during fragment traversal) to match ENO merging
         // behavior where the same field from a direct selection and a fragment spread merge into one.
-        if (shouldRunNonFragmentSpreadChecks()) {
+        if (shouldRunDocumentLevelRules()) {
             GraphQLObjectType queryType = validationContext.getSchema().getQueryType();
             if (queryType != null && parentType.getName().equals(queryType.getName())) {
                 if ("__schema".equals(fieldName) || "__type".equals(fieldName)) {
diff --git a/src/main/java/graphql/validation/ValidationContext.java b/src/main/java/graphql/validation/ValidationContext.java
@@ -39,7 +39,7 @@ public ValidationContext(GraphQLSchema schema, Document document, I18n i18n) {
         this(schema, document, i18n, null);
     }
 
-    public ValidationContext(GraphQLSchema schema, Document document, I18n i18n, QueryComplexityLimits limits) {
+    public ValidationContext(GraphQLSchema schema, Document document, I18n i18n, @Nullable QueryComplexityLimits limits) {
         this.schema = schema;
         this.document = document;
         this.traversalContext = new TraversalContext(schema);

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public static boolean containsIntrospectionFields(Document document) {`
`125`	`125`	`*`
`126`	`126`	`* @return complexity limits with good faith bounds applied`
`127`	`127`	`*/`
`128`		`- public static QueryComplexityLimits goodFaithLimits(QueryComplexityLimits existing) {`
	`128`	`+ public static QueryComplexityLimits goodFaithLimits(@Nullable QueryComplexityLimits existing) {`
`129`	`129`	`if (existing == null) {`
`130`	`130`	`existing = QueryComplexityLimits.getDefaultLimits();`
`131`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public ValidationContext(GraphQLSchema schema, Document document, I18n i18n) {`
`39`	`39`	`this(schema, document, i18n, null);`
`40`	`40`	`}`
`41`	`41`
`42`		`- public ValidationContext(GraphQLSchema schema, Document document, I18n i18n, QueryComplexityLimits limits) {`
	`42`	`+ public ValidationContext(GraphQLSchema schema, Document document, I18n i18n, @Nullable QueryComplexityLimits limits) {`
`43`	`43`	`this.schema = schema;`
`44`	`44`	`this.document = document;`
`45`	`45`	`this.traversalContext = new TraversalContext(schema);`