build(*): Upgrade project dependencies (#14)

fix issue with GraphQL Java 14

Author: aoudiamoncef

readme.md README.mdreadme.md renamed to README.md

@@ -21,13 +21,13 @@ 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.1</version>
+  <version>0.0.3</version>
   <type>pom</type>
 </dependency>
 ```
 
 ```groovy
-compile 'com.graphql-java:graphql-java-extended-validation:0.0.1'
+compile 'com.graphql-java:graphql-java-extended-validation:0.0.3'
 ```
 
 Its currently available from JCenter repo and Maven central is pending.

build.gradle

@@ -2,7 +2,7 @@ import java.text.SimpleDateFormat
 
 
 plugins {
-    id "com.jfrog.bintray" version "1.8.4"
+    id "com.jfrog.bintray" version "1.8.5"
 }
 
 apply plugin: 'java'
@@ -39,26 +39,25 @@ repositories {
 
 
 dependencies {
-    compile "com.graphql-java:graphql-java:13.0"
+    compile "com.graphql-java:graphql-java:14.0"
     compile 'org.slf4j:slf4j-api:1.7.25'
-    compile "javax.validation:validation-api:2.0.1.Final"
-    compile "org.hibernate.validator:hibernate-validator:6.0.17.Final"
-    //compile "org.hibernate.validator:hibernate-validator:6.1.0.Alpha5"
-    compile "javax.el:javax.el-api:3.0.0"
-    compile "org.glassfish:javax.el:3.0.0"
-
-    testCompile 'org.slf4j:slf4j-simple:1.7.25'
-    testCompile 'org.spockframework:spock-core:1.1-groovy-2.4'
-    testCompile 'org.codehaus.groovy:groovy-all:2.5.7'
+    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"
+    compile "org.glassfish:jakarta.el:3.0.3"
+
+    testCompile 'org.slf4j:slf4j-simple:1.7.30'
+    testCompile 'org.spockframework:spock-core:1.3-groovy-2.5'
+    testCompile 'org.codehaus.groovy:groovy-all:2.5.11'
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
+    archiveClassifier.set("sources")
     from sourceSets.main.allSource
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
+    archiveClassifier.set("javadoc")
     from javadoc.destinationDir
 }
 

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

@@ -10,6 +10,7 @@
 import graphql.schema.GraphQLFieldsContainer;
 import graphql.schema.GraphQLInputObjectType;
 import graphql.schema.GraphQLInputType;
+import graphql.schema.GraphQLNamedInputType;
 import graphql.schema.GraphQLScalarType;
 import graphql.schema.GraphQLTypeUtil;
 import graphql.validation.rules.ValidationEnvironment;
@@ -162,10 +163,13 @@ private List<GraphQLError> runConstraintOnDirectives(ValidationEnvironment valid
      * @return true ifits oneof them
      */
     protected boolean isOneOfTheseTypes(GraphQLInputType inputType, GraphQLScalarType... scalarTypes) {
-        GraphQLInputType unwrappedType = Util.unwrapNonNull(inputType);
-        for (GraphQLScalarType scalarType : scalarTypes) {
-            if (unwrappedType.getName().equals(scalarType.getName())) {
-                return true;
+        GraphQLInputType type = Util.unwrapNonNull(inputType);
+        if (type instanceof GraphQLNamedInputType) {
+            final GraphQLNamedInputType unwrappedType = (GraphQLNamedInputType) type;
+            for (GraphQLScalarType scalarType : scalarTypes) {
+                if (unwrappedType.getName().equals(scalarType.getName())) {
+                    return true;
+                }
             }
         }
         return false;
@@ -283,7 +287,6 @@ protected Map<String, Object> mkMessageParams(Object validatedValue, ValidationE
     }
 
 
-
     /**
      * Creates  a new {@link graphql.GraphQLError}
      *

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

@@ -3,8 +3,6 @@
 import graphql.PublicSpi;
 import graphql.validation.rules.ValidationRule;
 
-import java.util.List;
-
 /**
  * A DirectiveConstraint is a specialised form of validation rule
  * that assumes it is backed by a SDL directive on fields, field arguments

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

@@ -19,7 +19,6 @@
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
-import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;

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

@@ -16,9 +16,9 @@ import graphql.schema.GraphQLObjectType
 import graphql.schema.GraphQLSchema
 import graphql.validation.TestUtil
 import graphql.validation.interpolation.MessageInterpolator
+import graphql.validation.rules.TargetedValidationRules
 import graphql.validation.rules.ValidationCoordinates
 import graphql.validation.rules.ValidationEnvironment
-import graphql.validation.rules.TargetedValidationRules
 import spock.lang.Specification
 
 class BaseConstraintTestSupport extends Specification {

src/test/groovy/graphql/validation/constraints/standard/SizeConstraintTest.groovy

@@ -1,7 +1,7 @@
 package graphql.validation.constraints.standard
 
 import graphql.validation.constraints.BaseConstraintTestSupport
-    import graphql.validation.constraints.DirectiveConstraint
+import graphql.validation.constraints.DirectiveConstraint
 import spock.lang.Unroll
 
 class SizeConstraintTest extends BaseConstraintTestSupport {