Graphql java 14 stable (#23)

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

This reverts commit 4c08118

* Updating to latest hibernate-validation dependency to match what is defaulted in spring-boot-starter-parent 2.3.0.RELEASE and above

* Updating to latest graphql-java:14.1, slf4j:1.7.30

Author: setchy

README.md

@@ -21,21 +21,15 @@ 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.5</version>
+  <version>0.0.3</version>
   <type>pom</type>
 </dependency>
 ```
 
 ```groovy
-compile 'com.graphql-java:graphql-java-extended-validation:0.0.5'
+compile 'com.graphql-java:graphql-java-extended-validation:0.0.3'
 ```
 
-> 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,10 +39,10 @@ repositories {
 
 
 dependencies {
-    compile "com.graphql-java:graphql-java:15.0"
+    compile "com.graphql-java:graphql-java:14.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.0.19.Final"
+    compile "org.hibernate.validator:hibernate-validator:6.1.5.Final"
     compile "jakarta.el:jakarta.el-api:3.0.3"
     compile "org.glassfish:jakarta.el:3.0.3"
 

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

@@ -28,7 +28,6 @@
 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")
@@ -73,10 +72,10 @@ public boolean appliesTo(GraphQLArgument argument, GraphQLFieldDefinition fieldD
                 if (appliesToType) {
                     return true;
                 }
-                // if they have a @Directive on there BUT it can't handle that type
+                // if they have a @Directive on there BUT it cant handle that type
                 // then is a really bad situation
                 String argType = GraphQLTypeUtil.simplePrint(inputType);
-                Assert.assertTrue(false, () -> format("The directive rule '%s' cannot be placed on elements of type '%s'", "@" + this.getName(), argType));
+                Assert.assertTrue(false, "The directive rule '%s' cannot be placed on elements of type '%s'", "@" + this.getName(), argType);
             }
             return false;
         });
@@ -326,7 +325,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/interpolation/ResourceBundleMessageInterpolator.java

@@ -7,16 +7,18 @@
 import graphql.schema.GraphQLDirective;
 import graphql.validation.el.StandardELVariables;
 import graphql.validation.rules.ValidationEnvironment;
+import javax.validation.Path;
 import org.hibernate.validator.internal.engine.MessageInterpolatorContext;
 import org.hibernate.validator.internal.metadata.core.ConstraintHelper;
 import org.hibernate.validator.internal.metadata.descriptor.ConstraintDescriptorImpl;
+import org.hibernate.validator.internal.metadata.descriptor.ConstraintDescriptorImpl.ConstraintType;
+import org.hibernate.validator.internal.metadata.location.ConstraintLocation.ConstraintLocationKind;
 import org.hibernate.validator.internal.util.annotation.ConstraintAnnotationDescriptor;
 import org.hibernate.validator.resourceloading.PlatformResourceBundleLocator;
 import org.hibernate.validator.spi.resourceloading.ResourceBundleLocator;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;
-import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 import java.util.LinkedHashMap;
@@ -148,16 +150,18 @@ private MessageInterpolatorContext buildHibernateContext(Map<String, Object> mes
 
         ConstraintDescriptorImpl<BridgeAnnotation> constraintDescriptor
                 = new ConstraintDescriptorImpl<>(
-                new ConstraintHelper(), null,
-                annotationDescriptor, ElementType.FIELD
+                ConstraintHelper.forAllBuiltinConstraints(), null,
+                annotationDescriptor, ConstraintLocationKind.FIELD, ConstraintType.GENERIC
         );
 
         Map<String, Object> expressionVariables = StandardELVariables.standardELVars(validationEnvironment);
 
         Class<?> rootBeanType = null;
+        Path propertyPath = null;
+
         return new MessageInterpolatorContext(
                 constraintDescriptor, validatedValue, rootBeanType,
-                messageParams, expressionVariables);
+                propertyPath, messageParams, expressionVariables);
     }
 
     private org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterpolator hibernateInterpolator() {

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/ELDiscover.java

@@ -3,6 +3,8 @@
 import org.hibernate.validator.internal.engine.path.PathImpl;
 import org.hibernate.validator.internal.metadata.core.ConstraintHelper;
 import org.hibernate.validator.internal.metadata.descriptor.ConstraintDescriptorImpl;
+import org.hibernate.validator.internal.metadata.descriptor.ConstraintDescriptorImpl.ConstraintType;
+import org.hibernate.validator.internal.metadata.location.ConstraintLocation.ConstraintLocationKind;
 import org.hibernate.validator.internal.util.annotation.ConstraintAnnotationDescriptor;
 import org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterpolator;
 
@@ -14,7 +16,6 @@
 import javax.validation.MessageInterpolator;
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotNull;
-import java.lang.annotation.ElementType;
 import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.HashMap;
@@ -88,10 +89,11 @@ public static void main(String[] args) throws Exception {
                 = new ConstraintAnnotationDescriptor.Builder<>(NotNull.class, attributes);
 
         ConstraintDescriptorImpl<NotNull> constraintDescriptor = new ConstraintDescriptorImpl<>(
-                new ConstraintHelper(),
+                ConstraintHelper.forAllBuiltinConstraints(),
                 null,
                 constraintBuilder.build(),
-                ElementType.FIELD
+                ConstraintLocationKind.FIELD,
+                ConstraintType.GENERIC
         );
 
 
@@ -103,7 +105,7 @@ public static void main(String[] args) throws Exception {
         PathImpl rootPath = PathImpl.createRootPath();
 
         MessageInterpolator.Context context = new MessageInterpolatorContext(
-                constraintDescriptor, user, null, Collections.emptyMap(), Collections.emptyMap());
+                constraintDescriptor, user, null, rootPath, Collections.emptyMap(), Collections.emptyMap());
 
         print("${validatedValue.age}", messageInterpolator, context);
         print("${validatedValue}", messageInterpolator, context);

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()
+        def options = SchemaGenerator.Options.defaultOptions().enforceSchemaDirectives(false)
         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()
+            def options = SchemaGenerator.Options.defaultOptions().enforceSchemaDirectives(false)
             return new SchemaGenerator().makeExecutableSchema(options, registry, runtimeWiring)
         } catch (SchemaProblem e) {
             assert false: "The schema could not be compiled : ${e}"