refactor: upgrade to GraphQL Java 16.1

close #38

Author: aoudiamoncef

README.md

@@ -16,13 +16,13 @@ This library provides extended validation of fields and field arguments for [gra
 <dependency>
   <groupId>com.graphql-java</groupId>
   <artifactId>graphql-java-extended-validation</artifactId>
-  <version>15.0.1</version>
+  <version>16.0.0</version>
   <type>pom</type>
 </dependency>
 ```
 
 ```groovy
-compile 'com.graphql-java:graphql-java-extended-validation:15.0.1'
+compile 'com.graphql-java:graphql-java-extended-validation:16.0.0'
 ```
 
 > Note:
@@ -32,6 +32,8 @@ compile 'com.graphql-java:graphql-java-extended-validation:15.0.1'
 > use 14.0.1 or above for graphql-java 14.x and above
 >
 > use 15.0.1 or above for graphql-java 15.x and above
+> 
+> use 16.0.0 or above for graphql-java 16.x and above
 
 Its currently available from JCenter repo and Maven central.
 

build.gradle

@@ -39,10 +39,10 @@ repositories {
 
 
 dependencies {
-    compile "com.graphql-java:graphql-java:15.0"
+    compile "com.graphql-java:graphql-java:16.1"
     compile 'org.slf4j:slf4j-api:1.7.30'
     compile "jakarta.validation:jakarta.validation-api:2.0.2"
-    compile "org.hibernate.validator:hibernate-validator:6.1.5.Final"
+    compile "org.hibernate.validator:hibernate-validator:6.1.6.Final"
     compile "jakarta.el:jakarta.el-api:3.0.3"
     compile "org.glassfish:jakarta.el:3.0.3"
 

src/main/java/graphql/validation/interpolation/ResourceBundleMessageInterpolator.java

@@ -3,7 +3,7 @@
 import graphql.ErrorClassification;
 import graphql.GraphQLError;
 import graphql.GraphqlErrorBuilder;
-import graphql.execution.ExecutionPath;
+import graphql.execution.ResultPath;
 import graphql.schema.GraphQLDirective;
 import graphql.validation.el.StandardELVariables;
 import graphql.validation.rules.ValidationEnvironment;
@@ -70,7 +70,7 @@ public class ResourceBundleMessageInterpolator implements MessageInterpolator {
      */
     @SuppressWarnings("unused")
     protected ErrorClassification buildErrorClassification(String messageTemplate, Map<String, Object> messageParams, ValidationEnvironment validationEnvironment) {
-        ExecutionPath fieldOrArgumentPath = validationEnvironment.getValidatedPath();
+        ResultPath fieldOrArgumentPath = validationEnvironment.getValidatedPath();
         GraphQLDirective directive = validationEnvironment.getContextObject(GraphQLDirective.class);
         return new ValidationErrorType(fieldOrArgumentPath, directive);
     }
@@ -183,10 +183,10 @@ private org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterp
     }
 
     private static class ValidationErrorType implements ErrorClassification {
-        private final ExecutionPath fieldOrArgumentPath;
+        private final ResultPath fieldOrArgumentPath;
         private final GraphQLDirective directive;
 
-        ValidationErrorType(ExecutionPath fieldOrArgumentPath, GraphQLDirective directive) {
+        ValidationErrorType(ResultPath fieldOrArgumentPath, GraphQLDirective directive) {
             this.fieldOrArgumentPath = fieldOrArgumentPath;
             this.directive = directive;
         }

src/main/java/graphql/validation/rules/TargetedValidationRules.java

@@ -3,7 +3,7 @@
 import graphql.Assert;
 import graphql.GraphQLError;
 import graphql.PublicApi;
-import graphql.execution.ExecutionPath;
+import graphql.execution.ResultPath;
 import graphql.schema.DataFetchingEnvironment;
 import graphql.schema.GraphQLArgument;
 import graphql.schema.GraphQLDirective;
@@ -71,7 +71,7 @@ public List<GraphQLError> runValidationRules(DataFetchingEnvironment env, Messag
 
         GraphQLObjectType fieldContainer = env.getExecutionStepInfo().getFieldContainer();
         GraphQLFieldDefinition fieldDefinition = env.getFieldDefinition();
-        ExecutionPath fieldPath = env.getExecutionStepInfo().getPath();
+        ResultPath fieldPath = env.getExecutionStepInfo().getPath();
         //
         // run the field specific rules
         ValidationCoordinates fieldCoords = ValidationCoordinates.newCoordinates(fieldContainer, fieldDefinition);
@@ -168,7 +168,7 @@ private List<GraphQLError> walkObjectArg(ValidationRule rule, ValidationEnvironm
                 continue;
             }
 
-            ExecutionPath newPath = validationEnvironment.getValidatedPath().segment(inputField.getName());
+            ResultPath newPath = validationEnvironment.getValidatedPath().segment(inputField.getName());
 
             ValidationEnvironment newValidationEnvironment = validationEnvironment.transform(builder -> builder
                     .validatedPath(newPath)
@@ -197,7 +197,7 @@ private List<GraphQLError> walkListArg(ValidationRule rule, ValidationEnvironmen
         int ix = 0;
         for (Object value : objectList) {
 
-            ExecutionPath newPath = validationEnvironment.getValidatedPath().segment(ix);
+            ResultPath newPath = validationEnvironment.getValidatedPath().segment(ix);
 
             ValidationEnvironment newValidationEnvironment = validationEnvironment.transform(builder -> builder
                     .validatedPath(newPath)

src/main/java/graphql/validation/rules/ValidationEnvironment.java

@@ -1,7 +1,7 @@
 package graphql.validation.rules;
 
 import graphql.PublicApi;
-import graphql.execution.ExecutionPath;
+import graphql.execution.ResultPath;
 import graphql.language.SourceLocation;
 import graphql.schema.DataFetchingEnvironment;
 import graphql.schema.GraphQLArgument;
@@ -45,8 +45,8 @@ public enum ValidatedElement {
     private final GraphQLFieldsContainer fieldsContainer;
     private final GraphQLFieldDefinition fieldDefinition;
     private final GraphQLArgument argument;
-    private final ExecutionPath executionPath;
-    private final ExecutionPath validatedPath;
+    private final ResultPath executionPath;
+    private final ResultPath validatedPath;
     private final SourceLocation location;
     private final MessageInterpolator interpolator;
     private final Map<Class, Object> contextMap;
@@ -99,11 +99,11 @@ public SourceLocation getLocation() {
         return location;
     }
 
-    public ExecutionPath getValidatedPath() {
+    public ResultPath getValidatedPath() {
         return validatedPath;
     }
 
-    public ExecutionPath getExecutionPath() {
+    public ResultPath getExecutionPath() {
         return executionPath;
     }
 
@@ -146,8 +146,8 @@ public static class Builder {
         private GraphQLArgument argument;
         private Map<String, Object> argumentValues = new HashMap<>();
         private GraphQLFieldDefinition fieldDefinition;
-        private ExecutionPath validatedPath = ExecutionPath.rootPath();
-        private ExecutionPath executionPath;
+        private ResultPath validatedPath = ResultPath.rootPath();
+        private ResultPath executionPath;
         private GraphQLFieldsContainer fieldsContainer;
         private MessageInterpolator interpolator;
         private Locale locale;
@@ -202,7 +202,7 @@ public Builder fieldsContainer(GraphQLFieldsContainer fieldsContainer) {
             return this;
         }
 
-        public Builder executionPath(ExecutionPath executionPath) {
+        public Builder executionPath(ResultPath executionPath) {
             this.executionPath = executionPath;
             return this;
         }
@@ -227,7 +227,7 @@ public Builder validatedValue(Object validatedValue) {
             return this;
         }
 
-        public Builder validatedPath(ExecutionPath validatedPath) {
+        public Builder validatedPath(ResultPath validatedPath) {
             this.validatedPath = validatedPath;
             return this;
         }

src/main/java/graphql/validation/util/Util.java

@@ -4,7 +4,7 @@
 import graphql.GraphQLError;
 import graphql.Internal;
 import graphql.execution.DataFetcherResult;
-import graphql.execution.ExecutionPath;
+import graphql.execution.ResultPath;
 import graphql.schema.GraphQLInputType;
 import graphql.schema.GraphQLType;
 import graphql.schema.GraphQLTypeUtil;
@@ -79,7 +79,7 @@ public static <T, U extends Comparable<? super U>> List<T> sort(Collection<T> to
     }
 
 
-    public static ExecutionPath concatPaths(ExecutionPath parent, ExecutionPath child) {
+    public static ResultPath concatPaths(ResultPath parent, ResultPath child) {
         if (child == null) {
             return parent;
         }

src/test/groovy/graphql/validation/TestUtil.groovy

@@ -34,6 +34,7 @@ import graphql.schema.idl.errors.SchemaProblem
 import java.util.function.Supplier
 import java.util.stream.Collectors
 
+
 class TestUtil {
 
 
@@ -47,8 +48,9 @@ class TestUtil {
 
     static dummySchema = GraphQLSchema.newSchema()
             .query(GraphQLObjectType.newObject()
-            .name("QueryType")
-            .build())
+                    .name("QueryType")
+                    .field(GraphQLFieldDefinition.newFieldDefinition().name("field").type(Scalars.GraphQLString))
+                    .build())
             .build()
 
     static GraphQLSchema schemaFile(String fileName) {

src/test/groovy/graphql/validation/constraints/BaseConstraintTestSupport.groovy

@@ -2,7 +2,7 @@ package graphql.validation.constraints
 
 import graphql.GraphQLError
 import graphql.GraphqlErrorBuilder
-import graphql.execution.ExecutionPath
+import graphql.execution.ResultPath
 import graphql.execution.ExecutionStepInfo
 import graphql.execution.MergedField
 import graphql.language.Field
@@ -50,7 +50,7 @@ class BaseConstraintTestSupport extends Specification {
 
         def validationRules = TargetedValidationRules.newValidationRules().addRule(coordinates, ruleUnderTest).build()
 
-        def path = ExecutionPath.rootPath()
+        def path = ResultPath.rootPath()
 
         def astField = Field.newField()
                 .name(fieldDefinition.name)
@@ -100,8 +100,8 @@ class BaseConstraintTestSupport extends Specification {
                 .validatedType(argUnderTest.getType())
                 .fieldDefinition(fieldDefinition)
                 .fieldsContainer(fieldsContainer)
-                .executionPath(ExecutionPath.rootPath().segment(fieldDefinition.getName()))
-                .validatedPath(ExecutionPath.rootPath().segment(argName))
+                .executionPath(ResultPath.rootPath().segment(fieldDefinition.getName()))
+                .validatedPath(ResultPath.rootPath().segment(argName))
                 .context(GraphQLDirective.class, argUnderTest.getDirective(targetDirective))
                 .messageInterpolator(interpolator)
                 .build()
@@ -112,7 +112,7 @@ class BaseConstraintTestSupport extends Specification {
         GraphQLFieldsContainer fieldsContainer = schema.getObjectType("Query") as GraphQLFieldsContainer
         GraphQLFieldDefinition fieldDefinition = fieldsContainer.getFieldDefinition("field")
 
-        def path = ExecutionPath.rootPath().segment(fieldDefinition.getName())
+        def path = ResultPath.rootPath().segment(fieldDefinition.getName())
         def ruleEnvironment = ValidationEnvironment.newValidationEnvironment()
                 .argumentValues(arguments)
                 .fieldsContainer(fieldsContainer)

src/test/groovy/graphql/validation/interpolation/ResourceBundleMessageInterpolatorTest.groovy

@@ -1,6 +1,6 @@
 package graphql.validation.interpolation
 
-import graphql.execution.ExecutionPath
+import graphql.execution.ResultPath
 import graphql.schema.GraphQLArgument
 import graphql.schema.GraphQLFieldDefinition
 import graphql.schema.GraphQLFieldsContainer
@@ -24,8 +24,8 @@ class ResourceBundleMessageInterpolatorTest extends Specification {
                 .fieldDefinition(fieldDefinition)
                 .fieldsContainer(fieldsContainer)
                 .messageInterpolator(interpolator)
-                .executionPath(ExecutionPath.rootPath().segment(fieldDefinition.getName()))
-                .validatedPath(ExecutionPath.rootPath().segment(argName))
+                .executionPath(ResultPath.rootPath().segment(fieldDefinition.getName()))
+                .validatedPath(ResultPath.rootPath().segment(argName))
                 .locale(locale)
                 .build()
         ruleEnvironment

src/test/groovy/graphql/validation/util/DirectivesAndTypeWalkerTest.groovy

@@ -9,6 +9,8 @@ class DirectivesAndTypeWalkerTest extends Specification {
 
     def "can walk self referencing types"() {
         def sdl = """
+            directive @deprecated on INPUT_OBJECT
+
             input TestInput @deprecated {
                 name : String
                 list : [TestInput]