graphql-java · andimarek · Feb 19, 2026 · Jan 27, 2026 · Jan 28, 2026 · Jan 28, 2026
diff --git a/src/jmh/java/benchmark/OverlappingFieldValidationBenchmark.java b/src/jmh/java/benchmark/OverlappingFieldValidationBenchmark.java
@@ -8,11 +8,11 @@
 import graphql.schema.GraphQLSchema;
 import graphql.schema.idl.SchemaGenerator;
 import graphql.validation.LanguageTraversal;
-import graphql.validation.RulesVisitor;
+import graphql.validation.OperationValidationRule;
+import graphql.validation.OperationValidator;
 import graphql.validation.ValidationContext;
 import graphql.validation.ValidationError;
 import graphql.validation.ValidationErrorCollector;
-import graphql.validation.rules.OverlappingFieldsCanBeMerged;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -25,7 +25,6 @@
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.infra.Blackhole;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
@@ -78,9 +77,10 @@ private List<ValidationError> validateQuery(GraphQLSchema schema, Document docum
         ValidationErrorCollector errorCollector = new ValidationErrorCollector();
         I18n i18n = I18n.i18n(I18n.BundleType.Validation, Locale.ENGLISH);
         ValidationContext validationContext = new ValidationContext(schema, document, i18n);
-        OverlappingFieldsCanBeMerged overlappingFieldsCanBeMerged = new OverlappingFieldsCanBeMerged(validationContext, errorCollector);
+        OperationValidator operationValidator = new OperationValidator(validationContext, errorCollector,
+                rule -> rule == OperationValidationRule.OVERLAPPING_FIELDS_CAN_BE_MERGED);
         LanguageTraversal languageTraversal = new LanguageTraversal();
-        languageTraversal.traverse(document, new RulesVisitor(validationContext, Collections.singletonList(overlappingFieldsCanBeMerged)));
+        languageTraversal.traverse(document, operationValidator);
         return errorCollector.getErrors();
     }
 }
diff --git a/src/jmh/java/performance/OverlappingFieldValidationPerformance.java b/src/jmh/java/performance/OverlappingFieldValidationPerformance.java
@@ -9,11 +9,11 @@
 import graphql.schema.GraphQLSchema;
 import graphql.schema.idl.SchemaGenerator;
 import graphql.validation.LanguageTraversal;
-import graphql.validation.RulesVisitor;
+import graphql.validation.OperationValidationRule;
+import graphql.validation.OperationValidator;
 import graphql.validation.ValidationContext;
 import graphql.validation.ValidationError;
 import graphql.validation.ValidationErrorCollector;
-import graphql.validation.rules.OverlappingFieldsCanBeMerged;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -27,7 +27,6 @@
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.infra.Blackhole;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
@@ -151,9 +150,10 @@ private List<ValidationError> validateQuery(GraphQLSchema schema, Document docum
         ValidationErrorCollector errorCollector = new ValidationErrorCollector();
         I18n i18n = I18n.i18n(I18n.BundleType.Validation, Locale.ENGLISH);
         ValidationContext validationContext = new ValidationContext(schema, document, i18n);
-        OverlappingFieldsCanBeMerged overlappingFieldsCanBeMerged = new OverlappingFieldsCanBeMerged(validationContext, errorCollector);
+        OperationValidator operationValidator = new OperationValidator(validationContext, errorCollector,
+                rule -> rule == OperationValidationRule.OVERLAPPING_FIELDS_CAN_BE_MERGED);
         LanguageTraversal languageTraversal = new LanguageTraversal();
-        languageTraversal.traverse(document, new RulesVisitor(validationContext, Collections.singletonList(overlappingFieldsCanBeMerged)));
+        languageTraversal.traverse(document, operationValidator);
         Assert.assertTrue(errorCollector.getErrors().size() == 0);
         return errorCollector.getErrors();
     }

diff --git a/src/main/java/graphql/GraphQL.java b/src/main/java/graphql/GraphQL.java
@@ -25,6 +25,7 @@
 import graphql.execution.preparsed.PreparsedDocumentProvider;
 import graphql.language.Document;
 import graphql.schema.GraphQLSchema;
+import graphql.validation.OperationValidationRule;
 import graphql.validation.ValidationError;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.NullUnmarked;
@@ -598,7 +599,7 @@ private List<ValidationError> validate(ExecutionInput executionInput, Document d
         InstrumentationContext<List<ValidationError>> validationCtx = nonNullCtx(instrumentation.beginValidation(new InstrumentationValidationParameters(executionInput, document, graphQLSchema), instrumentationState));
         validationCtx.onDispatched();
 
-        Predicate<Class<?>> validationRulePredicate = executionInput.getGraphQLContext().getOrDefault(ParseAndValidate.INTERNAL_VALIDATION_PREDICATE_HINT, r -> true);
+        Predicate<OperationValidationRule> validationRulePredicate = executionInput.getGraphQLContext().getOrDefault(ParseAndValidate.INTERNAL_VALIDATION_PREDICATE_HINT, r -> true);
         Locale locale = executionInput.getLocale();
         List<ValidationError> validationErrors = ParseAndValidate.validate(graphQLSchema, document, validationRulePredicate, locale);
 

diff --git a/src/main/java/graphql/ParseAndValidate.java b/src/main/java/graphql/ParseAndValidate.java
@@ -6,8 +6,10 @@
 import graphql.parser.ParserEnvironment;
 import graphql.parser.ParserOptions;
 import graphql.schema.GraphQLSchema;
+import graphql.validation.OperationValidationRule;
 import graphql.validation.ValidationError;
 import graphql.validation.Validator;
+import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.NullMarked;
 
 import java.util.List;
@@ -28,7 +30,7 @@ public class ParseAndValidate {
 
     /**
      * This {@link GraphQLContext} hint can be used to supply a Predicate to the Validator so that certain rules can be skipped.
-     * <p>
+     *
      * This is an internal capability that you should use at your own risk.  While we intend for this to be present for some time, the validation
      * rule class names may change, as may this mechanism.
      */
@@ -44,7 +46,7 @@ public class ParseAndValidate {
      *
      * @return a result object that indicates how this operation went
      */
-    public static ParseAndValidateResult parseAndValidate(GraphQLSchema graphQLSchema, ExecutionInput executionInput) {
+    public static ParseAndValidateResult parseAndValidate(@NonNull GraphQLSchema graphQLSchema, @NonNull ExecutionInput executionInput) {
         ParseAndValidateResult result = parse(executionInput);
         if (!result.isFailure()) {
             List<ValidationError> errors = validate(graphQLSchema, assertNotNull(result.getDocument(), "Parse result document cannot be null when parse succeeded"), executionInput.getLocale());
@@ -60,7 +62,7 @@ public static ParseAndValidateResult parseAndValidate(GraphQLSchema graphQLSchem
      *
      * @return a result object that indicates how this operation went
      */
-    public static ParseAndValidateResult parse(ExecutionInput executionInput) {
+    public static ParseAndValidateResult parse(@NonNull ExecutionInput executionInput) {
         try {
             //
             // we allow the caller to specify new parser options by context
@@ -89,8 +91,8 @@ public static ParseAndValidateResult parse(ExecutionInput executionInput) {
      *
      * @return a result object that indicates how this operation went
      */
-    public static List<ValidationError> validate(GraphQLSchema graphQLSchema, Document parsedDocument, Locale locale) {
-        return validate(graphQLSchema, parsedDocument, ruleClass -> true, locale);
+    public static List<ValidationError> validate(@NonNull GraphQLSchema graphQLSchema, @NonNull Document parsedDocument, @NonNull Locale locale) {
+        return validate(graphQLSchema, parsedDocument, rule -> true, locale);
     }
 
     /**
@@ -101,8 +103,8 @@ public static List<ValidationError> validate(GraphQLSchema graphQLSchema, Docume
      *
      * @return a result object that indicates how this operation went
      */
-    public static List<ValidationError> validate(GraphQLSchema graphQLSchema, Document parsedDocument) {
-        return validate(graphQLSchema, parsedDocument, ruleClass -> true, Locale.getDefault());
+    public static List<ValidationError> validate(@NonNull GraphQLSchema graphQLSchema, @NonNull Document parsedDocument) {
+        return validate(graphQLSchema, parsedDocument, rule -> true, Locale.getDefault());
     }
 
     /**
@@ -115,7 +117,7 @@ public static List<ValidationError> validate(GraphQLSchema graphQLSchema, Docume
      *
      * @return a result object that indicates how this operation went
      */
-    public static List<ValidationError> validate(GraphQLSchema graphQLSchema, Document parsedDocument, Predicate<Class<?>> rulePredicate, Locale locale) {
+    public static List<ValidationError> validate(@NonNull GraphQLSchema graphQLSchema, @NonNull Document parsedDocument, @NonNull Predicate<OperationValidationRule> rulePredicate, @NonNull Locale locale) {
         Validator validator = new Validator();
         return validator.validateDocument(graphQLSchema, parsedDocument, rulePredicate, locale);
     }
@@ -129,7 +131,7 @@ public static List<ValidationError> validate(GraphQLSchema graphQLSchema, Docume
      *
      * @return a result object that indicates how this operation went
      */
-    public static List<ValidationError> validate(GraphQLSchema graphQLSchema, Document parsedDocument, Predicate<Class<?>> rulePredicate) {
+    public static List<ValidationError> validate(@NonNull GraphQLSchema graphQLSchema, @NonNull Document parsedDocument, @NonNull Predicate<OperationValidationRule> rulePredicate) {
         Validator validator = new Validator();
         return validator.validateDocument(graphQLSchema, parsedDocument, rulePredicate, Locale.getDefault());
     }

diff --git a/src/main/java/graphql/execution/MergedField.java b/src/main/java/graphql/execution/MergedField.java
@@ -61,7 +61,7 @@
  * </pre>
  * These examples make clear that you need to consider all merged fields together to have the full picture.
  * <p>
- * The actual logic when fields can be successfully merged together is implemented in {#graphql.validation.rules.OverlappingFieldsCanBeMerged}
+ * The actual logic when fields can be successfully merged together is implemented in {#graphql.validation.OperationValidator}
  */
 @PublicApi
 @NullMarked

diff --git a/src/main/java/graphql/normalized/ENFMerger.java b/src/main/java/graphql/normalized/ENFMerger.java
@@ -168,7 +168,7 @@ private static boolean compareWithoutChildren(ExecutableNormalizedField one, Exe
         return true;
     }
 
-    // copied from graphql.validation.rules.OverlappingFieldsCanBeMerged
+    // copied from graphql.validation.OperationValidator
     private static boolean sameArguments(List<Argument> arguments1, List<Argument> arguments2) {
         if (arguments1.size() != arguments2.size()) {
             return false;

diff --git a/src/main/java/graphql/normalized/nf/NormalizedFieldsMerger.java b/src/main/java/graphql/normalized/nf/NormalizedFieldsMerger.java
@@ -166,7 +166,7 @@ private static boolean compareWithoutChildren(NormalizedField one, NormalizedFie
         return true;
     }
 
-    // copied from graphql.validation.rules.OverlappingFieldsCanBeMerged
+    // copied from graphql.validation.OperationValidator
     private static boolean sameArguments(List<Argument> arguments1, List<Argument> arguments2) {
         if (arguments1.size() != arguments2.size()) {
             return false;

diff --git a/src/main/java/graphql/schema/GraphQLSchema.java b/src/main/java/graphql/schema/GraphQLSchema.java
@@ -565,7 +565,7 @@ public Map<String, GraphQLDirective> getDirectivesByName() {
      *
      * @return the directive or null if there is not one with that name
      */
-    public GraphQLDirective getDirective(String directiveName) {
+    public @Nullable GraphQLDirective getDirective(String directiveName) {
         return directiveDefinitionsHolder.getDirective(directiveName);
     }
 
@@ -1215,6 +1215,7 @@ public FastBuilder(GraphQLCodeRegistry.Builder codeRegistryBuilder,
          * multiple FastBuilder instances.
          *
          * @param type the named type to add
+         *
          * @return this builder for chaining
          */
         public FastBuilder addType(GraphQLNamedType type) {
@@ -1264,6 +1265,7 @@ public FastBuilder addType(GraphQLNamedType type) {
          * All non-root types added via this method will be included in {@link GraphQLSchema#getAdditionalTypes()}.
          *
          * @param types the named types to add
+         *
          * @return this builder for chaining
          */
         public FastBuilder addTypes(Collection<? extends GraphQLNamedType> types) {
@@ -1275,6 +1277,7 @@ public FastBuilder addTypes(Collection<? extends GraphQLNamedType> types) {
          * Adds a directive definition to the schema.
          *
          * @param directive the directive to add
+         *
          * @return this builder for chaining
          */
         public FastBuilder additionalDirective(GraphQLDirective directive) {
@@ -1296,6 +1299,7 @@ public FastBuilder additionalDirective(GraphQLDirective directive) {
          * Adds multiple directive definitions to the schema.
          *
          * @param directives the directives to add
+         *
          * @return this builder for chaining
          */
         public FastBuilder additionalDirectives(Collection<? extends GraphQLDirective> directives) {
@@ -1307,6 +1311,7 @@ public FastBuilder additionalDirectives(Collection<? extends GraphQLDirective> d
          * Adds a schema-level directive (deprecated, use applied directives).
          *
          * @param directive the directive to add
+         *
          * @return this builder for chaining
          */
         public FastBuilder withSchemaDirective(GraphQLDirective directive) {
@@ -1318,6 +1323,7 @@ public FastBuilder withSchemaDirective(GraphQLDirective directive) {
          * Adds multiple schema-level directives.
          *
          * @param directives the directives to add
+         *
          * @return this builder for chaining
          */
         public FastBuilder withSchemaDirectives(Collection<? extends GraphQLDirective> directives) {
@@ -1329,6 +1335,7 @@ public FastBuilder withSchemaDirectives(Collection<? extends GraphQLDirective> d
          * Adds a schema-level applied directive.
          *
          * @param applied the applied directive to add
+         *
          * @return this builder for chaining
          */
         public FastBuilder withSchemaAppliedDirective(GraphQLAppliedDirective applied) {
@@ -1342,6 +1349,7 @@ public FastBuilder withSchemaAppliedDirective(GraphQLAppliedDirective applied) {
          * Adds multiple schema-level applied directives.
          *
          * @param appliedList the applied directives to add
+         *
          * @return this builder for chaining
          */
         public FastBuilder withSchemaAppliedDirectives(Collection<? extends GraphQLAppliedDirective> appliedList) {
@@ -1355,6 +1363,7 @@ public FastBuilder withSchemaAppliedDirectives(Collection<? extends GraphQLAppli
          * Sets the schema definition (AST).
          *
          * @param def the schema definition
+         *
          * @return this builder for chaining
          */
         public FastBuilder definition(SchemaDefinition def) {
@@ -1366,6 +1375,7 @@ public FastBuilder definition(SchemaDefinition def) {
          * Sets the schema extension definitions (AST).
          *
          * @param defs the extension definitions
+         *
          * @return this builder for chaining
          */
         public FastBuilder extensionDefinitions(List<SchemaExtensionDefinition> defs) {
@@ -1377,6 +1387,7 @@ public FastBuilder extensionDefinitions(List<SchemaExtensionDefinition> defs) {
          * Sets the schema description.
          *
          * @param description the description
+         *
          * @return this builder for chaining
          */
         public FastBuilder description(String description) {
@@ -1388,6 +1399,7 @@ public FastBuilder description(String description) {
          * Sets the introspection schema type.
          *
          * @param type the introspection schema type
+         *
          * @return this builder for chaining
          */
         public FastBuilder introspectionSchemaType(GraphQLObjectType type) {
@@ -1399,6 +1411,7 @@ public FastBuilder introspectionSchemaType(GraphQLObjectType type) {
          * Enables or disables schema validation.
          *
          * @param enabled true to enable validation, false to disable
+         *
          * @return this builder for chaining
          */
         public FastBuilder withValidation(boolean enabled) {
@@ -1415,9 +1428,10 @@ public FastBuilder withValidation(boolean enabled) {
          * should not be reused with another FastBuilder.
          *
          * @return the built schema
+         *
          * @throws InvalidSchemaException if validation is enabled and the schema is invalid
-         * @throws AssertException if a type reference cannot be resolved or if an interface/union
-         *                         type is missing a type resolver
+         * @throws AssertException        if a type reference cannot be resolved or if an interface/union
+         *                                type is missing a type resolver
          */
         public GraphQLSchema build() {
             // Validate type resolvers for all interfaces and unions