Move VariablesTypesMatcher and all validation tests from rules sub-package to validation package

andimarek · claude · andimarek · commit 1f6d39d400df · 2026-01-28T10:58:03.000+10:00
The rules sub-package is no longer needed since all 31 rule classes
were consolidated into OperationValidator. Move the remaining utility
class (VariablesTypesMatcher) and all 32 test files into the parent
graphql.validation package, then delete the empty rules directories.

Also remove stale JSpecifyAnnotationsCheck entries for deleted rule
classes and update comments referencing the old package.

Co-Authored-By: Claude Opus 4.5 &lt;noreply@anthropic.com&gt;
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/validation/OperationValidator.java b/src/main/java/graphql/validation/OperationValidator.java
@@ -56,7 +56,6 @@
 import graphql.schema.GraphQLUnionType;
 import graphql.schema.GraphQLUnmodifiedType;
 import graphql.schema.InputValueWithState;
-import graphql.validation.rules.VariablesTypesMatcher;
 import graphql.util.StringKit;
 
 import java.util.ArrayList;
diff --git a/src/main/java/graphql/validation/VariablesTypesMatcher.java b/src/main/java/graphql/validation/VariablesTypesMatcher.java
@@ -1,4 +1,4 @@
-package graphql.validation.rules;
+package graphql.validation;
 
 
 import graphql.Internal;
diff --git a/src/test/groovy/graphql/archunit/JSpecifyAnnotationsCheck.groovy b/src/test/groovy/graphql/archunit/JSpecifyAnnotationsCheck.groovy
@@ -325,10 +325,7 @@ class JSpecifyAnnotationsCheck extends Specification {
             "graphql.util.TreeTransformerUtil",
             "graphql.validation.ValidationError",
             "graphql.validation.ValidationErrorClassification",
-            "graphql.validation.ValidationErrorType",
-            "graphql.validation.rules.DeferDirectiveLabel",
-            "graphql.validation.rules.DeferDirectiveOnRootLevel",
-            "graphql.validation.rules.DeferDirectiveOnValidOperation"
+            "graphql.validation.ValidationErrorType"
     ] as Set
 
     def "ensure all public API and experimental API classes have @NullMarked annotation"() {
diff --git a/src/test/groovy/graphql/validation/ArgumentsOfCorrectTypeTest.groovy b/src/test/groovy/graphql/validation/ArgumentsOfCorrectTypeTest.groovy
@@ -1,4 +1,4 @@
-package graphql.validation.rules
+package graphql.validation
 
 import graphql.TestUtil
 import graphql.parser.Parser
diff --git a/src/test/groovy/graphql/validation/DeferDirectiveLabelTest.groovy b/src/test/groovy/graphql/validation/DeferDirectiveLabelTest.groovy
@@ -1,4 +1,4 @@
-package graphql.validation.rules
+package graphql.validation
 
 import graphql.ExperimentalApi
 import graphql.i18n.I18n
diff --git a/src/test/groovy/graphql/validation/DeferDirectiveOnRootLevelTest.groovy b/src/test/groovy/graphql/validation/DeferDirectiveOnRootLevelTest.groovy
@@ -1,4 +1,4 @@
-package graphql.validation.rules
+package graphql.validation
 
 import graphql.ExperimentalApi
 import graphql.i18n.I18n
diff --git a/src/test/groovy/graphql/validation/DeferDirectiveOnValidOperationTest.groovy b/src/test/groovy/graphql/validation/DeferDirectiveOnValidOperationTest.groovy
@@ -1,4 +1,4 @@
-package graphql.validation.rules
+package graphql.validation
 
 import graphql.ExperimentalApi
 import graphql.i18n.I18n
diff --git a/src/test/groovy/graphql/validation/ExecutableDefinitionsTest.groovy b/src/test/groovy/graphql/validation/ExecutableDefinitionsTest.groovy
@@ -1,4 +1,4 @@
-package graphql.validation.rules
+package graphql.validation
 
 import graphql.language.SourceLocation
 import graphql.parser.Parser
diff --git a/src/test/groovy/graphql/validation/FieldsOnCorrectTypeTest.groovy b/src/test/groovy/graphql/validation/FieldsOnCorrectTypeTest.groovy
@@ -1,4 +1,4 @@
-package graphql.validation.rules
+package graphql.validation
 
 import graphql.parser.Parser
 import graphql.validation.SpecValidationSchema
diff --git a/src/test/groovy/graphql/validation/FragmentsOnCompositeTypeTest.groovy b/src/test/groovy/graphql/validation/FragmentsOnCompositeTypeTest.groovy
@@ -1,4 +1,4 @@
-package graphql.validation.rules
+package graphql.validation
 
 import graphql.ExecutionInput
 import graphql.GraphQL
diff --git a/src/test/groovy/graphql/validation/Harness.java b/src/test/groovy/graphql/validation/Harness.java
@@ -1,4 +1,4 @@
-package graphql.validation.rules;
+package graphql.validation;
 
 import graphql.schema.GraphQLEnumType;
 import graphql.schema.GraphQLInputObjectType;
diff --git a/src/test/groovy/graphql/validation/KnownArgumentNamesTest.groovy b/src/test/groovy/graphql/validation/KnownArgumentNamesTest.groovy
@@ -1,4 +1,4 @@
-package graphql.validation.rules
+package graphql.validation
 
 import graphql.parser.Parser
 import graphql.validation.SpecValidationSchema
diff --git a/src/test/groovy/graphql/validation/KnownDirectivesTest.groovy b/src/test/groovy/graphql/validation/KnownDirectivesTest.groovy
@@ -1,4 +1,4 @@
-package graphql.validation.rules
+package graphql.validation
 
 import graphql.StarWarsSchema
 import graphql.TestUtil
diff --git a/src/test/groovy/graphql/validation/KnownFragmentNamesTest.groovy b/src/test/groovy/graphql/validation/KnownFragmentNamesTest.groovy
@@ -1,4 +1,4 @@
-package graphql.validation.rules
+package graphql.validation
 
 import graphql.parser.Parser
 import graphql.validation.SpecValidationSchema
diff --git a/src/test/groovy/graphql/validation/KnownTypeNamesTest.groovy b/src/test/groovy/graphql/validation/KnownTypeNamesTest.groovy
@@ -1,4 +1,4 @@
-package graphql.validation.rules
+package graphql.validation
 
 import graphql.parser.Parser
 import graphql.validation.SpecValidationSchema
diff --git a/src/test/groovy/graphql/validation/LoneAnonymousOperationTest.groovy b/src/test/groovy/graphql/validation/LoneAnonymousOperationTest.groovy
@@ -1,4 +1,4 @@
-package graphql.validation.rules
+package graphql.validation
 
 import graphql.parser.Parser
 import graphql.validation.SpecValidationSchema
diff --git a/src/test/groovy/graphql/validation/NoFragmentCyclesTest.groovy b/src/test/groovy/graphql/validation/NoFragmentCyclesTest.groovy
@@ -1,4 +1,4 @@
-package graphql.validation.rules
+package graphql.validation
 
 import graphql.TestUtil
 import graphql.i18n.I18n
diff --git a/src/test/groovy/graphql/validation/NoUndefinedVariablesTest.groovy b/src/test/groovy/graphql/validation/NoUndefinedVariablesTest.groovy
@@ -1,4 +1,4 @@
-package graphql.validation.rules
+package graphql.validation
 
 import graphql.TestUtil
 import graphql.i18n.I18n
diff --git a/src/test/groovy/graphql/validation/NoUnusedFragmentsTest.groovy b/src/test/groovy/graphql/validation/NoUnusedFragmentsTest.groovy
@@ -1,4 +1,4 @@
-package graphql.validation.rules
+package graphql.validation
 
 import graphql.TestUtil
 import graphql.i18n.I18n
diff --git a/src/test/groovy/graphql/validation/NoUnusedVariablesTest.groovy b/src/test/groovy/graphql/validation/NoUnusedVariablesTest.groovy
@@ -1,4 +1,4 @@
-package graphql.validation.rules
+package graphql.validation
 
 import graphql.TestUtil
 import graphql.i18n.I18n
diff --git a/src/test/groovy/graphql/validation/OverlappingFieldsCanBeMergedTest.groovy b/src/test/groovy/graphql/validation/OverlappingFieldsCanBeMergedTest.groovy
@@ -1,4 +1,4 @@
-package graphql.validation.rules
+package graphql.validation
 
 import graphql.i18n.I18n
 import graphql.language.Document
diff --git a/src/test/groovy/graphql/validation/PossibleFragmentSpreadsTest.groovy b/src/test/groovy/graphql/validation/PossibleFragmentSpreadsTest.groovy
@@ -1,4 +1,4 @@
-package graphql.validation.rules
+package graphql.validation
 
 import graphql.i18n.I18n
 import graphql.language.Document
diff --git a/src/test/groovy/graphql/validation/ProvidedNonNullArgumentsTest.groovy b/src/test/groovy/graphql/validation/ProvidedNonNullArgumentsTest.groovy
@@ -1,4 +1,4 @@
-package graphql.validation.rules
+package graphql.validation
 
 import graphql.parser.Parser
 import graphql.schema.GraphQLArgument
diff --git a/src/test/groovy/graphql/validation/ScalarLeavesTest.groovy b/src/test/groovy/graphql/validation/ScalarLeavesTest.groovy
@@ -1,4 +1,4 @@
-package graphql.validation.rules
+package graphql.validation
 
 import graphql.parser.Parser
 import graphql.validation.SpecValidationSchema
diff --git a/src/test/groovy/graphql/validation/SubscriptionUniqueRootFieldTest.groovy b/src/test/groovy/graphql/validation/SubscriptionUniqueRootFieldTest.groovy
@@ -1,4 +1,4 @@
-package graphql.validation.rules
+package graphql.validation
 
 import graphql.parser.Parser
 import graphql.validation.SpecValidationSchema
diff --git a/src/test/groovy/graphql/validation/UniqueArgumentNamesTest.groovy b/src/test/groovy/graphql/validation/UniqueArgumentNamesTest.groovy
@@ -1,4 +1,4 @@
-package graphql.validation.rules
+package graphql.validation
 
 import graphql.parser.Parser
 import graphql.validation.SpecValidationSchema
diff --git a/src/test/groovy/graphql/validation/UniqueDirectiveNamesPerLocationTest.groovy b/src/test/groovy/graphql/validation/UniqueDirectiveNamesPerLocationTest.groovy
@@ -1,4 +1,4 @@
-package graphql.validation.rules
+package graphql.validation
 
 
 import graphql.parser.Parser
diff --git a/src/test/groovy/graphql/validation/UniqueFragmentNamesTest.groovy b/src/test/groovy/graphql/validation/UniqueFragmentNamesTest.groovy
@@ -1,4 +1,4 @@
-package graphql.validation.rules
+package graphql.validation
 
 import graphql.language.SourceLocation
 import graphql.parser.Parser
diff --git a/src/test/groovy/graphql/validation/UniqueObjectFieldNameTest.groovy b/src/test/groovy/graphql/validation/UniqueObjectFieldNameTest.groovy
@@ -1,4 +1,4 @@
-package graphql.validation.rules
+package graphql.validation
 
 import graphql.parser.Parser
 import graphql.validation.Validator
diff --git a/src/test/groovy/graphql/validation/UniqueOperationNamesTest.groovy b/src/test/groovy/graphql/validation/UniqueOperationNamesTest.groovy
@@ -1,4 +1,4 @@
-package graphql.validation.rules
+package graphql.validation
 
 import graphql.language.SourceLocation
 import graphql.parser.Parser
diff --git a/src/test/groovy/graphql/validation/UniqueVariableNamesTest.groovy b/src/test/groovy/graphql/validation/UniqueVariableNamesTest.groovy
@@ -1,4 +1,4 @@
-package graphql.validation.rules
+package graphql.validation
 
 import graphql.TestUtil
 import graphql.parser.Parser
diff --git a/src/test/groovy/graphql/validation/VariableDefaultValuesOfCorrectTypeTest.groovy b/src/test/groovy/graphql/validation/VariableDefaultValuesOfCorrectTypeTest.groovy
@@ -1,4 +1,4 @@
-package graphql.validation.rules
+package graphql.validation
 
 import graphql.TestUtil
 import graphql.validation.ValidationErrorType
diff --git a/src/test/groovy/graphql/validation/VariableTypesMatchTest.groovy b/src/test/groovy/graphql/validation/VariableTypesMatchTest.groovy
@@ -1,4 +1,4 @@
-package graphql.validation.rules
+package graphql.validation
 
 
 import graphql.StarWarsSchema
diff --git a/src/test/groovy/graphql/validation/VariablesAreInputTypesTest.groovy b/src/test/groovy/graphql/validation/VariablesAreInputTypesTest.groovy
@@ -1,4 +1,4 @@
-package graphql.validation.rules
+package graphql.validation
 
 import graphql.TestUtil
 import graphql.validation.ValidationErrorType
diff --git a/src/test/groovy/graphql/validation/VariablesTypesMatcherTest.groovy b/src/test/groovy/graphql/validation/VariablesTypesMatcherTest.groovy
@@ -1,4 +1,4 @@
-package graphql.validation.rules
+package graphql.validation
 
 import graphql.language.BooleanValue
 import graphql.language.StringValue

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ private static boolean compareWithoutChildren(ExecutableNormalizedField one, Exe`
`168`	`168`	`return true;`
`169`	`169`	`}`
`170`	`170`
`171`		`- // copied from graphql.validation.rules.OverlappingFieldsCanBeMerged`
	`171`	`+ // copied from graphql.validation.OperationValidator`
`172`	`172`	`private static boolean sameArguments(List<Argument> arguments1, List<Argument> arguments2) {`
`173`	`173`	`if (arguments1.size() != arguments2.size()) {`
`174`	`174`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ private static boolean compareWithoutChildren(NormalizedField one, NormalizedFie`
`166`	`166`	`return true;`
`167`	`167`	`}`
`168`	`168`
`169`		`- // copied from graphql.validation.rules.OverlappingFieldsCanBeMerged`
	`169`	`+ // copied from graphql.validation.OperationValidator`
`170`	`170`	`private static boolean sameArguments(List<Argument> arguments1, List<Argument> arguments2) {`
`171`	`171`	`if (arguments1.size() != arguments2.size()) {`
`172`	`172`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package graphql.validation.rules;`
	`1`	`+package graphql.validation;`
`2`	`2`
`3`	`3`
`4`	`4`	`import graphql.Internal;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package graphql.validation.rules`
	`1`	`+package graphql.validation`
`2`	`2`
`3`	`3`	`import graphql.TestUtil`
`4`	`4`	`import graphql.parser.Parser`