Feature/bump hibernate validators version (#46)

* fix schema wiring

* bump version of hibernate validator

* fix imports

* refix imports

* update dependency versions

* upgrade jakarta context

* remove useless dupplication of APIs

* change editor config

Author: pelletier197

build.gradle

@@ -40,13 +40,10 @@ repositories {
 
 dependencies {
     compile "com.graphql-java:graphql-java:16.2"
-    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.7.Final"
-    compile "jakarta.el:jakarta.el-api:3.0.3"
-    compile "org.glassfish:jakarta.el:3.0.3"
+    compile "org.hibernate.validator:hibernate-validator:6.2.0.Final"
+    compile "org.glassfish:jakarta.el:4.0.0"
 
-    testCompile 'org.slf4j:slf4j-simple:1.7.30'
+    testCompile 'org.slf4j:slf4j-simple:1.7.31'
     testCompile 'org.spockframework:spock-core:1.3-groovy-2.5'
     testCompile 'org.codehaus.groovy:groovy-all:2.5.14'
 }

src/main/java/graphql/validation/el/BetterMapELResolver.java

@@ -1,9 +1,9 @@
 package graphql.validation.el;
 
 import graphql.Internal;
+import jakarta.el.ELContext;
+import jakarta.el.MapELResolver;
 
-import javax.el.ELContext;
-import javax.el.MapELResolver;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;

src/main/java/graphql/validation/el/ELSupport.java

@@ -1,16 +1,15 @@
 package graphql.validation.el;
 
 import graphql.Internal;
-import org.hibernate.validator.internal.engine.messageinterpolation.FormatterWrapper;
-
-import javax.el.ELContext;
-import javax.el.ELManager;
-import javax.el.ExpressionFactory;
-import javax.el.StandardELContext;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ELManager;
+import jakarta.el.ExpressionFactory;
+import jakarta.el.StandardELContext;
+import jakarta.el.ValueExpression;
 import java.lang.reflect.Method;
 import java.util.Locale;
 import java.util.Map;
+import org.hibernate.validator.internal.engine.messageinterpolation.FormatterWrapper;
 
 @Internal
 @SuppressWarnings("unused")

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

@@ -7,27 +7,26 @@
 import graphql.schema.GraphQLDirective;
 import graphql.validation.el.StandardELVariables;
 import graphql.validation.rules.ValidationEnvironment;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import java.util.LinkedHashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.Optional;
+import java.util.ResourceBundle;
+import javax.validation.Constraint;
 import javax.validation.Path;
+import javax.validation.Payload;
 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.messageinterpolation.ExpressionLanguageFeatureLevel;
 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.Retention;
-import java.lang.annotation.Target;
-import java.util.LinkedHashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.Optional;
-import java.util.ResourceBundle;
-
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.CONSTRUCTOR;
 import static java.lang.annotation.ElementType.FIELD;
@@ -161,7 +160,7 @@ private MessageInterpolatorContext buildHibernateContext(Map<String, Object> mes
 
         return new MessageInterpolatorContext(
                 constraintDescriptor, validatedValue, rootBeanType,
-                propertyPath, messageParams, expressionVariables);
+                propertyPath, messageParams, expressionVariables, ExpressionLanguageFeatureLevel.DEFAULT, true);
     }
 
     private org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterpolator hibernateInterpolator() {