refactor(*): Upgrade to GraphQL Java 15.0 (#16)

upgrade project dependencies.

Author: aoudiamoncef

README.md

@@ -21,15 +21,21 @@ But the project welcomes all feedback and input on code design and validation re
 <dependency>
   <groupId>com.graphql-java</groupId>
   <artifactId>graphql-java-extended-validation</artifactId>
-  <version>0.0.3</version>
+  <version>0.0.5</version>
   <type>pom</type>
 </dependency>
 ```
 
 ```groovy
-compile 'com.graphql-java:graphql-java-extended-validation:0.0.3'
+compile 'com.graphql-java:graphql-java-extended-validation:0.0.5'
 ```
 
+> Note:
+>
+> use 0.0.3 or below for graphql-java 13.x and below
+>
+> use 0.0.4 or above for graphql-java 14.x and above
+
 Its currently available from JCenter repo and Maven central is pending.
 
 

build.gradle

@@ -39,8 +39,8 @@ repositories {
 
 
 dependencies {
-    compile "com.graphql-java:graphql-java:14.0"
-    compile 'org.slf4j:slf4j-api:1.7.25'
+    compile "com.graphql-java:graphql-java:15.0"
+    compile 'org.slf4j:slf4j-api:1.7.30'
     compile "jakarta.validation:jakarta.validation-api:2.0.2"
     compile "org.hibernate.validator:hibernate-validator:6.0.19.Final"
     compile "jakarta.el:jakarta.el-api:3.0.3"

src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java

@@ -28,6 +28,7 @@
 import static graphql.schema.GraphQLTypeUtil.isList;
 import static graphql.validation.rules.ValidationEnvironment.ValidatedElement.FIELD;
 import static graphql.validation.util.Util.mkMap;
+import static java.lang.String.format;
 import static java.util.Collections.singletonList;
 
 @SuppressWarnings("UnnecessaryLocalVariable")
@@ -72,10 +73,10 @@ public boolean appliesTo(GraphQLArgument argument, GraphQLFieldDefinition fieldD
                 if (appliesToType) {
                     return true;
                 }
-                // if they have a @Directive on there BUT it cant handle that type
+                // if they have a @Directive on there BUT it can't handle that type
                 // then is a really bad situation
                 String argType = GraphQLTypeUtil.simplePrint(inputType);
-                Assert.assertTrue(false, "The directive rule '%s' cannot be placed on elements of type '%s'", "@" + this.getName(), argType);
+                Assert.assertTrue(false, () -> format("The directive rule '%s' cannot be placed on elements of type '%s'", "@" + this.getName(), argType));
             }
             return false;
         });
@@ -325,7 +326,7 @@ protected boolean isStringOrListOrMap(GraphQLInputType inputType) {
      */
     @SuppressWarnings("ConstantConditions")
     protected Map asMap(Object value) {
-        Assert.assertTrue(value instanceof Map, "The argument value MUST be a Map value");
+        Assert.assertTrue(value instanceof Map, () -> "The argument value MUST be a Map value");
         return (Map) value;
     }
 

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

@@ -104,10 +104,10 @@ public static ExecutionPath concatPaths(ExecutionPath parent, ExecutionPath chil
      */
     public static Map<String, Object> mkMap(Object... args) {
         Map<String, Object> params = new LinkedHashMap<>();
-        Assert.assertTrue(args.length % 2 == 0, "You MUST pass in an even number of arguments");
+        Assert.assertTrue(args.length % 2 == 0, () -> "You MUST pass in an even number of arguments");
         for (int ix = 0; ix < args.length; ix = ix + 2) {
             Object key = args[ix];
-            Assert.assertTrue(key instanceof String, "You MUST pass in a message param string key");
+            Assert.assertTrue(key instanceof String, () -> "You MUST pass in a message param string key");
             Object val = args[ix + 1];
             params.put(String.valueOf(key), val);
         }

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

@@ -66,7 +66,7 @@ class TestUtil {
         def stream = TestUtil.class.getClassLoader().getResourceAsStream(fileName)
 
         def typeRegistry = new SchemaParser().parse(new InputStreamReader(stream))
-        def options = SchemaGenerator.Options.defaultOptions().enforceSchemaDirectives(false)
+        def options = SchemaGenerator.Options.defaultOptions()
         def schema = new SchemaGenerator().makeExecutableSchema(options, typeRegistry, wiring)
         schema
     }
@@ -103,7 +103,7 @@ class TestUtil {
     static GraphQLSchema schema(Reader specReader, RuntimeWiring runtimeWiring) {
         try {
             def registry = new SchemaParser().parse(specReader)
-            def options = SchemaGenerator.Options.defaultOptions().enforceSchemaDirectives(false)
+            def options = SchemaGenerator.Options.defaultOptions()
             return new SchemaGenerator().makeExecutableSchema(options, registry, runtimeWiring)
         } catch (SchemaProblem e) {
             assert false: "The schema could not be compiled : ${e}"