Skip to content

Feature/bump hibernate validators version #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jul 7, 2021
Merged

Feature/bump hibernate validators version #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7ad838d
fix schema wiring
pelletier197 Sep 29, 2020
91d8d33
Merge branch 'master' of github.com:graphql-java/graphql-java-extende…
pelletier197 Jun 1, 2021
1dda6c2
bump version of hibernate validator
pelletier197 Jun 1, 2021
3757c23
fix imports
pelletier197 Jun 1, 2021
01edca8
refix imports
pelletier197 Jun 1, 2021
5b76fe6
update dependency versions
pelletier197 Jul 6, 2021
ae252a0
upgrade jakarta context
pelletier197 Jul 6, 2021
2e912e8
remove useless dupplication of APIs
pelletier197 Jul 6, 2021
f1130f2
change editor config
pelletier197 Jul 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/graphql/validation/el/BetterMapELResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
13 changes: 6 additions & 7 deletions src/main/java/graphql/validation/el/ELSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
25 changes: 12 additions & 13 deletions src/main/java/graphql/validation/interpolation/ResourceBundleMessageInterpolator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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() {
Expand Down